zorba-coders team mailing list archive

Thread
Date

[Merge] lp:~zorba-coders/zorba/feature-empty_object into lp:zorba

To: mp+155856@xxxxxxxxxxxxxxxxxx
From: Matthias Brantner <matthias.brantner@xxxxxxxxxx>
Date: Wed, 27 Mar 2013 21:37:22 -0000
Reply-to: mp+155856@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/feature-empty_object into lp:zorba.

Commit message:
BlockExpression allows for  ::= LBRACE RBRACE and interprets it as an empty object; removed ::= LBRACE RBRACE from the JSONObjectConstructor

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

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-empty_object/+merge/155856
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~zorba-coders/zorba/feature-empty_object/+merge/155856
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/compiler/parser/FlexLexer.h'
--- src/compiler/parser/FlexLexer.h	2013-03-26 23:16:42 +0000
+++ src/compiler/parser/FlexLexer.h	2013-03-27 21:36:23 +0000
@@ -62,8 +62,8 @@
 public:
 	virtual ~FlexLexer()	{ }
 
-	const char* YYText()	{ return yytext; }
-	int YYLeng()		{ return yyleng; }
+	const char* YYText() const	{ return yytext; }
+	int YYLeng()	const	{ return yyleng; }
 
 	virtual void
 		yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
@@ -99,12 +99,12 @@
 };
 
 }
-#endif
+#endif // FLEXLEXER_H
 
 #if defined(yyFlexLexer) || ! defined(yyFlexLexerOnce)
 // Either this is the first time through (yyFlexLexerOnce not defined),
 // or this is a repeated include to define a different flavor of
-// yyFlexLexer, as discussed in the flex man page.
+// yyFlexLexer, as discussed in the flex manual.
 #define yyFlexLexerOnce
 
 extern "C++" {
@@ -122,11 +122,12 @@
 	void yy_delete_buffer( struct yy_buffer_state* b );
 	void yyrestart( FLEX_STD istream* s );
 
-    void yypush_buffer_state( struct yy_buffer_state* new_buffer );
-    void yypop_buffer_state(void);
+	void yypush_buffer_state( struct yy_buffer_state* new_buffer );
+	void yypop_buffer_state();
 
 	virtual int yylex();
-	virtual void switch_streams( FLEX_STD istream* new_in, FLEX_STD ostream* new_out );
+	virtual void switch_streams( FLEX_STD istream* new_in, FLEX_STD ostream* new_out = 0 );
+	virtual int yywrap();
 
 protected:
 	virtual int LexerInput( char* buf, int max_size );
@@ -172,10 +173,10 @@
 	int yy_did_buffer_switch_on_eof;
 
 
-    size_t yy_buffer_stack_top; /**< index of top of stack. */
-    size_t yy_buffer_stack_max; /**< capacity of stack. */
-    struct yy_buffer_state ** yy_buffer_stack; /**< Stack as an array. */
-    void yyensure_buffer_stack(void);
+	size_t yy_buffer_stack_top; /**< index of top of stack. */
+	size_t yy_buffer_stack_max; /**< capacity of stack. */
+	struct yy_buffer_state ** yy_buffer_stack; /**< Stack as an array. */
+	void yyensure_buffer_stack(void);
 
 	// The following are not always needed, but may be depending
 	// on use of certain flex features (like REJECT or yymore()).
@@ -201,4 +202,5 @@
 
 }
 
-#endif
+#endif // yyFlexLexer || ! yyFlexLexerOnce
+

=== modified file 'src/compiler/parser/jsoniq_parser.cpp'
--- src/compiler/parser/jsoniq_parser.cpp	2013-03-26 23:16:42 +0000
+++ src/compiler/parser/jsoniq_parser.cpp	2013-03-27 21:36:23 +0000
@@ -36,7 +36,7 @@
 /* First part of user declarations.  */
 
 /* Line 293 of lalr1.cc  */
-#line 88 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 88 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 
 
 #include "common/common.h"
@@ -65,7 +65,7 @@
 
 
 /* Line 293 of lalr1.cc  */
-#line 69 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 69 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 917 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1053 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 
 #include "compiler/parser/jsoniq_scanner.h"
 
@@ -95,7 +95,7 @@
 
 
 /* Line 299 of lalr1.cc  */
-#line 99 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 99 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 185 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 915 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->decval); };
 
 /* Line 480 of lalr1.cc  */
-#line 290 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 290 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 127: /* "\"'DOUBLE'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 914 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->dval); };
 
 /* Line 480 of lalr1.cc  */
-#line 299 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 299 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 152: /* "\"'INTEGER'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 913 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 913 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->ival); };
 
 /* Line 480 of lalr1.cc  */
-#line 308 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 308 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 346: /* "VersionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 317 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 317 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 347: /* "MainModule" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 326 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 326 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 348: /* "LibraryModule" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 335 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 335 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 349: /* "ModuleDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 344 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 344 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 350: /* "SIND_DeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 353 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 353 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 351: /* "SIND_Decl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 362 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 362 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 352: /* "Setter" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 371 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 371 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 353: /* "BoundarySpaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 380 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 380 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 354: /* "DefaultCollationDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 389 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 389 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 355: /* "BaseURIDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 398 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 398 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 356: /* "ConstructionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 407 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 407 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 357: /* "OrderingModeDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 416 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 416 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 358: /* "EmptyOrderDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 425 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 425 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 359: /* "CopyNamespacesDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 434 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 434 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 360: /* "Import" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 443 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 443 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 361: /* "SchemaImport" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 452 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 452 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 362: /* "URILiteralList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 461 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 461 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 363: /* "SchemaPrefix" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 470 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 470 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 364: /* "ModuleImport" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 479 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 479 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 365: /* "NamespaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 488 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 488 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 366: /* "DefaultNamespaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 497 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 497 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 367: /* "VFO_DeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 506 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 506 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 368: /* "VFO_Decl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 515 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 515 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 369: /* "DecimalFormatDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 524 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 524 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 370: /* "DecimalFormatParamList" */
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 947 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->vstrpair); };
 
 /* Line 480 of lalr1.cc  */
-#line 533 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 533 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 371: /* "DecimalFormatParam" */
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 947 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->strpair); };
 
 /* Line 480 of lalr1.cc  */
-#line 542 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 542 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 373: /* "OptionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 551 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 551 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 374: /* "FTOptionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 560 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 560 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 375: /* "CtxItemDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 569 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 569 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 376: /* "CtxItemDecl2" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 578 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 578 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 377: /* "CtxItemDecl3" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 587 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 587 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 378: /* "CtxItemDecl4" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 596 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 596 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 379: /* "VarDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 605 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 605 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 380: /* "VarNameAndType" */
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 947 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->varnametype); };
 
 /* Line 480 of lalr1.cc  */
-#line 614 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 614 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 381: /* "AnnotationList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 623 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 623 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 382: /* "Annotation" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 632 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 632 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 383: /* "AnnotationLiteralList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 641 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 641 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 384: /* "FunctionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 650 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 650 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 385: /* "FunctionDecl2" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 659 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 659 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 386: /* "FunctionDeclSimple" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 668 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 668 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 387: /* "FunctionDeclUpdating" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 677 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 677 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 388: /* "FunctionSig" */
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 947 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->fnsig); };
 
 /* Line 480 of lalr1.cc  */
-#line 686 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 686 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 389: /* "ParamList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 695 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 695 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 390: /* "Param" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 704 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 704 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 391: /* "CollectionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 713 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 713 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 393: /* "IndexDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 722 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 722 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 394: /* "IndexKeyList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 731 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 731 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 395: /* "IndexKeySpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 740 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 740 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 396: /* "IntegrityConstraintDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 749 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 749 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 397: /* "QueryBody" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 758 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 758 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 398: /* "StatementsAndOptionalExprTop" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 767 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 767 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 399: /* "StatementsAndOptionalExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 776 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 776 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 400: /* "StatementsAndExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 785 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 785 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 401: /* "Statements" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 794 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 794 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 402: /* "Statement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 803 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 803 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 403: /* "BlockStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 812 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 812 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 404: /* "BlockExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 821 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 821 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 405: /* "EnclosedStatementsAndOptionalExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 830 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 830 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 406: /* "VarDeclStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 839 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 839 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 409: /* "AssignStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 848 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 848 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 410: /* "ApplyStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 857 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 857 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 411: /* "ExitStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 866 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 866 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 412: /* "WhileStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 875 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 875 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 413: /* "FlowCtlStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 884 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 884 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 414: /* "FLWORStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 893 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 893 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 415: /* "ReturnStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 902 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 902 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 416: /* "IfStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 911 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 911 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 417: /* "TryStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 920 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 920 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 418: /* "CatchListStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 929 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 929 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 419: /* "CatchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 938 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 421: /* "Expr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 947 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 422: /* "ExprSingle" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 956 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 956 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 423: /* "ExprSimple" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 965 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 965 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 424: /* "FLWORExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 974 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 974 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 425: /* "ReturnExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 983 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 983 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 428: /* "FLWORWinCond" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 992 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 992 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 429: /* "WindowClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1001 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1001 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 430: /* "CountClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1010 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1010 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 431: /* "ForLetWinClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1019 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1019 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 433: /* "FLWORClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1028 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1028 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 434: /* "ForClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1037 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1037 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 436: /* "VarInDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1046 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1046 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 437: /* "VarInDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1055 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1055 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 438: /* "PositionalVar" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1064 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1064 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 439: /* "FTScoreVar" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1073 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1073 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 440: /* "LetClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1082 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1082 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 441: /* "VarGetsDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1091 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1091 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 442: /* "VarGetsDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1100 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1100 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 443: /* "WindowVarDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1109 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1109 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 444: /* "WindowVars" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1118 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1118 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 445: /* "WindowVars3" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1127 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1127 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 446: /* "WindowVars2" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1136 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1136 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 447: /* "WhereClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1145 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1145 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 448: /* "GroupByClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1154 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1154 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 449: /* "GroupSpecList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1163 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1163 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 450: /* "GroupSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1172 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1172 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 451: /* "GroupCollationSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1181 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1181 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 452: /* "OrderByClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1190 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1190 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 453: /* "OrderSpecList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1199 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1199 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 454: /* "OrderSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1208 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1208 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 455: /* "OrderModifier" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1217 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1217 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 456: /* "OrderDirSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1226 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1226 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 457: /* "OrderEmptySpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1235 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1235 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 458: /* "OrderCollationSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1244 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1244 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 459: /* "QuantifiedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1253 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1253 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 460: /* "QVarInDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1262 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1262 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 461: /* "QVarInDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1271 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1271 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 462: /* "SwitchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1280 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1280 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 463: /* "SwitchCaseClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1289 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1289 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 464: /* "SwitchCaseClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1298 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1298 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 465: /* "SwitchCaseOperandList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1307 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1307 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 466: /* "SwitchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1316 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1316 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 469: /* "TypeswitchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1325 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1325 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 470: /* "TypeswitchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1334 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1334 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 471: /* "CaseClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1343 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1343 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 472: /* "CaseClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1352 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1352 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 475: /* "SequenceTypeList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1361 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1361 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 476: /* "IfExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1370 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1370 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 477: /* "OrExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1379 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1379 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 478: /* "AndExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1388 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1388 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 479: /* "NotExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1397 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1397 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 480: /* "ComparisonExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1406 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1406 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 481: /* "FTContainsExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1415 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1415 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 482: /* "StringConcatExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1424 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1424 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 483: /* "opt_FTIgnoreOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1433 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1433 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 484: /* "RangeExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1442 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1442 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 485: /* "AdditiveExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1451 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1451 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 486: /* "MultiplicativeExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1460 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1460 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 487: /* "UnionExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1469 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1469 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 488: /* "IntersectExceptExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1478 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1478 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 489: /* "InstanceofExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1487 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1487 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 490: /* "TreatExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1496 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1496 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 491: /* "CastableExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1505 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1505 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 492: /* "CastExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1514 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1514 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 493: /* "SingleType" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1523 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1523 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 494: /* "UnaryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1532 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1532 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 495: /* "SignList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1541 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1541 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 496: /* "ValueExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1550 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1550 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 497: /* "SimpleMapExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1559 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1559 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 498: /* "ValueComp" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1568 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1568 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 499: /* "ValidateExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1577 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1577 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 500: /* "ExtensionExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1586 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1586 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 501: /* "Pragma_list" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1595 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1595 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 502: /* "Pragma" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1604 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1604 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 503: /* "PathExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1613 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1613 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 504: /* "RelativePathExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1622 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1622 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 505: /* "StepExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1631 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1631 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 506: /* "NameTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1640 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1640 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 507: /* "Wildcard" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1649 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1649 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 508: /* "FilterExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1658 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1658 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 509: /* "PredicateList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1667 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1667 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 510: /* "Predicate" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1676 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1676 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 511: /* "PrimaryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1685 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1685 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 512: /* "Literal" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1694 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1694 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 513: /* "NumericLiteral" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1703 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1703 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 515: /* "VarRef" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1712 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1712 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 516: /* "ParenthesizedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1721 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1721 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 517: /* "ContextItemExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1730 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1730 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 518: /* "OrderedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1739 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1739 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 519: /* "UnorderedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1748 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1748 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 520: /* "FunctionCall" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1757 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1757 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 521: /* "ArgList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1766 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1766 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 525: /* "Constructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1775 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1775 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 526: /* "DirectConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1784 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1784 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 527: /* "DirElemConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1793 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1793 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 528: /* "DirElemContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1802 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1802 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 529: /* "DirAttributeList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1811 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1811 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 530: /* "DirAttr" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1820 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1820 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 532: /* "DirAttributeValue" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1829 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1829 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 533: /* "opt_QuoteAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1838 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1838 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 534: /* "QuoteAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1847 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1847 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 535: /* "opt_AposAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1856 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1856 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 536: /* "AposAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1865 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1865 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 537: /* "QuoteAttrValueContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1874 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1874 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 538: /* "AposAttrValueContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1883 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1883 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 539: /* "DirElemContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1892 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1892 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 540: /* "CommonContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1901 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1901 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 541: /* "DirCommentConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1910 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1910 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 542: /* "DirPIConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1919 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1919 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 543: /* "CDataSection" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1928 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1928 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 544: /* "ComputedConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1937 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1937 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 545: /* "CompDocConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1946 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1946 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 546: /* "CompElemConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1955 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1955 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 547: /* "CompAttrConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1964 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1964 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 548: /* "CompTextConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1973 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1973 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 549: /* "CompCommentConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1982 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1982 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 550: /* "CompPIConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1991 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1991 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 551: /* "CompNamespaceConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2000 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2000 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 552: /* "TypeDeclaration" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2009 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2009 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 553: /* "SequenceType" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2018 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2018 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 554: /* "OccurrenceIndicator" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2027 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2027 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 555: /* "ItemType" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2036 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2036 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 556: /* "TypeList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2045 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2045 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 557: /* "GeneralizedAtomicType" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2054 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2054 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 558: /* "SimpleType" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2063 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2063 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 559: /* "KindTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2072 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2072 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 560: /* "AnyKindTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2081 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2081 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 561: /* "DocumentTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2090 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2090 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 562: /* "NamespaceTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2099 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2099 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 563: /* "TextTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2108 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2108 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 564: /* "CommentTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2117 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2117 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 565: /* "PITest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2126 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2126 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 566: /* "AttributeTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2135 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2135 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 567: /* "SchemaAttributeTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2144 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2144 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 568: /* "ElementTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2153 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2153 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 569: /* "SchemaElementTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2162 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2162 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 570: /* "TypeName" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2171 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2171 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 571: /* "TypeName_WITH_HOOK" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2180 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2180 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 572: /* "StringLiteral" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2189 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2189 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 574: /* "AnyFunctionTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2198 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2198 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 575: /* "TypedFunctionTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2207 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2207 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 578: /* "InsertExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2216 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2216 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 579: /* "DeleteExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2225 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2225 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 580: /* "ReplaceExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2234 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2234 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 581: /* "RenameExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2243 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2243 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 582: /* "TransformExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2252 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2252 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 583: /* "VarNameList" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2261 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2261 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 584: /* "VarNameDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2270 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2270 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 585: /* "TryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2279 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2279 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 586: /* "CatchListExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2288 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2288 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 587: /* "CatchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2297 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2297 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 588: /* "BracedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2306 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2306 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 589: /* "NameTestList" */
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 947 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->name_test_list); };
 
 /* Line 480 of lalr1.cc  */
-#line 2315 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2315 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 590: /* "FTSelection" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2324 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2324 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 593: /* "FTOr" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2333 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2333 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 594: /* "FTAnd" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2342 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2342 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 595: /* "FTMildNot" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2351 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2351 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 596: /* "FTUnaryNot" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2360 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2360 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 597: /* "FTPrimaryWithOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2369 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2369 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 598: /* "opt_FTMatchOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2378 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2378 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 600: /* "FTWeight" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2387 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2387 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 601: /* "FTPrimary" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2396 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2396 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 602: /* "opt_FTTimes" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2405 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2405 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 603: /* "FTExtensionSelection" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2414 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2414 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 605: /* "FTWords" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2423 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2423 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 606: /* "FTWordsValue" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2432 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2432 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 608: /* "FTAnyallOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2441 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2441 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 611: /* "FTPosFilter" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2450 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2450 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 612: /* "FTOrder" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2459 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2459 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 613: /* "FTWindow" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2468 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2468 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 614: /* "FTDistance" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2477 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2477 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 615: /* "FTUnit" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2486 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2486 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 616: /* "FTMatchOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2495 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2495 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 617: /* "FTMatchOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2504 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2504 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 618: /* "FTCaseOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2513 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2513 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 619: /* "FTDiacriticsOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2522 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2522 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 620: /* "FTExtensionOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2531 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2531 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 621: /* "FTStemOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2540 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2540 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 622: /* "FTThesaurusOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2549 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2549 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 626: /* "FTThesaurusID" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2558 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2558 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 629: /* "FTStopWordOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2567 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2567 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 630: /* "FTStopWords" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2576 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2576 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 634: /* "FTStopWordsInclExcl" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2585 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2585 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 635: /* "FTLanguageOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2594 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2594 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 636: /* "FTWildCardOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2603 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2603 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 637: /* "FTContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2612 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2612 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 638: /* "FTTimes" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2621 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2621 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 639: /* "FTRange" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2630 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2630 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 640: /* "FTScope" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2639 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2639 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 641: /* "FTBigUnit" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2648 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2648 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 642: /* "FTIgnoreOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2657 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2657 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 643: /* "JSONArrayConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2666 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2666 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 644: /* "JSONSimpleObjectUnion" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2675 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2675 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 645: /* "JSONAccumulatorObjectUnion" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2684 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2684 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 646: /* "JSONObjectConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2693 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2693 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 647: /* "JSONPairList" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2702 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2702 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 648: /* "JSONInsertExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2711 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2711 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 649: /* "JSONAppendExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2720 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2720 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 650: /* "JSONDeleteExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2729 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2729 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 651: /* "JSONRenameExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2738 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2738 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 652: /* "JSONReplaceExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2747 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2747 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 659: /* "QNAME" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2756 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2756 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 660: /* "FUNCTION_NAME" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2765 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2765 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 661: /* "EQNAME" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2774 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2774 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
 
 	default:
@@ -2861,13 +2861,13 @@
     /* User initialization code.  */
     
 /* Line 565 of lalr1.cc  */
-#line 133 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 133 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
 {
     yylloc.begin.filename = yylloc.end.filename = &(driver.theFilename2);
 }
 
 /* Line 565 of lalr1.cc  */
-#line 2871 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2871 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1071 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1075 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1079 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1087 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = NULL;
       }
@@ -3022,7 +3022,7 @@
   case 7:
 
 /* Line 690 of lalr1.cc  */
-#line 1093 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1093 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = NULL; YYABORT;
       }
@@ -3031,7 +3031,7 @@
   case 8:
 
 /* Line 690 of lalr1.cc  */
-#line 1097 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1097 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = NULL; YYABORT;
       }
@@ -3040,7 +3040,7 @@
   case 9:
 
 /* Line 690 of lalr1.cc  */
-#line 1106 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1106 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1112 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1120 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1126 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1137 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1142 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1146 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1151 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1160 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1167 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1174 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1183 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1190 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1198 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1206 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1214 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1225 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1230 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1237 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1244 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1256 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1266 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1273 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1280 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1315 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1320 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1328 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1336 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1344 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1349 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1357 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1362 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1370 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1375 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1383 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1388 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1393 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1398 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1411 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1421 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1426 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1434 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1442 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1453 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1460 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1471 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1476 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1484 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1491 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1498 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1507 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1520 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1528 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1535 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1545 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1552 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1559 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1582 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1588 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1597 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1604 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1614 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1623 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "decimal-separator"; }
     break;
 
   case 95:
 
 /* Line 690 of lalr1.cc  */
-#line 1624 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1624 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "digit"; }
     break;
 
   case 96:
 
 /* Line 690 of lalr1.cc  */
-#line 1625 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1625 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "grouping-separator"; }
     break;
 
   case 97:
 
 /* Line 690 of lalr1.cc  */
-#line 1626 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1626 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "infinty"; }
     break;
 
   case 98:
 
 /* Line 690 of lalr1.cc  */
-#line 1627 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1627 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "minus-sign"; }
     break;
 
   case 99:
 
 /* Line 690 of lalr1.cc  */
-#line 1628 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1628 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "NaN"; }
     break;
 
   case 100:
 
 /* Line 690 of lalr1.cc  */
-#line 1629 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1629 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "pattern-separator"; }
     break;
 
   case 101:
 
 /* Line 690 of lalr1.cc  */
-#line 1630 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1630 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "percent"; }
     break;
 
   case 102:
 
 /* Line 690 of lalr1.cc  */
-#line 1631 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1631 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "per-mille"; }
     break;
 
   case 103:
 
 /* Line 690 of lalr1.cc  */
-#line 1632 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1632 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "zero-digit"; }
     break;
 
   case 104:
 
 /* Line 690 of lalr1.cc  */
-#line 1638 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1638 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1646 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1654 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1662 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1669 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1677 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1684 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1689 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1697 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1705 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1719 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1733 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1750 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1755 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1763 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1771 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1782 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1787 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1796 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1801 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1808 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1813 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1823 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1828 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1837 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1843 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1856 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1861 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1869 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1880 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1895 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1907 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1922 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1927 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1932 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1937 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1945 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1952 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1963 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1968 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1978 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1987 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 1996 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2005 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2017 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2021 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2027 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2031 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2041 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2051 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2064 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2070 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2079 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2084 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2091 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2098 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2110 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2120 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2130 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2141 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2157 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2177 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2181 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2185 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) =  NULL;
     }
@@ -4504,7 +4504,7 @@
   case 168:
 
 /* Line 690 of lalr1.cc  */
-#line 2193 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2193 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2197 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2201 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2209 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2214 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2226 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2233 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2243 "/home/colea/xquery_bzr/feature-empty_object/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/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2276 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -4602,9 +4602,14 @@
   case 190:
 
 /* Line 690 of lalr1.cc  */
-#line 2284 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2284 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
-      if (dynamic_cast<BlockBody*>((yysemantic_stack_[(3) - (2)].expr)) == NULL)
+      BlockBody* block = dynamic_cast<BlockBody*>((yysemantic_stack_[(3) - (2)].expr));
+      if ((yysemantic_stack_[(3) - (2)].expr) == NULL || (block != NULL && block->isEmpty()))
+      {
+        (yyval.expr) = new JSONDirectObjectConstructor(LOC((yyloc)));
+      }
+      else if (block == NULL)
       {
         BlockBody* blk = new BlockBody(LOC((yyloc)));
         blk->add((yysemantic_stack_[(3) - (2)].expr));
@@ -4620,7 +4625,7 @@
   case 191:
 
 /* Line 690 of lalr1.cc  */
-#line 2301 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2306 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -4629,7 +4634,7 @@
   case 192:
 
 /* Line 690 of lalr1.cc  */
-#line 2309 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2314 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(2) - (1)].expr);
     }
@@ -4638,7 +4643,7 @@
   case 193:
 
 /* Line 690 of lalr1.cc  */
-#line 2317 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2322 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       VarDeclStmt* vdecl = static_cast<VarDeclStmt*>((yysemantic_stack_[(3) - (1)].expr));
       vdecl->add((yysemantic_stack_[(3) - (3)].node));
@@ -4649,7 +4654,7 @@
   case 194:
 
 /* Line 690 of lalr1.cc  */
-#line 2324 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2329 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)), NULL);
       vdecl->add((yysemantic_stack_[(2) - (2)].node));
@@ -4660,7 +4665,7 @@
   case 195:
 
 /* Line 690 of lalr1.cc  */
-#line 2331 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2336 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)),
                                            static_cast<AnnotationListParsenode*>((yysemantic_stack_[(3) - (1)].node)));
@@ -4672,7 +4677,7 @@
   case 196:
 
 /* Line 690 of lalr1.cc  */
-#line 2342 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2347 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)),
@@ -4686,7 +4691,7 @@
   case 197:
 
 /* Line 690 of lalr1.cc  */
-#line 2351 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2356 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4700,7 +4705,7 @@
   case 198:
 
 /* Line 690 of lalr1.cc  */
-#line 2360 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2365 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4714,7 +4719,7 @@
   case 199:
 
 /* Line 690 of lalr1.cc  */
-#line 2369 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2374 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -4728,7 +4733,7 @@
   case 200:
 
 /* Line 690 of lalr1.cc  */
-#line 2382 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2387 "/home/colea/xquery_bzr/feature-empty_object/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));
     }
@@ -4737,7 +4742,7 @@
   case 201:
 
 /* Line 690 of lalr1.cc  */
-#line 2390 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2395 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new ApplyExpr(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr));
     }
@@ -4746,7 +4751,7 @@
   case 202:
 
 /* Line 690 of lalr1.cc  */
-#line 2398 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2403 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new ExitExpr(LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr));
     }
@@ -4755,7 +4760,7 @@
   case 203:
 
 /* Line 690 of lalr1.cc  */
-#line 2406 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2411 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* bb = dynamic_cast<BlockBody *>((yysemantic_stack_[(5) - (5)].expr));
       if (bb == NULL)
@@ -4771,7 +4776,7 @@
   case 204:
 
 /* Line 690 of lalr1.cc  */
-#line 2421 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2426 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new FlowCtlStatement(LOC((yyloc)), FlowCtlStatement::BREAK);
     }
@@ -4780,7 +4785,7 @@
   case 205:
 
 /* Line 690 of lalr1.cc  */
-#line 2426 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2431 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new FlowCtlStatement( LOC((yyloc)), FlowCtlStatement::CONTINUE );
     }
@@ -4789,7 +4794,7 @@
   case 206:
 
 /* Line 690 of lalr1.cc  */
-#line 2434 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2439 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       ReturnExpr* re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
       (yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4804,7 +4809,7 @@
   case 207:
 
 /* Line 690 of lalr1.cc  */
-#line 2448 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2453 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       exprnode* retExpr = (yysemantic_stack_[(2) - (2)].expr);
 
@@ -4822,7 +4827,7 @@
   case 208:
 
 /* Line 690 of lalr1.cc  */
-#line 2465 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2470 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       exprnode* thenExpr = (yysemantic_stack_[(8) - (6)].expr);
       exprnode* elseExpr = (yysemantic_stack_[(8) - (8)].expr);
@@ -4848,7 +4853,7 @@
   case 209:
 
 /* Line 690 of lalr1.cc  */
-#line 2490 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2495 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TryExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), (yysemantic_stack_[(3) - (3)].expr));
     }
@@ -4857,7 +4862,7 @@
   case 210:
 
 /* Line 690 of lalr1.cc  */
-#line 2498 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2503 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       CatchListExpr* cle = new CatchListExpr( LOC((yyloc)) );
       cle->push_back( static_cast<CatchExpr*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -4868,7 +4873,7 @@
   case 211:
 
 /* Line 690 of lalr1.cc  */
-#line 2505 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2510 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
       if ( cle )
@@ -4880,7 +4885,7 @@
   case 212:
 
 /* Line 690 of lalr1.cc  */
-#line 2516 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2521 "/home/colea/xquery_bzr/feature-empty_object/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);
@@ -4890,7 +4895,7 @@
   case 213:
 
 /* Line 690 of lalr1.cc  */
-#line 2525 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2530 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new BlockBody(LOC((yyloc)));
     }
@@ -4899,7 +4904,7 @@
   case 214:
 
 /* Line 690 of lalr1.cc  */
-#line 2532 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2537 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4908,7 +4913,7 @@
   case 215:
 
 /* Line 690 of lalr1.cc  */
-#line 2537 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2542 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       Expr* expr = dynamic_cast<Expr*>((yysemantic_stack_[(3) - (1)].expr));
       if ( !expr )
@@ -4924,7 +4929,7 @@
   case 216:
 
 /* Line 690 of lalr1.cc  */
-#line 2550 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2555 "/home/colea/xquery_bzr/feature-empty_object/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
@@ -4942,7 +4947,7 @@
   case 235:
 
 /* Line 690 of lalr1.cc  */
-#line 2597 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2602 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       ReturnExpr *re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
       (yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4957,7 +4962,7 @@
   case 236:
 
 /* Line 690 of lalr1.cc  */
-#line 2611 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2616 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new ReturnExpr( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr) );
     }
@@ -4966,7 +4971,7 @@
   case 237:
 
 /* Line 690 of lalr1.cc  */
-#line 2619 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2624 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_sliding;
     }
@@ -4975,7 +4980,7 @@
   case 238:
 
 /* Line 690 of lalr1.cc  */
-#line 2624 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2629 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_tumbling;
     }
@@ -4984,7 +4989,7 @@
   case 239:
 
 /* Line 690 of lalr1.cc  */
-#line 2632 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2637 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_start;
     }
@@ -4993,7 +4998,7 @@
   case 240:
 
 /* Line 690 of lalr1.cc  */
-#line 2637 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2642 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_end;
     }
@@ -5002,7 +5007,7 @@
   case 241:
 
 /* Line 690 of lalr1.cc  */
-#line 2642 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2647 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
     (yyval.strval) = parser::the_only_end;
   }
@@ -5011,7 +5016,7 @@
   case 242:
 
 /* Line 690 of lalr1.cc  */
-#line 2650 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2655 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FLWORWinCond(LOC((yyloc)),
                             dynamic_cast<WindowVars*>((yysemantic_stack_[(4) - (2)].node)),
@@ -5024,7 +5029,7 @@
   case 243:
 
 /* Line 690 of lalr1.cc  */
-#line 2659 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2664 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FLWORWinCond(LOC((yyloc)),
                             NULL,
@@ -5037,7 +5042,7 @@
   case 244:
 
 /* Line 690 of lalr1.cc  */
-#line 2671 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2676 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowClause (LOC ((yyloc)),
                              ((yysemantic_stack_[(5) - (2)].strval) == parser::the_tumbling ?
@@ -5052,7 +5057,7 @@
   case 245:
 
 /* Line 690 of lalr1.cc  */
-#line 2681 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2686 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowClause (LOC ((yyloc)),
                              ((yysemantic_stack_[(4) - (2)].strval) == parser::the_tumbling ?
@@ -5066,7 +5071,7 @@
   case 246:
 
 /* Line 690 of lalr1.cc  */
-#line 2694 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2699 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CountClause(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -5075,7 +5080,7 @@
   case 255:
 
 /* Line 690 of lalr1.cc  */
-#line 2718 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2723 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       FLWORClauseList *fcl = new FLWORClauseList( LOC((yyloc)) );
       fcl->push_back( dynamic_cast<FLWORClause*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5086,7 +5091,7 @@
   case 256:
 
 /* Line 690 of lalr1.cc  */
-#line 2725 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2730 "/home/colea/xquery_bzr/feature-empty_object/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)) );
@@ -5097,7 +5102,7 @@
   case 257:
 
 /* Line 690 of lalr1.cc  */
-#line 2735 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2740 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ForClause(LOC((yyloc)), dynamic_cast<VarInDeclList*>((yysemantic_stack_[(3) - (3)].node)));
     }
@@ -5106,7 +5111,7 @@
   case 258:
 
 /* Line 690 of lalr1.cc  */
-#line 2741 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2746 "/home/colea/xquery_bzr/feature-empty_object/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 \""
@@ -5119,7 +5124,7 @@
   case 259:
 
 /* Line 690 of lalr1.cc  */
-#line 2750 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2755 "/home/colea/xquery_bzr/feature-empty_object/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
@@ -5130,7 +5135,7 @@
   case 261:
 
 /* Line 690 of lalr1.cc  */
-#line 2760 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2765 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       // this adds on shift-reduce conflict (probably with FTRange expression)
     }
@@ -5139,7 +5144,7 @@
   case 262:
 
 /* Line 690 of lalr1.cc  */
-#line 2768 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2773 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       VarInDeclList* vdl = new VarInDeclList( LOC((yyloc)) );
       vdl->push_back( dynamic_cast<VarInDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5150,7 +5155,7 @@
   case 263:
 
 /* Line 690 of lalr1.cc  */
-#line 2775 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2780 "/home/colea/xquery_bzr/feature-empty_object/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)) );
@@ -5161,7 +5166,7 @@
   case 264:
 
 /* Line 690 of lalr1.cc  */
-#line 2783 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2788 "/home/colea/xquery_bzr/feature-empty_object/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 \""
@@ -5174,7 +5179,7 @@
   case 265:
 
 /* Line 690 of lalr1.cc  */
-#line 2795 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2800 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)),
@@ -5189,7 +5194,7 @@
   case 266:
 
 /* Line 690 of lalr1.cc  */
-#line 2805 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2810 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5204,7 +5209,7 @@
   case 267:
 
 /* Line 690 of lalr1.cc  */
-#line 2815 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2820 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5219,7 +5224,7 @@
   case 268:
 
 /* Line 690 of lalr1.cc  */
-#line 2825 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2830 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5234,7 +5239,7 @@
   case 269:
 
 /* Line 690 of lalr1.cc  */
-#line 2835 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2840 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5249,7 +5254,7 @@
   case 270:
 
 /* Line 690 of lalr1.cc  */
-#line 2845 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2850 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5264,7 +5269,7 @@
   case 271:
 
 /* Line 690 of lalr1.cc  */
-#line 2855 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2860 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5279,7 +5284,7 @@
   case 272:
 
 /* Line 690 of lalr1.cc  */
-#line 2865 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2870 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(7) - (1)].expr)),
@@ -5294,7 +5299,7 @@
   case 273:
 
 /* Line 690 of lalr1.cc  */
-#line 2876 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2881 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5308,7 +5313,7 @@
   case 274:
 
 /* Line 690 of lalr1.cc  */
-#line 2885 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2890 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5323,7 +5328,7 @@
   case 275:
 
 /* Line 690 of lalr1.cc  */
-#line 2895 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2900 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC ((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5338,7 +5343,7 @@
   case 276:
 
 /* Line 690 of lalr1.cc  */
-#line 2905 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2910 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC ((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5353,7 +5358,7 @@
   case 277:
 
 /* Line 690 of lalr1.cc  */
-#line 2921 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2926 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new PositionalVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -5362,7 +5367,7 @@
   case 278:
 
 /* Line 690 of lalr1.cc  */
-#line 2930 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FTScoreVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -5371,7 +5376,7 @@
   case 279:
 
 /* Line 690 of lalr1.cc  */
-#line 2939 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new LetClause( LOC((yyloc)), dynamic_cast<VarGetsDeclList*>((yysemantic_stack_[(2) - (2)].node)) );
         }
@@ -5380,7 +5385,7 @@
   case 280:
 
 /* Line 690 of lalr1.cc  */
-#line 2947 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2952 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             VarGetsDeclList *vgdl = new VarGetsDeclList( LOC((yyloc)) );
             vgdl->push_back( dynamic_cast<VarGetsDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5391,7 +5396,7 @@
   case 281:
 
 /* Line 690 of lalr1.cc  */
-#line 2953 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2958 "/home/colea/xquery_bzr/feature-empty_object/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)) );
@@ -5402,7 +5407,7 @@
   case 282:
 
 /* Line 690 of lalr1.cc  */
-#line 2965 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2970 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -5415,7 +5420,7 @@
   case 283:
 
 /* Line 690 of lalr1.cc  */
-#line 2973 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2978 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5428,7 +5433,7 @@
   case 284:
 
 /* Line 690 of lalr1.cc  */
-#line 2983 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2988 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            dynamic_cast<FTScoreVar*>((yysemantic_stack_[(3) - (1)].node))->get_var_name(),
@@ -5441,7 +5446,7 @@
   case 285:
 
 /* Line 690 of lalr1.cc  */
-#line 2991 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 2996 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -5454,7 +5459,7 @@
   case 286:
 
 /* Line 690 of lalr1.cc  */
-#line 3003 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3008 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVarDecl(LOC ((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -5465,7 +5470,7 @@
   case 287:
 
 /* Line 690 of lalr1.cc  */
-#line 3009 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3014 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVarDecl(LOC ((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5477,7 +5482,7 @@
   case 289:
 
 /* Line 690 of lalr1.cc  */
-#line 3022 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3027 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL, NULL);
     }
@@ -5486,7 +5491,7 @@
   case 290:
 
 /* Line 690 of lalr1.cc  */
-#line 3026 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3031 "/home/colea/xquery_bzr/feature-empty_object/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)));
@@ -5496,7 +5501,7 @@
   case 291:
 
 /* Line 690 of lalr1.cc  */
-#line 3034 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3039 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), dynamic_cast<PositionalVar*>((yysemantic_stack_[(1) - (1)].node)), NULL, NULL, NULL);
     }
@@ -5505,7 +5510,7 @@
   case 292:
 
 /* Line 690 of lalr1.cc  */
-#line 3038 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3043 "/home/colea/xquery_bzr/feature-empty_object/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)));
@@ -5515,7 +5520,7 @@
   case 294:
 
 /* Line 690 of lalr1.cc  */
-#line 3047 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3052 "/home/colea/xquery_bzr/feature-empty_object/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)));
     }
@@ -5524,7 +5529,7 @@
   case 295:
 
 /* Line 690 of lalr1.cc  */
-#line 3051 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3056 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, NULL, static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -5533,7 +5538,7 @@
   case 296:
 
 /* Line 690 of lalr1.cc  */
-#line 3055 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3060 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL);
     }
@@ -5542,7 +5547,7 @@
   case 297:
 
 /* Line 690 of lalr1.cc  */
-#line 3065 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3070 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new WhereClause(LOC ((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
     }
@@ -5551,7 +5556,7 @@
   case 298:
 
 /* Line 690 of lalr1.cc  */
-#line 3073 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3078 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupByClause(LOC((yyloc)), dynamic_cast<GroupSpecList*>((yysemantic_stack_[(3) - (3)].node)));
     }
@@ -5560,7 +5565,7 @@
   case 299:
 
 /* Line 690 of lalr1.cc  */
-#line 3080 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3085 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       GroupSpecList* gsl = new GroupSpecList(LOC((yyloc)));
       gsl->push_back(static_cast<GroupSpec*>((yysemantic_stack_[(1) - (1)].node)));
@@ -5571,7 +5576,7 @@
   case 300:
 
 /* Line 690 of lalr1.cc  */
-#line 3086 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3091 "/home/colea/xquery_bzr/feature-empty_object/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)));
@@ -5582,7 +5587,7 @@
   case 301:
 
 /* Line 690 of lalr1.cc  */
-#line 3096 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3101 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL, NULL, NULL);
     }
@@ -5591,7 +5596,7 @@
   case 302:
 
 /* Line 690 of lalr1.cc  */
-#line 3100 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3105 "/home/colea/xquery_bzr/feature-empty_object/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);
     }
@@ -5600,7 +5605,7 @@
   case 303:
 
 /* Line 690 of lalr1.cc  */
-#line 3104 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3109 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5613,7 +5618,7 @@
   case 304:
 
 /* Line 690 of lalr1.cc  */
-#line 3112 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3117 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -5626,7 +5631,7 @@
   case 305:
 
 /* Line 690 of lalr1.cc  */
-#line 3120 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3125 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5639,7 +5644,7 @@
   case 306:
 
 /* Line 690 of lalr1.cc  */
-#line 3128 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3133 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -5652,7 +5657,7 @@
   case 307:
 
 /* Line 690 of lalr1.cc  */
-#line 3140 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3145 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GroupCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
     }
@@ -5661,7 +5666,7 @@
   case 308:
 
 /* Line 690 of lalr1.cc  */
-#line 3148 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3153 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderByClause(
                 LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(3) - (3)].node))
@@ -5672,7 +5677,7 @@
   case 309:
 
 /* Line 690 of lalr1.cc  */
-#line 3154 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3159 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderByClause(
                 LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(4) - (4)].node)), true
@@ -5683,7 +5688,7 @@
   case 310:
 
 /* Line 690 of lalr1.cc  */
-#line 3164 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3169 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             OrderSpecList *osl = new OrderSpecList( LOC((yyloc)) );
             osl->push_back( dynamic_cast<OrderSpec*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5694,7 +5699,7 @@
   case 311:
 
 /* Line 690 of lalr1.cc  */
-#line 3170 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3175 "/home/colea/xquery_bzr/feature-empty_object/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)) );
@@ -5705,7 +5710,7 @@
   case 312:
 
 /* Line 690 of lalr1.cc  */
-#line 3180 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3185 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderSpec( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL );
         }
@@ -5714,7 +5719,7 @@
   case 313:
 
 /* Line 690 of lalr1.cc  */
-#line 3184 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3189 "/home/colea/xquery_bzr/feature-empty_object/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))
@@ -5725,7 +5730,7 @@
   case 314:
 
 /* Line 690 of lalr1.cc  */
-#line 3194 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3199 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), dynamic_cast<OrderDirSpec*>((yysemantic_stack_[(1) - (1)].node)), NULL, NULL
@@ -5736,7 +5741,7 @@
   case 315:
 
 /* Line 690 of lalr1.cc  */
-#line 3200 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3205 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), NULL, dynamic_cast<OrderEmptySpec*>((yysemantic_stack_[(1) - (1)].node)), NULL
@@ -5747,7 +5752,7 @@
   case 316:
 
 /* Line 690 of lalr1.cc  */
-#line 3206 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3211 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), NULL, NULL, dynamic_cast<OrderCollationSpec*>((yysemantic_stack_[(1) - (1)].node))
@@ -5758,7 +5763,7 @@
   case 317:
 
 /* Line 690 of lalr1.cc  */
-#line 3212 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3217 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5772,7 +5777,7 @@
   case 318:
 
 /* Line 690 of lalr1.cc  */
-#line 3221 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3226 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5786,7 +5791,7 @@
   case 319:
 
 /* Line 690 of lalr1.cc  */
-#line 3230 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3235 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5800,7 +5805,7 @@
   case 320:
 
 /* Line 690 of lalr1.cc  */
-#line 3239 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3244 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5814,7 +5819,7 @@
   case 321:
 
 /* Line 690 of lalr1.cc  */
-#line 3252 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3257 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_ascending );
         }
@@ -5823,7 +5828,7 @@
   case 322:
 
 /* Line 690 of lalr1.cc  */
-#line 3256 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3261 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_descending );
         }
@@ -5832,7 +5837,7 @@
   case 323:
 
 /* Line 690 of lalr1.cc  */
-#line 3264 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3269 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderEmptySpec(
                 LOC((yyloc)), StaticContextConsts::empty_greatest
@@ -5843,7 +5848,7 @@
   case 324:
 
 /* Line 690 of lalr1.cc  */
-#line 3270 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3275 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderEmptySpec(
                 LOC((yyloc)), StaticContextConsts::empty_least
@@ -5854,7 +5859,7 @@
   case 325:
 
 /* Line 690 of lalr1.cc  */
-#line 3280 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3285 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OrderCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
         }
@@ -5863,7 +5868,7 @@
   case 326:
 
 /* Line 690 of lalr1.cc  */
-#line 3288 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3293 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new QuantifiedExpr(
                 LOC((yyloc)),
@@ -5877,7 +5882,7 @@
   case 327:
 
 /* Line 690 of lalr1.cc  */
-#line 3297 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3302 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new QuantifiedExpr(
                 LOC((yyloc)),
@@ -5891,7 +5896,7 @@
   case 328:
 
 /* Line 690 of lalr1.cc  */
-#line 3310 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3315 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       QVarInDeclList *qvidl = new QVarInDeclList( LOC((yyloc)) );
       qvidl->push_back( dynamic_cast<QVarInDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5903,7 +5908,7 @@
   case 329:
 
 /* Line 690 of lalr1.cc  */
-#line 3317 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3322 "/home/colea/xquery_bzr/feature-empty_object/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)) );
@@ -5914,7 +5919,7 @@
   case 330:
 
 /* Line 690 of lalr1.cc  */
-#line 3329 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3334 "/home/colea/xquery_bzr/feature-empty_object/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));
     }
@@ -5923,7 +5928,7 @@
   case 331:
 
 /* Line 690 of lalr1.cc  */
-#line 3333 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3338 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new QVarInDecl(LOC((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5935,7 +5940,7 @@
   case 332:
 
 /* Line 690 of lalr1.cc  */
-#line 3345 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3350 "/home/colea/xquery_bzr/feature-empty_object/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));
     }
@@ -5944,7 +5949,7 @@
   case 333:
 
 /* Line 690 of lalr1.cc  */
-#line 3352 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3357 "/home/colea/xquery_bzr/feature-empty_object/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)));
@@ -5955,7 +5960,7 @@
   case 334:
 
 /* Line 690 of lalr1.cc  */
-#line 3358 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3363 "/home/colea/xquery_bzr/feature-empty_object/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)));
@@ -5966,7 +5971,7 @@
   case 335:
 
 /* Line 690 of lalr1.cc  */
-#line 3367 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3372 "/home/colea/xquery_bzr/feature-empty_object/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));
     }
@@ -5975,7 +5980,7 @@
   case 336:
 
 /* Line 690 of lalr1.cc  */
-#line 3374 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3379 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       SwitchCaseOperandList* sco_list_p = new SwitchCaseOperandList(LOC((yyloc)));
       sco_list_p->push_back((yysemantic_stack_[(2) - (2)].expr));
@@ -5986,7 +5991,7 @@
   case 337:
 
 /* Line 690 of lalr1.cc  */
-#line 3380 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3385 "/home/colea/xquery_bzr/feature-empty_object/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));
@@ -5997,7 +6002,7 @@
   case 338:
 
 /* Line 690 of lalr1.cc  */
-#line 3391 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3396 "/home/colea/xquery_bzr/feature-empty_object/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));
     }
@@ -6006,7 +6011,7 @@
   case 339:
 
 /* Line 690 of lalr1.cc  */
-#line 3398 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3403 "/home/colea/xquery_bzr/feature-empty_object/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)));
@@ -6017,7 +6022,7 @@
   case 340:
 
 /* Line 690 of lalr1.cc  */
-#line 3404 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3409 "/home/colea/xquery_bzr/feature-empty_object/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)));
@@ -6028,7 +6033,7 @@
   case 341:
 
 /* Line 690 of lalr1.cc  */
-#line 3413 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3418 "/home/colea/xquery_bzr/feature-empty_object/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));
     }
@@ -6037,7 +6042,7 @@
   case 342:
 
 /* Line 690 of lalr1.cc  */
-#line 3422 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3427 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
                               (yysemantic_stack_[(8) - (3)].expr),
@@ -6049,7 +6054,7 @@
   case 343:
 
 /* Line 690 of lalr1.cc  */
-#line 3429 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3434 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
                               (yysemantic_stack_[(10) - (3)].expr),
@@ -6062,7 +6067,7 @@
   case 344:
 
 /* Line 690 of lalr1.cc  */
-#line 3440 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3445 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
                               (yysemantic_stack_[(8) - (3)].expr),
@@ -6074,7 +6079,7 @@
   case 345:
 
 /* Line 690 of lalr1.cc  */
-#line 3447 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3452 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
                               (yysemantic_stack_[(10) - (3)].expr),
@@ -6087,7 +6092,7 @@
   case 346:
 
 /* Line 690 of lalr1.cc  */
-#line 3459 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3464 "/home/colea/xquery_bzr/feature-empty_object/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)));
@@ -6098,7 +6103,7 @@
   case 347:
 
 /* Line 690 of lalr1.cc  */
-#line 3465 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3470 "/home/colea/xquery_bzr/feature-empty_object/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)));
@@ -6109,7 +6114,7 @@
   case 348:
 
 /* Line 690 of lalr1.cc  */
-#line 3477 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3482 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<SequenceTypeList*>((yysemantic_stack_[(4) - (2)].node)),
@@ -6120,7 +6125,7 @@
   case 349:
 
 /* Line 690 of lalr1.cc  */
-#line 3483 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3488 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
@@ -6132,7 +6137,7 @@
   case 350:
 
 /* Line 690 of lalr1.cc  */
-#line 3494 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3499 "/home/colea/xquery_bzr/feature-empty_object/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)));
@@ -6143,7 +6148,7 @@
   case 351:
 
 /* Line 690 of lalr1.cc  */
-#line 3500 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3505 "/home/colea/xquery_bzr/feature-empty_object/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)));
@@ -6154,7 +6159,7 @@
   case 352:
 
 /* Line 690 of lalr1.cc  */
-#line 3511 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3516 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<SequenceTypeList*>((yysemantic_stack_[(4) - (2)].node)),
@@ -6165,7 +6170,7 @@
   case 353:
 
 /* Line 690 of lalr1.cc  */
-#line 3517 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3522 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
@@ -6177,7 +6182,7 @@
   case 354:
 
 /* Line 690 of lalr1.cc  */
-#line 3528 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3533 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       SequenceTypeList* seqList = new SequenceTypeList(LOC((yyloc)));
       seqList->push_back(static_cast<SequenceType*>((yysemantic_stack_[(1) - (1)].node)));
@@ -6188,7 +6193,7 @@
   case 355:
 
 /* Line 690 of lalr1.cc  */
-#line 3534 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3539 "/home/colea/xquery_bzr/feature-empty_object/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)));
@@ -6199,7 +6204,7 @@
   case 356:
 
 /* Line 690 of lalr1.cc  */
-#line 3545 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3550 "/home/colea/xquery_bzr/feature-empty_object/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));
     }
@@ -6208,7 +6213,7 @@
   case 357:
 
 /* Line 690 of lalr1.cc  */
-#line 3554 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3559 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -6217,7 +6222,7 @@
   case 358:
 
 /* Line 690 of lalr1.cc  */
-#line 3558 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3563 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new OrExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
     }
@@ -6226,7 +6231,7 @@
   case 359:
 
 /* Line 690 of lalr1.cc  */
-#line 3567 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3572 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6235,7 +6240,7 @@
   case 360:
 
 /* Line 690 of lalr1.cc  */
-#line 3571 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3576 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new AndExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -6244,7 +6249,7 @@
   case 361:
 
 /* Line 690 of lalr1.cc  */
-#line 3578 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3583 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6253,7 +6258,7 @@
   case 362:
 
 /* Line 690 of lalr1.cc  */
-#line 3582 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3587 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new ComparisonExpr(
               LOC((yyloc)),
@@ -6267,7 +6272,7 @@
   case 363:
 
 /* Line 690 of lalr1.cc  */
-#line 3595 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3600 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6276,7 +6281,7 @@
   case 364:
 
 /* Line 690 of lalr1.cc  */
-#line 3599 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3604 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             /*  ::=  "eq" | "ne" | "lt" | "le" | "gt" | "ge" */
             (yyval.expr) = new ComparisonExpr(
@@ -6291,7 +6296,7 @@
   case 365:
 
 /* Line 690 of lalr1.cc  */
-#line 3679 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3684 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6300,7 +6305,7 @@
   case 366:
 
 /* Line 690 of lalr1.cc  */
-#line 3683 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3688 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new FTContainsExpr(
                 LOC((yyloc)),
@@ -6314,7 +6319,7 @@
   case 367:
 
 /* Line 690 of lalr1.cc  */
-#line 3695 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3700 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6323,7 +6328,7 @@
   case 368:
 
 /* Line 690 of lalr1.cc  */
-#line 3699 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3704 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new StringConcatExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
         }
@@ -6332,7 +6337,7 @@
   case 369:
 
 /* Line 690 of lalr1.cc  */
-#line 3706 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3711 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -6341,7 +6346,7 @@
   case 370:
 
 /* Line 690 of lalr1.cc  */
-#line 3710 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3715 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -6350,7 +6355,7 @@
   case 371:
 
 /* Line 690 of lalr1.cc  */
-#line 3717 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3722 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6359,7 +6364,7 @@
   case 372:
 
 /* Line 690 of lalr1.cc  */
-#line 3721 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3726 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new RangeExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -6368,7 +6373,7 @@
   case 373:
 
 /* Line 690 of lalr1.cc  */
-#line 3730 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3735 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6377,7 +6382,7 @@
   case 374:
 
 /* Line 690 of lalr1.cc  */
-#line 3734 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3739 "/home/colea/xquery_bzr/feature-empty_object/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) );
         }
@@ -6386,7 +6391,7 @@
   case 375:
 
 /* Line 690 of lalr1.cc  */
-#line 3738 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3743 "/home/colea/xquery_bzr/feature-empty_object/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) );
         }
@@ -6395,7 +6400,7 @@
   case 376:
 
 /* Line 690 of lalr1.cc  */
-#line 3746 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3751 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6404,7 +6409,7 @@
   case 377:
 
 /* Line 690 of lalr1.cc  */
-#line 3750 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3755 "/home/colea/xquery_bzr/feature-empty_object/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)
@@ -6415,7 +6420,7 @@
   case 378:
 
 /* Line 690 of lalr1.cc  */
-#line 3756 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3761 "/home/colea/xquery_bzr/feature-empty_object/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)
@@ -6426,7 +6431,7 @@
   case 379:
 
 /* Line 690 of lalr1.cc  */
-#line 3762 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3767 "/home/colea/xquery_bzr/feature-empty_object/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)
@@ -6437,7 +6442,7 @@
   case 380:
 
 /* Line 690 of lalr1.cc  */
-#line 3768 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3773 "/home/colea/xquery_bzr/feature-empty_object/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)
@@ -6448,7 +6453,7 @@
   case 381:
 
 /* Line 690 of lalr1.cc  */
-#line 3778 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3783 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6457,7 +6462,7 @@
   case 382:
 
 /* Line 690 of lalr1.cc  */
-#line 3782 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3787 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -6466,7 +6471,7 @@
   case 383:
 
 /* Line 690 of lalr1.cc  */
-#line 3786 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3791 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -6475,7 +6480,7 @@
   case 384:
 
 /* Line 690 of lalr1.cc  */
-#line 3794 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3799 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6484,7 +6489,7 @@
   case 385:
 
 /* Line 690 of lalr1.cc  */
-#line 3798 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3803 "/home/colea/xquery_bzr/feature-empty_object/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)
@@ -6495,7 +6500,7 @@
   case 386:
 
 /* Line 690 of lalr1.cc  */
-#line 3804 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3809 "/home/colea/xquery_bzr/feature-empty_object/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)
@@ -6506,7 +6511,7 @@
   case 387:
 
 /* Line 690 of lalr1.cc  */
-#line 3814 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3819 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6515,7 +6520,7 @@
   case 388:
 
 /* Line 690 of lalr1.cc  */
-#line 3818 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3823 "/home/colea/xquery_bzr/feature-empty_object/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))
@@ -6526,7 +6531,7 @@
   case 389:
 
 /* Line 690 of lalr1.cc  */
-#line 3828 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3833 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6535,7 +6540,7 @@
   case 390:
 
 /* Line 690 of lalr1.cc  */
-#line 3832 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3837 "/home/colea/xquery_bzr/feature-empty_object/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))
@@ -6546,7 +6551,7 @@
   case 391:
 
 /* Line 690 of lalr1.cc  */
-#line 3842 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3847 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6555,7 +6560,7 @@
   case 392:
 
 /* Line 690 of lalr1.cc  */
-#line 3846 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3851 "/home/colea/xquery_bzr/feature-empty_object/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))
@@ -6566,7 +6571,7 @@
   case 393:
 
 /* Line 690 of lalr1.cc  */
-#line 3856 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3861 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6575,7 +6580,7 @@
   case 394:
 
 /* Line 690 of lalr1.cc  */
-#line 3860 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3865 "/home/colea/xquery_bzr/feature-empty_object/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))
@@ -6586,7 +6591,7 @@
   case 395:
 
 /* Line 690 of lalr1.cc  */
-#line 3870 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3875 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SingleType(LOC((yyloc)), dynamic_cast<SimpleType*>((yysemantic_stack_[(1) - (1)].node)), false);
     }
@@ -6595,7 +6600,7 @@
   case 396:
 
 /* Line 690 of lalr1.cc  */
-#line 3874 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3879 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SingleType(LOC((yyloc)), dynamic_cast<SimpleType*>((yysemantic_stack_[(2) - (1)].node)), true);
     }
@@ -6604,7 +6609,7 @@
   case 397:
 
 /* Line 690 of lalr1.cc  */
-#line 3883 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3888 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6613,7 +6618,7 @@
   case 398:
 
 /* Line 690 of lalr1.cc  */
-#line 3887 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3892 "/home/colea/xquery_bzr/feature-empty_object/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) );
         }
@@ -6622,7 +6627,7 @@
   case 399:
 
 /* Line 690 of lalr1.cc  */
-#line 3895 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3900 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SignList( LOC((yyloc)), true );
         }
@@ -6631,7 +6636,7 @@
   case 400:
 
 /* Line 690 of lalr1.cc  */
-#line 3899 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3904 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SignList( LOC((yyloc)), false );
         }
@@ -6640,7 +6645,7 @@
   case 401:
 
 /* Line 690 of lalr1.cc  */
-#line 3903 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3908 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
         }
@@ -6649,7 +6654,7 @@
   case 402:
 
 /* Line 690 of lalr1.cc  */
-#line 3907 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3912 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             if ( SignList *sl = dynamic_cast<SignList*>((yysemantic_stack_[(2) - (1)].node)) )
                 sl->negate();
@@ -6660,7 +6665,7 @@
   case 403:
 
 /* Line 690 of lalr1.cc  */
-#line 3917 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3922 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6669,7 +6674,7 @@
   case 404:
 
 /* Line 690 of lalr1.cc  */
-#line 3921 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3926 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6678,7 +6683,7 @@
   case 405:
 
 /* Line 690 of lalr1.cc  */
-#line 3925 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3930 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6687,7 +6692,7 @@
   case 406:
 
 /* Line 690 of lalr1.cc  */
-#line 3932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3937 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
       }
@@ -6696,7 +6701,7 @@
   case 407:
 
 /* Line 690 of lalr1.cc  */
-#line 3937 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3942 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.expr) = new SimpleMapExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
       }
@@ -6705,7 +6710,7 @@
   case 408:
 
 /* Line 690 of lalr1.cc  */
-#line 3945 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3950 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_eq );
         }
@@ -6714,7 +6719,7 @@
   case 409:
 
 /* Line 690 of lalr1.cc  */
-#line 3949 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3954 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ne );
         }
@@ -6723,7 +6728,7 @@
   case 410:
 
 /* Line 690 of lalr1.cc  */
-#line 3953 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3958 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_lt );
         }
@@ -6732,7 +6737,7 @@
   case 411:
 
 /* Line 690 of lalr1.cc  */
-#line 3957 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3962 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_le );
         }
@@ -6741,7 +6746,7 @@
   case 412:
 
 /* Line 690 of lalr1.cc  */
-#line 3961 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3966 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_gt );
         }
@@ -6750,7 +6755,7 @@
   case 413:
 
 /* Line 690 of lalr1.cc  */
-#line 3965 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3970 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ge );
         }
@@ -6759,7 +6764,7 @@
   case 414:
 
 /* Line 690 of lalr1.cc  */
-#line 3989 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3994 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -6768,7 +6773,7 @@
   case 415:
 
 /* Line 690 of lalr1.cc  */
-#line 3993 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 3998 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "lax", (yysemantic_stack_[(5) - (4)].expr) );
         }
@@ -6777,7 +6782,7 @@
   case 416:
 
 /* Line 690 of lalr1.cc  */
-#line 3997 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4002 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(5) - (4)].expr) );
         }
@@ -6786,7 +6791,7 @@
   case 417:
 
 /* Line 690 of lalr1.cc  */
-#line 4001 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4006 "/home/colea/xquery_bzr/feature-empty_object/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)
@@ -6798,7 +6803,7 @@
   case 418:
 
 /* Line 690 of lalr1.cc  */
-#line 4012 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4017 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ExtensionExpr(
                 LOC((yyloc)), dynamic_cast<PragmaList*>((yysemantic_stack_[(3) - (1)].node)), NULL
@@ -6809,7 +6814,7 @@
   case 419:
 
 /* Line 690 of lalr1.cc  */
-#line 4018 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4023 "/home/colea/xquery_bzr/feature-empty_object/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)
@@ -6820,7 +6825,7 @@
   case 420:
 
 /* Line 690 of lalr1.cc  */
-#line 4028 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4033 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             PragmaList *pl = new PragmaList( LOC((yyloc)) );
             pl->push_back( dynamic_cast<Pragma*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -6831,7 +6836,7 @@
   case 421:
 
 /* Line 690 of lalr1.cc  */
-#line 4034 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4039 "/home/colea/xquery_bzr/feature-empty_object/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)) );
@@ -6842,7 +6847,7 @@
   case 422:
 
 /* Line 690 of lalr1.cc  */
-#line 4044 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4049 "/home/colea/xquery_bzr/feature-empty_object/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)) );
         }
@@ -6851,7 +6856,7 @@
   case 423:
 
 /* Line 690 of lalr1.cc  */
-#line 4048 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4053 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new Pragma( LOC((yyloc)), new QName( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) ), "" );
         }
@@ -6860,7 +6865,7 @@
   case 424:
 
 /* Line 690 of lalr1.cc  */
-#line 4052 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4057 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new Pragma( LOC((yyloc)), new QName( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)), true ), "" );
         }
@@ -6869,7 +6874,7 @@
   case 425:
 
 /* Line 690 of lalr1.cc  */
-#line 4115 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4120 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       RelativePathExpr* rpe = dynamic_cast<RelativePathExpr*>((yysemantic_stack_[(1) - (1)].expr));
       (yyval.expr) = (!rpe ?
@@ -6881,7 +6886,7 @@
   case 426:
 
 /* Line 690 of lalr1.cc  */
-#line 4137 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4142 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       AxisStep* as = dynamic_cast<AxisStep*>((yysemantic_stack_[(1) - (1)].expr));
       (yyval.expr) = (as ?
@@ -6896,7 +6901,7 @@
   case 427:
 
 /* Line 690 of lalr1.cc  */
-#line 4165 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4170 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -6905,7 +6910,7 @@
   case 428:
 
 /* Line 690 of lalr1.cc  */
-#line 4329 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4334 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new NameTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
         }
@@ -6914,7 +6919,7 @@
   case 429:
 
 /* Line 690 of lalr1.cc  */
-#line 4333 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4338 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new NameTest( LOC((yyloc)), dynamic_cast<Wildcard*>((yysemantic_stack_[(1) - (1)].node)) );
         }
@@ -6923,7 +6928,7 @@
   case 430:
 
 /* Line 690 of lalr1.cc  */
-#line 4343 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4348 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), "", "", ParseConstants::wild_all, false);
     }
@@ -6932,7 +6937,7 @@
   case 431:
 
 /* Line 690 of lalr1.cc  */
-#line 4347 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4352 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, false);
     }
@@ -6941,7 +6946,7 @@
   case 432:
 
 /* Line 690 of lalr1.cc  */
-#line 4351 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4356 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, true);
     }
@@ -6950,7 +6955,7 @@
   case 433:
 
 /* Line 690 of lalr1.cc  */
-#line 4355 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4360 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), "", SYMTAB((yysemantic_stack_[(1) - (1)].sval)), ParseConstants::wild_prefix, false);
     }
@@ -6959,7 +6964,7 @@
   case 434:
 
 /* Line 690 of lalr1.cc  */
-#line 4364 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4369 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
      }
@@ -6968,7 +6973,7 @@
   case 435:
 
 /* Line 690 of lalr1.cc  */
-#line 4368 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4373 "/home/colea/xquery_bzr/feature-empty_object/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)));
      }
@@ -6977,7 +6982,7 @@
   case 436:
 
 /* Line 690 of lalr1.cc  */
-#line 4372 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4377 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = new DynamicFunctionInvocation(LOC ((yyloc)), (yysemantic_stack_[(3) - (1)].expr), false);
      }
@@ -6986,7 +6991,7 @@
   case 437:
 
 /* Line 690 of lalr1.cc  */
-#line 4376 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4381 "/home/colea/xquery_bzr/feature-empty_object/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);
      }
@@ -6995,7 +7000,7 @@
   case 438:
 
 /* Line 690 of lalr1.cc  */
-#line 4380 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4385 "/home/colea/xquery_bzr/feature-empty_object/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);
@@ -7005,7 +7010,7 @@
   case 439:
 
 /* Line 690 of lalr1.cc  */
-#line 4385 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4390 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
      }
@@ -7014,7 +7019,7 @@
   case 440:
 
 /* Line 690 of lalr1.cc  */
-#line 4389 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4394 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
      }
@@ -7023,7 +7028,7 @@
   case 441:
 
 /* Line 690 of lalr1.cc  */
-#line 4393 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4398 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
        (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
      }
@@ -7032,7 +7037,7 @@
   case 442:
 
 /* Line 690 of lalr1.cc  */
-#line 4402 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4407 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             PredicateList *pl = new PredicateList( LOC((yyloc)) );
             pl->push_back( dynamic_cast<exprnode*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -7043,7 +7048,7 @@
   case 443:
 
 /* Line 690 of lalr1.cc  */
-#line 4408 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4413 "/home/colea/xquery_bzr/feature-empty_object/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)) );
@@ -7054,7 +7059,7 @@
   case 444:
 
 /* Line 690 of lalr1.cc  */
-#line 4418 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4423 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
         }
@@ -7063,7 +7068,7 @@
   case 445:
 
 /* Line 690 of lalr1.cc  */
-#line 4426 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4431 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7072,7 +7077,7 @@
   case 446:
 
 /* Line 690 of lalr1.cc  */
-#line 4430 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4435 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7081,7 +7086,7 @@
   case 447:
 
 /* Line 690 of lalr1.cc  */
-#line 4434 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4439 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7090,7 +7095,7 @@
   case 448:
 
 /* Line 690 of lalr1.cc  */
-#line 4438 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4443 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7099,7 +7104,7 @@
   case 449:
 
 /* Line 690 of lalr1.cc  */
-#line 4442 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4447 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7108,7 +7113,7 @@
   case 450:
 
 /* Line 690 of lalr1.cc  */
-#line 4446 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4451 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7117,7 +7122,7 @@
   case 451:
 
 /* Line 690 of lalr1.cc  */
-#line 4450 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4455 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7126,7 +7131,7 @@
   case 452:
 
 /* Line 690 of lalr1.cc  */
-#line 4454 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4459 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7135,7 +7140,7 @@
   case 453:
 
 /* Line 690 of lalr1.cc  */
-#line 4458 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4463 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7144,7 +7149,7 @@
   case 454:
 
 /* Line 690 of lalr1.cc  */
-#line 4462 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4467 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7153,7 +7158,7 @@
   case 455:
 
 /* Line 690 of lalr1.cc  */
-#line 4467 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4472 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7162,7 +7167,7 @@
   case 456:
 
 /* Line 690 of lalr1.cc  */
-#line 4471 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4476 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7171,7 +7176,7 @@
   case 457:
 
 /* Line 690 of lalr1.cc  */
-#line 4475 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4480 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7180,7 +7185,7 @@
   case 458:
 
 /* Line 690 of lalr1.cc  */
-#line 4479 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4484 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7189,7 +7194,7 @@
   case 459:
 
 /* Line 690 of lalr1.cc  */
-#line 4487 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4492 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7198,7 +7203,7 @@
   case 460:
 
 /* Line 690 of lalr1.cc  */
-#line 4491 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4496 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7207,7 +7212,7 @@
   case 461:
 
 /* Line 690 of lalr1.cc  */
-#line 4495 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4500 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7216,7 +7221,7 @@
   case 462:
 
 /* Line 690 of lalr1.cc  */
-#line 4499 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4504 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new NullLiteral(LOC((yyloc)));
         }
@@ -7225,7 +7230,7 @@
   case 463:
 
 /* Line 690 of lalr1.cc  */
-#line 4507 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4512 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_decimal, *(yysemantic_stack_[(1) - (1)].decval)
@@ -7237,7 +7242,7 @@
   case 464:
 
 /* Line 690 of lalr1.cc  */
-#line 4514 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4519 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_integer, *(yysemantic_stack_[(1) - (1)].ival)
@@ -7249,7 +7254,7 @@
   case 465:
 
 /* Line 690 of lalr1.cc  */
-#line 4521 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4526 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_double, *(yysemantic_stack_[(1) - (1)].dval)
@@ -7261,7 +7266,7 @@
   case 466:
 
 /* Line 690 of lalr1.cc  */
-#line 4531 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4536 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new BooleanLiteral(LOC((yyloc)), true);
         }
@@ -7270,7 +7275,7 @@
   case 467:
 
 /* Line 690 of lalr1.cc  */
-#line 4535 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4540 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new BooleanLiteral(LOC((yyloc)), false);
         }
@@ -7279,7 +7284,7 @@
   case 468:
 
 /* Line 690 of lalr1.cc  */
-#line 4543 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4548 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new VarRef(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)));
         }
@@ -7288,7 +7293,7 @@
   case 469:
 
 /* Line 690 of lalr1.cc  */
-#line 4551 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4556 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), NULL);
         }
@@ -7297,7 +7302,7 @@
   case 470:
 
 /* Line 690 of lalr1.cc  */
-#line 4555 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4560 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
         }
@@ -7306,7 +7311,7 @@
   case 471:
 
 /* Line 690 of lalr1.cc  */
-#line 4563 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4568 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ContextItemExpr( LOC((yyloc)) );
         }
@@ -7315,7 +7320,7 @@
   case 472:
 
 /* Line 690 of lalr1.cc  */
-#line 4567 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4572 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new ContextItemExpr( LOC((yyloc)) );
         }
@@ -7324,7 +7329,7 @@
   case 473:
 
 /* Line 690 of lalr1.cc  */
-#line 4575 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4580 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new OrderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -7333,7 +7338,7 @@
   case 474:
 
 /* Line 690 of lalr1.cc  */
-#line 4583 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4588 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new UnorderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -7342,7 +7347,7 @@
   case 475:
 
 /* Line 690 of lalr1.cc  */
-#line 4637 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4642 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new FunctionCall( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), NULL );
     }
@@ -7351,7 +7356,7 @@
   case 476:
 
 /* Line 690 of lalr1.cc  */
-#line 4641 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4646 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       ArgList* argList = dynamic_cast<ArgList*>((yysemantic_stack_[(4) - (3)].node));
 
@@ -7374,7 +7379,7 @@
   case 477:
 
 /* Line 690 of lalr1.cc  */
-#line 4663 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4668 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       ArgList *al = new ArgList( LOC((yyloc)) );
       al->push_back(new ArgumentPlaceholder(LOC((yyloc))));
@@ -7385,7 +7390,7 @@
   case 478:
 
 /* Line 690 of lalr1.cc  */
-#line 4669 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4674 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       if ( ArgList *al = dynamic_cast<ArgList*>((yysemantic_stack_[(3) - (1)].node)) )
         al->push_back( new ArgumentPlaceholder(LOC((yyloc))) );
@@ -7396,7 +7401,7 @@
   case 479:
 
 /* Line 690 of lalr1.cc  */
-#line 4675 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4680 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       ArgList *al = new ArgList( LOC((yyloc)) );
       al->push_back( (yysemantic_stack_[(1) - (1)].expr) );
@@ -7407,7 +7412,7 @@
   case 480:
 
 /* Line 690 of lalr1.cc  */
-#line 4681 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4686 "/home/colea/xquery_bzr/feature-empty_object/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) );
@@ -7418,7 +7423,7 @@
   case 481:
 
 /* Line 690 of lalr1.cc  */
-#line 4691 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4696 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7427,7 +7432,7 @@
   case 482:
 
 /* Line 690 of lalr1.cc  */
-#line 4695 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4700 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7436,7 +7441,7 @@
   case 483:
 
 /* Line 690 of lalr1.cc  */
-#line 4703 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4708 "/home/colea/xquery_bzr/feature-empty_object/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));
     }
@@ -7445,7 +7450,7 @@
   case 484:
 
 /* Line 690 of lalr1.cc  */
-#line 4711 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4716 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new InlineFunction(LOC((yyloc)),
                               &*(yysemantic_stack_[(3) - (2)].fnsig)->theParams,
@@ -7458,7 +7463,7 @@
   case 485:
 
 /* Line 690 of lalr1.cc  */
-#line 4723 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4728 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7467,7 +7472,7 @@
   case 486:
 
 /* Line 690 of lalr1.cc  */
-#line 4727 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4732 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7476,7 +7481,7 @@
   case 487:
 
 /* Line 690 of lalr1.cc  */
-#line 4735 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4740 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7485,7 +7490,7 @@
   case 488:
 
 /* Line 690 of lalr1.cc  */
-#line 4739 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4744 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7494,7 +7499,7 @@
   case 489:
 
 /* Line 690 of lalr1.cc  */
-#line 4743 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4748 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7503,7 +7508,7 @@
   case 490:
 
 /* Line 690 of lalr1.cc  */
-#line 4751 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4756 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirElemConstructor(LOC((yyloc)),
                                   static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -7516,7 +7521,7 @@
   case 491:
 
 /* Line 690 of lalr1.cc  */
-#line 4759 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4764 "/home/colea/xquery_bzr/feature-empty_object/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())
       {
@@ -7538,7 +7543,7 @@
   case 492:
 
 /* Line 690 of lalr1.cc  */
-#line 4776 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4781 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirElemConstructor(LOC((yyloc)),
                                   static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -7551,7 +7556,7 @@
   case 493:
 
 /* Line 690 of lalr1.cc  */
-#line 4784 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4789 "/home/colea/xquery_bzr/feature-empty_object/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())
       {
@@ -7573,7 +7578,7 @@
   case 494:
 
 /* Line 690 of lalr1.cc  */
-#line 4803 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4808 "/home/colea/xquery_bzr/feature-empty_object/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())
       {
@@ -7595,7 +7600,7 @@
   case 495:
 
 /* Line 690 of lalr1.cc  */
-#line 4822 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4827 "/home/colea/xquery_bzr/feature-empty_object/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())
       {
@@ -7617,7 +7622,7 @@
   case 496:
 
 /* Line 690 of lalr1.cc  */
-#line 4844 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4849 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       DirElemContentList *decl = new DirElemContentList( LOC((yyloc)) );
       decl->push_back( dynamic_cast<DirElemContent*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -7628,7 +7633,7 @@
   case 497:
 
 /* Line 690 of lalr1.cc  */
-#line 4850 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4855 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       DirElemContentList *decl = dynamic_cast<DirElemContentList*>((yysemantic_stack_[(2) - (1)].node));
       if ( decl )
@@ -7640,7 +7645,7 @@
   case 498:
 
 /* Line 690 of lalr1.cc  */
-#line 4861 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4866 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       DirAttributeList *dal = new DirAttributeList( LOC((yyloc)) );
       dal->push_back( dynamic_cast<DirAttr*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7651,7 +7656,7 @@
   case 499:
 
 /* Line 690 of lalr1.cc  */
-#line 4867 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4872 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       DirAttributeList *dal = dynamic_cast<DirAttributeList*>((yysemantic_stack_[(2) - (1)].node));
       if ( dal )
@@ -7663,7 +7668,7 @@
   case 500:
 
 /* Line 690 of lalr1.cc  */
-#line 4878 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4883 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DirAttr(LOC((yyloc)),
                        static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -7674,7 +7679,7 @@
   case 503:
 
 /* Line 690 of lalr1.cc  */
-#line 4893 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4898 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DirAttributeValue(LOC((yyloc)),
                                  dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(3) - (2)].node)));
@@ -7684,7 +7689,7 @@
   case 504:
 
 /* Line 690 of lalr1.cc  */
-#line 4898 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4903 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DirAttributeValue( LOC((yyloc)),
                                   dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(3) - (2)].node)));
@@ -7694,7 +7699,7 @@
   case 505:
 
 /* Line 690 of lalr1.cc  */
-#line 4907 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4912 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new QuoteAttrContentList( LOC((yyloc)) );
     }
@@ -7703,7 +7708,7 @@
   case 506:
 
 /* Line 690 of lalr1.cc  */
-#line 4911 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4916 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7712,7 +7717,7 @@
   case 507:
 
 /* Line 690 of lalr1.cc  */
-#line 4918 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4923 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
       qacl->push_back( new QuoteAttrValueContent( LOC((yyloc)), "\"" ) );
@@ -7723,7 +7728,7 @@
   case 508:
 
 /* Line 690 of lalr1.cc  */
-#line 4924 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4929 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
       qacl->push_back( dynamic_cast<QuoteAttrValueContent*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7734,7 +7739,7 @@
   case 509:
 
 /* Line 690 of lalr1.cc  */
-#line 4930 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       QuoteAttrContentList* qacl = dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
       if ( qacl )
@@ -7746,7 +7751,7 @@
   case 510:
 
 /* Line 690 of lalr1.cc  */
-#line 4937 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4942 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       QuoteAttrContentList *qacl = dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
       if ( qacl )
@@ -7758,7 +7763,7 @@
   case 511:
 
 /* Line 690 of lalr1.cc  */
-#line 4948 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4953 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AposAttrContentList( LOC((yyloc)) );
     }
@@ -7767,7 +7772,7 @@
   case 512:
 
 /* Line 690 of lalr1.cc  */
-#line 4952 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4957 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7776,7 +7781,7 @@
   case 513:
 
 /* Line 690 of lalr1.cc  */
-#line 4959 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4964 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       AposAttrContentList *aacl = new AposAttrContentList( LOC((yyloc)) );
       aacl->push_back( new AposAttrValueContent( LOC((yyloc)),"'") );
@@ -7787,7 +7792,7 @@
   case 514:
 
 /* Line 690 of lalr1.cc  */
-#line 4965 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4970 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       AposAttrContentList *aacl = new AposAttrContentList( LOC((yyloc)) );
       aacl->push_back( dynamic_cast<AposAttrValueContent*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7798,7 +7803,7 @@
   case 515:
 
 /* Line 690 of lalr1.cc  */
-#line 4971 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4976 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
       if (aacl)
@@ -7810,7 +7815,7 @@
   case 516:
 
 /* Line 690 of lalr1.cc  */
-#line 4978 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4983 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
       if ( aacl )
@@ -7822,7 +7827,7 @@
   case 517:
 
 /* Line 690 of lalr1.cc  */
-#line 4989 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4994 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new QuoteAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
     }
@@ -7831,7 +7836,7 @@
   case 518:
 
 /* Line 690 of lalr1.cc  */
-#line 4993 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 4998 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new QuoteAttrValueContent(LOC((yyloc)), dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr)));
     }
@@ -7840,7 +7845,7 @@
   case 519:
 
 /* Line 690 of lalr1.cc  */
-#line 5001 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5006 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AposAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
     }
@@ -7849,7 +7854,7 @@
   case 520:
 
 /* Line 690 of lalr1.cc  */
-#line 5005 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5010 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AposAttrValueContent(LOC((yyloc)), dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr)));
     }
@@ -7858,7 +7863,7 @@
   case 521:
 
 /* Line 690 of lalr1.cc  */
-#line 5013 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5018 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirElemContent( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr) );
     }
@@ -7867,7 +7872,7 @@
   case 522:
 
 /* Line 690 of lalr1.cc  */
-#line 5017 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5022 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirElemContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
     }
@@ -7876,7 +7881,7 @@
   case 523:
 
 /* Line 690 of lalr1.cc  */
-#line 5021 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5026 "/home/colea/xquery_bzr/feature-empty_object/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 );
@@ -7886,7 +7891,7 @@
   case 524:
 
 /* Line 690 of lalr1.cc  */
-#line 5026 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5031 "/home/colea/xquery_bzr/feature-empty_object/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 );
@@ -7896,7 +7901,7 @@
   case 525:
 
 /* Line 690 of lalr1.cc  */
-#line 5035 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5040 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_charref, SYMTAB((yysemantic_stack_[(1) - (1)].sval)));
     }
@@ -7905,7 +7910,7 @@
   case 526:
 
 /* Line 690 of lalr1.cc  */
-#line 5039 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5044 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_escape_lbrace);
     }
@@ -7914,7 +7919,7 @@
   case 527:
 
 /* Line 690 of lalr1.cc  */
-#line 5043 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5048 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_escape_rbrace);
     }
@@ -7923,7 +7928,7 @@
   case 528:
 
 /* Line 690 of lalr1.cc  */
-#line 5047 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5052 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CommonContent(LOC((yyloc)), new EnclosedExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr)));
     }
@@ -7932,7 +7937,7 @@
   case 529:
 
 /* Line 690 of lalr1.cc  */
-#line 5055 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5060 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirCommentConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
@@ -7941,7 +7946,7 @@
   case 530:
 
 /* Line 690 of lalr1.cc  */
-#line 5060 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5065 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirCommentConstructor( LOC((yyloc)), "" );
     }
@@ -7950,7 +7955,7 @@
   case 531:
 
 /* Line 690 of lalr1.cc  */
-#line 5068 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5073 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirPIConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
@@ -7959,7 +7964,7 @@
   case 532:
 
 /* Line 690 of lalr1.cc  */
-#line 5073 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5078 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new DirPIConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
     }
@@ -7968,7 +7973,7 @@
   case 533:
 
 /* Line 690 of lalr1.cc  */
-#line 5081 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5086 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CDataSection( LOC((yyloc)),SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
     }
@@ -7977,7 +7982,7 @@
   case 534:
 
 /* Line 690 of lalr1.cc  */
-#line 5089 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5094 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7986,7 +7991,7 @@
   case 535:
 
 /* Line 690 of lalr1.cc  */
-#line 5094 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5099 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7995,7 +8000,7 @@
   case 536:
 
 /* Line 690 of lalr1.cc  */
-#line 5099 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5104 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8004,7 +8009,7 @@
   case 537:
 
 /* Line 690 of lalr1.cc  */
-#line 5104 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5109 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8013,7 +8018,7 @@
   case 538:
 
 /* Line 690 of lalr1.cc  */
-#line 5109 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5114 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8022,7 +8027,7 @@
   case 539:
 
 /* Line 690 of lalr1.cc  */
-#line 5114 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5119 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8031,7 +8036,7 @@
   case 541:
 
 /* Line 690 of lalr1.cc  */
-#line 5125 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5130 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompDocConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
     }
@@ -8040,7 +8045,7 @@
   case 542:
 
 /* Line 690 of lalr1.cc  */
-#line 5133 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5138 "/home/colea/xquery_bzr/feature-empty_object/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));
     }
@@ -8049,7 +8054,7 @@
   case 543:
 
 /* Line 690 of lalr1.cc  */
-#line 5137 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5142 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompElemConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
     }
@@ -8058,7 +8063,7 @@
   case 544:
 
 /* Line 690 of lalr1.cc  */
-#line 5154 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5159 "/home/colea/xquery_bzr/feature-empty_object/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) );
     }
@@ -8067,7 +8072,7 @@
   case 545:
 
 /* Line 690 of lalr1.cc  */
-#line 5158 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5163 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompAttrConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
     }
@@ -8076,7 +8081,7 @@
   case 546:
 
 /* Line 690 of lalr1.cc  */
-#line 5166 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5171 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompTextConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
     }
@@ -8085,7 +8090,7 @@
   case 547:
 
 /* Line 690 of lalr1.cc  */
-#line 5174 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5179 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompCommentConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
     }
@@ -8094,7 +8099,7 @@
   case 548:
 
 /* Line 690 of lalr1.cc  */
-#line 5182 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5187 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompPIConstructor(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)), (yysemantic_stack_[(3) - (2)].expr));
     }
@@ -8103,7 +8108,7 @@
   case 549:
 
 /* Line 690 of lalr1.cc  */
-#line 5186 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5191 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompPIConstructor(LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr));
     }
@@ -8112,7 +8117,7 @@
   case 550:
 
 /* Line 690 of lalr1.cc  */
-#line 5194 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5199 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompNamespaceConstructor(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)), (yysemantic_stack_[(3) - (2)].expr));
     }
@@ -8121,7 +8126,7 @@
   case 551:
 
 /* Line 690 of lalr1.cc  */
-#line 5198 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5203 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new CompNamespaceConstructor(LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr));
     }
@@ -8130,7 +8135,7 @@
   case 552:
 
 /* Line 690 of lalr1.cc  */
-#line 5206 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5211 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
     }
@@ -8139,7 +8144,7 @@
   case 553:
 
 /* Line 690 of lalr1.cc  */
-#line 5214 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5219 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SequenceType( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL );
         }
@@ -8148,7 +8153,7 @@
   case 554:
 
 /* Line 690 of lalr1.cc  */
-#line 5218 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5223 "/home/colea/xquery_bzr/feature-empty_object/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)));
         }
@@ -8157,7 +8162,7 @@
   case 555:
 
 /* Line 690 of lalr1.cc  */
-#line 5222 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5227 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SequenceType( LOC((yyloc)), NULL, NULL );
         }
@@ -8166,7 +8171,7 @@
   case 556:
 
 /* Line 690 of lalr1.cc  */
-#line 5227 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5232 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SequenceType( LOC((yyloc)), NULL, NULL );
         }
@@ -8175,7 +8180,7 @@
   case 557:
 
 /* Line 690 of lalr1.cc  */
-#line 5262 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5267 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_optionally
@@ -8186,7 +8191,7 @@
   case 558:
 
 /* Line 690 of lalr1.cc  */
-#line 5268 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5273 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_zero_or_more
@@ -8197,7 +8202,7 @@
   case 559:
 
 /* Line 690 of lalr1.cc  */
-#line 5274 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5279 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_one_or_more
@@ -8208,7 +8213,7 @@
   case 560:
 
 /* Line 690 of lalr1.cc  */
-#line 5284 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5289 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8217,7 +8222,7 @@
   case 561:
 
 /* Line 690 of lalr1.cc  */
-#line 5288 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5293 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8226,7 +8231,7 @@
   case 562:
 
 /* Line 690 of lalr1.cc  */
-#line 5292 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5297 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ItemType( LOC((yyloc)), true );
         }
@@ -8235,7 +8240,7 @@
   case 563:
 
 /* Line 690 of lalr1.cc  */
-#line 5297 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5302 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ItemType( LOC((yyloc)), true );
         }
@@ -8244,7 +8249,7 @@
   case 564:
 
 /* Line 690 of lalr1.cc  */
-#line 5301 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5306 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new StructuredItemType(LOC((yyloc)));
         }
@@ -8253,7 +8258,7 @@
   case 565:
 
 /* Line 690 of lalr1.cc  */
-#line 5306 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5311 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new StructuredItemType(LOC((yyloc)));
         }
@@ -8262,7 +8267,7 @@
   case 566:
 
 /* Line 690 of lalr1.cc  */
-#line 5310 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5315 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8271,7 +8276,7 @@
   case 567:
 
 /* Line 690 of lalr1.cc  */
-#line 5314 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5319 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8280,7 +8285,7 @@
   case 568:
 
 /* Line 690 of lalr1.cc  */
-#line 5318 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5323 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8289,7 +8294,7 @@
   case 569:
 
 /* Line 690 of lalr1.cc  */
-#line 5325 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5330 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           TypeList* aTypeList = new TypeList(LOC ((yyloc)));
           aTypeList->push_back(dynamic_cast<SequenceType *>((yysemantic_stack_[(1) - (1)].node)));
@@ -8300,7 +8305,7 @@
   case 570:
 
 /* Line 690 of lalr1.cc  */
-#line 5331 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5336 "/home/colea/xquery_bzr/feature-empty_object/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)));
@@ -8311,7 +8316,7 @@
   case 571:
 
 /* Line 690 of lalr1.cc  */
-#line 5341 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5346 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new GeneralizedAtomicType( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
     }
@@ -8320,7 +8325,7 @@
   case 572:
 
 /* Line 690 of lalr1.cc  */
-#line 5349 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5354 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SimpleType( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
     }
@@ -8329,7 +8334,7 @@
   case 573:
 
 /* Line 690 of lalr1.cc  */
-#line 5357 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5362 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8338,7 +8343,7 @@
   case 574:
 
 /* Line 690 of lalr1.cc  */
-#line 5361 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5366 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8347,7 +8352,7 @@
   case 575:
 
 /* Line 690 of lalr1.cc  */
-#line 5365 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5370 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8356,7 +8361,7 @@
   case 576:
 
 /* Line 690 of lalr1.cc  */
-#line 5369 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5374 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8365,7 +8370,7 @@
   case 577:
 
 /* Line 690 of lalr1.cc  */
-#line 5373 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5378 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8374,7 +8379,7 @@
   case 578:
 
 /* Line 690 of lalr1.cc  */
-#line 5377 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5382 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8383,7 +8388,7 @@
   case 579:
 
 /* Line 690 of lalr1.cc  */
-#line 5381 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5386 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8392,7 +8397,7 @@
   case 580:
 
 /* Line 690 of lalr1.cc  */
-#line 5385 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5390 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8401,7 +8406,7 @@
   case 581:
 
 /* Line 690 of lalr1.cc  */
-#line 5389 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5394 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8410,7 +8415,7 @@
   case 582:
 
 /* Line 690 of lalr1.cc  */
-#line 5393 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5398 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8419,7 +8424,7 @@
   case 583:
 
 /* Line 690 of lalr1.cc  */
-#line 5401 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5406 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnyKindTest( LOC((yyloc)) );
     }
@@ -8428,7 +8433,7 @@
   case 584:
 
 /* Line 690 of lalr1.cc  */
-#line 5409 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5414 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DocumentTest(LOC((yyloc)));
     }
@@ -8437,7 +8442,7 @@
   case 585:
 
 /* Line 690 of lalr1.cc  */
-#line 5413 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5418 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DocumentTest(LOC((yyloc)), dynamic_cast<ElementTest*>((yysemantic_stack_[(4) - (3)].node)));
     }
@@ -8446,7 +8451,7 @@
   case 586:
 
 /* Line 690 of lalr1.cc  */
-#line 5417 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5422 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DocumentTest(LOC((yyloc)), dynamic_cast<SchemaElementTest*>((yysemantic_stack_[(4) - (3)].node)));
     }
@@ -8455,7 +8460,7 @@
   case 587:
 
 /* Line 690 of lalr1.cc  */
-#line 5425 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5430 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new NamespaceTest(LOC((yyloc)));
     }
@@ -8464,7 +8469,7 @@
   case 588:
 
 /* Line 690 of lalr1.cc  */
-#line 5432 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5437 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new TextTest(LOC((yyloc)));
     }
@@ -8473,7 +8478,7 @@
   case 589:
 
 /* Line 690 of lalr1.cc  */
-#line 5440 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5445 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CommentTest(LOC((yyloc)));
     }
@@ -8482,7 +8487,7 @@
   case 590:
 
 /* Line 690 of lalr1.cc  */
-#line 5448 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5453 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new PITest( LOC((yyloc)), "" );
         }
@@ -8491,7 +8496,7 @@
   case 591:
 
 /* Line 690 of lalr1.cc  */
-#line 5452 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5457 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
         }
@@ -8500,7 +8505,7 @@
   case 592:
 
 /* Line 690 of lalr1.cc  */
-#line 5456 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5461 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
         }
@@ -8509,7 +8514,7 @@
   case 593:
 
 /* Line 690 of lalr1.cc  */
-#line 5464 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5469 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
         }
@@ -8518,7 +8523,7 @@
   case 594:
 
 /* Line 690 of lalr1.cc  */
-#line 5468 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5473 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new AttributeTest(
                 LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL
@@ -8529,7 +8534,7 @@
   case 595:
 
 /* Line 690 of lalr1.cc  */
-#line 5474 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5479 "/home/colea/xquery_bzr/feature-empty_object/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))
@@ -8540,7 +8545,7 @@
   case 596:
 
 /* Line 690 of lalr1.cc  */
-#line 5480 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5485 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
         }
@@ -8549,7 +8554,7 @@
   case 597:
 
 /* Line 690 of lalr1.cc  */
-#line 5484 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5489 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new AttributeTest(
                 LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node))
@@ -8560,7 +8565,7 @@
   case 598:
 
 /* Line 690 of lalr1.cc  */
-#line 5494 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5499 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SchemaAttributeTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
@@ -8569,7 +8574,7 @@
   case 599:
 
 /* Line 690 of lalr1.cc  */
-#line 5502 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5507 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest( LOC((yyloc)), NULL, NULL, true );
         }
@@ -8578,7 +8583,7 @@
   case 600:
 
 /* Line 690 of lalr1.cc  */
-#line 5506 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5511 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL, true
@@ -8589,7 +8594,7 @@
   case 601:
 
 /* Line 690 of lalr1.cc  */
-#line 5512 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5517 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)),
@@ -8603,7 +8608,7 @@
   case 602:
 
 /* Line 690 of lalr1.cc  */
-#line 5521 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5526 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)),
@@ -8617,7 +8622,7 @@
   case 603:
 
 /* Line 690 of lalr1.cc  */
-#line 5530 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5535 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), NULL, NULL, true
@@ -8628,7 +8633,7 @@
   case 604:
 
 /* Line 690 of lalr1.cc  */
-#line 5536 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5541 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), false
@@ -8639,7 +8644,7 @@
   case 605:
 
 /* Line 690 of lalr1.cc  */
-#line 5542 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5547 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), true
@@ -8650,7 +8655,7 @@
   case 606:
 
 /* Line 690 of lalr1.cc  */
-#line 5552 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5557 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new SchemaElementTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
@@ -8659,7 +8664,7 @@
   case 607:
 
 /* Line 690 of lalr1.cc  */
-#line 5569 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5574 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
         }
@@ -8668,7 +8673,7 @@
   case 608:
 
 /* Line 690 of lalr1.cc  */
-#line 5576 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5581 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (1)].expr)), true );
         }
@@ -8677,7 +8682,7 @@
   case 609:
 
 /* Line 690 of lalr1.cc  */
-#line 5591 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5596 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
         }
@@ -8686,7 +8691,7 @@
   case 610:
 
 /* Line 690 of lalr1.cc  */
-#line 5618 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5623 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8695,7 +8700,7 @@
   case 611:
 
 /* Line 690 of lalr1.cc  */
-#line 5622 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5627 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8704,7 +8709,7 @@
   case 612:
 
 /* Line 690 of lalr1.cc  */
-#line 5630 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5635 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnyFunctionTest(LOC((yyloc)));
     }
@@ -8713,7 +8718,7 @@
   case 613:
 
 /* Line 690 of lalr1.cc  */
-#line 5638 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5643 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = new TypedFunctionTest(LOC ((yyloc)), dynamic_cast<SequenceType *>((yysemantic_stack_[(5) - (5)].node)));
         }
@@ -8722,7 +8727,7 @@
   case 614:
 
 /* Line 690 of lalr1.cc  */
-#line 5642 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5647 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = new TypedFunctionTest(LOC ((yyloc)),
               dynamic_cast<TypeList *>((yysemantic_stack_[(6) - (3)].node)),
@@ -8733,7 +8738,7 @@
   case 615:
 
 /* Line 690 of lalr1.cc  */
-#line 5653 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5658 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
            (yyval.node) = (yysemantic_stack_[(3) - (2)].node);
         }
@@ -8742,7 +8747,7 @@
   case 616:
 
 /* Line 690 of lalr1.cc  */
-#line 5670 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5675 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::strict_validation
@@ -8753,7 +8758,7 @@
   case 617:
 
 /* Line 690 of lalr1.cc  */
-#line 5676 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5681 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::lax_validation
@@ -8764,7 +8769,7 @@
   case 618:
 
 /* Line 690 of lalr1.cc  */
-#line 5682 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5687 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::skip_validation
@@ -8775,7 +8780,7 @@
   case 619:
 
 /* Line 690 of lalr1.cc  */
-#line 5692 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5697 "/home/colea/xquery_bzr/feature-empty_object/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) );
         }
@@ -8784,7 +8789,7 @@
   case 620:
 
 /* Line 690 of lalr1.cc  */
-#line 5696 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5701 "/home/colea/xquery_bzr/feature-empty_object/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)
@@ -8795,7 +8800,7 @@
   case 621:
 
 /* Line 690 of lalr1.cc  */
-#line 5702 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5707 "/home/colea/xquery_bzr/feature-empty_object/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)
@@ -8806,7 +8811,7 @@
   case 622:
 
 /* Line 690 of lalr1.cc  */
-#line 5708 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5713 "/home/colea/xquery_bzr/feature-empty_object/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) );
         }
@@ -8815,7 +8820,7 @@
   case 623:
 
 /* Line 690 of lalr1.cc  */
-#line 5712 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5717 "/home/colea/xquery_bzr/feature-empty_object/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)
@@ -8826,7 +8831,7 @@
   case 624:
 
 /* Line 690 of lalr1.cc  */
-#line 5718 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5723 "/home/colea/xquery_bzr/feature-empty_object/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) );
         }
@@ -8835,7 +8840,7 @@
   case 625:
 
 /* Line 690 of lalr1.cc  */
-#line 5722 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5727 "/home/colea/xquery_bzr/feature-empty_object/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)
@@ -8846,7 +8851,7 @@
   case 626:
 
 /* Line 690 of lalr1.cc  */
-#line 5728 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5733 "/home/colea/xquery_bzr/feature-empty_object/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)
@@ -8857,7 +8862,7 @@
   case 627:
 
 /* Line 690 of lalr1.cc  */
-#line 5734 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5739 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new InsertExpr(
                 LOC ((yyloc)),
@@ -8869,7 +8874,7 @@
   case 628:
 
 /* Line 690 of lalr1.cc  */
-#line 5741 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5746 "/home/colea/xquery_bzr/feature-empty_object/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)
@@ -8880,7 +8885,7 @@
   case 629:
 
 /* Line 690 of lalr1.cc  */
-#line 5751 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5756 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -8889,7 +8894,7 @@
   case 630:
 
 /* Line 690 of lalr1.cc  */
-#line 5756 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5761 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -8898,7 +8903,7 @@
   case 631:
 
 /* Line 690 of lalr1.cc  */
-#line 5764 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5769 "/home/colea/xquery_bzr/feature-empty_object/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)
@@ -8909,7 +8914,7 @@
   case 632:
 
 /* Line 690 of lalr1.cc  */
-#line 5770 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5775 "/home/colea/xquery_bzr/feature-empty_object/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)
@@ -8920,7 +8925,7 @@
   case 633:
 
 /* Line 690 of lalr1.cc  */
-#line 5780 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5785 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new RenameExpr( LOC ((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
@@ -8929,7 +8934,7 @@
   case 634:
 
 /* Line 690 of lalr1.cc  */
-#line 5802 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5807 "/home/colea/xquery_bzr/feature-empty_object/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) );
@@ -8939,7 +8944,7 @@
   case 635:
 
 /* Line 690 of lalr1.cc  */
-#line 5811 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5816 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       CopyVarList* lList = new CopyVarList(LOC((yyloc)));
       lList->push_back (dynamic_cast<VarBinding*> ((yysemantic_stack_[(1) - (1)].expr)));
@@ -8950,7 +8955,7 @@
   case 636:
 
 /* Line 690 of lalr1.cc  */
-#line 5817 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5822 "/home/colea/xquery_bzr/feature-empty_object/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));
@@ -8962,7 +8967,7 @@
   case 637:
 
 /* Line 690 of lalr1.cc  */
-#line 5830 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5835 "/home/colea/xquery_bzr/feature-empty_object/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));
     }
@@ -8971,7 +8976,7 @@
   case 638:
 
 /* Line 690 of lalr1.cc  */
-#line 5844 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5849 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.expr) = new TryExpr( LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
@@ -8980,7 +8985,7 @@
   case 639:
 
 /* Line 690 of lalr1.cc  */
-#line 5851 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5856 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             CatchListExpr *cle = new CatchListExpr( LOC((yyloc)) );
             cle->push_back( static_cast<CatchExpr*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -8991,7 +8996,7 @@
   case 640:
 
 /* Line 690 of lalr1.cc  */
-#line 5857 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5862 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
             if ( cle )
@@ -9003,7 +9008,7 @@
   case 641:
 
 /* Line 690 of lalr1.cc  */
-#line 5867 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5872 "/home/colea/xquery_bzr/feature-empty_object/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);
@@ -9013,7 +9018,7 @@
   case 642:
 
 /* Line 690 of lalr1.cc  */
-#line 5876 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5881 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -9022,7 +9027,7 @@
   case 643:
 
 /* Line 690 of lalr1.cc  */
-#line 5884 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5889 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             CatchExpr::NameTestList *ntl = new CatchExpr::NameTestList;
             ntl->push_back( static_cast<NameTest*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -9033,7 +9038,7 @@
   case 644:
 
 /* Line 690 of lalr1.cc  */
-#line 5890 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5895 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             CatchExpr::NameTestList *ntl =
                 static_cast<CatchExpr::NameTestList*>((yysemantic_stack_[(3) - (1)].name_test_list));
@@ -9045,7 +9050,7 @@
   case 645:
 
 /* Line 690 of lalr1.cc  */
-#line 5908 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5913 "/home/colea/xquery_bzr/feature-empty_object/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);
@@ -9055,7 +9060,7 @@
   case 646:
 
 /* Line 690 of lalr1.cc  */
-#line 5916 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5921 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.pos_filter_list) = NULL;
         }
@@ -9064,7 +9069,7 @@
   case 647:
 
 /* Line 690 of lalr1.cc  */
-#line 5920 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5925 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.pos_filter_list) = (yysemantic_stack_[(1) - (1)].pos_filter_list);
         }
@@ -9073,7 +9078,7 @@
   case 648:
 
 /* Line 690 of lalr1.cc  */
-#line 5927 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5932 "/home/colea/xquery_bzr/feature-empty_object/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)) );
@@ -9083,7 +9088,7 @@
   case 649:
 
 /* Line 690 of lalr1.cc  */
-#line 5932 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5937 "/home/colea/xquery_bzr/feature-empty_object/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);
@@ -9093,7 +9098,7 @@
   case 650:
 
 /* Line 690 of lalr1.cc  */
-#line 5940 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5945 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9102,7 +9107,7 @@
   case 651:
 
 /* Line 690 of lalr1.cc  */
-#line 5944 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5949 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTOr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
         }
@@ -9111,7 +9116,7 @@
   case 652:
 
 /* Line 690 of lalr1.cc  */
-#line 5951 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5956 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9120,7 +9125,7 @@
   case 653:
 
 /* Line 690 of lalr1.cc  */
-#line 5955 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5960 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTAnd( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
         }
@@ -9129,7 +9134,7 @@
   case 654:
 
 /* Line 690 of lalr1.cc  */
-#line 5962 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5967 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9138,7 +9143,7 @@
   case 655:
 
 /* Line 690 of lalr1.cc  */
-#line 5966 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5971 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTMildNot( LOC((yyloc)), (yysemantic_stack_[(4) - (1)].node), (yysemantic_stack_[(4) - (4)].node) );
         }
@@ -9147,7 +9152,7 @@
   case 656:
 
 /* Line 690 of lalr1.cc  */
-#line 5973 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5978 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9156,7 +9161,7 @@
   case 657:
 
 /* Line 690 of lalr1.cc  */
-#line 5977 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5982 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTUnaryNot(
                 LOC((yyloc)), dynamic_cast<FTPrimaryWithOptions*>((yysemantic_stack_[(2) - (2)].node))
@@ -9167,7 +9172,7 @@
   case 658:
 
 /* Line 690 of lalr1.cc  */
-#line 5986 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 5991 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTPrimaryWithOptions(
                 LOC((yyloc)),
@@ -9181,7 +9186,7 @@
   case 659:
 
 /* Line 690 of lalr1.cc  */
-#line 5998 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6003 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9190,7 +9195,7 @@
   case 660:
 
 /* Line 690 of lalr1.cc  */
-#line 6002 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6007 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9199,7 +9204,7 @@
   case 661:
 
 /* Line 690 of lalr1.cc  */
-#line 6009 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6014 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9208,7 +9213,7 @@
   case 662:
 
 /* Line 690 of lalr1.cc  */
-#line 6013 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6018 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9217,7 +9222,7 @@
   case 663:
 
 /* Line 690 of lalr1.cc  */
-#line 6021 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6026 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWeight( LOC((yyloc)), dynamic_cast<exprnode*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
@@ -9226,7 +9231,7 @@
   case 664:
 
 /* Line 690 of lalr1.cc  */
-#line 6029 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6034 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWordsTimes(
                 LOC((yyloc)),
@@ -9239,7 +9244,7 @@
   case 665:
 
 /* Line 690 of lalr1.cc  */
-#line 6037 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6042 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(3) - (2)].node);
         }
@@ -9248,7 +9253,7 @@
   case 666:
 
 /* Line 690 of lalr1.cc  */
-#line 6041 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6046 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9257,7 +9262,7 @@
   case 667:
 
 /* Line 690 of lalr1.cc  */
-#line 6048 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6053 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9266,7 +9271,7 @@
   case 668:
 
 /* Line 690 of lalr1.cc  */
-#line 6052 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6057 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9275,7 +9280,7 @@
   case 669:
 
 /* Line 690 of lalr1.cc  */
-#line 6060 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6065 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTExtensionSelection(
                 LOC((yyloc)),
@@ -9288,7 +9293,7 @@
   case 670:
 
 /* Line 690 of lalr1.cc  */
-#line 6071 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6076 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9297,7 +9302,7 @@
   case 671:
 
 /* Line 690 of lalr1.cc  */
-#line 6075 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6080 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9306,7 +9311,7 @@
   case 672:
 
 /* Line 690 of lalr1.cc  */
-#line 6083 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6088 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWords(
                 LOC((yyloc)),
@@ -9319,7 +9324,7 @@
   case 673:
 
 /* Line 690 of lalr1.cc  */
-#line 6095 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6100 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWordsValue(
                 LOC((yyloc)), static_cast<StringLiteral*>((yysemantic_stack_[(1) - (1)].expr)), NULL
@@ -9330,7 +9335,7 @@
   case 674:
 
 /* Line 690 of lalr1.cc  */
-#line 6101 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6106 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWordsValue(
                 LOC((yyloc)), NULL, dynamic_cast<exprnode*>((yysemantic_stack_[(3) - (2)].expr))
@@ -9341,7 +9346,7 @@
   case 675:
 
 /* Line 690 of lalr1.cc  */
-#line 6110 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6115 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::any );
         }
@@ -9350,7 +9355,7 @@
   case 676:
 
 /* Line 690 of lalr1.cc  */
-#line 6114 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6119 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9359,7 +9364,7 @@
   case 677:
 
 /* Line 690 of lalr1.cc  */
-#line 6122 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6127 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
         }
@@ -9368,7 +9373,7 @@
   case 678:
 
 /* Line 690 of lalr1.cc  */
-#line 6126 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6131 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
         }
@@ -9377,7 +9382,7 @@
   case 679:
 
 /* Line 690 of lalr1.cc  */
-#line 6130 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6135 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::phrase );
         }
@@ -9386,7 +9391,7 @@
   case 680:
 
 /* Line 690 of lalr1.cc  */
-#line 6137 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6142 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::any;
         }
@@ -9395,7 +9400,7 @@
   case 681:
 
 /* Line 690 of lalr1.cc  */
-#line 6141 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6146 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::any_word;
         }
@@ -9404,7 +9409,7 @@
   case 682:
 
 /* Line 690 of lalr1.cc  */
-#line 6148 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6153 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::all;
         }
@@ -9413,7 +9418,7 @@
   case 683:
 
 /* Line 690 of lalr1.cc  */
-#line 6152 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6157 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::all_words;
         }
@@ -9422,7 +9427,7 @@
   case 684:
 
 /* Line 690 of lalr1.cc  */
-#line 6160 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6165 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9431,7 +9436,7 @@
   case 685:
 
 /* Line 690 of lalr1.cc  */
-#line 6164 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6169 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9440,7 +9445,7 @@
   case 686:
 
 /* Line 690 of lalr1.cc  */
-#line 6168 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6173 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9449,7 +9454,7 @@
   case 687:
 
 /* Line 690 of lalr1.cc  */
-#line 6172 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6177 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9458,7 +9463,7 @@
   case 688:
 
 /* Line 690 of lalr1.cc  */
-#line 6176 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6181 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9467,7 +9472,7 @@
   case 689:
 
 /* Line 690 of lalr1.cc  */
-#line 6184 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6189 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTOrder( LOC((yyloc)) );
         }
@@ -9476,7 +9481,7 @@
   case 690:
 
 /* Line 690 of lalr1.cc  */
-#line 6192 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6197 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWindow(
                 LOC((yyloc)),
@@ -9489,7 +9494,7 @@
   case 691:
 
 /* Line 690 of lalr1.cc  */
-#line 6204 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6209 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTDistance(
                 LOC((yyloc)),
@@ -9502,7 +9507,7 @@
   case 692:
 
 /* Line 690 of lalr1.cc  */
-#line 6216 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6221 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::words );
         }
@@ -9511,7 +9516,7 @@
   case 693:
 
 /* Line 690 of lalr1.cc  */
-#line 6220 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6225 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::sentences );
         }
@@ -9520,7 +9525,7 @@
   case 694:
 
 /* Line 690 of lalr1.cc  */
-#line 6224 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6229 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::paragraphs );
         }
@@ -9529,7 +9534,7 @@
   case 695:
 
 /* Line 690 of lalr1.cc  */
-#line 6232 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6237 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             FTMatchOptions *mo = new FTMatchOptions( LOC((yyloc)) );
             mo->push_back( dynamic_cast<FTMatchOption*>((yysemantic_stack_[(2) - (2)].node)) );
@@ -9540,7 +9545,7 @@
   case 696:
 
 /* Line 690 of lalr1.cc  */
-#line 6238 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6243 "/home/colea/xquery_bzr/feature-empty_object/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)) );
@@ -9551,7 +9556,7 @@
   case 697:
 
 /* Line 690 of lalr1.cc  */
-#line 6248 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6253 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9560,7 +9565,7 @@
   case 698:
 
 /* Line 690 of lalr1.cc  */
-#line 6252 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6257 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9569,7 +9574,7 @@
   case 699:
 
 /* Line 690 of lalr1.cc  */
-#line 6256 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6261 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9578,7 +9583,7 @@
   case 700:
 
 /* Line 690 of lalr1.cc  */
-#line 6260 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6265 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9587,7 +9592,7 @@
   case 701:
 
 /* Line 690 of lalr1.cc  */
-#line 6264 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6269 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9596,7 +9601,7 @@
   case 702:
 
 /* Line 690 of lalr1.cc  */
-#line 6268 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6273 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9605,7 +9610,7 @@
   case 703:
 
 /* Line 690 of lalr1.cc  */
-#line 6272 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6277 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9614,7 +9619,7 @@
   case 704:
 
 /* Line 690 of lalr1.cc  */
-#line 6276 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6281 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9623,7 +9628,7 @@
   case 705:
 
 /* Line 690 of lalr1.cc  */
-#line 6284 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6289 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::sensitive );
         }
@@ -9632,7 +9637,7 @@
   case 706:
 
 /* Line 690 of lalr1.cc  */
-#line 6288 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6293 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::insensitive );
         }
@@ -9641,7 +9646,7 @@
   case 707:
 
 /* Line 690 of lalr1.cc  */
-#line 6292 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6297 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::lower );
         }
@@ -9650,7 +9655,7 @@
   case 708:
 
 /* Line 690 of lalr1.cc  */
-#line 6296 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6301 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::upper );
         }
@@ -9659,7 +9664,7 @@
   case 709:
 
 /* Line 690 of lalr1.cc  */
-#line 6304 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6309 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTDiacriticsOption(
                 LOC((yyloc)), ft_diacritics_mode::sensitive
@@ -9670,7 +9675,7 @@
   case 710:
 
 /* Line 690 of lalr1.cc  */
-#line 6310 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6315 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTDiacriticsOption(
                 LOC((yyloc)), ft_diacritics_mode::insensitive
@@ -9681,7 +9686,7 @@
   case 711:
 
 /* Line 690 of lalr1.cc  */
-#line 6320 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6325 "/home/colea/xquery_bzr/feature-empty_object/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))
@@ -9692,7 +9697,7 @@
   case 712:
 
 /* Line 690 of lalr1.cc  */
-#line 6330 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6335 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::stemming );
         }
@@ -9701,7 +9706,7 @@
   case 713:
 
 /* Line 690 of lalr1.cc  */
-#line 6334 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6339 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::no_stemming );
         }
@@ -9710,7 +9715,7 @@
   case 714:
 
 /* Line 690 of lalr1.cc  */
-#line 6342 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6347 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             FTThesaurusOption::thesaurus_id_list_t *til = NULL;
             if ( (yysemantic_stack_[(2) - (2)].node) ) {
@@ -9725,7 +9730,7 @@
   case 715:
 
 /* Line 690 of lalr1.cc  */
-#line 6352 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6357 "/home/colea/xquery_bzr/feature-empty_object/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) ) {
@@ -9741,7 +9746,7 @@
   case 716:
 
 /* Line 690 of lalr1.cc  */
-#line 6363 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6368 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTThesaurusOption( LOC((yyloc)), NULL, false, true );
         }
@@ -9750,7 +9755,7 @@
   case 717:
 
 /* Line 690 of lalr1.cc  */
-#line 6370 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6375 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9759,7 +9764,7 @@
   case 718:
 
 /* Line 690 of lalr1.cc  */
-#line 6374 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6379 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9768,7 +9773,7 @@
   case 719:
 
 /* Line 690 of lalr1.cc  */
-#line 6381 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6386 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.thesaurus_id_list) = NULL;
         }
@@ -9777,7 +9782,7 @@
   case 720:
 
 /* Line 690 of lalr1.cc  */
-#line 6385 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6390 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.thesaurus_id_list) = (yysemantic_stack_[(2) - (2)].thesaurus_id_list);
         }
@@ -9786,7 +9791,7 @@
   case 721:
 
 /* Line 690 of lalr1.cc  */
-#line 6392 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6397 "/home/colea/xquery_bzr/feature-empty_object/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)) );
@@ -9796,7 +9801,7 @@
   case 722:
 
 /* Line 690 of lalr1.cc  */
-#line 6397 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6402 "/home/colea/xquery_bzr/feature-empty_object/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);
@@ -9806,7 +9811,7 @@
   case 723:
 
 /* Line 690 of lalr1.cc  */
-#line 6406 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6411 "/home/colea/xquery_bzr/feature-empty_object/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))
@@ -9817,7 +9822,7 @@
   case 724:
 
 /* Line 690 of lalr1.cc  */
-#line 6415 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6420 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.sval) = 0;
         }
@@ -9826,7 +9831,7 @@
   case 725:
 
 /* Line 690 of lalr1.cc  */
-#line 6419 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6424 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.sval) = (yysemantic_stack_[(2) - (2)].sval);
         }
@@ -9835,7 +9840,7 @@
   case 726:
 
 /* Line 690 of lalr1.cc  */
-#line 6426 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6431 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9844,7 +9849,7 @@
   case 727:
 
 /* Line 690 of lalr1.cc  */
-#line 6430 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6435 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
         }
@@ -9853,7 +9858,7 @@
   case 728:
 
 /* Line 690 of lalr1.cc  */
-#line 6438 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6443 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWordOption(
                 LOC((yyloc)),
@@ -9867,7 +9872,7 @@
   case 729:
 
 /* Line 690 of lalr1.cc  */
-#line 6447 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6452 "/home/colea/xquery_bzr/feature-empty_object/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
@@ -9879,7 +9884,7 @@
   case 730:
 
 /* Line 690 of lalr1.cc  */
-#line 6454 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6459 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWordOption(
                 LOC((yyloc)), NULL, NULL, ft_stop_words_mode::without
@@ -9890,7 +9895,7 @@
   case 731:
 
 /* Line 690 of lalr1.cc  */
-#line 6464 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6469 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWords( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)), NULL );
         }
@@ -9899,7 +9904,7 @@
   case 732:
 
 /* Line 690 of lalr1.cc  */
-#line 6468 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6473 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWords( LOC((yyloc)), "", (yysemantic_stack_[(3) - (2)].strlist) );
         }
@@ -9908,7 +9913,7 @@
   case 733:
 
 /* Line 690 of lalr1.cc  */
-#line 6475 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6480 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             string_list_t *sl = new string_list_t;
             sl->push_back( SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
@@ -9919,7 +9924,7 @@
   case 734:
 
 /* Line 690 of lalr1.cc  */
-#line 6481 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6486 "/home/colea/xquery_bzr/feature-empty_object/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)) );
@@ -9930,7 +9935,7 @@
   case 735:
 
 /* Line 690 of lalr1.cc  */
-#line 6490 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6495 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.incl_excl_list) = NULL;
         }
@@ -9939,7 +9944,7 @@
   case 736:
 
 /* Line 690 of lalr1.cc  */
-#line 6494 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6499 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.incl_excl_list) = (yysemantic_stack_[(1) - (1)].incl_excl_list);
         }
@@ -9948,7 +9953,7 @@
   case 737:
 
 /* Line 690 of lalr1.cc  */
-#line 6501 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6506 "/home/colea/xquery_bzr/feature-empty_object/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)) );
@@ -9958,7 +9963,7 @@
   case 738:
 
 /* Line 690 of lalr1.cc  */
-#line 6506 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6511 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             FTStopWordOption::incl_excl_list_t *iel = (yysemantic_stack_[(2) - (1)].incl_excl_list);
             if ( !iel )
@@ -9971,7 +9976,7 @@
   case 739:
 
 /* Line 690 of lalr1.cc  */
-#line 6518 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6523 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWordsInclExcl(
                 LOC((yyloc)),
@@ -9984,7 +9989,7 @@
   case 740:
 
 /* Line 690 of lalr1.cc  */
-#line 6526 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6531 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTStopWordsInclExcl(
                 LOC((yyloc)),
@@ -9997,7 +10002,7 @@
   case 741:
 
 /* Line 690 of lalr1.cc  */
-#line 6538 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6543 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTLanguageOption( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
         }
@@ -10006,7 +10011,7 @@
   case 742:
 
 /* Line 690 of lalr1.cc  */
-#line 6546 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6551 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::with );
         }
@@ -10015,7 +10020,7 @@
   case 743:
 
 /* Line 690 of lalr1.cc  */
-#line 6550 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6555 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::without );
         }
@@ -10024,7 +10029,7 @@
   case 744:
 
 /* Line 690 of lalr1.cc  */
-#line 6558 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6563 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_start );
         }
@@ -10033,7 +10038,7 @@
   case 745:
 
 /* Line 690 of lalr1.cc  */
-#line 6562 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6567 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_end );
         }
@@ -10042,7 +10047,7 @@
   case 746:
 
 /* Line 690 of lalr1.cc  */
-#line 6566 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6571 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::entire );
         }
@@ -10051,7 +10056,7 @@
   case 747:
 
 /* Line 690 of lalr1.cc  */
-#line 6574 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6579 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTTimes( LOC((yyloc)), dynamic_cast<FTRange*>((yysemantic_stack_[(3) - (2)].node)) );
         }
@@ -10060,7 +10065,7 @@
   case 748:
 
 /* Line 690 of lalr1.cc  */
-#line 6582 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6587 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::exactly, (yysemantic_stack_[(2) - (2)].expr) );
         }
@@ -10069,7 +10074,7 @@
   case 749:
 
 /* Line 690 of lalr1.cc  */
-#line 6586 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6591 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::at_least, (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -10078,7 +10083,7 @@
   case 750:
 
 /* Line 690 of lalr1.cc  */
-#line 6590 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6595 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::at_most, (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -10087,7 +10092,7 @@
   case 751:
 
 /* Line 690 of lalr1.cc  */
-#line 6594 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6599 "/home/colea/xquery_bzr/feature-empty_object/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) );
         }
@@ -10096,7 +10101,7 @@
   case 752:
 
 /* Line 690 of lalr1.cc  */
-#line 6602 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6607 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTScope(
                 LOC((yyloc)),
@@ -10109,7 +10114,7 @@
   case 753:
 
 /* Line 690 of lalr1.cc  */
-#line 6610 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6615 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTScope(
                 LOC((yyloc)),
@@ -10122,7 +10127,7 @@
   case 754:
 
 /* Line 690 of lalr1.cc  */
-#line 6622 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6627 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::sentence );
         }
@@ -10131,7 +10136,7 @@
   case 755:
 
 /* Line 690 of lalr1.cc  */
-#line 6626 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6631 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::paragraph );
         }
@@ -10140,7 +10145,7 @@
   case 756:
 
 /* Line 690 of lalr1.cc  */
-#line 6634 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6639 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
             (yyval.node) = new FTIgnoreOption( LOC((yyloc)), static_cast<UnionExpr*>((yysemantic_stack_[(3) - (3)].expr)) );
         }
@@ -10149,7 +10154,7 @@
   case 757:
 
 /* Line 690 of lalr1.cc  */
-#line 6648 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6653 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), NULL );
         }
@@ -10158,7 +10163,7 @@
   case 758:
 
 /* Line 690 of lalr1.cc  */
-#line 6652 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6657 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
         }
@@ -10167,7 +10172,7 @@
   case 759:
 
 /* Line 690 of lalr1.cc  */
-#line 6659 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6664 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), NULL, false);
@@ -10177,7 +10182,7 @@
   case 760:
 
 /* Line 690 of lalr1.cc  */
-#line 6664 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6669 "/home/colea/xquery_bzr/feature-empty_object/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);
@@ -10187,7 +10192,7 @@
   case 761:
 
 /* Line 690 of lalr1.cc  */
-#line 6672 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6677 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), NULL, true);
@@ -10197,7 +10202,7 @@
   case 762:
 
 /* Line 690 of lalr1.cc  */
-#line 6677 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6682 "/home/colea/xquery_bzr/feature-empty_object/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);
@@ -10207,7 +10212,7 @@
   case 763:
 
 /* Line 690 of lalr1.cc  */
-#line 6686 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6691 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONDirectObjectConstructor(LOC((yyloc)),
                                                dynamic_cast<JSONPairList*>((yysemantic_stack_[(3) - (2)].node)));
@@ -10217,16 +10222,7 @@
   case 764:
 
 /* Line 690 of lalr1.cc  */
-#line 6691 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    {
-          (yyval.expr) = new JSONDirectObjectConstructor(LOC((yyloc)));
-        }
-    break;
-
-  case 765:
-
-/* Line 690 of lalr1.cc  */
-#line 6698 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6703 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           StringLiteral* sl = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)) );
           JSONPairList* jpl = new JSONPairList(LOC((yyloc)));
@@ -10235,13 +10231,25 @@
         }
     break;
 
+  case 765:
+
+/* Line 690 of lalr1.cc  */
+#line 6710 "/home/colea/xquery_bzr/feature-empty_object/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)));
+          (yyval.node) = jpl;
+        }
+    break;
+
   case 766:
 
 /* Line 690 of lalr1.cc  */
-#line 6705 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6716 "/home/colea/xquery_bzr/feature-empty_object/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)));
+          JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (1)].node));
+          assert(jpl);
+          jpl->push_back(new JSONPairConstructor(LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)));
           (yyval.node) = jpl;
         }
     break;
@@ -10249,19 +10257,7 @@
   case 767:
 
 /* Line 690 of lalr1.cc  */
-#line 6711 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    {
-          JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (1)].node));
-          assert(jpl);
-          jpl->push_back(new JSONPairConstructor(LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)));
-          (yyval.node) = jpl;
-        }
-    break;
-
-  case 768:
-
-/* Line 690 of lalr1.cc  */
-#line 6718 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6723 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (1)].node));
           assert(jpl);
@@ -10271,10 +10267,10 @@
         }
     break;
 
-  case 769:
+  case 768:
 
 /* Line 690 of lalr1.cc  */
-#line 6729 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6734 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONObjectInsertExpr(LOC((yyloc)),
                                         (yysemantic_stack_[(5) - (3)].expr),
@@ -10282,10 +10278,10 @@
         }
     break;
 
-  case 770:
+  case 769:
 
 /* Line 690 of lalr1.cc  */
-#line 6735 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6740 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (3)].node));
           (yyval.expr) = new JSONObjectInsertExpr(
@@ -10297,19 +10293,19 @@
         }
     break;
 
+  case 770:
+
+/* Line 690 of lalr1.cc  */
+#line 6750 "/home/colea/xquery_bzr/feature-empty_object/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));
+        }
+    break;
+
   case 771:
 
 /* Line 690 of lalr1.cc  */
-#line 6745 "/home/mbrantner/zorba/sandbox/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));
-        }
-    break;
-
-  case 772:
-
-/* Line 690 of lalr1.cc  */
-#line 6750 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6755 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.expr) = new JSONObjectInsertExpr(LOC((yyloc)),
                                         (yysemantic_stack_[(4) - (2)].expr),
@@ -10317,10 +10313,10 @@
         }
     break;
 
-  case 773:
+  case 772:
 
 /* Line 690 of lalr1.cc  */
-#line 6756 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6761 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(4) - (2)].node));
           (yyval.expr) = new JSONObjectInsertExpr(
@@ -10332,37 +10328,37 @@
         }
     break;
 
+  case 773:
+
+/* Line 690 of lalr1.cc  */
+#line 6771 "/home/colea/xquery_bzr/feature-empty_object/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));
+        }
+    break;
+
   case 774:
 
 /* Line 690 of lalr1.cc  */
-#line 6766 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6778 "/home/colea/xquery_bzr/feature-empty_object/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));
+          (yyval.expr) = new JSONArrayAppendExpr(LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr));
         }
     break;
 
   case 775:
 
 /* Line 690 of lalr1.cc  */
-#line 6773 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6782 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
-          (yyval.expr) = new JSONArrayAppendExpr(LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr));
+          (yyval.expr) = new JSONArrayAppendExpr(LOC((yyloc)), (yysemantic_stack_[(4) - (2)].expr), (yysemantic_stack_[(4) - (4)].expr));
         }
     break;
 
   case 776:
 
 /* Line 690 of lalr1.cc  */
-#line 6777 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    {
-          (yyval.expr) = new JSONArrayAppendExpr(LOC((yyloc)), (yysemantic_stack_[(4) - (2)].expr), (yysemantic_stack_[(4) - (4)].expr));
-        }
-    break;
-
-  case 777:
-
-/* Line 690 of lalr1.cc  */
-#line 6784 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6789 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(3) - (3)].expr));
@@ -10386,10 +10382,10 @@
         }
     break;
 
-  case 778:
+  case 777:
 
 /* Line 690 of lalr1.cc  */
-#line 6806 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6811 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(2) - (2)].expr));
@@ -10413,10 +10409,10 @@
         }
     break;
 
-  case 779:
+  case 778:
 
 /* Line 690 of lalr1.cc  */
-#line 6831 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6836 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(5) - (3)].expr));
@@ -10443,10 +10439,10 @@
         }
     break;
 
-  case 780:
+  case 779:
 
 /* Line 690 of lalr1.cc  */
-#line 6856 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6861 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(4) - (2)].expr));
@@ -10473,10 +10469,10 @@
         }
     break;
 
-  case 781:
+  case 780:
 
 /* Line 690 of lalr1.cc  */
-#line 6884 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6889 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(7) - (5)].expr));
@@ -10503,10 +10499,10 @@
         }
     break;
 
-  case 782:
+  case 781:
 
 /* Line 690 of lalr1.cc  */
-#line 6909 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6914 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(6) - (4)].expr));
@@ -10533,10 +10529,19 @@
         }
     break;
 
+  case 782:
+
+/* Line 690 of lalr1.cc  */
+#line 6942 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+    {
+          (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
   case 783:
 
 /* Line 690 of lalr1.cc  */
-#line 6937 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6946 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -10545,7 +10550,7 @@
   case 784:
 
 /* Line 690 of lalr1.cc  */
-#line 6941 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6950 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -10554,16 +10559,16 @@
   case 785:
 
 /* Line 690 of lalr1.cc  */
-#line 6945 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6957 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
-          (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+          (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonItem);
         }
     break;
 
   case 786:
 
 /* Line 690 of lalr1.cc  */
-#line 6952 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6962 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonItem);
         }
@@ -10572,16 +10577,16 @@
   case 787:
 
 /* Line 690 of lalr1.cc  */
-#line 6957 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6969 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
-          (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonItem);
+          (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonObject);
         }
     break;
 
   case 788:
 
 /* Line 690 of lalr1.cc  */
-#line 6964 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6974 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonObject);
         }
@@ -10590,34 +10595,25 @@
   case 789:
 
 /* Line 690 of lalr1.cc  */
-#line 6969 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6981 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
-          (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonObject);
+          (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonArray);
         }
     break;
 
   case 790:
 
 /* Line 690 of lalr1.cc  */
-#line 6976 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    {
-          (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonArray);
-        }
-    break;
-
-  case 791:
-
-/* Line 690 of lalr1.cc  */
-#line 6981 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    {
-          (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonArray);
-        }
-    break;
-
-  case 794:
-
-/* Line 690 of lalr1.cc  */
-#line 6998 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 6986 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+    {
+          (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonArray);
+        }
+    break;
+
+  case 793:
+
+/* Line 690 of lalr1.cc  */
+#line 7003 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
     {
           auto_ptr<QName> lQName( static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
           zstring const &tmp = lQName->get_qname();
@@ -10629,1487 +10625,1487 @@
         }
     break;
 
+  case 795:
+
+/* Line 690 of lalr1.cc  */
+#line 7016 "/home/colea/xquery_bzr/feature-empty_object/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 7011 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("attribute"))); }
+#line 7017 "/home/colea/xquery_bzr/feature-empty_object/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 7012 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("comment"))); }
+#line 7018 "/home/colea/xquery_bzr/feature-empty_object/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 7013 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("document-node"))); }
+#line 7019 "/home/colea/xquery_bzr/feature-empty_object/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 7014 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("namespace-node"))); }
+#line 7020 "/home/colea/xquery_bzr/feature-empty_object/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 7015 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("element"))); }
+#line 7022 "/home/colea/xquery_bzr/feature-empty_object/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 7017 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("if"))); }
+#line 7023 "/home/colea/xquery_bzr/feature-empty_object/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 7018 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("node"))); }
+#line 7024 "/home/colea/xquery_bzr/feature-empty_object/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 7019 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("processing-instruction"))); }
+#line 7025 "/home/colea/xquery_bzr/feature-empty_object/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 7020 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema-attribute"))); }
+#line 7026 "/home/colea/xquery_bzr/feature-empty_object/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 7021 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema-element"))); }
+#line 7027 "/home/colea/xquery_bzr/feature-empty_object/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 7022 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("text"))); }
+#line 7028 "/home/colea/xquery_bzr/feature-empty_object/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 7023 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("typeswitch"))); }
+#line 7029 "/home/colea/xquery_bzr/feature-empty_object/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 7024 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("switch"))); }
+#line 7030 "/home/colea/xquery_bzr/feature-empty_object/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 7025 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("empty-sequence"))); }
-    break;
-
-  case 810:
-
-/* Line 690 of lalr1.cc  */
-#line 7026 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 7031 "/home/colea/xquery_bzr/feature-empty_object/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"
+    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))); }
+    break;
+
   case 812:
 
 /* Line 690 of lalr1.cc  */
-#line 7031 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))); }
+#line 7037 "/home/colea/xquery_bzr/feature-empty_object/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 7032 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("xquery"))); }
+#line 7038 "/home/colea/xquery_bzr/feature-empty_object/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 7033 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("empty"))); }
+#line 7039 "/home/colea/xquery_bzr/feature-empty_object/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 7034 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("boundary-space"))); }
+#line 7040 "/home/colea/xquery_bzr/feature-empty_object/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 7035 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ft-option"))); }
+#line 7041 "/home/colea/xquery_bzr/feature-empty_object/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 7036 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("base-uri"))); }
+#line 7042 "/home/colea/xquery_bzr/feature-empty_object/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 7037 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lax"))); }
+#line 7043 "/home/colea/xquery_bzr/feature-empty_object/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 7038 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("strict"))); }
+#line 7044 "/home/colea/xquery_bzr/feature-empty_object/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 7039 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("idiv"))); }
+#line 7045 "/home/colea/xquery_bzr/feature-empty_object/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 7040 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("document"))); }
+#line 7046 "/home/colea/xquery_bzr/feature-empty_object/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 7041 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ftnot"))); }
+#line 7047 "/home/colea/xquery_bzr/feature-empty_object/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 7042 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("not"))); }
+#line 7048 "/home/colea/xquery_bzr/feature-empty_object/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 7043 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sensitive"))); }
+#line 7049 "/home/colea/xquery_bzr/feature-empty_object/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 7044 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("insensitive"))); }
+#line 7050 "/home/colea/xquery_bzr/feature-empty_object/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 7045 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("diacritics"))); }
+#line 7051 "/home/colea/xquery_bzr/feature-empty_object/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 7046 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("without"))); }
+#line 7052 "/home/colea/xquery_bzr/feature-empty_object/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 7047 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stemming"))); }
+#line 7053 "/home/colea/xquery_bzr/feature-empty_object/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 7048 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("thesaurus"))); }
+#line 7054 "/home/colea/xquery_bzr/feature-empty_object/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 7049 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stop"))); }
+#line 7055 "/home/colea/xquery_bzr/feature-empty_object/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 7050 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("wildcards"))); }
+#line 7056 "/home/colea/xquery_bzr/feature-empty_object/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 7051 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("entire"))); }
+#line 7057 "/home/colea/xquery_bzr/feature-empty_object/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 7052 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("content"))); }
+#line 7058 "/home/colea/xquery_bzr/feature-empty_object/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 7053 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("word"))); }
+#line 7059 "/home/colea/xquery_bzr/feature-empty_object/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 7054 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("start"))); }
+#line 7060 "/home/colea/xquery_bzr/feature-empty_object/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 7055 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("end"))); }
+#line 7061 "/home/colea/xquery_bzr/feature-empty_object/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 7056 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("most"))); }
+#line 7062 "/home/colea/xquery_bzr/feature-empty_object/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 7057 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("skip"))); }
+#line 7063 "/home/colea/xquery_bzr/feature-empty_object/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 7058 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("copy"))); }
+#line 7064 "/home/colea/xquery_bzr/feature-empty_object/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 7059 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("general"))); }
+#line 7065 "/home/colea/xquery_bzr/feature-empty_object/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 7060 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("value"))); }
+#line 7066 "/home/colea/xquery_bzr/feature-empty_object/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 7061 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("eq"))); }
+#line 7067 "/home/colea/xquery_bzr/feature-empty_object/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 7062 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ne"))); }
+#line 7068 "/home/colea/xquery_bzr/feature-empty_object/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 7063 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lt"))); }
+#line 7069 "/home/colea/xquery_bzr/feature-empty_object/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 7064 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("le"))); }
+#line 7070 "/home/colea/xquery_bzr/feature-empty_object/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 7065 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("gt"))); }
+#line 7071 "/home/colea/xquery_bzr/feature-empty_object/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 7066 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ge"))); }
+#line 7072 "/home/colea/xquery_bzr/feature-empty_object/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 7067 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("at"))); }
+#line 7073 "/home/colea/xquery_bzr/feature-empty_object/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 7068 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("context"))); }
+#line 7074 "/home/colea/xquery_bzr/feature-empty_object/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 7069 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("variable"))); }
+#line 7075 "/home/colea/xquery_bzr/feature-empty_object/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 7070 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("return"))); }
+#line 7076 "/home/colea/xquery_bzr/feature-empty_object/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 7071 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("for"))); }
+#line 7077 "/home/colea/xquery_bzr/feature-empty_object/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 7072 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("allowing"))); }
+#line 7078 "/home/colea/xquery_bzr/feature-empty_object/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 7073 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sliding"))); }
+#line 7079 "/home/colea/xquery_bzr/feature-empty_object/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 7074 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("tumbling"))); }
+#line 7080 "/home/colea/xquery_bzr/feature-empty_object/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 7075 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("previous"))); }
+#line 7081 "/home/colea/xquery_bzr/feature-empty_object/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 7076 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("next"))); }
+#line 7082 "/home/colea/xquery_bzr/feature-empty_object/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 7077 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("only"))); }
+#line 7083 "/home/colea/xquery_bzr/feature-empty_object/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 7078 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("when"))); }
+#line 7084 "/home/colea/xquery_bzr/feature-empty_object/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 7079 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("count"))); }
+#line 7085 "/home/colea/xquery_bzr/feature-empty_object/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 7080 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("in"))); }
+#line 7086 "/home/colea/xquery_bzr/feature-empty_object/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 7081 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("let"))); }
+#line 7087 "/home/colea/xquery_bzr/feature-empty_object/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 7082 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("where"))); }
+#line 7088 "/home/colea/xquery_bzr/feature-empty_object/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 7083 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("by"))); }
+#line 7089 "/home/colea/xquery_bzr/feature-empty_object/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 7084 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("group"))); }
+#line 7090 "/home/colea/xquery_bzr/feature-empty_object/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 7085 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("order"))); }
+#line 7091 "/home/colea/xquery_bzr/feature-empty_object/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 7086 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stable"))); }
+#line 7092 "/home/colea/xquery_bzr/feature-empty_object/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 7087 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ascending"))); }
+#line 7093 "/home/colea/xquery_bzr/feature-empty_object/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 7088 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descending"))); }
+#line 7094 "/home/colea/xquery_bzr/feature-empty_object/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 7089 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("greatest"))); }
+#line 7095 "/home/colea/xquery_bzr/feature-empty_object/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 7090 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("least"))); }
+#line 7096 "/home/colea/xquery_bzr/feature-empty_object/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 7091 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("collation"))); }
+#line 7097 "/home/colea/xquery_bzr/feature-empty_object/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 7092 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("some"))); }
+#line 7098 "/home/colea/xquery_bzr/feature-empty_object/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 7093 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("every"))); }
+#line 7099 "/home/colea/xquery_bzr/feature-empty_object/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 7094 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("satisfies"))); }
+#line 7100 "/home/colea/xquery_bzr/feature-empty_object/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 7095 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("case"))); }
+#line 7101 "/home/colea/xquery_bzr/feature-empty_object/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 7096 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("as"))); }
+#line 7102 "/home/colea/xquery_bzr/feature-empty_object/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 7097 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("then"))); }
+#line 7103 "/home/colea/xquery_bzr/feature-empty_object/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 7098 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("else"))); }
+#line 7104 "/home/colea/xquery_bzr/feature-empty_object/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 7099 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("or"))); }
+#line 7105 "/home/colea/xquery_bzr/feature-empty_object/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 7100 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("and"))); }
+#line 7106 "/home/colea/xquery_bzr/feature-empty_object/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 7101 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("instance"))); }
+#line 7107 "/home/colea/xquery_bzr/feature-empty_object/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 7102 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("of"))); }
+#line 7108 "/home/colea/xquery_bzr/feature-empty_object/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 7103 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("castable"))); }
+#line 7109 "/home/colea/xquery_bzr/feature-empty_object/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 7104 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("to"))); }
+#line 7110 "/home/colea/xquery_bzr/feature-empty_object/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 7105 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("div"))); }
+#line 7111 "/home/colea/xquery_bzr/feature-empty_object/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 7106 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("mod"))); }
+#line 7112 "/home/colea/xquery_bzr/feature-empty_object/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 7107 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("union"))); }
+#line 7113 "/home/colea/xquery_bzr/feature-empty_object/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 7108 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("intersect"))); }
+#line 7114 "/home/colea/xquery_bzr/feature-empty_object/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 7109 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("except"))); }
+#line 7115 "/home/colea/xquery_bzr/feature-empty_object/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 7110 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("validate"))); }
+#line 7116 "/home/colea/xquery_bzr/feature-empty_object/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 7111 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("type"))); }
+#line 7117 "/home/colea/xquery_bzr/feature-empty_object/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 7112 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("cast"))); }
+#line 7118 "/home/colea/xquery_bzr/feature-empty_object/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 7113 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("treat"))); }
+#line 7119 "/home/colea/xquery_bzr/feature-empty_object/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 7114 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("is"))); }
+#line 7120 "/home/colea/xquery_bzr/feature-empty_object/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 7115 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preserve"))); }
+#line 7121 "/home/colea/xquery_bzr/feature-empty_object/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 7116 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("strip"))); }
+#line 7122 "/home/colea/xquery_bzr/feature-empty_object/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 7117 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("namespace"))); }
+#line 7123 "/home/colea/xquery_bzr/feature-empty_object/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 7118 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("external"))); }
+#line 7124 "/home/colea/xquery_bzr/feature-empty_object/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 7119 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("encoding"))); }
+#line 7125 "/home/colea/xquery_bzr/feature-empty_object/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 7120 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("no-preserve"))); }
+#line 7126 "/home/colea/xquery_bzr/feature-empty_object/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 7121 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("inherit"))); }
+#line 7127 "/home/colea/xquery_bzr/feature-empty_object/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 7122 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("no-inherit"))); }
+#line 7128 "/home/colea/xquery_bzr/feature-empty_object/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 7123 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("declare"))); }
+#line 7129 "/home/colea/xquery_bzr/feature-empty_object/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 7124 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("construction"))); }
+#line 7130 "/home/colea/xquery_bzr/feature-empty_object/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 7125 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ordering"))); }
+#line 7131 "/home/colea/xquery_bzr/feature-empty_object/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 7126 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("default"))); }
+#line 7132 "/home/colea/xquery_bzr/feature-empty_object/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 7127 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("copy-namespaces"))); }
+#line 7133 "/home/colea/xquery_bzr/feature-empty_object/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 7128 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("option"))); }
+#line 7134 "/home/colea/xquery_bzr/feature-empty_object/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 7129 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("version"))); }
+#line 7135 "/home/colea/xquery_bzr/feature-empty_object/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 7130 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("import"))); }
+#line 7136 "/home/colea/xquery_bzr/feature-empty_object/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 7131 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema"))); }
+#line 7137 "/home/colea/xquery_bzr/feature-empty_object/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 7132 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("module"))); }
+#line 7138 "/home/colea/xquery_bzr/feature-empty_object/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 7133 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("function"))); }
+#line 7139 "/home/colea/xquery_bzr/feature-empty_object/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 7134 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("score"))); }
+#line 7140 "/home/colea/xquery_bzr/feature-empty_object/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 7135 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("contains"))); }
+#line 7141 "/home/colea/xquery_bzr/feature-empty_object/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 7136 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("weight"))); }
+#line 7142 "/home/colea/xquery_bzr/feature-empty_object/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 7137 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("window"))); }
+#line 7143 "/home/colea/xquery_bzr/feature-empty_object/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 7138 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("distance"))); }
+#line 7144 "/home/colea/xquery_bzr/feature-empty_object/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 7139 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("occurs"))); }
+#line 7145 "/home/colea/xquery_bzr/feature-empty_object/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 7140 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("times"))); }
+#line 7146 "/home/colea/xquery_bzr/feature-empty_object/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 7141 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("same"))); }
+#line 7147 "/home/colea/xquery_bzr/feature-empty_object/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 7142 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("different"))); }
+#line 7148 "/home/colea/xquery_bzr/feature-empty_object/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 7143 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lowercase"))); }
+#line 7149 "/home/colea/xquery_bzr/feature-empty_object/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 7144 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("uppercase"))); }
+#line 7150 "/home/colea/xquery_bzr/feature-empty_object/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 7145 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("relationship"))); }
+#line 7151 "/home/colea/xquery_bzr/feature-empty_object/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 7146 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("levels"))); }
+#line 7152 "/home/colea/xquery_bzr/feature-empty_object/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 7147 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("language"))); }
+#line 7153 "/home/colea/xquery_bzr/feature-empty_object/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 7148 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("any"))); }
+#line 7154 "/home/colea/xquery_bzr/feature-empty_object/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 7149 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("all"))); }
+#line 7155 "/home/colea/xquery_bzr/feature-empty_object/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 7150 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("exactly"))); }
+#line 7156 "/home/colea/xquery_bzr/feature-empty_object/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 7151 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("from"))); }
+#line 7157 "/home/colea/xquery_bzr/feature-empty_object/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 7152 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("words"))); }
+#line 7158 "/home/colea/xquery_bzr/feature-empty_object/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 7153 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sentences"))); }
+#line 7159 "/home/colea/xquery_bzr/feature-empty_object/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 7154 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sentence"))); }
+#line 7160 "/home/colea/xquery_bzr/feature-empty_object/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 7155 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("phrase"))); }
+#line 7161 "/home/colea/xquery_bzr/feature-empty_object/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 7156 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("paragraph"))); }
+#line 7162 "/home/colea/xquery_bzr/feature-empty_object/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 7157 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("paragraphs"))); }
+#line 7164 "/home/colea/xquery_bzr/feature-empty_object/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 7159 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("modify"))); }
+#line 7165 "/home/colea/xquery_bzr/feature-empty_object/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 7160 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("first"))); }
+#line 7167 "/home/colea/xquery_bzr/feature-empty_object/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 7162 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("before"))); }
+#line 7168 "/home/colea/xquery_bzr/feature-empty_object/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 7163 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("after"))); }
+#line 7169 "/home/colea/xquery_bzr/feature-empty_object/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 7164 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("revalidation"))); }
+#line 7170 "/home/colea/xquery_bzr/feature-empty_object/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 7165 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("with"))); }
+#line 7171 "/home/colea/xquery_bzr/feature-empty_object/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 7166 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("nodes"))); }
+#line 7173 "/home/colea/xquery_bzr/feature-empty_object/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 7168 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("last"))); }
+#line 7175 "/home/colea/xquery_bzr/feature-empty_object/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 7170 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("into"))); }
+#line 7176 "/home/colea/xquery_bzr/feature-empty_object/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 7171 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("simple"))); }
+#line 7177 "/home/colea/xquery_bzr/feature-empty_object/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 7172 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sequential"))); }
+#line 7178 "/home/colea/xquery_bzr/feature-empty_object/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 7173 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("updating"))); }
+#line 7179 "/home/colea/xquery_bzr/feature-empty_object/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 7174 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ordered"))); }
+#line 7180 "/home/colea/xquery_bzr/feature-empty_object/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 7175 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("unordered"))); }
+#line 7181 "/home/colea/xquery_bzr/feature-empty_object/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 7176 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("returning"))); }
+#line 7182 "/home/colea/xquery_bzr/feature-empty_object/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 7177 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("exit"))); }
+#line 7183 "/home/colea/xquery_bzr/feature-empty_object/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 7178 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("loop"))); }
+#line 7184 "/home/colea/xquery_bzr/feature-empty_object/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 7179 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("break"))); }
+#line 7185 "/home/colea/xquery_bzr/feature-empty_object/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 7180 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("continue"))); }
+#line 7186 "/home/colea/xquery_bzr/feature-empty_object/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 7181 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("try"))); }
+#line 7187 "/home/colea/xquery_bzr/feature-empty_object/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 7182 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("catch"))); }
+#line 7188 "/home/colea/xquery_bzr/feature-empty_object/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 7183 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("using"))); }
+#line 7189 "/home/colea/xquery_bzr/feature-empty_object/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 7184 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("set"))); }
+#line 7190 "/home/colea/xquery_bzr/feature-empty_object/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 7185 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("index"))); }
+#line 7191 "/home/colea/xquery_bzr/feature-empty_object/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 7186 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("unique"))); }
+#line 7192 "/home/colea/xquery_bzr/feature-empty_object/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 7187 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("non"))); }
+#line 7193 "/home/colea/xquery_bzr/feature-empty_object/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 7188 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("on"))); }
+#line 7194 "/home/colea/xquery_bzr/feature-empty_object/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 7189 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("range"))); }
+#line 7195 "/home/colea/xquery_bzr/feature-empty_object/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 7190 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("equality"))); }
+#line 7196 "/home/colea/xquery_bzr/feature-empty_object/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 7191 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("manually"))); }
+#line 7197 "/home/colea/xquery_bzr/feature-empty_object/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 7192 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("automatically"))); }
+#line 7198 "/home/colea/xquery_bzr/feature-empty_object/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 7193 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("maintained"))); }
+#line 7199 "/home/colea/xquery_bzr/feature-empty_object/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 7194 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("decimal-format"))); }
+#line 7200 "/home/colea/xquery_bzr/feature-empty_object/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 7195 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("decimal-separator"))); }
+#line 7201 "/home/colea/xquery_bzr/feature-empty_object/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 7196 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("grouping-separator"))); }
+#line 7202 "/home/colea/xquery_bzr/feature-empty_object/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 7197 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("infinity"))); }
+#line 7203 "/home/colea/xquery_bzr/feature-empty_object/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 7198 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("minus-sign"))); }
+#line 7204 "/home/colea/xquery_bzr/feature-empty_object/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 7199 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("NaN"))); }
+#line 7205 "/home/colea/xquery_bzr/feature-empty_object/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 7200 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("percent"))); }
+#line 7206 "/home/colea/xquery_bzr/feature-empty_object/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 7201 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("per-mille"))); }
+#line 7207 "/home/colea/xquery_bzr/feature-empty_object/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 7202 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("zero-digit"))); }
+#line 7208 "/home/colea/xquery_bzr/feature-empty_object/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 7203 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("digit"))); }
+#line 7209 "/home/colea/xquery_bzr/feature-empty_object/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 7204 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("pattern-separator"))); }
+#line 7210 "/home/colea/xquery_bzr/feature-empty_object/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 7205 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("collection"))); }
+#line 7211 "/home/colea/xquery_bzr/feature-empty_object/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 7206 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("const"))); }
+#line 7212 "/home/colea/xquery_bzr/feature-empty_object/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 7207 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("append-only"))); }
+#line 7213 "/home/colea/xquery_bzr/feature-empty_object/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 7208 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("queue"))); }
+#line 7214 "/home/colea/xquery_bzr/feature-empty_object/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 7209 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("mutable"))); }
+#line 7215 "/home/colea/xquery_bzr/feature-empty_object/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 7210 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("read-only"))); }
+#line 7216 "/home/colea/xquery_bzr/feature-empty_object/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 7211 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("integrity"))); }
+#line 7217 "/home/colea/xquery_bzr/feature-empty_object/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 7212 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("constraint"))); }
+#line 7218 "/home/colea/xquery_bzr/feature-empty_object/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 7213 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("check"))); }
+#line 7219 "/home/colea/xquery_bzr/feature-empty_object/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 7214 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("key"))); }
+#line 7220 "/home/colea/xquery_bzr/feature-empty_object/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 7215 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("foreach"))); }
+#line 7221 "/home/colea/xquery_bzr/feature-empty_object/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 7216 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("foreign"))); }
+#line 7222 "/home/colea/xquery_bzr/feature-empty_object/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 7217 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("keys"))); }
+#line 7223 "/home/colea/xquery_bzr/feature-empty_object/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 7218 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ancestor"))); }
+#line 7224 "/home/colea/xquery_bzr/feature-empty_object/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 7219 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("child"))); }
+#line 7225 "/home/colea/xquery_bzr/feature-empty_object/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 7220 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descendant"))); }
+#line 7226 "/home/colea/xquery_bzr/feature-empty_object/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 7221 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("parent"))); }
+#line 7227 "/home/colea/xquery_bzr/feature-empty_object/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 7222 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preceding"))); }
+#line 7228 "/home/colea/xquery_bzr/feature-empty_object/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 7223 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("self"))); }
+#line 7229 "/home/colea/xquery_bzr/feature-empty_object/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 7224 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("following"))); }
+#line 7230 "/home/colea/xquery_bzr/feature-empty_object/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 7225 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ancestor-or-self"))); }
+#line 7231 "/home/colea/xquery_bzr/feature-empty_object/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 7226 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descendant-or-self"))); }
+#line 7232 "/home/colea/xquery_bzr/feature-empty_object/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 7227 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("following-sibling"))); }
+#line 7233 "/home/colea/xquery_bzr/feature-empty_object/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 7228 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preceding-sibling"))); }
+#line 7236 "/home/colea/xquery_bzr/feature-empty_object/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 7231 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
-    { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("position"))); }
-    break;
-
-  case 1007:
-
-/* Line 690 of lalr1.cc  */
-#line 7240 "/home/mbrantner/zorba/sandbox/src/compiler/parser/jsoniq_parser.y"
+#line 7245 "/home/colea/xquery_bzr/feature-empty_object/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 12113 "/home/mbrantner/zorba/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 12109 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
 	default:
           break;
       }
@@ -12383,192 +12379,192 @@
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
-  const short int jsoniq_parser::yypact_ninf_ = -1487;
+  const short int jsoniq_parser::yypact_ninf_ = -1495;
   const short int
   jsoniq_parser::yypact_[] =
   {
-      5092,  8430,  8430,  8430,  8430, -1487, -1487,   322,   413, -1487,
-     577,   432, -1487, -1487, -1487,   476, -1487, -1487, -1487,   494,
-   -1487,   501,   719,   535,   541,   857, -1487,    76, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487,   567, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487,    52, -1487,   612, -1487,   616,   655, -1487,
-      11, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487,   688, -1487, -1487, -1487, -1487, -1487, -1487, -1487,   629,
-   -1487, -1487, -1487, -1487, -1487, 18628, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487,   743, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487,  5710, 10551, 10854, 18628, -1487,
-   -1487,   750, -1487, -1487, -1487, -1487,   758, -1487, -1487, -1487,
-    7222, -1487,  7521, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487,   772, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487,    88,   763,   773, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, 14490, -1487,
-    6014, -1487, 14793,   266, -1487, -1487, -1487, -1487, -1487, -1487,
-     877, -1487,   713,   751,   752, -1487, -1487,   844,   851, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487,   741, -1487, 14187, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, 11157, 11460, 11763, -1487,  5401,  7824,  1015, -1487,
-    8733, -1487, -1487,   721,    87, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,    89,
-   -1487, -1487, -1487, -1487, -1487, -1487,   520, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487,  8430, -1487, -1487, -1487, -1487,
-       8, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-     164, -1487,   859, -1487, -1487, -1487,   191, -1487,   115, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487,   880,   959, -1487, -1487,
-     826,   798,   954,   659,   305,   746,    39, -1487,  1005,   856,
-     957,   958, 13278, -1487,   865, -1487, -1487,    13, -1487, -1487,
-   -1487, -1487,   670, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487,   915,   905, -1487, -1487,
-   -1487, -1487, -1487,   878, -1487,  8430,   881,   882,   883,  8430,
-     353,   353,  1037,   726,   727,   593, 18920, 18628,   -14,  1023,
-   18628,   917,   953,   702,  7222,   813,   821, 18628, 18628,   769,
-     841,    38, -1487, -1487, -1487,  7222,  8430,  8430, 12672,   258,
-     926, 12672,  1083,   192,   351, 18628,   965,   941,   978, -1487,
-   12672, 18628,  8430, 12672, 12672, 18628,  8430,   943,   945, 12672,
-   18628, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,   960,
-   -1487, 18628, -1487, -1487,   916,  8127,   980,    34,   982,   915,
-     948,   949,   950, 18628,  5710, -1487,   946,   201, -1487,   457,
-   -1487,   121,  1074, 12672, 12672,   168, -1487, -1487, -1487,  1095,
-   12672,   896, -1487,  1084,  1087, 12672, 12975, 15096,   670, 12672,
-   12975,  6318,    25,     4, 12672, 15096,   314, 12672,   884,   888,
-   18628,   925,   930, 12672, 12672,  8430,   867, -1487, -1487,    53,
-   -1487,    46, 12672,   887,  7824, -1487, -1487, -1487, -1487, -1487,
-     577,   857,    91,    93,  1123,  9036,  3526,  9339,  3846,   629,
-   -1487, -1487,   270,   629, -1487, 12672,  4480, -1487,  1008, -1487,
-      76,   962,   956,   963,  8430, 12672, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, 18628, -1487,   840,   843, 18628,
-    1012, 13581, 13581, -1487, -1487, -1487, -1487, -1487, -1487, 13884,
-    1063, 13884, 13884, 13884, 13884, 13884, 13884, 13884, 13884, 13884,
-   13884, 13884, 13884,   899,  1045,  1046,  1047, -1487, -1487, -1487,
-   15096, 12066, -1487,  6620, 12672,  9945,   987, -1487,   993, 10248,
-   -1487, -1487, -1487, -1487,   293, -1487,   294, -1487, -1487, -1487,
-   -1487, -1487, -1487,  1038,  1039,   535,  1116, -1487, -1487, 18920,
-    1007,   694, 18628,   986,   988,  1007,  1037,  1026,  1018, -1487,
-   -1487, -1487,   538,   904,  1062,   855, 18628,  1017, 12672,  1044,
-   18628, 18628, -1487,  1031,   981,   983,   110, 18628,  1071,   320,
-   -1487,  8430, -1487,   123, -1487,  7222,  1073,  1127,  7222,  1037,
-    1077,   356, 18628, 12672,    76,   209,    16, -1487,    48,   991,
-     136,   139,  1024, -1487,   992,  8430,  8430,   232,   506, 12672,
-      24, -1487, -1487, 12672,  6318, -1487, 12672, 12672, 12672, 12672,
-   -1487, 12672, -1487, 12672, -1487, 18628,  1074, -1487,   452,   241,
-     302, -1487, -1487, -1487,   363, -1487,    12,   514, -1487, -1487,
-     670,   372,   374,   299,   283, 12672, 12672,  1085,   662, 12672,
-     938, 15399,   947,   273, -1487,  1041, -1487, -1487,   990,   144,
-    8127,   397,  4789,   867, -1487, -1487, -1487,   944, 12672, -1487,
-     721,   847,  1154,   180, -1487, -1487,    94, -1487, -1487, -1487,
-     105, -1487,   103, -1487, -1487, -1487, -1487, -1487,  4163, -1487,
-   -1487, -1487, 18628,  1016, 12672,  1070, -1487, -1487, -1487,  1086,
-   -1487,    36, -1487, -1487,  1086, 18628,    45,   959, -1487, -1487,
-     211, -1487,   305,   305,    -5,   746,   746,   746,   746,    39,
-      39, -1487, -1487, 17164, 17164, 18628, 18628, -1487, -1487,   416,
-   -1487, -1487, -1487, -1487,   230, -1487, -1487, -1487,   483, -1487,
-   -1487, -1487,   529,   353, -1487, -1487,   528,   689,   647, -1487,
-     535, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487,  1007, -1487,  1057, 17458,  1048, 12672, -1487, -1487, -1487,
-    1101,  1037,  1037,  1007, -1487,   886,  1037,   710, 18628,   588,
-     709,  1168, -1487, -1487,   907,   597, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487,   538,    96,   968,
-     676, 12672, -1487, 18628,  1107,   898,  1037, -1487, -1487,  1050,
-    1101, 17164,  1088,  1111,  1022,  1011,  1079,  1037,  1053,  1090,
-    1120,  1037, 17164, 12672,    67, -1487, -1487, -1487,  1064,  1099,
-   12672, 12672,  1076, -1487,  1119,  1121,  8430, -1487,  1040,  1042,
-    1072, 12672,  1089,  1043, 12672, -1487,  1106,  1109, -1487,   152,
-     179,   198,  1195, -1487,   543, -1487,    98,  1081, -1487, -1487,
-    1205, -1487,  1208, -1487,   -68, 12672, 12672, 12672,   325, 12672,
-   12672, 12672, 12672, 12672,  1141, -1487, 12672, 12672, -1487, 12672,
-   12672,   486, 15096,  1122, 12672, 12672, -1487,  9642,   111,   989,
-   -1487, -1487, -1487, -1487, -1487, -1487,   251, -1487, -1487, 12672,
-   -1487,   108,    62,   103,  9339,  3846,  9339,  1159, -1487, -1487,
-   12672,   812,  1135, -1487, 18628,  1136, -1487, 18336,  1117,  1126,
-   12672,   -57,  1098,    37,    58,   994, -1487, -1487,   770,    45,
-   12672,   211,   461,   282, -1487,   964,   472,   995,   984, -1487,
-   -1487,   821, -1487,   979,   661,  1100,  1102,  1103,  1104,  1105,
-    1112,  1113,  1114,  1115,  1118,  1124, 15988,  1125,  1128,  1129,
-    1130,  1131,  1132, -1487,   634, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,  1133, -1487,
-   -1487, -1487, -1487, 12369, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487,   768, -1487,  1224, 17458,   868, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487,   972, -1487, -1487,
-    1228, -1487, -1487, -1487, -1487, -1487,   674,  1238, -1487,   762,
-   -1487, -1487, -1487,  1100,  1102,  1103,  1105,  1112,  1113,  1114,
-    1115,  1118,  1128, -1487,   634,   634, 15096,   976,   966, -1487,
-    1101,    96,  1060,  1082,  8430, -1487, -1487, -1487, 17164, -1487,
-    8430,  1037,  1167, -1487, -1487, -1487,  1037,  1167, -1487, -1487,
-   12672,  1137,  8430, 18628, -1487, -1487, 12672, 12672,   849, -1487,
-     347,   852, -1487, 16282,   863, -1487,   869, -1487,  1091, -1487,
-   -1487,  8430, -1487, 12672, -1487, -1487, 12672, 12672,  1096,  1119,
-    1194, -1487,  1163, -1487,   757, -1487, -1487,  1292, -1487, -1487,
-    8430, 18628, -1487,   842, -1487, -1487, -1487,  8430,  1108,  1134,
-    1066,  1067, -1487, -1487, -1487,  1069,  1075, -1487, -1487, -1487,
-    1202, -1487,   996, -1487, -1487, -1487,  1058, 12672,   542, 18628,
-    1139, -1487,  1145,  1151,  1152,  1157, -1487,   859,   590,  4789,
-     989, -1487,  9642,  4789, -1487, -1487,  1154,   430, -1487, -1487,
-   -1487,  1135, -1487,  1037, -1487,   891, -1487,    55,  1206, -1487,
-   12672,   608,  1070, 18628, -1487,   343, 18628, -1487, 12672,  1166,
-   12672,  1187, 12672,   237,  1170, 12672,  1171, -1487,  1198,  1203,
-   12672, 18628,   961,  1243, -1487, -1487, -1487,   442,  1140, -1487,
-     211,  1068, -1487, -1487,   -55, -1487,   162,    -7,  1078,   211,
-     162, 13884, -1487,   556, -1487, -1487, -1487, -1487, -1487, -1487,
-     211,  1174,  1049,   904,    -7, -1487, -1487,  1033,  1249, -1487,
-   -1487, -1487,  1142,   330, 17752, 15694,  1143,  6921, 18628, 18628,
-    1144, 18044,  1146, -1487,  1147,  1149,  1150,  1156,  1158,  1160,
-    1161, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487,  1301,   -10,  1311,   -10,  1092,  1233,
-   -1487, -1487,  1176, 18628,  1093, -1487, -1487, 15096, -1487,  1165,
-   -1487,  1218,  1225,  1255,  1037,  1167, -1487, 12672,  1169, -1487,
-   -1487, -1487,  1172, -1487,   354, 12672,  8430,  1173,   479, -1487,
-   18628,   269, -1487, 16576,   471, -1487, 16870,  1175, -1487, -1487,
-    1178, -1487, -1487, -1487, 12672,   873,  1195, 18628,   923, -1487,
-    1179,  1195, 18628, -1487,  1180, -1487, -1487, 12672, 12672, 12672,
-   12672,  1032, 12672, 12672, -1487, 12672, -1487, 12672, 12672, 12672,
-   12672,  9642,   274, -1487, -1487, -1487, -1487, -1487,  1206, -1487,
-   -1487, -1487,  1037, 12672, -1487,  1214, -1487, -1487, 12672,  1210,
-   -1487, -1487, 12672, -1487,   480, -1487, 12672,  1213, 12672, -1487,
-   12672, 18628, 18628, -1487,   804, -1487, 12672, -1487, -1487, -1487,
-    1181, 13884, -1487, -1487, -1487, -1487, -1487,   421, 13884, 13884,
-     663, -1487,   995, -1487,   519, -1487,   984,   211,  1215, -1487,
-   -1487,  1094, -1487, -1487, -1487, -1487, -1487, -1487,  1182,  1183,
-   -1487,   530,   546,  1273,  1184, -1487,   554, -1487,  1185, -1487,
-    1186,  1188,  1189, -1487, -1487,   562,   569, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487,   523,   523, -1487,   -10,
-   -1487, -1487,   579, -1487,  1347,    28,  1282,  1192, 15096,   -35,
-    1097,  1211, -1487,  9642, 12672,  1037, -1487, -1487, -1487, 12672,
-   12672, -1487, -1487, -1487,  9642,  9642,  1287,  8430, 17164, 18628,
-     657, 18628, 12672, 18628,   683,  9642, -1487,   536,   306,  1195,
-   18628, -1487,  1190,  1195, -1487, -1487, -1487, -1487, -1487, 12672,
-   -1487, -1487, -1487, -1487,   203,   226,   235, 12672, -1487, -1487,
-   -1487,  1277, 12672, -1487, 12672, -1487, 12672,  1236, -1487, 12672,
-   -1487, -1487, -1487,  1332, -1487, -1487, -1487,   746, 13884, 13884,
-      -5,   705, -1487, -1487, -1487, -1487, -1487, -1487, 12672, -1487,
-   -1487, -1487, 18628, -1487, 18628, -1487, 17164, -1487, 17164,  1293,
-   -1487, -1487, -1487, -1487, 18628, -1487, 18628, -1487, -1487, -1487,
-   -1487,  1358, -1487, -1487, -1487,  1148,  1283, -1487, -1487,  1284,
-   -1487,    74, 18628,  1274,  1191, 18628, 15096, -1487, -1487,  1167,
-   -1487, -1487, 17164, -1487, -1487, -1487,  1299, 12672,  1209, -1487,
-    1303,  9642, -1487, 18628,   601,   598, -1487,  1197,  1195, -1487,
-    1200, -1487,  1201,  1119,  1121,   460, -1487,  1277, -1487, -1487,
-   12672, -1487,  1285,    -5,    -5, 13884,   462,  1216,  1217,  1256,
-    1221,  1222, -1487, -1487, 17164,  1223,  1226, -1487, -1487,  1282,
-   15096, -1487,  1206,  1110, 18628,  1288,  1196,  1284,   685, 17164,
-    8430, 17164,  1229, -1487, -1487,  1309,   765, -1487, -1487, -1487,
-   -1487,  1231,   680, -1487, -1487, -1487,  1219, -1487,  9642,   874,
-   -1487, -1487, -1487, 18628,    -5, -1487, -1487, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487, -1487, -1487, -1487, 12672,  1138, 18628,
-    1294,  8430,   697, -1487, -1487,   714, 12672, -1487, -1487, -1487,
-   -1487, -1487, -1487, -1487,  1295, -1487, -1487,  1153,  1155, 18628,
-   -1487, -1487, 12672,  9642, 18628,  1164, 12672,  1177,  1232, 15096,
-   -1487, 15096,  9642, -1487,  1227,  1162, 18628,  1199,  1304, 18628,
-    1193, 15096, -1487
+      5037,  8375,  8375,  8375,  8375, -1495, -1495,    -2,    39, -1495,
+     558,    50, -1495, -1495, -1495,   326, -1495, -1495, -1495,   396,
+   -1495,   402,   742,   348,   670,   701, -1495,    79, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495,   688, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495,   734, -1495,   716, -1495,   704,   745, -1495,
+     446, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495,   793, -1495, -1495, -1495, -1495, -1495, -1495, -1495,   790,
+   -1495, -1495, -1495, -1495, -1495, 18573, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495,   837, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495,  5655, 10496, 10799, 18573, -1495,
+   -1495,   828, -1495, -1495, -1495, -1495,   836, -1495, -1495, -1495,
+    7167, -1495,  7466, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495,   855, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495,    59,   747,   806, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, 14435, -1495,
+    5959, -1495, 14738,   183, -1495, -1495, -1495, -1495, -1495, -1495,
+     922, -1495,   817,   819,   805, -1495, -1495,   901,   914, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495,   752, -1495, 14132, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, 11102, 11405, 11708, -1495,  5346,  7769,  1068, -1495,
+    8678, -1495, -1495,   603,    88, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,    90,
+   -1495, -1495, -1495, -1495, -1495, -1495,   378, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495,  8375, -1495, -1495, -1495, -1495,
+      37, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+     387, -1495,   876, -1495, -1495, -1495,   132, -1495,   877, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495,   902,   977, -1495, -1495,
+     838,   822,   972,   736,   532,   775,   539, -1495,  1028,   878,
+     980,   981, 13223, -1495,   888, -1495, -1495,    25, -1495, -1495,
+   -1495, -1495,   766, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495,   938,   928, -1495, -1495,
+   -1495, -1495, -1495,   903, -1495,  8375,   904,   905,   906,  8375,
+      73,    73,  1058,   781,   784,   785, 18865, 18573,     4,  1041,
+   18573,   939,   975,    63,  7167,   811,   843, 18573, 18573,   786,
+     910,    44, -1495, -1495, -1495,  7167,  8375,  8375, 12617,    36,
+     942, 12617,  1098,   159,   142, 18573,   982,   955,   992, -1495,
+   12617, 18573,  8375, 12617, 12617, 18573,  8375,   948,   949, 12617,
+   18573, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,   958,
+   -1495, 18573, -1495,   919,  8072,   983,   444,   984,   938,   950,
+     951,   953, 18573,  5655, -1495,   957,   242, -1495,   541, -1495,
+      84,  1078, 12617, 12617,   172, -1495, -1495, -1495,  1099, 12617,
+     900, -1495,  1088,  1089, 12617, 12920, 15041,   766, 12617, 12920,
+    6263,   243,   154, 12617, 15041,   720, 12617,   884,   887, 18573,
+     932,   933, 12617, 12617,  8375,   879, -1495, -1495,    53, -1495,
+      60, 12617,   890,  7769, -1495, -1495, -1495, -1495, -1495,   558,
+     701,   101,   121,  1124,  8981,  3471,  9284,  3791,   790, -1495,
+   -1495,   428,   790, -1495, 12617,  4425, -1495,  1008, -1495,    79,
+     961,   960,   962,  8375, 12617, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, 18573, -1495,   845,   846, 18573,  1014,
+   13526, 13526, -1495, -1495, -1495, -1495, -1495, -1495, 13829,  1066,
+   13829, 13829, 13829, 13829, 13829, 13829, 13829, 13829, 13829, 13829,
+   13829, 13829,   907,  1043,  1044,  1045, -1495, -1495, -1495, 15041,
+   12011, -1495,  6565, 12617,  9890,   985, -1495,   991, 10193, -1495,
+   -1495, -1495, -1495,   267, -1495,   315, -1495, -1495, -1495, -1495,
+   -1495, -1495,  1035,  1037,   348,  1117, -1495, -1495, 18865,   947,
+     644, 18573,   986,   987,   947,  1058,  1018,  1016, -1495, -1495,
+   -1495,   319,   899,  1059,   850, 18573,  1012, 12617,  1040, 18573,
+   18573, -1495,  1026,   976,   978,   432, 18573,  1070,   331, -1495,
+    8375, -1495,    97, -1495,  7167,  1069,  1126,  7167,  1058,  1072,
+     495, 18573, 12617,    79,   440,   277, -1495,    65,   988,   128,
+     149,  1021, -1495,   994,  8375,  8375,   460,   498, 12617,   289,
+   -1495, -1495, 12617,  6263, -1495, 12617, 12617, 12617, 12617, -1495,
+   12617, -1495, 12617, -1495, 18573,  1078, -1495,   264,   461,   489,
+   -1495, -1495, -1495,   586, -1495,    15,   342, -1495, -1495,   766,
+     274,   420,   254,   257, 12617, 12617,  1082,   727, 12617,   930,
+   15344,   941,    82, -1495,  1038, -1495, -1495,   989,   150,  8072,
+     619,  4734,   879, -1495, -1495, -1495,   944, 12617, -1495,   603,
+     857,  1151,   667, -1495, -1495,   123, -1495, -1495, -1495,   124,
+   -1495,   107, -1495, -1495, -1495, -1495, -1495,  4108, -1495, -1495,
+   -1495, 18573,  1015, 12617,  1071, -1495, -1495, -1495,  1080, -1495,
+      45, -1495, -1495,  1080, 18573,    23,   977, -1495, -1495,    89,
+   -1495,   532,   532,    17,   775,   775,   775,   775,   539,   539,
+   -1495, -1495, 17109, 17109, 18573, 18573, -1495, -1495,   625, -1495,
+   -1495, -1495, -1495,   357, -1495, -1495, -1495,   354, -1495, -1495,
+   -1495,   361,    73, -1495, -1495,   379,   639,   815, -1495,   348,
+   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+     947, -1495,  1057, 17403,  1048, 12617, -1495, -1495, -1495,  1100,
+    1058,  1058,   947, -1495,   842,  1058,   737, 18573,   167,   677,
+    1164, -1495, -1495,   909,   740, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495,   319,    67,   963,   442,
+   12617, -1495, 18573,  1104,   897,  1058, -1495, -1495,  1049,  1100,
+   17109,  1087,  1112,  1023,  1011,  1083,  1058,  1050,  1084,  1122,
+    1058, 17109, 12617,   -45, -1495, -1495, -1495,  1073,  1095, 12617,
+   12617,  1074, -1495,  1120,  1123,  8375, -1495,  1039,  1046,  1076,
+   12617,  1085,  1034, 12617, -1495,  1110,  1111, -1495,   151,   153,
+     166,  1192, -1495,   286, -1495,   562,  1081, -1495, -1495,  1208,
+   -1495,  1209, -1495,   424, 12617, 12617, 12617,   812, 12617, 12617,
+   12617, 12617, 12617,  1142, -1495, 12617, 12617, -1495, 12617, 12617,
+     675, 15041,  1121, 12617, 12617, -1495,  9587,   314,   993, -1495,
+   -1495, -1495, -1495, -1495, -1495,   382, -1495, -1495, 12617, -1495,
+     141,    55,   107,  9284,  3791,  9284,  1163, -1495, -1495, 12617,
+     650,  1137, -1495, 18573,  1138, -1495, 18281,  1118,  1130, 12617,
+     -42,  1102,    47,   548,   996, -1495, -1495,   113,    23, 12617,
+      89,   659,    30, -1495,   966,   212,   990,   995, -1495, -1495,
+     843, -1495,   979,   698,  1101,  1105,  1107,  1108,  1113,  1114,
+    1115,  1119,  1127,  1128,  1129, 15933,  1131,  1134,  1136,  1140,
+    1141,  1144, -1495,   544, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495, -1495,  1116, -1495, -1495,
+   -1495, -1495, 12314, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495,   816, -1495,  1224, 17403,   912, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495,   968, -1495, -1495,  1229,
+   -1495, -1495, -1495, -1495, -1495,   787,  1239, -1495,   750, -1495,
+   -1495, -1495,  1101,  1105,  1107,  1113,  1114,  1115,  1119,  1127,
+    1128,  1134, -1495,   544,   544, 15041,  1002,   964, -1495,  1100,
+      67,  1036,  1086,  8375, -1495, -1495, -1495, 17109, -1495,  8375,
+    1058,  1162, -1495, -1495, -1495,  1058,  1162, -1495, -1495, 12617,
+    1152,  8375, 18573, -1495, -1495, 12617, 12617,   707, -1495,    34,
+     875, -1495, 16227,   883, -1495,   891, -1495,  1094, -1495, -1495,
+    8375, -1495, 12617, -1495, -1495, 12617, 12617,  1075,  1120,  1180,
+   -1495,  1148, -1495,   648, -1495, -1495,  1278, -1495, -1495,  8375,
+   18573, -1495,   715, -1495, -1495, -1495,  8375,  1096,  1125,  1061,
+    1064, -1495, -1495, -1495,  1065,  1077, -1495, -1495, -1495,  1210,
+   -1495,   997, -1495, -1495, -1495,  1062, 12617,   676, 18573,  1132,
+   -1495,  1150,  1154,  1155,  1159, -1495,   876,   581,  4734,   993,
+   -1495,  9587,  4734, -1495, -1495,  1151,   410, -1495, -1495, -1495,
+    1137, -1495,  1058, -1495,   864, -1495,   335,  1203, -1495, 12617,
+     658,  1071, 18573, -1495,   305, 18573, -1495, 12617,  1166, 12617,
+    1189, 12617,    81,  1172, 12617,  1173, -1495,  1204,  1205, 12617,
+   18573,   472,  1247, -1495, -1495, -1495,   634,  1139, -1495,    89,
+    1079, -1495, -1495,   -44, -1495,   630,     1,  1090,    89,   630,
+   13829, -1495,   351, -1495, -1495, -1495, -1495, -1495, -1495,    89,
+    1177,  1042,   899,     1, -1495, -1495,  1047,  1248, -1495, -1495,
+   -1495,  1143,   118, 17697, 15639,  1145,  6866, 18573, 18573,  1147,
+   17989,  1149, -1495,  1156,  1158,  1160,  1161,  1165,  1168,  1169,
+   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495,  1300,   240,  1302,   240,  1056,  1232, -1495,
+   -1495,  1176, 18573,  1092, -1495, -1495, 15041, -1495,  1167, -1495,
+    1216,  1223,  1240,  1058,  1162, -1495, 12617,  1174, -1495, -1495,
+   -1495,  1171, -1495,    51, 12617,  8375,  1175,   288, -1495, 18573,
+     222, -1495, 16521,    40, -1495, 16815,  1178, -1495, -1495,  1179,
+   -1495, -1495, -1495, 12617,   892,  1192, 18573,   804, -1495,  1181,
+    1192, 18573, -1495,  1182, -1495, -1495, 12617, 12617, 12617, 12617,
+    1030, 12617, 12617, -1495, 12617, -1495, 12617, 12617, 12617, 12617,
+    9587,   419, -1495, -1495, -1495, -1495, -1495,  1203, -1495, -1495,
+   -1495,  1058, 12617, -1495,  1217, -1495, -1495, 12617,  1213, -1495,
+   -1495, 12617, -1495,   338, -1495, 12617,  1215, 12617, -1495, 12617,
+   18573, 18573, -1495,   739, -1495, 12617, -1495, -1495, -1495,  1183,
+   13829, -1495, -1495, -1495, -1495, -1495,    87, 13829, 13829,   -89,
+   -1495,   990, -1495,   202, -1495,   995,    89,  1218, -1495, -1495,
+    1091, -1495, -1495, -1495, -1495, -1495, -1495,  1185,  1186, -1495,
+     459,   492,  1275,  1187, -1495,   509, -1495,  1191, -1495,  1193,
+    1194,  1195, -1495, -1495,   545,   575, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495,   491,   491, -1495,   240, -1495,
+   -1495,   577, -1495,  1342,     3,  1281,  1196, 15041,   -25,  1093,
+    1200, -1495,  9587, 12617,  1058, -1495, -1495, -1495, 12617, 12617,
+   -1495, -1495, -1495,  9587,  9587,  1284,  8375, 17109, 18573,   514,
+   18573, 12617, 18573,   580,  9587, -1495,    43,    38,  1192, 18573,
+   -1495,  1188,  1192, -1495, -1495, -1495, -1495, -1495, 12617, -1495,
+   -1495, -1495, -1495,   226,   235,   255, 12617, -1495, -1495, -1495,
+    1274, 12617, -1495, 12617, -1495, 12617,  1241, -1495, 12617, -1495,
+   -1495, -1495,  1334, -1495, -1495, -1495,   775, 13829, 13829,    17,
+     780, -1495, -1495, -1495, -1495, -1495, -1495, 12617, -1495, -1495,
+   -1495, 18573, -1495, 18573, -1495, 17109, -1495, 17109,  1294, -1495,
+   -1495, -1495, -1495, 18573, -1495, 18573, -1495, -1495, -1495, -1495,
+    1362, -1495, -1495, -1495,  1133,  1285, -1495, -1495,  1287, -1495,
+     754, 18573,  1273,  1170, 18573, 15041, -1495, -1495,  1162, -1495,
+   -1495, 17109, -1495, -1495, -1495,  1301, 12617,  1212, -1495,  1303,
+    9587, -1495, 18573,   674,   691, -1495,  1198,  1192, -1495,  1206,
+   -1495,  1202,  1120,  1123,   637, -1495,  1274, -1495, -1495, 12617,
+   -1495,  1290,    17,    17, 13829,   640,  1214,  1221,  1260,  1222,
+    1225, -1495, -1495, 17109,  1226,  1227, -1495, -1495,  1281, 15041,
+   -1495,  1203,  1106, 18573,  1293,  1197,  1287,   729, 17109,  8375,
+   17109,  1230, -1495, -1495,  1319,   770, -1495, -1495, -1495, -1495,
+    1234,   733, -1495, -1495, -1495,  1228, -1495,  9587,   913, -1495,
+   -1495, -1495, 18573,    17, -1495, -1495, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495, -1495, -1495, -1495, 12617,  1109, 18573,  1305,
+    8375,   738, -1495, -1495,   748, 12617, -1495, -1495, -1495, -1495,
+   -1495, -1495, -1495,  1306, -1495, -1495,  1135,  1146, 18573, -1495,
+   -1495, 12617,  9587, 18573,  1153, 12617,  1157,  1233, 15041, -1495,
+   15041,  9587, -1495,  1231,  1184, 18573,  1199,  1307, 18573,  1201,
+   15041, -1495
   };
 
   /* YYDEFACT[S] -- default reduction number in state S.  Performed when
@@ -12577,31 +12573,31 @@
   const unsigned short int
   jsoniq_parser::yydefact_[] =
   {
-       167,   170,   170,   170,     0,   812,  1007,   122,   124,   609,
-     904,   913,   853,   817,   815,   797,   905,   908,   860,   821,
-     798,   800,   260,   914,   801,   911,   882,   862,   837,   799,
-     857,   858,   909,   906,   856,   803,   912,   804,   805,   949,
-     961,   948,   854,   873,   867,   806,   855,   808,   807,   950,
-     891,   892,   859,   834,   971,   972,   973,   974,   975,   976,
-     977,   978,   979,   980,   981,   995,  1002,   881,   877,   868,
-     848,   796,   876,   884,   893,   996,   872,   463,   849,   850,
-     907,   997,  1003,   869,   886,     0,   472,   471,   465,   879,
-     814,   870,   871,   900,   874,   890,   899,  1001,  1004,   820,
-     861,   902,   464,   889,   895,     0,     0,     0,     0,   400,
-     887,   898,   903,   901,   880,   866,   951,   864,   865,   998,
-       0,   399,     0,   999,  1005,   896,   851,   875,  1000,   213,
-     897,   878,   885,   894,   888,   952,   842,   847,   846,   845,
-     844,   843,   809,   863,     0,   813,     0,   910,   835,   462,
-     466,   467,   942,   941,   943,   819,   818,   838,     0,   802,
-       0,   945,     0,     0,   841,

Follow ups

[Merge] lp:~zorba-coders/zorba/feature-empty_object into lp:zorba
From: noreply, 2013-03-28
[Merge] lp:~zorba-coders/zorba/feature-empty_object into lp:zorba
From: Zorba Build Bot, 2013-03-28
[Merge] lp:~zorba-coders/zorba/feature-empty_object into lp:zorba
From: Nicolae Brinza, 2013-03-28
[Merge] lp:~zorba-coders/zorba/feature-empty_object into lp:zorba
From: Zorba Build Bot, 2013-03-28
Re: [Merge] lp:~zorba-coders/zorba/feature-empty_object into lp:zorba
From: Nicolae Brinza, 2013-03-28
[Merge] lp:~zorba-coders/zorba/feature-empty_object into lp:zorba
From: Nicolae Brinza, 2013-03-28
[Merge] lp:~zorba-coders/zorba/feature-empty_object into lp:zorba
From: Zorba Build Bot, 2013-03-27
Re: [Merge] lp:~zorba-coders/zorba/feature-empty_object into lp:zorba
From: Zorba Build Bot, 2013-03-27
[Merge] lp:~zorba-coders/zorba/feature-empty_object into lp:zorba
From: Zorba Build Bot, 2013-03-27
Re: [Merge] lp:~zorba-coders/zorba/feature-empty_object into lp:zorba
From: Matthias Brantner, 2013-03-27
[Merge] lp:~zorba-coders/zorba/feature-empty_object into lp:zorba
From: Matthias Brantner, 2013-03-27