← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~zorba-coders/zorba/bug-1046561 into lp:zorba

 

Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/bug-1046561 into lp:zorba.

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1046561/+merge/123961

Changing json insert syntax.
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~zorba-coders/zorba/bug-1046561/+merge/123961
Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug-1046561 into lp:zorba.
=== modified file 'src/compiler/parser/FlexLexer.h'
--- src/compiler/parser/FlexLexer.h	2012-09-10 22:53:04 +0000
+++ src/compiler/parser/FlexLexer.h	2012-09-12 13:33:27 +0000
@@ -63,7 +63,7 @@
 	virtual ~FlexLexer()	{ }
 
 	const char* YYText() const	{ return yytext; }
-	int YYLeng()	const	{ return yyleng; }
+	size_t YYLeng()	const	{ return yyleng; }
 
 	virtual void
 		yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
@@ -93,7 +93,7 @@
 
 protected:
 	char* yytext;
-	int yyleng;
+	size_t yyleng;
 	int yylineno;		// only maintained if you use %option yylineno
 	int yy_flex_debug;	// only has effect with -d or "%option debug"
 };
@@ -130,8 +130,8 @@
 	virtual int yywrap();
 
 protected:
-	virtual int LexerInput( char* buf, int max_size );
-	virtual void LexerOutput( const char* buf, int size );
+	virtual size_t LexerInput( char* buf, size_t max_size );
+	virtual void LexerOutput( const char* buf, size_t size );
 	virtual void LexerError( const char* msg );
 
 	void yyunput( int c, char* buf_ptr );
@@ -160,7 +160,7 @@
 	char yy_hold_char;
 
 	// Number of characters read into yy_ch_buf.
-	int yy_n_chars;
+	size_t yy_n_chars;
 
 	// Points to current character in buffer.
 	char* yy_c_buf_p;

=== modified file 'src/compiler/parser/xquery_parser.cpp'
--- src/compiler/parser/xquery_parser.cpp	2012-09-10 22:53:04 +0000
+++ src/compiler/parser/xquery_parser.cpp	2012-09-12 13:33:27 +0000
@@ -1,10 +1,8 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.6.2.  */
 
 /* Skeleton implementation for Bison LALR(1) parsers in C++
    
-      Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
-   Foundation, Inc.
+      Copyright (C) 2002-2012 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -36,9 +34,14 @@
 #define yylex   zorbalex
 
 /* First part of user declarations.  */
+<<<<<<< TREE
 
 /* Line 311 of lalr1.cc  */
 #line 87 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 278 of lalr1.cc  */
+#line 87 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
 
 
 #include "common/common.h"
@@ -73,17 +76,27 @@
 using namespace zorba;
 
 
+<<<<<<< TREE
 
 /* Line 311 of lalr1.cc  */
 #line 79 "/home/markos/zorba/repo/gen-flwor-opt/build/src/compiler/parser/xquery_parser.cpp"
+=======
+/* Line 278 of lalr1.cc  */
+#line 75 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+>>>>>>> MERGE-SOURCE
 
 
 #include "xquery_parser.hpp"
 
 /* User implementation prologue.  */
+<<<<<<< TREE
 
 /* Line 317 of lalr1.cc  */
 #line 906 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 284 of lalr1.cc  */
+#line 906 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
 
 // HACK to trigger rchandle release: rchandles are freed when refcount == 0
 // (not <= 0); but Bison never increments the refcount, so we do it manually...
@@ -93,9 +106,14 @@
         RCHelper::removeReference( ref );
     }
 }
+<<<<<<< TREE
 
 /* Line 317 of lalr1.cc  */
 #line 1022 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 284 of lalr1.cc  */
+#line 1023 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
 
 #include "compiler/parser/xquery_scanner.h"
 
@@ -103,12 +121,26 @@
 #define yylex driver.lexer->lex
 
 
+<<<<<<< TREE
 
 /* Line 317 of lalr1.cc  */
 #line 109 "/home/markos/zorba/repo/gen-flwor-opt/build/src/compiler/parser/xquery_parser.cpp"
+=======
+/* Line 284 of lalr1.cc  */
+#line 102 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+
+
+# ifndef YY_NULL
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULL nullptr
+#  else
+#   define YY_NULL 0
+#  endif
+# endif
+>>>>>>> MERGE-SOURCE
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* FIXME: INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -119,6 +151,27 @@
 # endif
 #endif
 
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+# ifndef YYLLOC_DEFAULT
+#  define YYLLOC_DEFAULT(Current, Rhs, N)                               \
+    do                                                                  \
+      if (N)                                                            \
+        {                                                               \
+          (Current).begin  = YYRHSLOC (Rhs, 1).begin;                   \
+          (Current).end    = YYRHSLOC (Rhs, N).end;                     \
+        }                                                               \
+      else                                                              \
+        {                                                               \
+          (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;      \
+        }                                                               \
+    while (/*CONSTCOND*/ false)
+# endif
+
+
 /* Suppress unused-variable warnings by "using" E.  */
 #define YYUSE(e) ((void) (e))
 
@@ -168,14 +221,16 @@
 #define YYRECOVERING()  (!!yyerrstatus_)
 
 
-/* Line 380 of lalr1.cc  */
-#line 1 "[Bison:b4_percent_define_default]"
-
 namespace zorba {
+<<<<<<< TREE
 
 /* Line 380 of lalr1.cc  */
 #line 178 "/home/markos/zorba/repo/gen-flwor-opt/build/src/compiler/parser/xquery_parser.cpp"
 #if YYERROR_VERBOSE
+=======
+/* Line 352 of lalr1.cc  */
+#line 197 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+>>>>>>> MERGE-SOURCE
 
   /* Return YYSTR after stripping away unnecessary quotes and
      backslashes, so that it's suitable for yyerror.  The heuristic is
@@ -214,7 +269,6 @@
     return yystr;
   }
 
-#endif
 
   /// Build a parser object.
   xquery_parser::xquery_parser (xquery_driver& driver_yyarg)
@@ -242,6 +296,9 @@
   {
     YYUSE (yylocationp);
     YYUSE (yyvaluep);
+    std::ostream& yyo = debug_stream ();
+    std::ostream& yyoutput = yyo;
+    YYUSE (yyoutput);
     switch (yytype)
       {
          default:
@@ -274,6 +331,7 @@
 
     switch (yytype)
       {
+<<<<<<< TREE
         case 110: /* "\"'DECIMAL'\"" */
 
 /* Line 480 of lalr1.cc  */
@@ -2784,6 +2842,1960 @@
 
 /* Line 480 of lalr1.cc  */
 #line 2787 "/home/markos/zorba/repo/gen-flwor-opt/build/src/compiler/parser/xquery_parser.cpp"
+=======
+        case 110: /* "'DECIMAL'" */
+/* Line 453 of lalr1.cc  */
+#line 904 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ delete ((*yyvaluep).decval); };
+/* Line 453 of lalr1.cc  */
+#line 303 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 124: /* "'DOUBLE'" */
+/* Line 453 of lalr1.cc  */
+#line 903 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ delete ((*yyvaluep).dval); };
+/* Line 453 of lalr1.cc  */
+#line 310 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 149: /* "'INTEGER'" */
+/* Line 453 of lalr1.cc  */
+#line 902 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ delete ((*yyvaluep).ival); };
+/* Line 453 of lalr1.cc  */
+#line 317 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 336: /* VersionDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 324 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 337: /* MainModule */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 331 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 338: /* LibraryModule */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 338 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 339: /* ModuleDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 345 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 340: /* SIND_DeclList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 352 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 341: /* SIND_Decl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 359 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 342: /* Setter */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 366 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 343: /* BoundarySpaceDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 373 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 344: /* DefaultCollationDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 380 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 345: /* BaseURIDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 387 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 346: /* ConstructionDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 394 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 347: /* OrderingModeDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 401 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 348: /* EmptyOrderDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 408 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 349: /* CopyNamespacesDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 415 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 350: /* Import */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 422 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 351: /* SchemaImport */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 429 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 352: /* URILiteralList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 436 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 353: /* SchemaPrefix */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 443 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 354: /* ModuleImport */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 450 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 355: /* NamespaceDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 457 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 356: /* DefaultNamespaceDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 464 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 357: /* VFO_DeclList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 471 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 358: /* VFO_Decl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 478 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 359: /* DecimalFormatDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 485 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 360: /* DecimalFormatParamList */
+/* Line 453 of lalr1.cc  */
+#line 930 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ delete ((*yyvaluep).vstrpair); };
+/* Line 453 of lalr1.cc  */
+#line 492 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 361: /* DecimalFormatParam */
+/* Line 453 of lalr1.cc  */
+#line 930 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ delete ((*yyvaluep).strpair); };
+/* Line 453 of lalr1.cc  */
+#line 499 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 363: /* OptionDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 506 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 364: /* FTOptionDecl */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 513 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 365: /* CtxItemDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 520 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 366: /* CtxItemDecl2 */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 527 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 367: /* CtxItemDecl3 */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 534 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 368: /* CtxItemDecl4 */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 541 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 369: /* VarDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 548 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 370: /* VarNameAndType */
+/* Line 453 of lalr1.cc  */
+#line 930 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ delete ((*yyvaluep).varnametype); };
+/* Line 453 of lalr1.cc  */
+#line 555 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 371: /* AnnotationList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 562 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 372: /* Annotation */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 569 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 373: /* AnnotationLiteralList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 576 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 374: /* FunctionDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 583 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 375: /* FunctionDecl2 */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 590 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 376: /* FunctionDeclSimple */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 597 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 377: /* FunctionDeclUpdating */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 604 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 378: /* FunctionSig */
+/* Line 453 of lalr1.cc  */
+#line 930 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ delete ((*yyvaluep).fnsig); };
+/* Line 453 of lalr1.cc  */
+#line 611 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 379: /* ParamList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 618 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 380: /* Param */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 625 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 381: /* CollectionDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 632 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 383: /* IndexDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 639 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 384: /* IndexKeyList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 646 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 385: /* IndexKeySpec */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 653 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 386: /* IntegrityConstraintDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 660 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 387: /* QueryBody */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 667 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 388: /* StatementsAndOptionalExprTop */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 674 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 389: /* StatementsAndOptionalExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 681 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 390: /* StatementsAndExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 688 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 391: /* Statements */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 695 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 392: /* Statement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 702 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 393: /* BlockStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 709 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 394: /* BlockExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 716 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 395: /* EnclosedStatementsAndOptionalExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 723 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 396: /* VarDeclStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 730 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 399: /* AssignStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 737 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 400: /* ApplyStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 744 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 401: /* ExitStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 751 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 402: /* WhileStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 758 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 403: /* FlowCtlStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 765 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 404: /* FLWORStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 772 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 405: /* ReturnStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 779 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 406: /* IfStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 786 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 407: /* TryStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 793 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 408: /* CatchListStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 800 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 409: /* CatchStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 807 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 410: /* Expr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 814 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 411: /* ExprSingle */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 821 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 412: /* ExprSimple */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 828 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 413: /* FLWORExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 835 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 414: /* ReturnExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 842 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 417: /* FLWORWinCond */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 849 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 418: /* WindowClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 856 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 419: /* CountClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 863 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 420: /* ForLetWinClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 870 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 422: /* FLWORClauseList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 877 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 423: /* ForClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 884 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 424: /* VarInDeclList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 891 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 425: /* VarInDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 898 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 426: /* PositionalVar */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 905 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 427: /* FTScoreVar */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 912 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 428: /* LetClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 919 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 429: /* VarGetsDeclList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 926 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 430: /* VarGetsDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 933 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 431: /* WindowVarDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 940 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 432: /* WindowVars */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 947 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 433: /* WindowVars3 */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 954 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 434: /* WindowVars2 */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 961 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 435: /* WhereClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 968 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 436: /* GroupByClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 975 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 437: /* GroupSpecList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 982 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 438: /* GroupSpec */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 989 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 439: /* GroupCollationSpec */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 996 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 440: /* OrderByClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1003 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 441: /* OrderSpecList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1010 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 442: /* OrderSpec */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1017 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 443: /* OrderModifier */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1024 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 444: /* OrderDirSpec */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1031 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 445: /* OrderEmptySpec */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1038 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 446: /* OrderCollationSpec */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1045 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 447: /* QuantifiedExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1052 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 448: /* QVarInDeclList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1059 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 449: /* QVarInDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1066 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 450: /* SwitchExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1073 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 451: /* SwitchCaseClauseList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1080 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 452: /* SwitchCaseClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1087 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 453: /* SwitchCaseOperandList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1094 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 454: /* SwitchStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1101 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 457: /* TypeswitchExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1108 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 458: /* TypeswitchStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1115 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 459: /* CaseClauseList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1122 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 460: /* CaseClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1129 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 463: /* IfExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1136 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 464: /* OrExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1143 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 465: /* AndExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1150 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 466: /* ComparisonExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1157 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 468: /* FTContainsExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1164 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 469: /* StringConcatExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1171 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 470: /* opt_FTIgnoreOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1178 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 471: /* RangeExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1185 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 472: /* AdditiveExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1192 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 473: /* MultiplicativeExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1199 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 474: /* UnionExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1206 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 475: /* IntersectExceptExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1213 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 476: /* InstanceofExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1220 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 477: /* TreatExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1227 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 478: /* CastableExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1234 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 479: /* CastExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1241 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 480: /* UnaryExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1248 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 481: /* SignList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1255 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 482: /* ValueExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1262 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 483: /* ValueComp */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1269 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 484: /* NodeComp */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1276 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 485: /* ValidateExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1283 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 486: /* ExtensionExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1290 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 487: /* Pragma_list */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1297 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 488: /* Pragma */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1304 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 489: /* PathExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1311 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 491: /* RelativePathExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1318 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 492: /* StepExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1325 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 493: /* AxisStep */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1332 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 494: /* ForwardStep */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1339 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 495: /* ForwardAxis */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1346 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 496: /* AbbrevForwardStep */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1353 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 497: /* ReverseStep */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1360 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 498: /* ReverseAxis */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1367 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 499: /* NodeTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1374 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 500: /* NameTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1381 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 501: /* Wildcard */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1388 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 502: /* FilterExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1395 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 503: /* PredicateList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1402 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 504: /* Predicate */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1409 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 505: /* PrimaryExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1416 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 506: /* Literal */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1423 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 507: /* NumericLiteral */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1430 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 508: /* VarRef */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1437 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 509: /* ParenthesizedExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1444 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 510: /* ContextItemExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1451 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 511: /* OrderedExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1458 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 512: /* UnorderedExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1465 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 513: /* FunctionCall */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1472 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 514: /* ArgList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1479 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 515: /* Constructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1486 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 516: /* DirectConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1493 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 517: /* DirElemConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1500 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 518: /* DirElemContentList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1507 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 519: /* DirAttributeList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1514 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 520: /* DirAttr */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1521 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 522: /* DirAttributeValue */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1528 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 523: /* opt_QuoteAttrContentList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1535 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 524: /* QuoteAttrContentList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1542 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 525: /* opt_AposAttrContentList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1549 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 526: /* AposAttrContentList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1556 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 527: /* QuoteAttrValueContent */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1563 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 528: /* AposAttrValueContent */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1570 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 529: /* DirElemContent */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1577 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 530: /* CommonContent */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1584 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 531: /* DirCommentConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1591 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 532: /* DirPIConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1598 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 533: /* CDataSection */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1605 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 534: /* ComputedConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1612 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 535: /* CompDocConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1619 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 536: /* CompElemConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1626 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 537: /* CompAttrConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1633 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 538: /* CompTextConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1640 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 539: /* CompCommentConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1647 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 540: /* CompPIConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1654 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 541: /* SingleType */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1661 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 542: /* TypeDeclaration */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1668 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 543: /* SequenceType */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1675 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 544: /* OccurrenceIndicator */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1682 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 545: /* ItemType */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1689 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 546: /* TypeList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1696 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 547: /* AtomicType */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1703 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 548: /* KindTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1710 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 549: /* AnyKindTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1717 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 550: /* DocumentTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1724 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 551: /* TextTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1731 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 552: /* CommentTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1738 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 553: /* PITest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1745 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 554: /* AttributeTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1752 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 555: /* SchemaAttributeTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1759 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 556: /* ElementTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1766 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 557: /* SchemaElementTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1773 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 558: /* TypeName */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1780 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 559: /* TypeName_WITH_HOOK */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1787 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 560: /* StringLiteral */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1794 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 565: /* AnyFunctionTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1801 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 566: /* TypedFunctionTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1808 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 569: /* InsertExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1815 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 570: /* DeleteExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1822 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 571: /* ReplaceExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1829 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 572: /* RenameExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1836 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 573: /* TransformExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1843 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 574: /* VarNameList */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1850 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 575: /* VarNameDecl */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1857 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 576: /* TryExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1864 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 577: /* CatchListExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1871 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 578: /* CatchExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1878 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 579: /* BracedExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1885 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 580: /* NameTestList */
+/* Line 453 of lalr1.cc  */
+#line 930 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ delete ((*yyvaluep).name_test_list); };
+/* Line 453 of lalr1.cc  */
+#line 1892 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 581: /* FTSelection */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1899 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 584: /* FTOr */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1906 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 585: /* FTAnd */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1913 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 586: /* FTMildNot */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1920 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 587: /* FTUnaryNot */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1927 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 588: /* FTPrimaryWithOptions */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1934 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 589: /* opt_FTMatchOptions */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1941 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 591: /* FTWeight */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1948 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 592: /* FTPrimary */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1955 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 593: /* opt_FTTimes */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1962 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 594: /* FTExtensionSelection */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1969 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 596: /* FTWords */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1976 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 597: /* FTWordsValue */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1983 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 599: /* FTAnyallOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1990 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 602: /* FTPosFilter */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1997 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 603: /* FTOrder */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2004 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 604: /* FTWindow */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2011 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 605: /* FTDistance */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2018 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 606: /* FTUnit */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2025 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 607: /* FTMatchOptions */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2032 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 608: /* FTMatchOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2039 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 609: /* FTCaseOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2046 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 610: /* FTDiacriticsOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2053 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 611: /* FTExtensionOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2060 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 612: /* FTStemOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2067 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 613: /* FTThesaurusOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2074 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 617: /* FTThesaurusID */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2081 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 620: /* FTStopWordOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2088 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 621: /* FTStopWords */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2095 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 625: /* FTStopWordsInclExcl */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2102 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 626: /* FTLanguageOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2109 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 627: /* FTWildCardOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2116 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 628: /* FTContent */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2123 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 629: /* FTTimes */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2130 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 630: /* FTRange */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2137 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 631: /* FTScope */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2144 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 632: /* FTBigUnit */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2151 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 633: /* FTIgnoreOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2158 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 634: /* JSONArrayConstructor */
+/* Line 453 of lalr1.cc  */
+#line 924 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2165 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 635: /* JSONSimpleObjectUnion */
+/* Line 453 of lalr1.cc  */
+#line 924 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2172 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 636: /* JSONAccumulatorObjectUnion */
+/* Line 453 of lalr1.cc  */
+#line 924 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2179 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 637: /* JSONObjectConstructor */
+/* Line 453 of lalr1.cc  */
+#line 924 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2186 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 638: /* JSONPairList */
+/* Line 453 of lalr1.cc  */
+#line 924 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2193 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 639: /* JSONInsertExpr */
+/* Line 453 of lalr1.cc  */
+#line 924 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2200 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 640: /* JSONAppendExpr */
+/* Line 453 of lalr1.cc  */
+#line 924 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2207 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 641: /* JSONDeleteExpr */
+/* Line 453 of lalr1.cc  */
+#line 924 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2214 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 642: /* JSONRenameExpr */
+/* Line 453 of lalr1.cc  */
+#line 924 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2221 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 643: /* JSONReplaceExpr */
+/* Line 453 of lalr1.cc  */
+#line 924 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2228 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 650: /* QNAME */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2235 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 651: /* FUNCTION_NAME */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2242 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 652: /* EQNAME */
+/* Line 453 of lalr1.cc  */
+#line 927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2249 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+>>>>>>> MERGE-SOURCE
 	break;
 
 	default:
@@ -2826,6 +4838,18 @@
   }
 #endif
 
+  inline bool
+  xquery_parser::yy_pact_value_is_default_ (int yyvalue)
+  {
+    return yyvalue == yypact_ninf_;
+  }
+
+  inline bool
+  xquery_parser::yy_table_value_is_error_ (int yyvalue)
+  {
+    return yyvalue == yytable_ninf_;
+  }
+
   int
   xquery_parser::parse ()
   {
@@ -2847,7 +4871,7 @@
     /// Location of the lookahead.
     location_type yylloc;
     /// The locations where the error started and ended.
-    location_type yyerror_range[2];
+    location_type yyerror_range[3];
 
     /// $$.
     semantic_type yyval;
@@ -2859,16 +4883,27 @@
     YYCDEBUG << "Starting parse" << std::endl;
 
 
+<<<<<<< TREE
     /* User initialization code.  */
     
 /* Line 553 of lalr1.cc  */
 #line 140 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* User initialization code.  */
+/* Line 538 of lalr1.cc  */
+#line 140 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
 {
     yylloc.begin.filename = yylloc.end.filename = &(driver.theFilename2);
 }
+<<<<<<< TREE
 
 /* Line 553 of lalr1.cc  */
 #line 2872 "/home/markos/zorba/repo/gen-flwor-opt/build/src/compiler/parser/xquery_parser.cpp"
+=======
+/* Line 538 of lalr1.cc  */
+#line 2344 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+>>>>>>> MERGE-SOURCE
 
     /* Initialize the stacks.  The initial state will be pushed in
        yynewstate, since the latter expects the semantical and the
@@ -2896,7 +4931,7 @@
 
     /* Try to take a decision without lookahead.  */
     yyn = yypact_[yystate];
-    if (yyn == yypact_ninf_)
+    if (yy_pact_value_is_default_ (yyn))
       goto yydefault;
 
     /* Read a lookahead token.  */
@@ -2929,8 +4964,8 @@
     yyn = yytable_[yyn];
     if (yyn <= 0)
       {
-	if (yyn == 0 || yyn == yytable_ninf_)
-	goto yyerrlab;
+	if (yy_table_value_is_error_ (yyn))
+	  goto yyerrlab;
 	yyn = -yyn;
 	goto yyreduce;
       }
@@ -2985,45 +5020,70 @@
     switch (yyn)
       {
 	  case 3:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1040 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1041 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
         (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       }
     break;
 
   case 4:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1044 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1045 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
         (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       }
     break;
 
   case 5:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1048 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1049 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
         (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       }
     break;
 
   case 6:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1059 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1060 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
         (yyval.node) = NULL; YYABORT;
       }
     break;
 
   case 7:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1068 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1069 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
       driver.set_expr( (yyval.node) );
@@ -3031,9 +5091,14 @@
     break;
 
   case 8:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1074 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1075 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       MainModule* mm = dynamic_cast<MainModule*>((yysemantic_stack_[(2) - (2)].node));
       mm->set_version_decl( static_cast<VersionDecl*>((yysemantic_stack_[(2) - (1)].node)) );
@@ -3043,9 +5108,14 @@
     break;
 
   case 9:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1082 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1083 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
       driver.set_expr( (yyval.node) );
@@ -3053,9 +5123,14 @@
     break;
 
   case 10:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1088 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1089 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       LibraryModule* lm = dynamic_cast<LibraryModule*>((yysemantic_stack_[(2) - (2)].node));
       lm->set_version_decl( static_cast<VersionDecl*>((yysemantic_stack_[(2) - (1)].node)) );
@@ -3065,27 +5140,42 @@
     break;
 
   case 11:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1099 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1100 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)), "utf-8" );
     }
     break;
 
   case 12:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1104 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1105 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)) );
     }
     break;
 
   case 13:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1112 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1113 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (1)].node)), NULL);
 
@@ -3094,9 +5184,14 @@
     break;
 
   case 14:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1119 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1120 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (1)].node)));
 
@@ -3105,9 +5200,14 @@
     break;
 
   case 15:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1126 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1127 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       Prolog* prolog = new Prolog(LOC((yyloc)),
                                   static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (1)].node)),
@@ -3118,18 +5218,28 @@
     break;
 
   case 16:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1135 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1136 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new MainModule( LOC((yyloc)), static_cast<QueryBody*>((yysemantic_stack_[(1) - (1)].expr)), NULL );
     }
     break;
 
   case 17:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1142 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1143 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
       (yylocation_stack_[(3) - (1)]).step();
@@ -3139,9 +5249,14 @@
     break;
 
   case 18:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1150 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1151 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
       (yylocation_stack_[(3) - (1)]).step();
@@ -3151,9 +5266,14 @@
     break;
 
   case 19:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1158 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1159 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (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();
@@ -3163,9 +5283,14 @@
     break;
 
   case 20:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1166 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1167 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (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();
@@ -3175,18 +5300,28 @@
     break;
 
   case 21:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1177 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1178 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new LibraryModule(LOC((yyloc)), static_cast<ModuleDecl*>((yysemantic_stack_[(1) - (1)].node)), NULL);
     }
     break;
 
   case 22:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1182 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1183 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (2)].node)), NULL);
 
@@ -3195,9 +5330,14 @@
     break;
 
   case 23:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1189 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1190 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (2)].node)));
 
@@ -3206,9 +5346,14 @@
     break;
 
   case 24:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1196 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1197 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       Prolog* prolog = new Prolog(LOC((yyloc)),
                                   static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (2)].node)),
@@ -3219,9 +5364,14 @@
     break;
 
   case 25:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1208 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1209 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ModuleDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)) );
 
@@ -3230,9 +5380,14 @@
     break;
 
   case 26:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1218 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1219 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       SIND_DeclList *sdl = new SIND_DeclList( LOC((yyloc)) );
       sdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -3241,9 +5396,14 @@
     break;
 
   case 27:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1225 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1226 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       ((SIND_DeclList*)(yysemantic_stack_[(3) - (1)].node))->push_back( (yysemantic_stack_[(3) - (3)].node) );
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -3251,9 +5411,14 @@
     break;
 
   case 28:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1232 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1233 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       // error
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
@@ -3264,99 +5429,154 @@
     break;
 
   case 42:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1267 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1268 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::preserve_space);
     }
     break;
 
   case 43:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1272 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1273 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::strip_space);
     }
     break;
 
   case 44:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1280 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1281 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new DefaultCollationDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)) );
     }
     break;
 
   case 45:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1288 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1289 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new BaseURIDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
     }
     break;
 
   case 46:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1296 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1297 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_preserve);
     }
     break;
 
   case 47:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1301 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1302 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_strip);
     }
     break;
 
   case 48:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1309 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1310 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::ordered);
     }
     break;
 
   case 49:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1314 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1315 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::unordered);
     }
     break;
 
   case 50:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1322 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1323 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_greatest);
     }
     break;
 
   case 51:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1327 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1328 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_least);
     }
     break;
 
   case 52:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1335 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1336 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)),
                                   StaticContextConsts::preserve_ns,
@@ -3365,9 +5585,14 @@
     break;
 
   case 53:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1342 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1343 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)),
                                   StaticContextConsts::preserve_ns,
@@ -3376,9 +5601,14 @@
     break;
 
   case 54:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1349 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1350 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)),
                                   StaticContextConsts::no_preserve_ns,
@@ -3387,9 +5617,14 @@
     break;
 
   case 55:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1356 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1357 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)),
                                   StaticContextConsts::no_preserve_ns,
@@ -3398,9 +5633,14 @@
     break;
 
   case 58:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1371 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1372 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (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\".");
@@ -3409,18 +5649,28 @@
     break;
 
   case 59:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1381 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1382 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SchemaImport( LOC((yyloc)), NULL, SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL );
     }
     break;
 
   case 60:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1386 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1387 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(4) - (3)].node)),
@@ -3430,9 +5680,14 @@
     break;
 
   case 61:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1394 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1395 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             NULL,
@@ -3442,9 +5697,14 @@
     break;
 
   case 62:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1402 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1403 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(6) - (3)].node)),
@@ -3454,9 +5714,14 @@
     break;
 
   case 63:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1413 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1414 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       URILiteralList *ull = new URILiteralList( LOC((yyloc)));
       ull->push_back( SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
@@ -3465,9 +5730,14 @@
     break;
 
   case 64:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1420 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1421 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       if ( URILiteralList *ull = dynamic_cast<URILiteralList*>((yysemantic_stack_[(3) - (1)].node)) )
         ull->push_back( SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
@@ -3477,27 +5747,42 @@
     break;
 
   case 65:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1431 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1432 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SchemaPrefix( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
     break;
 
   case 66:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1436 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1437 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SchemaPrefix( LOC((yyloc)), true );
     }
     break;
 
   case 67:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1444 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1445 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL);
 
@@ -3506,9 +5791,14 @@
     break;
 
   case 68:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1451 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1452 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (4)].sval)), SYMTAB((yysemantic_stack_[(6) - (6)].sval)), NULL);
 
@@ -3517,9 +5807,14 @@
     break;
 
   case 69:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1458 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1459 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)),
                             SYMTAB((yysemantic_stack_[(5) - (3)].sval)),
@@ -3530,9 +5825,14 @@
     break;
 
   case 70:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1467 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1468 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)),
                             SYMTAB((yysemantic_stack_[(8) - (4)].sval)),
@@ -3544,18 +5844,28 @@
     break;
 
   case 71:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1480 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1481 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new NamespaceDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(5) - (3)].sval)), SYMTAB((yysemantic_stack_[(5) - (5)].sval)) );
     }
     break;
 
   case 72:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1488 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1489 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_element_default,
@@ -3564,9 +5874,14 @@
     break;
 
   case 73:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1495 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1496 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_function_default,
@@ -3575,9 +5890,14 @@
     break;
 
   case 74:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1505 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1506 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       VFO_DeclList *vdl = new VFO_DeclList( LOC((yyloc)));
       vdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -3586,9 +5906,14 @@
     break;
 
   case 75:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1512 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1513 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       ((VFO_DeclList*)(yysemantic_stack_[(3) - (1)].node))->push_back( (yysemantic_stack_[(3) - (3)].node) );
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -3596,9 +5921,14 @@
     break;
 
   case 76:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1519 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1520 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
       (yylocation_stack_[(3) - (1)]).step();
@@ -3608,9 +5938,14 @@
     break;
 
   case 85:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1542 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1543 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new DecimalFormatNode(LOC((yyloc)), (yysemantic_stack_[(4) - (4)].vstrpair));
       delete (yysemantic_stack_[(4) - (4)].vstrpair);
@@ -3618,9 +5953,14 @@
     break;
 
   case 86:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1548 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1549 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (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);
@@ -3628,9 +5968,14 @@
     break;
 
   case 87:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1557 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1558 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.vstrpair) = new vector<string_pair_t>();
       (yyval.vstrpair)->push_back( *(yysemantic_stack_[(1) - (1)].strpair) );
@@ -3639,9 +5984,14 @@
     break;
 
   case 88:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1564 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1565 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yysemantic_stack_[(2) - (1)].vstrpair)->push_back( *(yysemantic_stack_[(2) - (2)].strpair) );
       delete (yysemantic_stack_[(2) - (2)].strpair);
@@ -3650,9 +6000,14 @@
     break;
 
   case 89:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1574 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1575 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       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() );
@@ -3661,106 +6016,176 @@
     break;
 
   case 90:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1583 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1584 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "decimal-separator"; }
     break;
 
   case 91:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1584 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1585 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "digit"; }
     break;
 
   case 92:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1585 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1586 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "grouping-separator"; }
     break;
 
   case 93:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1586 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1587 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "infinty"; }
     break;
 
   case 94:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1587 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1588 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "minus-sign"; }
     break;
 
   case 95:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1588 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1589 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "NaN"; }
     break;
 
   case 96:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1589 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1590 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "pattern-separator"; }
     break;
 
   case 97:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1590 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1591 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "percent"; }
     break;
 
   case 98:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1591 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1592 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "per-mille"; }
     break;
 
   case 99:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1592 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1593 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "zero-digit"; }
     break;
 
   case 100:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1598 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1599 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new OptionDecl(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)));
     }
     break;
 
   case 101:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1606 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1607 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new FTOptionDecl( LOC((yyloc)), dynamic_cast<FTMatchOptions*>((yysemantic_stack_[(3) - (3)].node)) );
     }
     break;
 
   case 102:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1614 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1615 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(4) - (4)].node);
     }
     break;
 
   case 103:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1622 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1623 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(3) - (3)].node));
       d->theType = (yysemantic_stack_[(3) - (2)].node);
@@ -3769,18 +6194,28 @@
     break;
 
   case 104:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1629 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1630 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
     break;
 
   case 105:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1637 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1638 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(1) - (1)].node));
       d->theIsExternal = false;
@@ -3789,36 +6224,56 @@
     break;
 
   case 106:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1644 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1645 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CtxItemDecl(LOC((yyloc)), NULL);
     }
     break;
 
   case 107:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1649 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1650 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
     }
     break;
 
   case 108:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1657 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1658 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CtxItemDecl(LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
     }
     break;
 
   case 109:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1665 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1666 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(4) - (2)].varnametype)));
 
@@ -3834,9 +6289,14 @@
     break;
 
   case 110:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1679 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1680 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(3) - (2)].varnametype)));
 
@@ -3852,9 +6312,14 @@
     break;
 
   case 111:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1693 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1694 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(5) - (2)].varnametype)));
 
@@ -3870,18 +6335,28 @@
     break;
 
   case 112:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1710 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1711 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL, NULL);
     }
     break;
 
   case 113:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1715 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1716 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)),
@@ -3891,9 +6366,14 @@
     break;
 
   case 114:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1723 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1724 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
@@ -3903,9 +6383,14 @@
     break;
 
   case 115:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1731 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1732 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(5) - (4)].expr)),
@@ -3915,18 +6400,28 @@
     break;
 
   case 116:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1742 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1743 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AnnotationListParsenode(LOC((yyloc)), static_cast<AnnotationParsenode*>((yysemantic_stack_[(1) - (1)].node)));
     }
     break;
 
   case 117:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1747 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1748 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       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);
@@ -3934,18 +6429,28 @@
     break;
 
   case 118:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1756 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1757 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))), NULL);
     }
     break;
 
   case 119:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1761 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1762 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
                                    new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval))),
@@ -3954,18 +6459,28 @@
     break;
 
   case 120:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1768 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1769 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), true), NULL);
     }
     break;
 
   case 121:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1773 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1774 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
                                    new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval)), true),
@@ -3974,18 +6489,28 @@
     break;
 
   case 122:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1783 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1784 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AnnotationLiteralListParsenode(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr));
     }
     break;
 
   case 123:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1788 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1789 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       static_cast<AnnotationLiteralListParsenode*>((yysemantic_stack_[(3) - (1)].node))->push_back((yysemantic_stack_[(3) - (3)].expr));
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -3993,9 +6518,14 @@
     break;
 
   case 124:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1797 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1798 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       static_cast<FunctionDecl*>((yysemantic_stack_[(2) - (2)].node))->setComment( SYMTAB((yysemantic_stack_[(2) - (1)].sval)) );
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
@@ -4003,9 +6533,14 @@
     break;
 
   case 125:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1803 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1804 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       FunctionDecl* fdecl = static_cast<FunctionDecl*>((yysemantic_stack_[(3) - (3)].node));
 
@@ -4017,27 +6552,42 @@
     break;
 
   case 126:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1816 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1817 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
     break;
 
   case 127:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1821 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1822 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
     break;
 
   case 128:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1829 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1830 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new FunctionDecl(LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4051,9 +6601,14 @@
     break;
 
   case 129:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1840 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1841 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new FunctionDecl(LOC ((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4067,9 +6622,14 @@
     break;
 
   case 130:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1855 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1856 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new FunctionDecl(LOC ((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4083,9 +6643,14 @@
     break;
 
   case 131:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1867 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1868 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new FunctionDecl(LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4099,45 +6664,70 @@
     break;
 
   case 132:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1882 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1883 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.fnsig) = new FunctionSig(NULL);
     }
     break;
 
   case 133:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1887 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1888 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(3) - (2)].node)));
     }
     break;
 
   case 134:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1892 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1893 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.fnsig) = new FunctionSig(NULL, dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node)));
     }
     break;
 
   case 135:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1897 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1898 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(5) - (2)].node)), dynamic_cast<SequenceType*>((yysemantic_stack_[(5) - (5)].node)));
     }
     break;
 
   case 136:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1905 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1906 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       ParamList *pl = new ParamList( LOC((yyloc)) );
       pl->push_back( dynamic_cast<Param*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -4146,9 +6736,14 @@
     break;
 
   case 137:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1912 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1913 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       if ( ParamList *pl = dynamic_cast<ParamList*>((yysemantic_stack_[(3) - (1)].node)) )
         pl->push_back( dynamic_cast<Param*>((yysemantic_stack_[(3) - (3)].node)) );
@@ -4158,18 +6753,28 @@
     break;
 
   case 138:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1923 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1924 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new Param(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL);
     }
     break;
 
   case 139:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1928 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1929 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new Param(LOC((yyloc)),
                      static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4178,9 +6783,14 @@
     break;
 
   case 140:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1938 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1939 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)),
@@ -4190,9 +6800,14 @@
     break;
 
   case 141:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1945 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1946 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4202,9 +6817,14 @@
     break;
 
   case 142:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1952 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1953 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                                static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
@@ -4214,9 +6834,14 @@
     break;
 
   case 143:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1959 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1960 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                                static_cast<QName*>((yysemantic_stack_[(6) - (4)].expr)),
@@ -4226,18 +6851,28 @@
     break;
 
   case 144:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1969 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1970 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
     }
     break;
 
   case 145:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1973 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1974 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
                                                     (yysemantic_stack_[(2) - (1)].node),
@@ -4246,18 +6881,28 @@
     break;
 
   case 146:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1979 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1980 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
     }
     break;
 
   case 147:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1983 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1984 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
                                                     (yysemantic_stack_[(2) - (1)].node),
@@ -4267,9 +6912,14 @@
     break;
 
   case 148:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 1993 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 1994 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AST_IndexDecl(LOC((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(8) - (3)].expr)),
@@ -4280,9 +6930,14 @@
     break;
 
   case 149:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2001 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2002 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AST_IndexDecl(LOC((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(9) - (4)].expr)),
@@ -4293,9 +6948,14 @@
     break;
 
   case 150:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2012 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2013 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       IndexKeyList* keyList = new IndexKeyList(LOC((yyloc)));
       keyList->addKeySpec(dynamic_cast<IndexKeySpec*>((yysemantic_stack_[(1) - (1)].node)));
@@ -4304,9 +6964,14 @@
     break;
 
   case 151:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2018 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2019 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       dynamic_cast<IndexKeyList*>((yysemantic_stack_[(3) - (1)].node))->addKeySpec(dynamic_cast<IndexKeySpec*>((yysemantic_stack_[(3) - (3)].node)));
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -4314,18 +6979,28 @@
     break;
 
   case 152:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2027 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2028 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL, NULL);
     }
     break;
 
   case 153:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2032 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2033 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -4335,9 +7010,14 @@
     break;
 
   case 154:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2039 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2040 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -4347,9 +7027,14 @@
     break;
 
   case 155:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2046 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2047 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(3) - (1)].expr),
@@ -4359,9 +7044,14 @@
     break;
 
   case 156:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2058 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2059 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ICCollSimpleCheck(LOC((yyloc)),
                                  static_cast<QName*>((yysemantic_stack_[(11) - (4)].expr)),
@@ -4372,9 +7062,14 @@
     break;
 
   case 157:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2068 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2069 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ICCollUniqueKeyCheck(LOC((yyloc)),
                                     static_cast<QName*>((yysemantic_stack_[(14) - (4)].expr)),
@@ -4385,9 +7080,14 @@
     break;
 
   case 158:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2078 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2079 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ICCollForeachNode(LOC((yyloc)),
                                  static_cast<QName*>((yysemantic_stack_[(13) - (4)].expr)),
@@ -4398,9 +7098,14 @@
     break;
 
   case 159:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2089 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2090 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ICForeignKey( LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(22) - (4)].expr)),
@@ -4414,9 +7119,14 @@
     break;
 
   case 160:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2105 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2106 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       if ((yysemantic_stack_[(1) - (1)].expr) == NULL)
       {
@@ -4435,72 +7145,112 @@
     break;
 
   case 161:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2125 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2126 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 162:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2129 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2130 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 163:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2133 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2134 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) =  NULL;
     }
     break;
 
   case 164:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2141 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2142 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 165:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2145 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2146 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 166:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2149 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2150 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) =  new BlockBody(LOC((yyloc)));
     }
     break;
 
   case 167:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2157 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2158 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 168:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2162 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2163 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
 
@@ -4511,9 +7261,14 @@
     break;
 
   case 169:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2174 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2175 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       BlockBody* blk = new BlockBody(LOC((yyloc)));
       blk->add((yysemantic_stack_[(1) - (1)].expr));
@@ -4522,9 +7277,14 @@
     break;
 
   case 170:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2181 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2182 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
 
@@ -4535,27 +7295,42 @@
     break;
 
   case 183:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2210 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2211 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
     break;
 
   case 184:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2215 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2216 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new BlockBody(LOC((yyloc)));
     }
     break;
 
   case 185:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2223 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2224 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       if (dynamic_cast<BlockBody*>((yysemantic_stack_[(3) - (2)].expr)) == NULL)
       {
@@ -4571,27 +7346,42 @@
     break;
 
   case 186:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2240 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2241 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
     break;
 
   case 187:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2248 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2249 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(2) - (1)].expr);
     }
     break;
 
   case 188:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2256 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2257 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       VarDeclStmt* vdecl = static_cast<VarDeclStmt*>((yysemantic_stack_[(3) - (1)].expr));
       vdecl->add((yysemantic_stack_[(3) - (3)].node));
@@ -4600,9 +7390,14 @@
     break;
 
   case 189:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2263 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2264 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)), NULL);
       vdecl->add((yysemantic_stack_[(2) - (2)].node));
@@ -4611,9 +7406,14 @@
     break;
 
   case 190:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2270 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2271 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)),
                                            static_cast<AnnotationListParsenode*>((yysemantic_stack_[(3) - (1)].node)));
@@ -4623,9 +7423,14 @@
     break;
 
   case 191:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2281 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2282 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)),
@@ -4637,9 +7442,14 @@
     break;
 
   case 192:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2290 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2291 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4651,9 +7461,14 @@
     break;
 
   case 193:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2299 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2300 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4665,9 +7480,14 @@
     break;
 
   case 194:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2308 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2309 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -4679,36 +7499,56 @@
     break;
 
   case 195:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2321 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2322 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new AssignExpr(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)), (yysemantic_stack_[(5) - (4)].expr));
     }
     break;
 
   case 196:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2329 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2330 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new ApplyExpr(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr));
     }
     break;
 
   case 197:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2337 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2338 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new ExitExpr(LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr));
     }
     break;
 
   case 198:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2345 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2346 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       BlockBody* bb = dynamic_cast<BlockBody *>((yysemantic_stack_[(5) - (5)].expr));
       if (bb == NULL)
@@ -4722,27 +7562,42 @@
     break;
 
   case 199:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2360 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2361 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new FlowCtlStatement(LOC((yyloc)), FlowCtlStatement::BREAK);
     }
     break;
 
   case 200:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2365 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2366 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new FlowCtlStatement( LOC((yyloc)), FlowCtlStatement::CONTINUE );
     }
     break;
 
   case 201:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2373 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2374 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       ReturnExpr* re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
       (yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4755,9 +7610,14 @@
     break;
 
   case 202:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2387 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2388 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       exprnode* retExpr = (yysemantic_stack_[(2) - (2)].expr);
 
@@ -4773,9 +7633,14 @@
     break;
 
   case 203:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2404 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2405 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       exprnode* thenExpr = (yysemantic_stack_[(8) - (6)].expr);
       exprnode* elseExpr = (yysemantic_stack_[(8) - (8)].expr);
@@ -4799,18 +7664,28 @@
     break;
 
   case 204:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2429 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2430 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new TryExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), (yysemantic_stack_[(3) - (3)].expr));
     }
     break;
 
   case 205:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2437 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2438 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CatchListExpr* cle = new CatchListExpr( LOC((yyloc)) );
       cle->push_back( static_cast<CatchExpr*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -4819,9 +7694,14 @@
     break;
 
   case 206:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2444 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2445 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
       if ( cle )
@@ -4831,9 +7711,14 @@
     break;
 
   case 207:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2455 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2456 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
        (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);
@@ -4841,18 +7726,28 @@
     break;
 
   case 208:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2465 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2466 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 209:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2470 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2471 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       Expr* expr = dynamic_cast<Expr*>((yysemantic_stack_[(3) - (1)].expr));
       if ( !expr )
@@ -4865,6 +7760,7 @@
     }
     break;
 
+<<<<<<< TREE
   case 210:
 
 /* Line 678 of lalr1.cc  */
@@ -4895,6 +7791,11 @@
 
 /* Line 678 of lalr1.cc  */
 #line 2532 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 228:
+/* Line 661 of lalr1.cc  */
+#line 2516 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       ReturnExpr *re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
       (yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4906,64 +7807,106 @@
     }
     break;
 
+<<<<<<< TREE
   case 231:
 
 /* Line 678 of lalr1.cc  */
 #line 2546 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 229:
+/* Line 661 of lalr1.cc  */
+#line 2530 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new ReturnExpr( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr) );
     }
     break;
 
+<<<<<<< TREE
   case 232:
 
 /* Line 678 of lalr1.cc  */
 #line 2554 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 230:
+/* Line 661 of lalr1.cc  */
+#line 2538 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.strval) = parser::the_sliding;
     }
     break;
 
+<<<<<<< TREE
   case 233:
 
 /* Line 678 of lalr1.cc  */
 #line 2559 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 231:
+/* Line 661 of lalr1.cc  */
+#line 2543 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.strval) = parser::the_tumbling;
     }
     break;
 
+<<<<<<< TREE
   case 234:
 
 /* Line 678 of lalr1.cc  */
 #line 2567 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 232:
+/* Line 661 of lalr1.cc  */
+#line 2551 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.strval) = parser::the_start;
     }
     break;
 
+<<<<<<< TREE
   case 235:
 
 /* Line 678 of lalr1.cc  */
 #line 2572 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 233:
+/* Line 661 of lalr1.cc  */
+#line 2556 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.strval) = parser::the_end;
     }
     break;
 
+<<<<<<< TREE
   case 236:
 
 /* Line 678 of lalr1.cc  */
 #line 2577 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 234:
+/* Line 661 of lalr1.cc  */
+#line 2561 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
     (yyval.strval) = parser::the_only_end;
   }
     break;
 
+<<<<<<< TREE
   case 237:
 
 /* Line 678 of lalr1.cc  */
 #line 2585 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 235:
+/* Line 661 of lalr1.cc  */
+#line 2569 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new FLWORWinCond(LOC((yyloc)),
                             dynamic_cast<WindowVars*>((yysemantic_stack_[(4) - (2)].node)),
@@ -4973,10 +7916,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 238:
 
 /* Line 678 of lalr1.cc  */
 #line 2594 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 236:
+/* Line 661 of lalr1.cc  */
+#line 2578 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new FLWORWinCond(LOC((yyloc)),
                             NULL,
@@ -4986,10 +7935,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 239:
 
 /* Line 678 of lalr1.cc  */
 #line 2606 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 237:
+/* Line 661 of lalr1.cc  */
+#line 2590 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WindowClause (LOC ((yyloc)),
                              ((yysemantic_stack_[(5) - (2)].strval) == parser::the_tumbling ?
@@ -5001,10 +7956,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 240:
 
 /* Line 678 of lalr1.cc  */
 #line 2616 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 238:
+/* Line 661 of lalr1.cc  */
+#line 2600 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WindowClause (LOC ((yyloc)),
                              ((yysemantic_stack_[(4) - (2)].strval) == parser::the_tumbling ?
@@ -5015,19 +7976,31 @@
     }
     break;
 
+<<<<<<< TREE
   case 241:
 
 /* Line 678 of lalr1.cc  */
 #line 2629 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 239:
+/* Line 661 of lalr1.cc  */
+#line 2613 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CountClause(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
     break;
 
+<<<<<<< TREE
   case 250:
 
 /* Line 678 of lalr1.cc  */
 #line 2653 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 248:
+/* Line 661 of lalr1.cc  */
+#line 2637 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       FLWORClauseList *fcl = new FLWORClauseList( LOC((yyloc)) );
       fcl->push_back( dynamic_cast<FLWORClause*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5035,10 +8008,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 251:
 
 /* Line 678 of lalr1.cc  */
 #line 2660 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 249:
+/* Line 661 of lalr1.cc  */
+#line 2644 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       FLWORClauseList *fcl = dynamic_cast<FLWORClauseList*>((yysemantic_stack_[(2) - (1)].node));
       fcl->push_back( dynamic_cast<FLWORClause*>((yysemantic_stack_[(2) - (2)].node)) );
@@ -5046,19 +8025,31 @@
     }
     break;
 
+<<<<<<< TREE
   case 252:
 
 /* Line 678 of lalr1.cc  */
 #line 2670 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 250:
+/* Line 661 of lalr1.cc  */
+#line 2654 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ForClause(LOC((yyloc)), dynamic_cast<VarInDeclList*>((yysemantic_stack_[(3) - (3)].node)));
     }
     break;
 
+<<<<<<< TREE
   case 253:
 
 /* Line 678 of lalr1.cc  */
 #line 2676 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 251:
+/* Line 661 of lalr1.cc  */
+#line 2660 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
       error((yylocation_stack_[(3) - (2)]), "syntax error, unexpected QName \""
@@ -5068,10 +8059,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 254:
 
 /* Line 678 of lalr1.cc  */
 #line 2685 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 252:
+/* Line 661 of lalr1.cc  */
+#line 2669 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (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
@@ -5079,10 +8076,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 255:
 
 /* Line 678 of lalr1.cc  */
 #line 2695 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 253:
+/* Line 661 of lalr1.cc  */
+#line 2679 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       VarInDeclList* vdl = new VarInDeclList( LOC((yyloc)) );
       vdl->push_back( dynamic_cast<VarInDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5090,10 +8093,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 256:
 
 /* Line 678 of lalr1.cc  */
 #line 2702 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 254:
+/* Line 661 of lalr1.cc  */
+#line 2686 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       if ( VarInDeclList* vdl = dynamic_cast<VarInDeclList*>((yysemantic_stack_[(4) - (1)].node)) )
         vdl->push_back( dynamic_cast<VarInDecl*>((yysemantic_stack_[(4) - (4)].node)) );
@@ -5101,10 +8110,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 257:
 
 /* Line 678 of lalr1.cc  */
 #line 2710 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 255:
+/* Line 661 of lalr1.cc  */
+#line 2694 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); // to prevent the Bison warning
       error((yylocation_stack_[(3) - (3)]), "syntax error, unexpected QName \""
@@ -5114,10 +8129,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 258:
 
 /* Line 678 of lalr1.cc  */
 #line 2722 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 256:
+/* Line 661 of lalr1.cc  */
+#line 2706 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)),
@@ -5129,10 +8150,46 @@
     }
     break;
 
+<<<<<<< TREE
+=======
+  case 257:
+/* Line 661 of lalr1.cc  */
+#line 2716 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.node) = new VarInDecl(LOC((yyloc)),
+                         static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
+                         NULL,
+                         NULL,
+                         NULL,
+                         (yysemantic_stack_[(5) - (5)].expr),
+                         true);
+    }
+    break;
+
+  case 258:
+/* Line 661 of lalr1.cc  */
+#line 2726 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.node) = new VarInDecl(LOC((yyloc)),
+                         static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
+                         dynamic_cast<SequenceType *>((yysemantic_stack_[(4) - (2)].node)),
+                         NULL,
+                         NULL,
+                         (yysemantic_stack_[(4) - (4)].expr),
+                         false);
+    }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 259:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2732 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2736 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5145,6 +8202,7 @@
     break;
 
   case 260:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 2742 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -5178,6 +8236,10 @@
 
 /* Line 678 of lalr1.cc  */
 #line 2762 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 2746 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5189,10 +8251,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 263:
 
 /* Line 678 of lalr1.cc  */
 #line 2772 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 261:
+/* Line 661 of lalr1.cc  */
+#line 2756 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5204,10 +8272,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 264:
 
 /* Line 678 of lalr1.cc  */
 #line 2782 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 262:
+/* Line 661 of lalr1.cc  */
+#line 2766 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5219,10 +8293,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 265:
 
 /* Line 678 of lalr1.cc  */
 #line 2792 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 263:
+/* Line 661 of lalr1.cc  */
+#line 2776 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(7) - (1)].expr)),
@@ -5234,10 +8314,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 266:
 
 /* Line 678 of lalr1.cc  */
 #line 2803 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 264:
+/* Line 661 of lalr1.cc  */
+#line 2787 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5248,10 +8334,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 267:
 
 /* Line 678 of lalr1.cc  */
 #line 2812 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 265:
+/* Line 661 of lalr1.cc  */
+#line 2796 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5263,10 +8355,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 268:
 
 /* Line 678 of lalr1.cc  */
 #line 2822 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 266:
+/* Line 661 of lalr1.cc  */
+#line 2806 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC ((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5278,10 +8376,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 269:
 
 /* Line 678 of lalr1.cc  */
 #line 2832 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 267:
+/* Line 661 of lalr1.cc  */
+#line 2816 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC ((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5293,37 +8397,61 @@
     }
     break;
 
+<<<<<<< TREE
   case 270:
 
 /* Line 678 of lalr1.cc  */
 #line 2848 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 268:
+/* Line 661 of lalr1.cc  */
+#line 2832 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new PositionalVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
     break;
 
+<<<<<<< TREE
   case 271:
 
 /* Line 678 of lalr1.cc  */
 #line 2857 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 269:
+/* Line 661 of lalr1.cc  */
+#line 2841 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new FTScoreVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
     break;
 
+<<<<<<< TREE
   case 272:
 
 /* Line 678 of lalr1.cc  */
 #line 2866 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 270:
+/* Line 661 of lalr1.cc  */
+#line 2850 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new LetClause( LOC((yyloc)), dynamic_cast<VarGetsDeclList*>((yysemantic_stack_[(2) - (2)].node)) );
         }
     break;
 
+<<<<<<< TREE
   case 273:
 
 /* Line 678 of lalr1.cc  */
 #line 2874 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 271:
+/* Line 661 of lalr1.cc  */
+#line 2858 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             VarGetsDeclList *vgdl = new VarGetsDeclList( LOC((yyloc)) );
             vgdl->push_back( dynamic_cast<VarGetsDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5331,10 +8459,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 274:
 
 /* Line 678 of lalr1.cc  */
 #line 2880 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 272:
+/* Line 661 of lalr1.cc  */
+#line 2864 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             if( VarGetsDeclList *vgdl = dynamic_cast<VarGetsDeclList*>((yysemantic_stack_[(3) - (1)].node)) )
                 vgdl->push_back( dynamic_cast<VarGetsDecl*>((yysemantic_stack_[(3) - (3)].node)) );
@@ -5342,10 +8476,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 275:
 
 /* Line 678 of lalr1.cc  */
 #line 2892 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 273:
+/* Line 661 of lalr1.cc  */
+#line 2876 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -5355,10 +8495,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 276:
 
 /* Line 678 of lalr1.cc  */
 #line 2900 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 274:
+/* Line 661 of lalr1.cc  */
+#line 2884 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5368,10 +8514,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 277:
 
 /* Line 678 of lalr1.cc  */
 #line 2910 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 275:
+/* Line 661 of lalr1.cc  */
+#line 2894 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            dynamic_cast<FTScoreVar*>((yysemantic_stack_[(3) - (1)].node))->get_var_name(),
@@ -5381,10 +8533,16 @@
      }
     break;
 
+<<<<<<< TREE
   case 278:
 
 /* Line 678 of lalr1.cc  */
 #line 2918 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 276:
+/* Line 661 of lalr1.cc  */
+#line 2902 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -5394,10 +8552,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 279:
 
 /* Line 678 of lalr1.cc  */
 #line 2930 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 277:
+/* Line 661 of lalr1.cc  */
+#line 2914 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WindowVarDecl(LOC ((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -5405,10 +8569,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 280:
 
 /* Line 678 of lalr1.cc  */
 #line 2936 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 278:
+/* Line 661 of lalr1.cc  */
+#line 2920 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WindowVarDecl(LOC ((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5417,93 +8587,153 @@
     }
     break;
 
+<<<<<<< TREE
   case 282:
 
 /* Line 678 of lalr1.cc  */
 #line 2949 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 280:
+/* Line 661 of lalr1.cc  */
+#line 2933 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL, NULL);
     }
     break;
 
+<<<<<<< TREE
   case 283:
 
 /* Line 678 of lalr1.cc  */
 #line 2953 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 281:
+/* Line 661 of lalr1.cc  */
+#line 2937 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       dynamic_cast<WindowVars *>((yyval.node))->set_curr(static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)));
     }
     break;
 
+<<<<<<< TREE
   case 284:
 
 /* Line 678 of lalr1.cc  */
 #line 2961 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 282:
+/* Line 661 of lalr1.cc  */
+#line 2945 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), dynamic_cast<PositionalVar*>((yysemantic_stack_[(1) - (1)].node)), NULL, NULL, NULL);
     }
     break;
 
+<<<<<<< TREE
   case 285:
 
 /* Line 678 of lalr1.cc  */
 #line 2965 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 283:
+/* Line 661 of lalr1.cc  */
+#line 2949 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       dynamic_cast<WindowVars *>((yyval.node))->set_posvar(dynamic_cast<PositionalVar*>((yysemantic_stack_[(2) - (1)].node)));
     }
     break;
 
+<<<<<<< TREE
   case 287:
 
 /* Line 678 of lalr1.cc  */
 #line 2974 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 285:
+/* Line 661 of lalr1.cc  */
+#line 2958 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)), static_cast<QName*>((yysemantic_stack_[(6) - (6)].expr)));
     }
     break;
 
+<<<<<<< TREE
   case 288:
 
 /* Line 678 of lalr1.cc  */
 #line 2978 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 286:
+/* Line 661 of lalr1.cc  */
+#line 2962 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, NULL, static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
     break;
 
+<<<<<<< TREE
   case 289:
 
 /* Line 678 of lalr1.cc  */
 #line 2982 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 287:
+/* Line 661 of lalr1.cc  */
+#line 2966 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL);
     }
     break;
 
+<<<<<<< TREE
   case 290:
 
 /* Line 678 of lalr1.cc  */
 #line 2992 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 288:
+/* Line 661 of lalr1.cc  */
+#line 2976 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WhereClause(LOC ((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
     }
     break;
 
+<<<<<<< TREE
   case 291:
 
 /* Line 678 of lalr1.cc  */
 #line 3000 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 289:
+/* Line 661 of lalr1.cc  */
+#line 2984 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new GroupByClause(LOC((yyloc)), dynamic_cast<GroupSpecList*>((yysemantic_stack_[(3) - (3)].node)));
     }
     break;
 
+<<<<<<< TREE
   case 292:
 
 /* Line 678 of lalr1.cc  */
 #line 3007 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 290:
+/* Line 661 of lalr1.cc  */
+#line 2991 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       GroupSpecList* gsl = new GroupSpecList(LOC((yyloc)));
       gsl->push_back(static_cast<GroupSpec*>((yysemantic_stack_[(1) - (1)].node)));
@@ -5511,10 +8741,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 293:
 
 /* Line 678 of lalr1.cc  */
 #line 3013 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 291:
+/* Line 661 of lalr1.cc  */
+#line 2997 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       GroupSpecList* gsl = static_cast<GroupSpecList*>((yysemantic_stack_[(3) - (1)].node));
       gsl->push_back(static_cast<GroupSpec*>((yysemantic_stack_[(3) - (3)].node)));
@@ -5522,28 +8758,46 @@
     }
     break;
 
+<<<<<<< TREE
   case 294:
 
 /* Line 678 of lalr1.cc  */
 #line 3023 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 292:
+/* Line 661 of lalr1.cc  */
+#line 3007 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL, NULL, NULL);
     }
     break;
 
+<<<<<<< TREE
   case 295:
 
 /* Line 678 of lalr1.cc  */
 #line 3027 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 293:
+/* Line 661 of lalr1.cc  */
+#line 3011 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)), NULL, (yysemantic_stack_[(4) - (4)].expr), NULL);
     }
     break;
 
+<<<<<<< TREE
   case 296:
 
 /* Line 678 of lalr1.cc  */
 #line 3031 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 294:
+/* Line 661 of lalr1.cc  */
+#line 3015 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5553,10 +8807,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 297:
 
 /* Line 678 of lalr1.cc  */
 #line 3039 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 295:
+/* Line 661 of lalr1.cc  */
+#line 3023 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -5566,10 +8826,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 298:
 
 /* Line 678 of lalr1.cc  */
 #line 3047 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 296:
+/* Line 661 of lalr1.cc  */
+#line 3031 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5579,10 +8845,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 299:
 
 /* Line 678 of lalr1.cc  */
 #line 3055 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 297:
+/* Line 661 of lalr1.cc  */
+#line 3039 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -5592,19 +8864,31 @@
     }
     break;
 
+<<<<<<< TREE
   case 300:
 
 /* Line 678 of lalr1.cc  */
 #line 3067 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 298:
+/* Line 661 of lalr1.cc  */
+#line 3051 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new GroupCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
     }
     break;
 
+<<<<<<< TREE
   case 301:
 
 /* Line 678 of lalr1.cc  */
 #line 3075 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 299:
+/* Line 661 of lalr1.cc  */
+#line 3059 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderByClause(
                 LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(3) - (3)].node))
@@ -5612,10 +8896,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 302:
 
 /* Line 678 of lalr1.cc  */
 #line 3081 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 300:
+/* Line 661 of lalr1.cc  */
+#line 3065 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderByClause(
                 LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(4) - (4)].node)), true
@@ -5623,10 +8913,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 303:
 
 /* Line 678 of lalr1.cc  */
 #line 3091 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 301:
+/* Line 661 of lalr1.cc  */
+#line 3075 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             OrderSpecList *osl = new OrderSpecList( LOC((yyloc)) );
             osl->push_back( dynamic_cast<OrderSpec*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5634,10 +8930,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 304:
 
 /* Line 678 of lalr1.cc  */
 #line 3097 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 302:
+/* Line 661 of lalr1.cc  */
+#line 3081 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             if ( OrderSpecList* osl = dynamic_cast<OrderSpecList*>((yysemantic_stack_[(3) - (1)].node)) )
                 osl->push_back( dynamic_cast<OrderSpec*>((yysemantic_stack_[(3) - (3)].node)) );
@@ -5645,19 +8947,31 @@
         }
     break;
 
+<<<<<<< TREE
   case 305:
 
 /* Line 678 of lalr1.cc  */
 #line 3107 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 303:
+/* Line 661 of lalr1.cc  */
+#line 3091 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderSpec( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL );
         }
     break;
 
+<<<<<<< TREE
   case 306:
 
 /* Line 678 of lalr1.cc  */
 #line 3111 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 304:
+/* Line 661 of lalr1.cc  */
+#line 3095 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderSpec(
                 LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr), dynamic_cast<OrderModifierPN*>((yysemantic_stack_[(2) - (2)].node))
@@ -5665,10 +8979,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 307:
 
 /* Line 678 of lalr1.cc  */
 #line 3121 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 305:
+/* Line 661 of lalr1.cc  */
+#line 3105 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), dynamic_cast<OrderDirSpec*>((yysemantic_stack_[(1) - (1)].node)), NULL, NULL
@@ -5676,10 +8996,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 308:
 
 /* Line 678 of lalr1.cc  */
 #line 3127 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 306:
+/* Line 661 of lalr1.cc  */
+#line 3111 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), NULL, dynamic_cast<OrderEmptySpec*>((yysemantic_stack_[(1) - (1)].node)), NULL
@@ -5687,10 +9013,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 309:
 
 /* Line 678 of lalr1.cc  */
 #line 3133 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 307:
+/* Line 661 of lalr1.cc  */
+#line 3117 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), NULL, NULL, dynamic_cast<OrderCollationSpec*>((yysemantic_stack_[(1) - (1)].node))
@@ -5698,10 +9030,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 310:
 
 /* Line 678 of lalr1.cc  */
 #line 3139 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 308:
+/* Line 661 of lalr1.cc  */
+#line 3123 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5712,10 +9050,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 311:
 
 /* Line 678 of lalr1.cc  */
 #line 3148 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 309:
+/* Line 661 of lalr1.cc  */
+#line 3132 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5726,10 +9070,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 312:
 
 /* Line 678 of lalr1.cc  */
 #line 3157 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 310:
+/* Line 661 of lalr1.cc  */
+#line 3141 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5740,10 +9090,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 313:
 
 /* Line 678 of lalr1.cc  */
 #line 3166 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 311:
+/* Line 661 of lalr1.cc  */
+#line 3150 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5754,28 +9110,46 @@
         }
     break;
 
+<<<<<<< TREE
   case 314:
 
 /* Line 678 of lalr1.cc  */
 #line 3179 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 312:
+/* Line 661 of lalr1.cc  */
+#line 3163 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_ascending );
         }
     break;
 
+<<<<<<< TREE
   case 315:
 
 /* Line 678 of lalr1.cc  */
 #line 3183 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 313:
+/* Line 661 of lalr1.cc  */
+#line 3167 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_descending );
         }
     break;
 
+<<<<<<< TREE
   case 316:
 
 /* Line 678 of lalr1.cc  */
 #line 3191 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 314:
+/* Line 661 of lalr1.cc  */
+#line 3175 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderEmptySpec(
                 LOC((yyloc)), StaticContextConsts::empty_greatest
@@ -5783,10 +9157,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 317:
 
 /* Line 678 of lalr1.cc  */
 #line 3197 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 315:
+/* Line 661 of lalr1.cc  */
+#line 3181 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderEmptySpec(
                 LOC((yyloc)), StaticContextConsts::empty_least
@@ -5794,19 +9174,31 @@
         }
     break;
 
+<<<<<<< TREE
   case 318:
 
 /* Line 678 of lalr1.cc  */
 #line 3207 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 316:
+/* Line 661 of lalr1.cc  */
+#line 3191 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
         }
     break;
 
+<<<<<<< TREE
   case 319:
 
 /* Line 678 of lalr1.cc  */
 #line 3215 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 317:
+/* Line 661 of lalr1.cc  */
+#line 3199 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new QuantifiedExpr(
                 LOC((yyloc)),
@@ -5817,10 +9209,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 320:
 
 /* Line 678 of lalr1.cc  */
 #line 3224 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 318:
+/* Line 661 of lalr1.cc  */
+#line 3208 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new QuantifiedExpr(
                 LOC((yyloc)),
@@ -5831,10 +9229,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 321:
 
 /* Line 678 of lalr1.cc  */
 #line 3237 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 319:
+/* Line 661 of lalr1.cc  */
+#line 3221 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       QVarInDeclList *qvidl = new QVarInDeclList( LOC((yyloc)) );
       qvidl->push_back( dynamic_cast<QVarInDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5843,10 +9247,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 322:
 
 /* Line 678 of lalr1.cc  */
 #line 3244 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 320:
+/* Line 661 of lalr1.cc  */
+#line 3228 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       QVarInDeclList *qvidl = dynamic_cast<QVarInDeclList*>((yysemantic_stack_[(4) - (1)].node));
       qvidl->push_back( dynamic_cast<QVarInDecl*>((yysemantic_stack_[(4) - (4)].node)) );
@@ -5854,19 +9264,31 @@
     }
     break;
 
+<<<<<<< TREE
   case 323:
 
 /* Line 678 of lalr1.cc  */
 #line 3256 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 321:
+/* Line 661 of lalr1.cc  */
+#line 3240 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new QVarInDecl(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), (yysemantic_stack_[(3) - (3)].expr));
     }
     break;
 
+<<<<<<< TREE
   case 324:
 
 /* Line 678 of lalr1.cc  */
 #line 3260 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 322:
+/* Line 661 of lalr1.cc  */
+#line 3244 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new QVarInDecl(LOC((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5875,19 +9297,50 @@
     }
     break;
 
+<<<<<<< TREE
+=======
+  case 323:
+/* Line 661 of lalr1.cc  */
+#line 3256 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_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));
+    }
+    break;
+
+  case 324:
+/* Line 661 of lalr1.cc  */
+#line 3263 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+      SwitchCaseClauseList* scc_list_p = new SwitchCaseClauseList(LOC((yyloc)));
+      scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(1) - (1)].node)));
+      (yyval.node) = scc_list_p;
+    }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 325:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3272 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3269 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new SwitchExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(8) - (5)].node)), (yysemantic_stack_[(8) - (8)].expr));
     }
     break;
 
   case 326:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3279 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3278 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       SwitchCaseClauseList* scc_list_p = new SwitchCaseClauseList(LOC((yyloc)));
       scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(1) - (1)].node)));
@@ -5896,6 +9349,7 @@
     break;
 
   case 327:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3285 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -5919,6 +9373,10 @@
 
 /* Line 678 of lalr1.cc  */
 #line 3301 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3285 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       SwitchCaseOperandList* sco_list_p = new SwitchCaseOperandList(LOC((yyloc)));
       sco_list_p->push_back((yysemantic_stack_[(2) - (2)].expr));
@@ -5926,10 +9384,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 330:
 
 /* Line 678 of lalr1.cc  */
 #line 3307 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 328:
+/* Line 661 of lalr1.cc  */
+#line 3291 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       SwitchCaseOperandList* sco_list_p = static_cast<SwitchCaseOperandList*>((yysemantic_stack_[(3) - (1)].node));
       sco_list_p->push_back((yysemantic_stack_[(3) - (3)].expr));
@@ -5937,19 +9401,50 @@
     }
     break;
 
+<<<<<<< TREE
+=======
+  case 329:
+/* Line 661 of lalr1.cc  */
+#line 3302 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_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));
+    }
+    break;
+
+  case 330:
+/* Line 661 of lalr1.cc  */
+#line 3309 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+      SwitchCaseClauseList* scc_list_p = new SwitchCaseClauseList(LOC((yyloc)));
+      scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(1) - (1)].node)));
+      (yyval.node) = scc_list_p;
+    }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 331:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3318 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3315 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new SwitchExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(8) - (5)].node)), (yysemantic_stack_[(8) - (8)].expr));
     }
     break;
 
   case 332:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3325 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3324 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       SwitchCaseClauseList* scc_list_p = new SwitchCaseClauseList(LOC((yyloc)));
       scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(1) - (1)].node)));
@@ -5958,9 +9453,14 @@
     break;
 
   case 333:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3331 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3333 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       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)));
@@ -5969,18 +9469,28 @@
     break;
 
   case 334:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3340 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3340 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SwitchCaseClause(LOC((yyloc)), dynamic_cast<SwitchCaseOperandList*>((yysemantic_stack_[(3) - (1)].node)), (yysemantic_stack_[(3) - (3)].expr));
     }
     break;
 
   case 335:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3349 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3351 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
                               (yysemantic_stack_[(8) - (3)].expr),
@@ -5990,9 +9500,14 @@
     break;
 
   case 336:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3356 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3358 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
                               (yysemantic_stack_[(10) - (3)].expr),
@@ -6003,9 +9518,14 @@
     break;
 
   case 337:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3367 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3370 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
                               (yysemantic_stack_[(8) - (3)].expr),
@@ -6015,9 +9535,14 @@
     break;
 
   case 338:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3374 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3376 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
                               (yysemantic_stack_[(10) - (3)].expr),
@@ -6028,9 +9553,14 @@
     break;
 
   case 339:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3386 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3388 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CaseClauseList* cc_list_p = new CaseClauseList(LOC ((yyloc)));
       cc_list_p->push_back(dynamic_cast<CaseClause*>((yysemantic_stack_[(1) - (1)].node)));
@@ -6039,9 +9569,14 @@
     break;
 
   case 340:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3392 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3394 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CaseClauseList* cc_list_p = dynamic_cast<CaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
       cc_list_p->push_back(dynamic_cast<CaseClause*>((yysemantic_stack_[(2) - (2)].node)));
@@ -6050,9 +9585,14 @@
     break;
 
   case 341:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3404 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3405 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (2)].node)),
@@ -6061,9 +9601,14 @@
     break;
 
   case 342:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3410 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3411 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
@@ -6073,9 +9618,14 @@
     break;
 
   case 343:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3421 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3422 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CaseClauseList* cc_list_p = new CaseClauseList(LOC ((yyloc)));
       cc_list_p->push_back(dynamic_cast<CaseClause*>((yysemantic_stack_[(1) - (1)].node)));
@@ -6084,9 +9634,14 @@
     break;
 
   case 344:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3427 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3428 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CaseClauseList* cc_list_p = dynamic_cast<CaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
       cc_list_p->push_back(dynamic_cast<CaseClause*>((yysemantic_stack_[(2) - (2)].node)));
@@ -6095,9 +9650,14 @@
     break;
 
   case 345:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3438 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3439 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (2)].node)),
@@ -6106,9 +9666,14 @@
     break;
 
   case 346:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3444 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3448 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
@@ -6118,42 +9683,63 @@
     break;
 
   case 347:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3455 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3452 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new IfExpr(LOC ((yyloc)), (yysemantic_stack_[(8) - (3)].expr), (yysemantic_stack_[(8) - (6)].expr), (yysemantic_stack_[(8) - (8)].expr));
     }
     break;
 
   case 348:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3464 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3461 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 349:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3468 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3465 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new OrExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
     }
     break;
 
   case 350:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3477 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3473 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 351:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3481 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -6175,6 +9761,10 @@
 
 /* Line 678 of lalr1.cc  */
 #line 3493 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3477 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             /*  ::=  "eq" | "ne" | "lt" | "le" | "gt" | "ge" */
             (yyval.expr) = new ComparisonExpr(
@@ -6186,10 +9776,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 354:
 
 /* Line 678 of lalr1.cc  */
 #line 3503 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 352:
+/* Line 661 of lalr1.cc  */
+#line 3487 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             /*  ::=  "is" | "<<" | ">>" */
             (yyval.expr) = new ComparisonExpr(
@@ -6198,10 +9794,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 355:
 
 /* Line 678 of lalr1.cc  */
 #line 3510 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 353:
+/* Line 661 of lalr1.cc  */
+#line 3494 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6212,10 +9814,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 356:
 
 /* Line 678 of lalr1.cc  */
 #line 3519 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 354:
+/* Line 661 of lalr1.cc  */
+#line 3503 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6226,20 +9834,32 @@
         }
     break;
 
+<<<<<<< TREE
   case 357:
 
 /* Line 678 of lalr1.cc  */
 #line 3528 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 355:
+/* Line 661 of lalr1.cc  */
+#line 3512 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             /* this call is needed */
             driver.lexer->interpretAsLessThan();
         }
     break;
 
+<<<<<<< TREE
   case 358:
 
 /* Line 678 of lalr1.cc  */
 #line 3533 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 356:
+/* Line 661 of lalr1.cc  */
+#line 3517 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6250,10 +9870,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 359:
 
 /* Line 678 of lalr1.cc  */
 #line 3542 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 357:
+/* Line 661 of lalr1.cc  */
+#line 3526 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6264,10 +9890,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 360:
 
 /* Line 678 of lalr1.cc  */
 #line 3551 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 358:
+/* Line 661 of lalr1.cc  */
+#line 3535 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6278,10 +9910,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 361:
 
 /* Line 678 of lalr1.cc  */
 #line 3560 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 359:
+/* Line 661 of lalr1.cc  */
+#line 3544 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6292,19 +9930,31 @@
         }
     break;
 
+<<<<<<< TREE
   case 362:
 
 /* Line 678 of lalr1.cc  */
 #line 3573 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 360:
+/* Line 661 of lalr1.cc  */
+#line 3557 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
+<<<<<<< TREE
   case 363:
 
 /* Line 678 of lalr1.cc  */
 #line 3577 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 361:
+/* Line 661 of lalr1.cc  */
+#line 3561 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new FTContainsExpr(
                 LOC((yyloc)),
@@ -6315,100 +9965,174 @@
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 362:
+/* Line 661 of lalr1.cc  */
+#line 3573 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+          (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+        }
+    break;
+
+  case 363:
+/* Line 661 of lalr1.cc  */
+#line 3577 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+          (yyval.expr) = new StringConcatExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 364:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3589 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3584 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 365:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3593 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3588 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new StringConcatExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
         }
     break;
 
   case 366:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3600 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3595 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = NULL;
         }
     break;
 
   case 367:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3604 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3599 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 368:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3611 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3608 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 369:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3615 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3612 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new RangeExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
     break;
 
   case 370:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3624 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3616 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 371:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3628 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3624 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new AdditiveExpr( LOC((yyloc)), ParseConstants::op_plus, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
     break;
 
   case 372:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3632 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3628 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new AdditiveExpr( LOC((yyloc)), ParseConstants::op_minus, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
     break;
 
   case 373:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3640 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3634 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 374:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3644 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3640 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new MultiplicativeExpr(
                 LOC((yyloc)), ParseConstants::op_mul, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -6417,9 +10141,14 @@
     break;
 
   case 375:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3650 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3646 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new MultiplicativeExpr(
                 LOC((yyloc)), ParseConstants::op_div, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -6428,9 +10157,14 @@
     break;
 
   case 376:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3656 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3656 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new MultiplicativeExpr(
                 LOC((yyloc)), ParseConstants::op_idiv, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -6439,9 +10173,14 @@
     break;
 
   case 377:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3662 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3660 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new MultiplicativeExpr(
                 LOC((yyloc)), ParseConstants::op_mod, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -6450,45 +10189,70 @@
     break;
 
   case 378:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3672 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3664 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 379:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3676 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3672 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
     break;
 
   case 380:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3680 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3676 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
     break;
 
   case 381:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3688 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3682 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 382:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3692 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3692 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new IntersectExceptExpr(
                 LOC((yyloc)), ParseConstants::op_intersect, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -6497,9 +10261,14 @@
     break;
 
   case 383:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3698 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3696 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new IntersectExceptExpr(
                 LOC((yyloc)), ParseConstants::op_except, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -6508,18 +10277,28 @@
     break;
 
   case 384:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3708 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3706 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 385:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3712 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3710 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new InstanceofExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node))
@@ -6528,18 +10307,28 @@
     break;
 
   case 386:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3722 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3720 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 387:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3726 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3724 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new TreatExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node))
@@ -6548,18 +10337,28 @@
     break;
 
   case 388:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3736 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3734 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 389:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3740 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3738 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new CastableExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SingleType*>((yysemantic_stack_[(4) - (4)].node))
@@ -6568,18 +10367,28 @@
     break;
 
   case 390:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3750 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3748 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 391:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3754 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3752 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new CastExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SingleType*>((yysemantic_stack_[(4) - (4)].node))
@@ -6588,33 +10397,49 @@
     break;
 
   case 392:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3764 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3760 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 393:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3768 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3764 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new UnaryExpr( LOC((yyloc)), dynamic_cast<SignList*>((yysemantic_stack_[(2) - (1)].node)), (yysemantic_stack_[(2) - (2)].expr) );
         }
     break;
 
   case 394:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3776 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3768 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new SignList( LOC((yyloc)), true );
         }
     break;
 
   case 395:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3780 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -6636,6 +10461,10 @@
 
 /* Line 678 of lalr1.cc  */
 #line 3788 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3772 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             if ( SignList *sl = dynamic_cast<SignList*>((yysemantic_stack_[(2) - (1)].node)) )
                 sl->negate();
@@ -6643,16 +10472,41 @@
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 396:
+/* Line 661 of lalr1.cc  */
+#line 3782 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+        }
+    break;
+
+  case 397:
+/* Line 661 of lalr1.cc  */
+#line 3786 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 398:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3798 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3790 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 399:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 3802 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -6674,114 +10528,190 @@
 
 /* Line 678 of lalr1.cc  */
 #line 3814 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 3798 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_eq );
         }
     break;
 
+<<<<<<< TREE
   case 402:
 
 /* Line 678 of lalr1.cc  */
 #line 3818 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 400:
+/* Line 661 of lalr1.cc  */
+#line 3802 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ne );
         }
     break;
 
+<<<<<<< TREE
   case 403:
 
 /* Line 678 of lalr1.cc  */
 #line 3822 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 401:
+/* Line 661 of lalr1.cc  */
+#line 3806 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_lt );
         }
     break;
 
+<<<<<<< TREE
   case 404:
 
 /* Line 678 of lalr1.cc  */
 #line 3826 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 402:
+/* Line 661 of lalr1.cc  */
+#line 3810 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_le );
         }
     break;
 
+<<<<<<< TREE
   case 405:
 
 /* Line 678 of lalr1.cc  */
 #line 3830 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 403:
+/* Line 661 of lalr1.cc  */
+#line 3814 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_gt );
         }
     break;
 
+<<<<<<< TREE
   case 406:
 
 /* Line 678 of lalr1.cc  */
 #line 3834 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 404:
+/* Line 661 of lalr1.cc  */
+#line 3818 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ge );
         }
     break;
 
+<<<<<<< TREE
   case 407:
 
 /* Line 678 of lalr1.cc  */
 #line 3842 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 405:
+/* Line 661 of lalr1.cc  */
+#line 3826 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new NodeComp( LOC((yyloc)), ParseConstants::op_is );
         }
     break;
 
+<<<<<<< TREE
   case 408:
 
 /* Line 678 of lalr1.cc  */
 #line 3846 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 406:
+/* Line 661 of lalr1.cc  */
+#line 3830 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new NodeComp( LOC((yyloc)), ParseConstants::op_precedes );
         }
     break;
 
+<<<<<<< TREE
   case 409:
 
 /* Line 678 of lalr1.cc  */
 #line 3850 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 407:
+/* Line 661 of lalr1.cc  */
+#line 3834 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new NodeComp( LOC((yyloc)), ParseConstants::op_follows );
         }
     break;
 
+<<<<<<< TREE
   case 410:
 
 /* Line 678 of lalr1.cc  */
 #line 3858 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 408:
+/* Line 661 of lalr1.cc  */
+#line 3842 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(4) - (3)].expr) );
         }
     break;
 
+<<<<<<< TREE
   case 411:
 
 /* Line 678 of lalr1.cc  */
 #line 3862 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 409:
+/* Line 661 of lalr1.cc  */
+#line 3846 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "lax", (yysemantic_stack_[(5) - (4)].expr) );
         }
     break;
 
+<<<<<<< TREE
   case 412:
 
 /* Line 678 of lalr1.cc  */
 #line 3866 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 410:
+/* Line 661 of lalr1.cc  */
+#line 3850 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(5) - (4)].expr) );
         }
     break;
 
+<<<<<<< TREE
   case 413:
 
 /* Line 678 of lalr1.cc  */
 #line 3870 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 411:
+/* Line 661 of lalr1.cc  */
+#line 3854 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ValidateExpr(
                 LOC((yyloc)), dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (3)].node))->get_name(), (yysemantic_stack_[(6) - (5)].expr)
@@ -6790,10 +10720,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 414:
 
 /* Line 678 of lalr1.cc  */
 #line 3881 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 412:
+/* Line 661 of lalr1.cc  */
+#line 3865 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ExtensionExpr(
                 LOC((yyloc)), dynamic_cast<PragmaList*>((yysemantic_stack_[(3) - (1)].node)), NULL
@@ -6801,10 +10737,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 415:
 
 /* Line 678 of lalr1.cc  */
 #line 3887 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 413:
+/* Line 661 of lalr1.cc  */
+#line 3871 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ExtensionExpr(
                 LOC((yyloc)), dynamic_cast<PragmaList*>((yysemantic_stack_[(4) - (1)].node)), (yysemantic_stack_[(4) - (3)].expr)
@@ -6812,10 +10754,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 416:
 
 /* Line 678 of lalr1.cc  */
 #line 3897 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 414:
+/* Line 661 of lalr1.cc  */
+#line 3881 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             PragmaList *pl = new PragmaList( LOC((yyloc)) );
             pl->push_back( dynamic_cast<Pragma*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -6823,10 +10771,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 417:
 
 /* Line 678 of lalr1.cc  */
 #line 3903 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 415:
+/* Line 661 of lalr1.cc  */
+#line 3887 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             if ( PragmaList *pl = dynamic_cast<PragmaList*>((yysemantic_stack_[(2) - (1)].node)) )
                 pl->push_back( dynamic_cast<Pragma*>((yysemantic_stack_[(2) - (2)].node)) );
@@ -6834,46 +10788,76 @@
         }
     break;
 
+<<<<<<< TREE
   case 418:
 
 /* Line 678 of lalr1.cc  */
 #line 3913 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 416:
+/* Line 661 of lalr1.cc  */
+#line 3897 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new Pragma( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
         }
     break;
 
+<<<<<<< TREE
   case 419:
 
 /* Line 678 of lalr1.cc  */
 #line 3917 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 417:
+/* Line 661 of lalr1.cc  */
+#line 3901 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new Pragma( LOC((yyloc)), new QName( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) ), "" );
         }
     break;
 
+<<<<<<< TREE
   case 420:
 
 /* Line 678 of lalr1.cc  */
 #line 3921 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 418:
+/* Line 661 of lalr1.cc  */
+#line 3905 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new Pragma( LOC((yyloc)), new QName( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)), true ), "" );
         }
     break;
 
+<<<<<<< TREE
   case 421:
 
 /* Line 678 of lalr1.cc  */
 #line 3959 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 419:
+/* Line 661 of lalr1.cc  */
+#line 3943 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new PathExpr(LOC((yyloc)), ParseConstants::path_leading_lone_slash, NULL);
     }
     break;
 
+<<<<<<< TREE
   case 422:
 
 /* Line 678 of lalr1.cc  */
 #line 3963 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 420:
+/* Line 661 of lalr1.cc  */
+#line 3947 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       RelativePathExpr* rpe;
 
@@ -6885,10 +10869,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 423:
 
 /* Line 678 of lalr1.cc  */
 #line 3973 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 421:
+/* Line 661 of lalr1.cc  */
+#line 3957 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       RelativePathExpr* rpe;
 
@@ -6900,10 +10890,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 424:
 
 /* Line 678 of lalr1.cc  */
 #line 3983 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 422:
+/* Line 661 of lalr1.cc  */
+#line 3967 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       RelativePathExpr* rpe = dynamic_cast<RelativePathExpr*>((yysemantic_stack_[(1) - (1)].expr));
       (yyval.expr) = (!rpe ?
@@ -6912,19 +10908,31 @@
     }
     break;
 
+<<<<<<< TREE
   case 425:
 
 /* Line 678 of lalr1.cc  */
 #line 3996 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 423:
+/* Line 661 of lalr1.cc  */
+#line 3980 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = NULL;
     }
     break;
 
+<<<<<<< TREE
   case 426:
 
 /* Line 678 of lalr1.cc  */
 #line 4005 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 424:
+/* Line 661 of lalr1.cc  */
+#line 3989 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       AxisStep* as = dynamic_cast<AxisStep*>((yysemantic_stack_[(1) - (1)].expr));
       (yyval.expr) = (as ?
@@ -6936,25 +10944,57 @@
     }
     break;
 
+<<<<<<< TREE
   case 427:
 
 /* Line 678 of lalr1.cc  */
 #line 4015 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 425:
+/* Line 661 of lalr1.cc  */
+#line 3999 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new RelativePathExpr(LOC((yyloc)), ParseConstants::st_slash, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr), false);
     }
     break;
 
+<<<<<<< TREE
   case 428:
 
 /* Line 678 of lalr1.cc  */
 #line 4019 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 426:
+/* Line 661 of lalr1.cc  */
+#line 4003 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new RelativePathExpr(LOC((yyloc)), ParseConstants::st_slashslash, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr), false);
     }
     break;
 
+<<<<<<< TREE
+=======
+  case 427:
+/* Line 661 of lalr1.cc  */
+#line 4012 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+    }
+    break;
+
+  case 428:
+/* Line 661 of lalr1.cc  */
+#line 4016 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+    }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 429:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4028 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -6976,6 +11016,10 @@
 
 /* Line 678 of lalr1.cc  */
 #line 4041 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4025 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new AxisStep(
                 LOC((yyloc)), dynamic_cast<ForwardStep*>((yysemantic_stack_[(1) - (1)].node)), NULL
@@ -6983,10 +11027,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 432:
 
 /* Line 678 of lalr1.cc  */
 #line 4047 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 430:
+/* Line 661 of lalr1.cc  */
+#line 4031 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new AxisStep(
                 LOC((yyloc)),
@@ -6996,10 +11046,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 433:
 
 /* Line 678 of lalr1.cc  */
 #line 4055 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 431:
+/* Line 661 of lalr1.cc  */
+#line 4039 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new AxisStep(
                 LOC((yyloc)), dynamic_cast<ReverseStep*>((yysemantic_stack_[(1) - (1)].node)), NULL
@@ -7007,10 +11063,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 434:
 
 /* Line 678 of lalr1.cc  */
 #line 4061 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 432:
+/* Line 661 of lalr1.cc  */
+#line 4045 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new AxisStep(
                 LOC((yyloc)),
@@ -7020,10 +11082,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 435:
 
 /* Line 678 of lalr1.cc  */
 #line 4073 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 433:
+/* Line 661 of lalr1.cc  */
+#line 4057 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ForwardStep(
                 LOC((yyloc)), dynamic_cast<ForwardAxis*>((yysemantic_stack_[(2) - (1)].node)), (yysemantic_stack_[(2) - (2)].node)
@@ -7031,10 +11099,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 436:
 
 /* Line 678 of lalr1.cc  */
 #line 4079 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 434:
+/* Line 661 of lalr1.cc  */
+#line 4063 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ForwardStep(
                 LOC((yyloc)), dynamic_cast<AbbrevForwardStep*>((yysemantic_stack_[(1) - (1)].node))
@@ -7042,46 +11116,76 @@
         }
     break;
 
+<<<<<<< TREE
   case 437:
 
 /* Line 678 of lalr1.cc  */
 #line 4089 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 435:
+/* Line 661 of lalr1.cc  */
+#line 4073 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_child );
         }
     break;
 
+<<<<<<< TREE
   case 438:
 
 /* Line 678 of lalr1.cc  */
 #line 4093 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 436:
+/* Line 661 of lalr1.cc  */
+#line 4077 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_descendant);
         }
     break;
 
+<<<<<<< TREE
   case 439:
 
 /* Line 678 of lalr1.cc  */
 #line 4097 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 437:
+/* Line 661 of lalr1.cc  */
+#line 4081 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_attribute );
         }
     break;
 
+<<<<<<< TREE
   case 440:
 
 /* Line 678 of lalr1.cc  */
 #line 4101 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 438:
+/* Line 661 of lalr1.cc  */
+#line 4085 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_self );
         }
     break;
 
+<<<<<<< TREE
   case 441:
 
 /* Line 678 of lalr1.cc  */
 #line 4105 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 439:
+/* Line 661 of lalr1.cc  */
+#line 4089 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ForwardAxis(
                 LOC((yyloc)), ParseConstants::axis_descendant_or_self
@@ -7089,10 +11193,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 442:
 
 /* Line 678 of lalr1.cc  */
 #line 4111 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 440:
+/* Line 661 of lalr1.cc  */
+#line 4095 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ForwardAxis(
                 LOC((yyloc)), ParseConstants::axis_following_sibling
@@ -7100,46 +11210,76 @@
         }
     break;
 
+<<<<<<< TREE
   case 443:
 
 /* Line 678 of lalr1.cc  */
 #line 4117 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 441:
+/* Line 661 of lalr1.cc  */
+#line 4101 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_following );
         }
     break;
 
+<<<<<<< TREE
   case 444:
 
 /* Line 678 of lalr1.cc  */
 #line 4125 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 442:
+/* Line 661 of lalr1.cc  */
+#line 4109 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new AbbrevForwardStep( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), false );
         }
     break;
 
+<<<<<<< TREE
   case 445:
 
 /* Line 678 of lalr1.cc  */
 #line 4129 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 443:
+/* Line 661 of lalr1.cc  */
+#line 4113 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new AbbrevForwardStep( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].node), true );
         }
     break;
 
+<<<<<<< TREE
   case 446:
 
 /* Line 678 of lalr1.cc  */
 #line 4137 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 444:
+/* Line 661 of lalr1.cc  */
+#line 4121 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ReverseStep( LOC((yyloc)), dynamic_cast<ReverseAxis*>((yysemantic_stack_[(2) - (1)].node)), (yysemantic_stack_[(2) - (2)].node) );
         }
     break;
 
+<<<<<<< TREE
   case 447:
 
 /* Line 678 of lalr1.cc  */
 #line 4141 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 445:
+/* Line 661 of lalr1.cc  */
+#line 4125 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             ReverseAxis *ra = new ReverseAxis(
                 LOC((yyloc)), ParseConstants::axis_parent
@@ -7148,28 +11288,46 @@
         }
     break;
 
+<<<<<<< TREE
   case 448:
 
 /* Line 678 of lalr1.cc  */
 #line 4152 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 446:
+/* Line 661 of lalr1.cc  */
+#line 4136 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ReverseAxis( LOC((yyloc)), ParseConstants::axis_parent );
         }
     break;
 
+<<<<<<< TREE
   case 449:
 
 /* Line 678 of lalr1.cc  */
 #line 4156 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 447:
+/* Line 661 of lalr1.cc  */
+#line 4140 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ReverseAxis( LOC((yyloc)), ParseConstants::axis_ancestor );
         }
     break;
 
+<<<<<<< TREE
   case 450:
 
 /* Line 678 of lalr1.cc  */
 #line 4160 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 448:
+/* Line 661 of lalr1.cc  */
+#line 4144 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ReverseAxis(
                 LOC((yyloc)), ParseConstants::axis_preceding_sibling
@@ -7177,19 +11335,31 @@
         }
     break;
 
+<<<<<<< TREE
   case 451:
 
 /* Line 678 of lalr1.cc  */
 #line 4166 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 449:
+/* Line 661 of lalr1.cc  */
+#line 4150 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ReverseAxis( LOC((yyloc)), ParseConstants::axis_preceding );
         }
     break;
 
+<<<<<<< TREE
   case 452:
 
 /* Line 678 of lalr1.cc  */
 #line 4170 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 450:
+/* Line 661 of lalr1.cc  */
+#line 4154 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ReverseAxis(
                 LOC((yyloc)), ParseConstants::axis_ancestor_or_self
@@ -7197,7 +11367,27 @@
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 451:
+/* Line 661 of lalr1.cc  */
+#line 4168 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 452:
+/* Line 661 of lalr1.cc  */
+#line 4172 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 453:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4184 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -7219,96 +11409,160 @@
 
 /* Line 678 of lalr1.cc  */
 #line 4196 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4180 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new NameTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
         }
     break;
 
+<<<<<<< TREE
   case 456:
 
 /* Line 678 of lalr1.cc  */
 #line 4200 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 454:
+/* Line 661 of lalr1.cc  */
+#line 4184 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new NameTest( LOC((yyloc)), dynamic_cast<Wildcard*>((yysemantic_stack_[(1) - (1)].node)) );
         }
     break;
 
+<<<<<<< TREE
   case 457:
 
 /* Line 678 of lalr1.cc  */
 #line 4210 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 455:
+/* Line 661 of lalr1.cc  */
+#line 4194 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), "", "", ParseConstants::wild_all, false);
     }
     break;
 
+<<<<<<< TREE
   case 458:
 
 /* Line 678 of lalr1.cc  */
 #line 4214 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 456:
+/* Line 661 of lalr1.cc  */
+#line 4198 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, false);
     }
     break;
 
+<<<<<<< TREE
   case 459:
 
 /* Line 678 of lalr1.cc  */
 #line 4218 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 457:
+/* Line 661 of lalr1.cc  */
+#line 4202 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, true);
     }
     break;
 
+<<<<<<< TREE
   case 460:
 
 /* Line 678 of lalr1.cc  */
 #line 4222 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 458:
+/* Line 661 of lalr1.cc  */
+#line 4206 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), "", SYMTAB((yysemantic_stack_[(1) - (1)].sval)), ParseConstants::wild_prefix, false);
     }
     break;
 
+<<<<<<< TREE
   case 461:
 
 /* Line 678 of lalr1.cc  */
 #line 4231 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 459:
+/* Line 661 of lalr1.cc  */
+#line 4215 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
        (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
      }
     break;
 
+<<<<<<< TREE
   case 462:
 
 /* Line 678 of lalr1.cc  */
 #line 4235 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 460:
+/* Line 661 of lalr1.cc  */
+#line 4219 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
        (yyval.expr) = new FilterExpr(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr), dynamic_cast<PredicateList*>((yysemantic_stack_[(2) - (2)].node)));
      }
     break;
 
+<<<<<<< TREE
   case 463:
 
 /* Line 678 of lalr1.cc  */
 #line 4239 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 461:
+/* Line 661 of lalr1.cc  */
+#line 4223 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
        (yyval.expr) = new DynamicFunctionInvocation(LOC ((yyloc)), (yysemantic_stack_[(3) - (1)].expr));
      }
     break;
 
+<<<<<<< TREE
   case 464:
 
 /* Line 678 of lalr1.cc  */
 #line 4243 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 462:
+/* Line 661 of lalr1.cc  */
+#line 4227 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
        (yyval.expr) = new DynamicFunctionInvocation(LOC ((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<ArgList*>((yysemantic_stack_[(4) - (3)].node)));
      }
     break;
 
+<<<<<<< TREE
   case 465:
 
 /* Line 678 of lalr1.cc  */
 #line 4251 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 463:
+/* Line 661 of lalr1.cc  */
+#line 4235 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             PredicateList *pl = new PredicateList( LOC((yyloc)) );
             pl->push_back( dynamic_cast<exprnode*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -7316,10 +11570,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 466:
 
 /* Line 678 of lalr1.cc  */
 #line 4257 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 464:
+/* Line 661 of lalr1.cc  */
+#line 4241 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             if ( PredicateList *pl = dynamic_cast<PredicateList*>((yysemantic_stack_[(2) - (1)].node)) )
                 pl->push_back( dynamic_cast<exprnode*>((yysemantic_stack_[(2) - (2)].expr)) );
@@ -7327,142 +11587,238 @@
         }
     break;
 
+<<<<<<< TREE
   case 467:
 
 /* Line 678 of lalr1.cc  */
 #line 4267 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 465:
+/* Line 661 of lalr1.cc  */
+#line 4251 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 466:
+/* Line 661 of lalr1.cc  */
+#line 4259 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+          (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+        }
+    break;
+
+  case 467:
+/* Line 661 of lalr1.cc  */
+#line 4263 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+          (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 468:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4275 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4267 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 469:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4279 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4271 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 470:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4283 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4275 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 471:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4287 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4279 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 472:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4291 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4283 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 473:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4295 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4287 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 474:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4299 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4291 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 475:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4303 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4295 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 476:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4307 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4300 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 477:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4311 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4304 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 478:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4316 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4308 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 479:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4320 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4312 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 480:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4324 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4320 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 481:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4328 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4324 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 482:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4336 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -7484,6 +11840,10 @@
 
 /* Line 678 of lalr1.cc  */
 #line 4348 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4332 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_decimal, *(yysemantic_stack_[(1) - (1)].decval)
@@ -7492,10 +11852,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 485:
 
 /* Line 678 of lalr1.cc  */
 #line 4355 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 483:
+/* Line 661 of lalr1.cc  */
+#line 4339 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_integer, *(yysemantic_stack_[(1) - (1)].ival)
@@ -7504,10 +11870,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 486:
 
 /* Line 678 of lalr1.cc  */
 #line 4362 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 484:
+/* Line 661 of lalr1.cc  */
+#line 4346 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_double, *(yysemantic_stack_[(1) - (1)].dval)
@@ -7516,73 +11888,121 @@
         }
     break;
 
+<<<<<<< TREE
   case 487:
 
 /* Line 678 of lalr1.cc  */
 #line 4373 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 485:
+/* Line 661 of lalr1.cc  */
+#line 4357 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new VarRef(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)));
         }
     break;
 
+<<<<<<< TREE
   case 488:
 
 /* Line 678 of lalr1.cc  */
 #line 4381 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 486:
+/* Line 661 of lalr1.cc  */
+#line 4365 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), NULL);
         }
     break;
 
+<<<<<<< TREE
   case 489:
 
 /* Line 678 of lalr1.cc  */
 #line 4385 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 487:
+/* Line 661 of lalr1.cc  */
+#line 4369 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
         }
     break;
 
+<<<<<<< TREE
   case 490:
 
 /* Line 678 of lalr1.cc  */
 #line 4393 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 488:
+/* Line 661 of lalr1.cc  */
+#line 4377 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ContextItemExpr( LOC((yyloc)) );
         }
     break;
 
+<<<<<<< TREE
   case 491:
 
 /* Line 678 of lalr1.cc  */
 #line 4401 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 489:
+/* Line 661 of lalr1.cc  */
+#line 4385 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new OrderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
     break;
 
+<<<<<<< TREE
   case 492:
 
 /* Line 678 of lalr1.cc  */
 #line 4409 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 490:
+/* Line 661 of lalr1.cc  */
+#line 4393 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new UnorderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
     break;
 
+<<<<<<< TREE
   case 493:
 
 /* Line 678 of lalr1.cc  */
 #line 4463 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 491:
+/* Line 661 of lalr1.cc  */
+#line 4447 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new FunctionCall( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), NULL );
         }
     break;
 
+<<<<<<< TREE
   case 494:
 
 /* Line 678 of lalr1.cc  */
 #line 4467 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 492:
+/* Line 661 of lalr1.cc  */
+#line 4451 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new FunctionCall(
                 LOC((yyloc)),
@@ -7592,10 +12012,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 495:
 
 /* Line 678 of lalr1.cc  */
 #line 4480 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 493:
+/* Line 661 of lalr1.cc  */
+#line 4464 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             ArgList *al = new ArgList( LOC((yyloc)) );
             al->push_back( (yysemantic_stack_[(1) - (1)].expr) );
@@ -7603,10 +12029,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 496:
 
 /* Line 678 of lalr1.cc  */
 #line 4486 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 494:
+/* Line 661 of lalr1.cc  */
+#line 4470 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             if ( ArgList *al = dynamic_cast<ArgList*>((yysemantic_stack_[(3) - (1)].node)) )
                 al->push_back( (yysemantic_stack_[(3) - (3)].expr) );
@@ -7614,34 +12046,69 @@
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 495:
+/* Line 661 of lalr1.cc  */
+#line 4480 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+        }
+    break;
+
+  case 496:
+/* Line 661 of lalr1.cc  */
+#line 4484 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 497:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4496 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4492 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 498:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4500 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4496 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 499:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4508 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4500 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 500:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4512 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -7663,6 +12130,10 @@
 
 /* Line 678 of lalr1.cc  */
 #line 4524 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4508 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new DirElemConstructor(
                 LOC((yyloc)),
@@ -7674,10 +12145,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 503:
 
 /* Line 678 of lalr1.cc  */
 #line 4534 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 501:
+/* Line 661 of lalr1.cc  */
+#line 4518 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new DirElemConstructor(
                 LOC((yyloc)),
@@ -7689,10 +12166,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 504:
 
 /* Line 678 of lalr1.cc  */
 #line 4544 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 502:
+/* Line 661 of lalr1.cc  */
+#line 4528 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             if (static_cast<QName*>((yysemantic_stack_[(8) - (2)].expr))->get_qname() != static_cast<QName*>((yysemantic_stack_[(8) - (6)].expr))->get_qname())
             {
@@ -7711,10 +12194,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 505:
 
 /* Line 678 of lalr1.cc  */
 #line 4561 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 503:
+/* Line 661 of lalr1.cc  */
+#line 4545 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             if (static_cast<QName*>((yysemantic_stack_[(9) - (2)].expr))->get_qname() != static_cast<QName*>((yysemantic_stack_[(9) - (7)].expr))->get_qname())
             {
@@ -7733,10 +12222,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 506:
 
 /* Line 678 of lalr1.cc  */
 #line 4578 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 504:
+/* Line 661 of lalr1.cc  */
+#line 4562 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             if (static_cast<QName*>((yysemantic_stack_[(9) - (2)].expr))->get_qname() != static_cast<QName*>((yysemantic_stack_[(9) - (7)].expr))->get_qname())
             {
@@ -7755,10 +12250,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 507:
 
 /* Line 678 of lalr1.cc  */
 #line 4595 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 505:
+/* Line 661 of lalr1.cc  */
+#line 4579 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             if (static_cast<QName*>((yysemantic_stack_[(10) - (2)].expr))->get_qname() != static_cast<QName*>((yysemantic_stack_[(10) - (8)].expr))->get_qname())
             {
@@ -7777,10 +12278,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 508:
 
 /* Line 678 of lalr1.cc  */
 #line 4617 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 506:
+/* Line 661 of lalr1.cc  */
+#line 4601 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             DirElemContentList *decl = new DirElemContentList( LOC((yyloc)) );
             decl->push_back( dynamic_cast<DirElemContent*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -7788,10 +12295,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 509:
 
 /* Line 678 of lalr1.cc  */
 #line 4623 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 507:
+/* Line 661 of lalr1.cc  */
+#line 4607 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             DirElemContentList *decl = dynamic_cast<DirElemContentList*>((yysemantic_stack_[(2) - (1)].node));
             if ( decl )
@@ -7800,10 +12313,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 510:
 
 /* Line 678 of lalr1.cc  */
 #line 4634 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 508:
+/* Line 661 of lalr1.cc  */
+#line 4618 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             DirAttributeList *dal = new DirAttributeList( LOC((yyloc)) );
             dal->push_back( dynamic_cast<DirAttr*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7811,10 +12330,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 511:
 
 /* Line 678 of lalr1.cc  */
 #line 4640 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 509:
+/* Line 661 of lalr1.cc  */
+#line 4624 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             DirAttributeList *dal = dynamic_cast<DirAttributeList*>((yysemantic_stack_[(2) - (1)].node));
             if ( dal )
@@ -7823,10 +12348,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 512:
 
 /* Line 678 of lalr1.cc  */
 #line 4651 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 510:
+/* Line 661 of lalr1.cc  */
+#line 4635 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new DirAttr(
                 LOC((yyloc)),
@@ -7836,48 +12367,97 @@
         }
     break;
 
+<<<<<<< TREE
   case 515:
 
 /* Line 678 of lalr1.cc  */
 #line 4668 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 513:
+/* Line 661 of lalr1.cc  */
+#line 4652 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new DirAttributeValue( LOC((yyloc)),
                                 dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(3) - (2)].node)));
         }
     break;
 
+<<<<<<< TREE
   case 516:
 
 /* Line 678 of lalr1.cc  */
 #line 4673 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 514:
+/* Line 661 of lalr1.cc  */
+#line 4657 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new DirAttributeValue( LOC((yyloc)),
                                 dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(3) - (2)].node)));
         }
     break;
 
+<<<<<<< TREE
   case 517:
 
 /* Line 678 of lalr1.cc  */
 #line 4682 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 515:
+/* Line 661 of lalr1.cc  */
+#line 4666 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new QuoteAttrContentList( LOC((yyloc)) );
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 516:
+/* Line 661 of lalr1.cc  */
+#line 4670 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 517:
+/* Line 661 of lalr1.cc  */
+#line 4677 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
+            qacl->push_back( new QuoteAttrValueContent( LOC((yyloc)), "\"" ) );
+            (yyval.node) = qacl;
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 518:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4686 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4683 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 519:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4693 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4689 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
             qacl->push_back( new QuoteAttrValueContent( LOC((yyloc)), "\"" ) );
@@ -7886,9 +12466,14 @@
     break;
 
   case 520:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4699 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4697 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
             qacl->push_back( dynamic_cast<QuoteAttrValueContent*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7897,9 +12482,14 @@
     break;
 
   case 521:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4705 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4709 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             QuoteAttrContentList *qacl =
                 dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
@@ -7910,9 +12500,14 @@
     break;
 
   case 522:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4713 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4713 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             QuoteAttrContentList *qacl =
                 dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
@@ -7923,6 +12518,7 @@
     break;
 
   case 523:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4725 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -7944,6 +12540,10 @@
 
 /* Line 678 of lalr1.cc  */
 #line 4736 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4720 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             AposAttrContentList *aacl = new AposAttrContentList( LOC((yyloc)) );
             aacl->push_back( new AposAttrValueContent( LOC((yyloc)),"'") );
@@ -7951,10 +12551,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 526:
 
 /* Line 678 of lalr1.cc  */
 #line 4742 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 524:
+/* Line 661 of lalr1.cc  */
+#line 4726 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             AposAttrContentList *aacl = new AposAttrContentList( LOC((yyloc)) );
             aacl->push_back( dynamic_cast<AposAttrValueContent*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7962,10 +12568,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 527:
 
 /* Line 678 of lalr1.cc  */
 #line 4748 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 525:
+/* Line 661 of lalr1.cc  */
+#line 4732 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
             if (aacl)
@@ -7974,10 +12586,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 528:
 
 /* Line 678 of lalr1.cc  */
 #line 4755 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 526:
+/* Line 661 of lalr1.cc  */
+#line 4739 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
             if ( aacl )
@@ -7986,19 +12604,31 @@
         }
     break;
 
+<<<<<<< TREE
   case 529:
 
 /* Line 678 of lalr1.cc  */
 #line 4766 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 527:
+/* Line 661 of lalr1.cc  */
+#line 4750 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new QuoteAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
         }
     break;
 
+<<<<<<< TREE
   case 530:
 
 /* Line 678 of lalr1.cc  */
 #line 4770 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 528:
+/* Line 661 of lalr1.cc  */
+#line 4754 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new QuoteAttrValueContent(
                 LOC((yyloc)), dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr))
@@ -8006,19 +12636,31 @@
         }
     break;
 
+<<<<<<< TREE
   case 531:
 
 /* Line 678 of lalr1.cc  */
 #line 4780 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 529:
+/* Line 661 of lalr1.cc  */
+#line 4764 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new AposAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
         }
     break;
 
+<<<<<<< TREE
   case 532:
 
 /* Line 678 of lalr1.cc  */
 #line 4784 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 530:
+/* Line 661 of lalr1.cc  */
+#line 4768 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new AposAttrValueContent(
                 LOC((yyloc)), dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr))
@@ -8026,48 +12668,78 @@
         }
     break;
 
+<<<<<<< TREE
   case 533:
 
 /* Line 678 of lalr1.cc  */
 #line 4794 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 531:
+/* Line 661 of lalr1.cc  */
+#line 4778 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new DirElemContent( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr) );
         }
     break;
 
+<<<<<<< TREE
   case 534:
 
 /* Line 678 of lalr1.cc  */
 #line 4798 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 532:
+/* Line 661 of lalr1.cc  */
+#line 4782 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new DirElemContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
         }
     break;
 
+<<<<<<< TREE
   case 535:
 
 /* Line 678 of lalr1.cc  */
 #line 4802 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 533:
+/* Line 661 of lalr1.cc  */
+#line 4786 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             rchandle<CDataSection> cdata_h = dynamic_cast<CDataSection*>((yysemantic_stack_[(1) - (1)].expr));
             (yyval.expr) = new DirElemContent( LOC((yyloc)), cdata_h );
         }
     break;
 
+<<<<<<< TREE
   case 536:
 
 /* Line 678 of lalr1.cc  */
 #line 4807 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 534:
+/* Line 661 of lalr1.cc  */
+#line 4791 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             rchandle<CommonContent> cont_h = dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr));
             (yyval.expr) = new DirElemContent( LOC((yyloc)), cont_h );
         }
     break;
 
+<<<<<<< TREE
   case 537:
 
 /* Line 678 of lalr1.cc  */
 #line 4816 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 535:
+/* Line 661 of lalr1.cc  */
+#line 4800 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new CommonContent(
                 LOC((yyloc)), ParseConstants::cont_charref, SYMTAB((yysemantic_stack_[(1) - (1)].sval))
@@ -8075,10 +12747,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 538:
 
 /* Line 678 of lalr1.cc  */
 #line 4822 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 536:
+/* Line 661 of lalr1.cc  */
+#line 4806 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new CommonContent(
                 LOC((yyloc)), ParseConstants::cont_escape_lbrace
@@ -8086,10 +12764,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 539:
 
 /* Line 678 of lalr1.cc  */
 #line 4828 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 537:
+/* Line 661 of lalr1.cc  */
+#line 4812 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new CommonContent(
                 LOC((yyloc)), ParseConstants::cont_escape_rbrace
@@ -8097,199 +12781,334 @@
         }
     break;
 
+<<<<<<< TREE
   case 540:
 
 /* Line 678 of lalr1.cc  */
 #line 4834 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 538:
+/* Line 661 of lalr1.cc  */
+#line 4818 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new CommonContent(LOC((yyloc)), new EnclosedExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr)));
         }
     break;
 
+<<<<<<< TREE
   case 541:
 
 /* Line 678 of lalr1.cc  */
 #line 4842 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 539:
+/* Line 661 of lalr1.cc  */
+#line 4826 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new DirCommentConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
     break;
 
+<<<<<<< TREE
   case 542:
 
 /* Line 678 of lalr1.cc  */
 #line 4847 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 540:
+/* Line 661 of lalr1.cc  */
+#line 4831 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new DirCommentConstructor( LOC((yyloc)), "" );
     }
     break;
 
+<<<<<<< TREE
   case 543:
 
 /* Line 678 of lalr1.cc  */
 #line 4855 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 541:
+/* Line 661 of lalr1.cc  */
+#line 4839 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new DirPIConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
     break;
 
+<<<<<<< TREE
   case 544:
 
 /* Line 678 of lalr1.cc  */
 #line 4860 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 542:
+/* Line 661 of lalr1.cc  */
+#line 4844 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new DirPIConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
     }
     break;
 
+<<<<<<< TREE
   case 545:
 
 /* Line 678 of lalr1.cc  */
 #line 4868 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 543:
+/* Line 661 of lalr1.cc  */
+#line 4852 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new CDataSection( LOC((yyloc)),SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
     }
     break;
 
+<<<<<<< TREE
+=======
+  case 544:
+/* Line 661 of lalr1.cc  */
+#line 4860 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+    }
+    break;
+
+  case 545:
+/* Line 661 of lalr1.cc  */
+#line 4865 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+    }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 546:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4876 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4870 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 547:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4881 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4875 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 548:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4886 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4880 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 549:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4891 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4885 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 550:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4896 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4894 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 551:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4901 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4902 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 552:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4910 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4906 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new CompDocConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
     break;
 
   case 553:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4918 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4923 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new CompElemConstructor(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval))), (yysemantic_stack_[(3) - (2)].expr));
         }
     break;
 
   case 554:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4922 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4927 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new CompElemConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
         }
     break;
 
   case 555:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4939 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4935 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new CompAttrConstructor( LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval))), (yysemantic_stack_[(3) - (2)].expr) );
         }
     break;
 
   case 556:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4943 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4943 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new CompAttrConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
         }
     break;
 
   case 557:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4951 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4951 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new CompTextConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
     break;
 
   case 558:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4959 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4955 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new CompCommentConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
     break;
 
   case 559:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4967 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4963 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new CompPIConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)), (yysemantic_stack_[(3) - (2)].expr) );
         }
     break;
 
   case 560:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4971 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4969 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new CompPIConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
         }
     break;
 
   case 561:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4979 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4979 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new SingleType(
                 LOC((yyloc)), dynamic_cast<AtomicType*>((yysemantic_stack_[(1) - (1)].node)), false
@@ -8298,9 +13117,14 @@
     break;
 
   case 562:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4985 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4987 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new SingleType(
                 LOC((yyloc)), dynamic_cast<AtomicType*>((yysemantic_stack_[(2) - (1)].node)), true
@@ -8309,45 +13133,70 @@
     break;
 
   case 563:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 4995 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4991 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
         }
     break;
 
   case 564:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5003 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 4995 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new SequenceType( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL );
         }
     break;
 
   case 565:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5007 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5030 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new SequenceType(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].node), dynamic_cast<OccurrenceIndicator*>((yysemantic_stack_[(2) - (2)].node)));
         }
     break;
 
   case 566:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5011 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5036 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new SequenceType( LOC((yyloc)), NULL, NULL );
         }
     break;
 
   case 567:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5046 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5042 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_optionally
@@ -8356,9 +13205,14 @@
     break;
 
   case 568:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5052 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5052 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_zero_or_more
@@ -8367,9 +13221,14 @@
     break;
 
   case 569:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5058 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5056 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_one_or_more
@@ -8378,51 +13237,77 @@
     break;
 
   case 570:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5068 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5060 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 571:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5072 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5064 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 572:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5076 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5068 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ItemType( LOC((yyloc)), true );
         }
     break;
 
   case 573:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5080 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5072 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new StructuredItemType(LOC((yyloc)));
         }
     break;
 
   case 574:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5084 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5076 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 575:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5088 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -8444,6 +13329,10 @@
 
 /* Line 678 of lalr1.cc  */
 #line 5099 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5083 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           TypeList* aTypeList = new TypeList(LOC ((yyloc)));
           aTypeList->push_back(dynamic_cast<SequenceType *>((yysemantic_stack_[(1) - (1)].node)));
@@ -8451,10 +13340,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 578:
 
 /* Line 678 of lalr1.cc  */
 #line 5105 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 576:
+/* Line 661 of lalr1.cc  */
+#line 5089 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           TypeList* aTypeList = dynamic_cast<TypeList *>((yysemantic_stack_[(3) - (1)].node));
           aTypeList->push_back(dynamic_cast<SequenceType *>((yysemantic_stack_[(3) - (3)].node)));
@@ -8462,79 +13357,140 @@
         }
     break;
 
+<<<<<<< TREE
   case 579:
 
 /* Line 678 of lalr1.cc  */
 #line 5115 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 577:
+/* Line 661 of lalr1.cc  */
+#line 5099 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new AtomicType( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 578:
+/* Line 661 of lalr1.cc  */
+#line 5107 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 579:
+/* Line 661 of lalr1.cc  */
+#line 5111 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 580:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5123 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5115 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 581:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5127 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5119 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 582:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5131 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5123 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 583:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5135 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5127 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 584:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5139 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5131 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 585:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5143 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5135 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 586:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5147 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5139 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 587:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5151 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -8556,33 +13512,55 @@
 
 /* Line 678 of lalr1.cc  */
 #line 5163 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5147 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new AnyKindTest( LOC((yyloc)) );
         }
     break;
 
+<<<<<<< TREE
   case 590:
 
 /* Line 678 of lalr1.cc  */
 #line 5171 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 588:
+/* Line 661 of lalr1.cc  */
+#line 5155 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new DocumentTest( LOC((yyloc)) );
         }
     break;
 
+<<<<<<< TREE
   case 591:
 
 /* Line 678 of lalr1.cc  */
 #line 5175 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 589:
+/* Line 661 of lalr1.cc  */
+#line 5159 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new DocumentTest( LOC((yyloc)), dynamic_cast<ElementTest*>((yysemantic_stack_[(4) - (3)].node)) );
         }
     break;
 
+<<<<<<< TREE
   case 592:
 
 /* Line 678 of lalr1.cc  */
 #line 5179 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 590:
+/* Line 661 of lalr1.cc  */
+#line 5163 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new DocumentTest(
                 LOC((yyloc)), dynamic_cast<SchemaElementTest*>((yysemantic_stack_[(4) - (3)].node))
@@ -8590,64 +13568,121 @@
         }
     break;
 
+<<<<<<< TREE
   case 593:
 
 /* Line 678 of lalr1.cc  */
 #line 5189 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 591:
+/* Line 661 of lalr1.cc  */
+#line 5173 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new TextTest( LOC((yyloc)) );
         }
     break;
 
+<<<<<<< TREE
   case 594:
 
 /* Line 678 of lalr1.cc  */
 #line 5197 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 592:
+/* Line 661 of lalr1.cc  */
+#line 5181 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new CommentTest( LOC((yyloc)));
         }
     break;
 
+<<<<<<< TREE
   case 595:
 
 /* Line 678 of lalr1.cc  */
 #line 5205 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 593:
+/* Line 661 of lalr1.cc  */
+#line 5189 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new PITest( LOC((yyloc)), "" );
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 594:
+/* Line 661 of lalr1.cc  */
+#line 5193 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
+        }
+    break;
+
+  case 595:
+/* Line 661 of lalr1.cc  */
+#line 5197 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 596:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5209 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5205 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
         }
     break;
 
   case 597:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5213 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5209 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
         }
     break;
 
   case 598:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5221 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5215 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
         }
     break;
 
   case 599:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5225 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5221 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new AttributeTest(
                 LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL
@@ -8656,9 +13691,14 @@
     break;
 
   case 600:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5231 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5225 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new AttributeTest(
                 LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)), dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node))
@@ -8667,18 +13707,28 @@
     break;
 
   case 601:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5237 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5235 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
         }
     break;
 
   case 602:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5241 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5243 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new AttributeTest(
                 LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node))
@@ -8687,27 +13737,42 @@
     break;
 
   case 603:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5251 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5247 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new SchemaAttributeTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
     break;
 
   case 604:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5259 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5253 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ElementTest( LOC((yyloc)), NULL, NULL, true );
         }
     break;
 
   case 605:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5263 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5262 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL, true
@@ -8716,9 +13781,14 @@
     break;
 
   case 606:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5269 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5271 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)),
@@ -8730,9 +13800,14 @@
     break;
 
   case 607:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5278 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5277 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)),
@@ -8744,9 +13819,14 @@
     break;
 
   case 608:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5287 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5283 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), NULL, NULL, true
@@ -8755,9 +13835,14 @@
     break;
 
   case 609:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5293 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5293 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), false
@@ -8766,9 +13851,14 @@
     break;
 
   case 610:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5299 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5310 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), true
@@ -8777,42 +13867,63 @@
     break;
 
   case 611:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5309 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5317 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new SchemaElementTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
     break;
 
   case 612:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5326 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5332 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
         }
     break;
 
   case 613:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5333 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5368 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (1)].expr)), true );
         }
     break;
 
   case 614:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5348 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5372 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
         }
     break;
 
   case 615:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5384 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -8834,15 +13945,25 @@
 
 /* Line 678 of lalr1.cc  */
 #line 5396 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5380 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new LiteralFunctionItem(LOC ((yyloc)), dynamic_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), (yysemantic_stack_[(3) - (3)].ival));
     }
     break;
 
+<<<<<<< TREE
   case 618:
 
 /* Line 678 of lalr1.cc  */
 #line 5404 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 616:
+/* Line 661 of lalr1.cc  */
+#line 5388 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new InlineFunction(LOC((yyloc)),
                               &*(yysemantic_stack_[(3) - (2)].fnsig)->theParams,
@@ -8852,7 +13973,27 @@
     }
     break;
 
+<<<<<<< TREE
+=======
+  case 617:
+/* Line 661 of lalr1.cc  */
+#line 5400 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+    }
+    break;
+
+  case 618:
+/* Line 661 of lalr1.cc  */
+#line 5404 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+    }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 619:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5416 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -8874,24 +14015,40 @@
 
 /* Line 678 of lalr1.cc  */
 #line 5428 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5412 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AnyFunctionTest(LOC((yyloc)));
     }
     break;
 
+<<<<<<< TREE
   case 622:
 
 /* Line 678 of lalr1.cc  */
 #line 5436 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 620:
+/* Line 661 of lalr1.cc  */
+#line 5420 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.node) = new TypedFunctionTest(LOC ((yyloc)), dynamic_cast<SequenceType *>((yysemantic_stack_[(5) - (5)].node)));
         }
     break;
 
+<<<<<<< TREE
   case 623:
 
 /* Line 678 of lalr1.cc  */
 #line 5440 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 621:
+/* Line 661 of lalr1.cc  */
+#line 5424 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.node) = new TypedFunctionTest(LOC ((yyloc)),
               dynamic_cast<TypeList *>((yysemantic_stack_[(6) - (3)].node)),
@@ -8899,19 +14056,31 @@
         }
     break;
 
+<<<<<<< TREE
   case 624:
 
 /* Line 678 of lalr1.cc  */
 #line 5451 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 622:
+/* Line 661 of lalr1.cc  */
+#line 5435 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
            (yyval.node) = (yysemantic_stack_[(3) - (2)].node);
         }
     break;
 
+<<<<<<< TREE
   case 625:
 
 /* Line 678 of lalr1.cc  */
 #line 5468 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 623:
+/* Line 661 of lalr1.cc  */
+#line 5452 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::strict_validation
@@ -8919,10 +14088,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 626:
 
 /* Line 678 of lalr1.cc  */
 #line 5474 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 624:
+/* Line 661 of lalr1.cc  */
+#line 5458 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::lax_validation
@@ -8930,10 +14105,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 627:
 
 /* Line 678 of lalr1.cc  */
 #line 5480 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 625:
+/* Line 661 of lalr1.cc  */
+#line 5464 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::skip_validation
@@ -8941,19 +14122,50 @@
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 626:
+/* Line 661 of lalr1.cc  */
+#line 5474 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::INTO, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
+        }
+    break;
+
+  case 627:
+/* Line 661 of lalr1.cc  */
+#line 5478 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = new InsertExpr(
+                LOC((yyloc)), store::UpdateConsts::AS_FIRST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
+            );
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 628:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5490 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5484 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::INTO, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
     break;
 
   case 629:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5494 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5490 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new InsertExpr(
                 LOC((yyloc)), store::UpdateConsts::AS_FIRST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
@@ -8962,9 +14174,14 @@
     break;
 
   case 630:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5500 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5494 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new InsertExpr(
                 LOC((yyloc)), store::UpdateConsts::AS_LAST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
@@ -8973,18 +14190,28 @@
     break;
 
   case 631:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5506 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5500 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::AFTER, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
     break;
 
   case 632:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5510 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5504 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new InsertExpr(
                 LOC ((yyloc)), store::UpdateConsts::BEFORE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
@@ -8993,6 +14220,7 @@
     break;
 
   case 633:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5516 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -9016,6 +14244,10 @@
 
 /* Line 678 of lalr1.cc  */
 #line 5526 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5510 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new InsertExpr(
                   LOC((yyloc)), store::UpdateConsts::AS_LAST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
@@ -9023,10 +14255,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 636:
 
 /* Line 678 of lalr1.cc  */
 #line 5532 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 634:
+/* Line 661 of lalr1.cc  */
+#line 5516 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new InsertExpr(
                 LOC ((yyloc)),
@@ -9035,10 +14273,36 @@
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 635:
+/* Line 661 of lalr1.cc  */
+#line 5523 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = new InsertExpr(
+                LOC ((yyloc)), store::UpdateConsts::BEFORE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
+            );
+        }
+    break;
+
+  case 636:
+/* Line 661 of lalr1.cc  */
+#line 5533 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 637:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5539 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5538 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new InsertExpr(
                 LOC ((yyloc)), store::UpdateConsts::BEFORE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
@@ -9047,6 +14311,7 @@
     break;
 
   case 638:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5549 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -9068,6 +14333,10 @@
 
 /* Line 678 of lalr1.cc  */
 #line 5562 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5546 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ReplaceExpr(
                 LOC((yyloc)), store::UpdateConsts::NODE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
@@ -9075,10 +14344,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 641:
 
 /* Line 678 of lalr1.cc  */
 #line 5568 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 639:
+/* Line 661 of lalr1.cc  */
+#line 5552 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ReplaceExpr(
                 LOC((yyloc)), store::UpdateConsts::VALUE_OF_NODE, (yysemantic_stack_[(7) - (5)].expr), (yysemantic_stack_[(7) - (7)].expr)
@@ -9086,29 +14361,47 @@
         }
     break;
 
+<<<<<<< TREE
   case 642:
 
 /* Line 678 of lalr1.cc  */
 #line 5578 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 640:
+/* Line 661 of lalr1.cc  */
+#line 5562 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new RenameExpr( LOC ((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
     break;
 
+<<<<<<< TREE
   case 643:
 
 /* Line 678 of lalr1.cc  */
 #line 5600 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 641:
+/* Line 661 of lalr1.cc  */
+#line 5584 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       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) );
     }
     break;
 
+<<<<<<< TREE
   case 644:
 
 /* Line 678 of lalr1.cc  */
 #line 5609 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 642:
+/* Line 661 of lalr1.cc  */
+#line 5593 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CopyVarList* lList = new CopyVarList(LOC((yyloc)));
       lList->push_back (dynamic_cast<VarBinding*> ((yysemantic_stack_[(1) - (1)].expr)));
@@ -9116,10 +14409,16 @@
     }
     break;
 
+<<<<<<< TREE
   case 645:
 
 /* Line 678 of lalr1.cc  */
 #line 5615 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 643:
+/* Line 661 of lalr1.cc  */
+#line 5599 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CopyVarList* lList = dynamic_cast<CopyVarList*>((yysemantic_stack_[(4) - (1)].expr));
       VarBinding* lBinding = dynamic_cast<VarBinding*>((yysemantic_stack_[(4) - (4)].expr));
@@ -9128,28 +14427,46 @@
     }
     break;
 
+<<<<<<< TREE
   case 646:
 
 /* Line 678 of lalr1.cc  */
 #line 5628 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 644:
+/* Line 661 of lalr1.cc  */
+#line 5612 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
        (yyval.expr) = new VarBinding(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), (yysemantic_stack_[(3) - (3)].expr));
     }
     break;
 
+<<<<<<< TREE
   case 647:
 
 /* Line 678 of lalr1.cc  */
 #line 5642 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 645:
+/* Line 661 of lalr1.cc  */
+#line 5626 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new TryExpr( LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
     break;
 
+<<<<<<< TREE
   case 648:
 
 /* Line 678 of lalr1.cc  */
 #line 5649 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 646:
+/* Line 661 of lalr1.cc  */
+#line 5633 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             CatchListExpr *cle = new CatchListExpr( LOC((yyloc)) );
             cle->push_back( static_cast<CatchExpr*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -9157,10 +14474,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 649:
 
 /* Line 678 of lalr1.cc  */
 #line 5655 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 647:
+/* Line 661 of lalr1.cc  */
+#line 5639 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
             if ( cle )
@@ -9169,7 +14492,28 @@
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 648:
+/* Line 661 of lalr1.cc  */
+#line 5649 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_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);
+    }
+    break;
+
+  case 649:
+/* Line 661 of lalr1.cc  */
+#line 5658 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
+    }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 650:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5665 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -9192,6 +14536,10 @@
 
 /* Line 678 of lalr1.cc  */
 #line 5682 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5666 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             CatchExpr::NameTestList *ntl = new CatchExpr::NameTestList;
             ntl->push_back( static_cast<NameTest*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -9199,10 +14547,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 653:
 
 /* Line 678 of lalr1.cc  */
 #line 5688 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 651:
+/* Line 661 of lalr1.cc  */
+#line 5672 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             CatchExpr::NameTestList *ntl =
                 static_cast<CatchExpr::NameTestList*>((yysemantic_stack_[(3) - (1)].name_test_list));
@@ -9211,100 +14565,175 @@
         }
     break;
 
+<<<<<<< TREE
   case 654:
 
 /* Line 678 of lalr1.cc  */
 #line 5706 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 652:
+/* Line 661 of lalr1.cc  */
+#line 5690 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (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);
         }
     break;
 
+<<<<<<< TREE
   case 655:
 
 /* Line 678 of lalr1.cc  */
 #line 5714 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 653:
+/* Line 661 of lalr1.cc  */
+#line 5698 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.pos_filter_list) = NULL;
         }
     break;
 
+<<<<<<< TREE
   case 656:
 
 /* Line 678 of lalr1.cc  */
 #line 5718 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 654:
+/* Line 661 of lalr1.cc  */
+#line 5702 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.pos_filter_list) = (yysemantic_stack_[(1) - (1)].pos_filter_list);
         }
     break;
 
+<<<<<<< TREE
   case 657:
 
 /* Line 678 of lalr1.cc  */
 #line 5725 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 655:
+/* Line 661 of lalr1.cc  */
+#line 5709 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.pos_filter_list) = new FTSelection::pos_filter_list_t;
             (yyval.pos_filter_list)->push_back( dynamic_cast<FTPosFilter*>((yysemantic_stack_[(1) - (1)].node)) );
         }
     break;
 
+<<<<<<< TREE
   case 658:
 
 /* Line 678 of lalr1.cc  */
 #line 5730 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 656:
+/* Line 661 of lalr1.cc  */
+#line 5714 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (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);
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 657:
+/* Line 661 of lalr1.cc  */
+#line 5722 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 658:
+/* Line 661 of lalr1.cc  */
+#line 5726 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = new FTOr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 659:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5738 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5733 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 660:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5742 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5737 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTOr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
         }
     break;
 
   case 661:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5749 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5744 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 662:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5753 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5748 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTAnd( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
         }
     break;
 
   case 663:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5760 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5755 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 664:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5764 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -9326,6 +14755,10 @@
 
 /* Line 678 of lalr1.cc  */
 #line 5775 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5759 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTUnaryNot(
                 LOC((yyloc)), dynamic_cast<FTPrimaryWithOptions*>((yysemantic_stack_[(2) - (2)].node))
@@ -9333,10 +14766,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 667:
 
 /* Line 678 of lalr1.cc  */
 #line 5784 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 665:
+/* Line 661 of lalr1.cc  */
+#line 5768 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTPrimaryWithOptions(
                 LOC((yyloc)),
@@ -9347,25 +14786,55 @@
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 666:
+/* Line 661 of lalr1.cc  */
+#line 5780 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = NULL;
+        }
+    break;
+
+  case 667:
+/* Line 661 of lalr1.cc  */
+#line 5784 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 668:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5796 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5791 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = NULL;
         }
     break;
 
   case 669:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5800 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5795 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 670:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5807 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -9387,15 +14856,25 @@
 
 /* Line 678 of lalr1.cc  */
 #line 5819 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5803 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTWeight( LOC((yyloc)), dynamic_cast<exprnode*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
     break;
 
+<<<<<<< TREE
   case 673:
 
 /* Line 678 of lalr1.cc  */
 #line 5827 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 671:
+/* Line 661 of lalr1.cc  */
+#line 5811 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTWordsTimes(
                 LOC((yyloc)),
@@ -9405,25 +14884,56 @@
         }
     break;
 
+<<<<<<< TREE
   case 674:
 
 /* Line 678 of lalr1.cc  */
 #line 5835 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 672:
+/* Line 661 of lalr1.cc  */
+#line 5819 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(3) - (2)].node);
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 673:
+/* Line 661 of lalr1.cc  */
+#line 5823 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 674:
+/* Line 661 of lalr1.cc  */
+#line 5830 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = NULL;
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 675:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5839 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5834 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 676:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5846 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -9445,6 +14955,10 @@
 
 /* Line 678 of lalr1.cc  */
 #line 5858 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5842 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTExtensionSelection(
                 LOC((yyloc)),
@@ -9454,7 +14968,27 @@
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 677:
+/* Line 661 of lalr1.cc  */
+#line 5853 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = NULL;
+        }
+    break;
+
+  case 678:
+/* Line 661 of lalr1.cc  */
+#line 5857 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 679:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5869 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -9476,6 +15010,10 @@
 
 /* Line 678 of lalr1.cc  */
 #line 5881 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5865 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTWords(
                 LOC((yyloc)),
@@ -9485,10 +15023,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 682:
 
 /* Line 678 of lalr1.cc  */
 #line 5893 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 680:
+/* Line 661 of lalr1.cc  */
+#line 5877 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTWordsValue(
                 LOC((yyloc)), static_cast<StringLiteral*>((yysemantic_stack_[(1) - (1)].expr)), NULL
@@ -9496,10 +15040,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 683:
 
 /* Line 678 of lalr1.cc  */
 #line 5899 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 681:
+/* Line 661 of lalr1.cc  */
+#line 5883 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTWordsValue(
                 LOC((yyloc)), NULL, dynamic_cast<exprnode*>((yysemantic_stack_[(3) - (2)].expr))
@@ -9507,115 +15057,196 @@
         }
     break;
 
+<<<<<<< TREE
   case 684:
 
 /* Line 678 of lalr1.cc  */
 #line 5908 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 682:
+/* Line 661 of lalr1.cc  */
+#line 5892 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::any );
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 683:
+/* Line 661 of lalr1.cc  */
+#line 5896 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 684:
+/* Line 661 of lalr1.cc  */
+#line 5904 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 685:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5912 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5908 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 686:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5920 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5912 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
         }
     break;
 
   case 687:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5924 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5919 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
         }
     break;
 
   case 688:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5928 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5923 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::phrase );
         }
     break;
 
   case 689:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5935 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5930 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::any;
         }
     break;
 
   case 690:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5939 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5934 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::any_word;
         }
     break;
 
   case 691:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5946 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5942 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::all;
         }
     break;
 
   case 692:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5950 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5946 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::all_words;
         }
     break;
 
   case 693:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5958 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5950 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 694:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5962 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5954 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 695:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5966 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5958 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 696:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 5970 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -9637,15 +15268,25 @@
 
 /* Line 678 of lalr1.cc  */
 #line 5982 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 5966 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTOrder( LOC((yyloc)) );
         }
     break;
 
+<<<<<<< TREE
   case 699:
 
 /* Line 678 of lalr1.cc  */
 #line 5990 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 697:
+/* Line 661 of lalr1.cc  */
+#line 5974 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTWindow(
                 LOC((yyloc)),
@@ -9655,10 +15296,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 700:
 
 /* Line 678 of lalr1.cc  */
 #line 6002 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 698:
+/* Line 661 of lalr1.cc  */
+#line 5986 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTDistance(
                 LOC((yyloc)),
@@ -9668,37 +15315,61 @@
         }
     break;
 
+<<<<<<< TREE
   case 701:
 
 /* Line 678 of lalr1.cc  */
 #line 6014 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 699:
+/* Line 661 of lalr1.cc  */
+#line 5998 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::words );
         }
     break;
 
+<<<<<<< TREE
   case 702:
 
 /* Line 678 of lalr1.cc  */
 #line 6018 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 700:
+/* Line 661 of lalr1.cc  */
+#line 6002 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::sentences );
         }
     break;
 
+<<<<<<< TREE
   case 703:
 
 /* Line 678 of lalr1.cc  */
 #line 6022 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 701:
+/* Line 661 of lalr1.cc  */
+#line 6006 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::paragraphs );
         }
     break;
 
+<<<<<<< TREE
   case 704:
 
 /* Line 678 of lalr1.cc  */
 #line 6030 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 702:
+/* Line 661 of lalr1.cc  */
+#line 6014 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             FTMatchOptions *mo = new FTMatchOptions( LOC((yyloc)) );
             mo->push_back( dynamic_cast<FTMatchOption*>((yysemantic_stack_[(2) - (2)].node)) );
@@ -9706,10 +15377,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 705:
 
 /* Line 678 of lalr1.cc  */
 #line 6036 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 703:
+/* Line 661 of lalr1.cc  */
+#line 6020 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             FTMatchOptions *mo = dynamic_cast<FTMatchOptions*>((yysemantic_stack_[(3) - (1)].node));
             mo->push_back( dynamic_cast<FTMatchOption*>((yysemantic_stack_[(3) - (3)].node)) );
@@ -9717,61 +15394,111 @@
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 704:
+/* Line 661 of lalr1.cc  */
+#line 6030 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 705:
+/* Line 661 of lalr1.cc  */
+#line 6034 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 706:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 6046 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 6038 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 707:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 6050 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 6042 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 708:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 6054 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 6046 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 709:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 6058 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 6050 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 710:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 6062 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 6054 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 711:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 6066 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 6058 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 712:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 6070 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -9793,42 +15520,70 @@
 
 /* Line 678 of lalr1.cc  */
 #line 6082 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 6066 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::sensitive );
         }
     break;
 
+<<<<<<< TREE
   case 715:
 
 /* Line 678 of lalr1.cc  */
 #line 6086 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 713:
+/* Line 661 of lalr1.cc  */
+#line 6070 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::insensitive );
         }
     break;
 
+<<<<<<< TREE
   case 716:
 
 /* Line 678 of lalr1.cc  */
 #line 6090 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 714:
+/* Line 661 of lalr1.cc  */
+#line 6074 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::lower );
         }
     break;
 
+<<<<<<< TREE
   case 717:
 
 /* Line 678 of lalr1.cc  */
 #line 6094 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 715:
+/* Line 661 of lalr1.cc  */
+#line 6078 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::upper );
         }
     break;
 
+<<<<<<< TREE
   case 718:
 
 /* Line 678 of lalr1.cc  */
 #line 6102 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 716:
+/* Line 661 of lalr1.cc  */
+#line 6086 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTDiacriticsOption(
                 LOC((yyloc)), ft_diacritics_mode::sensitive
@@ -9836,10 +15591,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 719:
 
 /* Line 678 of lalr1.cc  */
 #line 6108 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 717:
+/* Line 661 of lalr1.cc  */
+#line 6092 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTDiacriticsOption(
                 LOC((yyloc)), ft_diacritics_mode::insensitive
@@ -9847,10 +15608,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 720:
 
 /* Line 678 of lalr1.cc  */
 #line 6118 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 718:
+/* Line 661 of lalr1.cc  */
+#line 6102 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTExtensionOption(
                 LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)), SYMTAB((yysemantic_stack_[(3) - (3)].sval))
@@ -9858,28 +15625,46 @@
         }
     break;
 
+<<<<<<< TREE
   case 721:
 
 /* Line 678 of lalr1.cc  */
 #line 6128 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 719:
+/* Line 661 of lalr1.cc  */
+#line 6112 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::stemming );
         }
     break;
 
+<<<<<<< TREE
   case 722:
 
 /* Line 678 of lalr1.cc  */
 #line 6132 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 720:
+/* Line 661 of lalr1.cc  */
+#line 6116 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::no_stemming );
         }
     break;
 
+<<<<<<< TREE
   case 723:
 
 /* Line 678 of lalr1.cc  */
 #line 6140 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 721:
+/* Line 661 of lalr1.cc  */
+#line 6124 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             FTThesaurusOption::thesaurus_id_list_t *til = NULL;
             if ( (yysemantic_stack_[(2) - (2)].node) ) {
@@ -9891,10 +15676,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 724:
 
 /* Line 678 of lalr1.cc  */
 #line 6150 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 722:
+/* Line 661 of lalr1.cc  */
+#line 6134 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             FTThesaurusOption::thesaurus_id_list_t *til = (yysemantic_stack_[(5) - (4)].thesaurus_id_list);
             if ( (yysemantic_stack_[(5) - (3)].node) ) {
@@ -9907,16 +15698,42 @@
         }
     break;
 
+<<<<<<< TREE
   case 725:
 
 /* Line 678 of lalr1.cc  */
 #line 6161 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 723:
+/* Line 661 of lalr1.cc  */
+#line 6145 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTThesaurusOption( LOC((yyloc)), NULL, false, true );
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 724:
+/* Line 661 of lalr1.cc  */
+#line 6152 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 725:
+/* Line 661 of lalr1.cc  */
+#line 6156 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = NULL;
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 726:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 6168 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -9938,44 +15755,72 @@
 
 /* Line 678 of lalr1.cc  */
 #line 6179 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 6163 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.thesaurus_id_list) = NULL;
         }
     break;
 
+<<<<<<< TREE
   case 729:
 
 /* Line 678 of lalr1.cc  */
 #line 6183 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 727:
+/* Line 661 of lalr1.cc  */
+#line 6167 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.thesaurus_id_list) = (yysemantic_stack_[(2) - (2)].thesaurus_id_list);
         }
     break;
 
+<<<<<<< TREE
   case 730:
 
 /* Line 678 of lalr1.cc  */
 #line 6190 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 728:
+/* Line 661 of lalr1.cc  */
+#line 6174 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.thesaurus_id_list) = new FTThesaurusOption::thesaurus_id_list_t;
             (yyval.thesaurus_id_list)->push_back( dynamic_cast<FTThesaurusID*>((yysemantic_stack_[(1) - (1)].node)) );
         }
     break;
 
+<<<<<<< TREE
   case 731:
 
 /* Line 678 of lalr1.cc  */
 #line 6195 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 729:
+/* Line 661 of lalr1.cc  */
+#line 6179 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (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);
         }
     break;
 
+<<<<<<< TREE
   case 732:
 
 /* Line 678 of lalr1.cc  */
 #line 6204 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 730:
+/* Line 661 of lalr1.cc  */
+#line 6188 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (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))
@@ -9983,25 +15828,57 @@
         }
     break;
 
+<<<<<<< TREE
   case 733:
 
 /* Line 678 of lalr1.cc  */
 #line 6213 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 731:
+/* Line 661 of lalr1.cc  */
+#line 6197 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.sval) = 0;
         }
     break;
 
+<<<<<<< TREE
   case 734:
 
 /* Line 678 of lalr1.cc  */
 #line 6217 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 732:
+/* Line 661 of lalr1.cc  */
+#line 6201 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.sval) = (yysemantic_stack_[(2) - (2)].sval);
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 733:
+/* Line 661 of lalr1.cc  */
+#line 6208 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = NULL;
+        }
+    break;
+
+  case 734:
+/* Line 661 of lalr1.cc  */
+#line 6212 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 735:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 6224 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -10023,6 +15900,10 @@
 
 /* Line 678 of lalr1.cc  */
 #line 6236 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 6220 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStopWordOption(
                 LOC((yyloc)),
@@ -10033,10 +15914,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 738:
 
 /* Line 678 of lalr1.cc  */
 #line 6245 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 736:
+/* Line 661 of lalr1.cc  */
+#line 6229 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStopWordOption(
                 LOC((yyloc)), NULL, (yysemantic_stack_[(4) - (4)].incl_excl_list), ft_stop_words_mode::with_default
@@ -10045,10 +15932,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 739:
 
 /* Line 678 of lalr1.cc  */
 #line 6252 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 737:
+/* Line 661 of lalr1.cc  */
+#line 6236 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStopWordOption(
                 LOC((yyloc)), NULL, NULL, ft_stop_words_mode::without
@@ -10056,28 +15949,46 @@
         }
     break;
 
+<<<<<<< TREE
   case 740:
 
 /* Line 678 of lalr1.cc  */
 #line 6262 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 738:
+/* Line 661 of lalr1.cc  */
+#line 6246 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStopWords( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)), NULL );
         }
     break;
 
+<<<<<<< TREE
   case 741:
 
 /* Line 678 of lalr1.cc  */
 #line 6266 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 739:
+/* Line 661 of lalr1.cc  */
+#line 6250 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStopWords( LOC((yyloc)), "", (yysemantic_stack_[(3) - (2)].strlist) );
         }
     break;
 
+<<<<<<< TREE
   case 742:
 
 /* Line 678 of lalr1.cc  */
 #line 6273 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 740:
+/* Line 661 of lalr1.cc  */
+#line 6257 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             string_list_t *sl = new string_list_t;
             sl->push_back( SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
@@ -10085,10 +15996,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 743:
 
 /* Line 678 of lalr1.cc  */
 #line 6279 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 741:
+/* Line 661 of lalr1.cc  */
+#line 6263 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             if ( (yysemantic_stack_[(3) - (1)].strlist) )
                 (yysemantic_stack_[(3) - (1)].strlist)->push_back( SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
@@ -10096,38 +16013,62 @@
         }
     break;
 
+<<<<<<< TREE
   case 744:
 
 /* Line 678 of lalr1.cc  */
 #line 6288 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 742:
+/* Line 661 of lalr1.cc  */
+#line 6272 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.incl_excl_list) = NULL;
         }
     break;
 
+<<<<<<< TREE
   case 745:
 
 /* Line 678 of lalr1.cc  */
 #line 6292 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 743:
+/* Line 661 of lalr1.cc  */
+#line 6276 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.incl_excl_list) = (yysemantic_stack_[(1) - (1)].incl_excl_list);
         }
     break;
 
+<<<<<<< TREE
   case 746:
 
 /* Line 678 of lalr1.cc  */
 #line 6299 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 744:
+/* Line 661 of lalr1.cc  */
+#line 6283 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.incl_excl_list) = new FTStopWordOption::incl_excl_list_t;
             (yyval.incl_excl_list)->push_back( dynamic_cast<FTStopWordsInclExcl*>((yysemantic_stack_[(1) - (1)].node)) );
         }
     break;
 
+<<<<<<< TREE
   case 747:
 
 /* Line 678 of lalr1.cc  */
 #line 6304 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 745:
+/* Line 661 of lalr1.cc  */
+#line 6288 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             FTStopWordOption::incl_excl_list_t *iel = (yysemantic_stack_[(2) - (1)].incl_excl_list);
             if ( !iel )
@@ -10137,10 +16078,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 748:
 
 /* Line 678 of lalr1.cc  */
 #line 6316 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 746:
+/* Line 661 of lalr1.cc  */
+#line 6300 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStopWordsInclExcl(
                 LOC((yyloc)),
@@ -10150,10 +16097,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 749:
 
 /* Line 678 of lalr1.cc  */
 #line 6324 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 747:
+/* Line 661 of lalr1.cc  */
+#line 6308 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStopWordsInclExcl(
                 LOC((yyloc)),
@@ -10163,109 +16116,181 @@
         }
     break;
 
+<<<<<<< TREE
   case 750:
 
 /* Line 678 of lalr1.cc  */
 #line 6336 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 748:
+/* Line 661 of lalr1.cc  */
+#line 6320 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTLanguageOption( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
         }
     break;
 
+<<<<<<< TREE
   case 751:
 
 /* Line 678 of lalr1.cc  */
 #line 6344 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 749:
+/* Line 661 of lalr1.cc  */
+#line 6328 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::with );
         }
     break;
 
+<<<<<<< TREE
   case 752:
 
 /* Line 678 of lalr1.cc  */
 #line 6348 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 750:
+/* Line 661 of lalr1.cc  */
+#line 6332 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::without );
         }
     break;
 
+<<<<<<< TREE
   case 753:
 
 /* Line 678 of lalr1.cc  */
 #line 6356 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 751:
+/* Line 661 of lalr1.cc  */
+#line 6340 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_start );
         }
     break;
 
+<<<<<<< TREE
   case 754:
 
 /* Line 678 of lalr1.cc  */
 #line 6360 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 752:
+/* Line 661 of lalr1.cc  */
+#line 6344 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_end );
         }
     break;
 
+<<<<<<< TREE
   case 755:
 
 /* Line 678 of lalr1.cc  */
 #line 6364 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 753:
+/* Line 661 of lalr1.cc  */
+#line 6348 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::entire );
         }
     break;
 
+<<<<<<< TREE
   case 756:
 
 /* Line 678 of lalr1.cc  */
 #line 6372 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 754:
+/* Line 661 of lalr1.cc  */
+#line 6356 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTTimes( LOC((yyloc)), dynamic_cast<FTRange*>((yysemantic_stack_[(3) - (2)].node)) );
         }
     break;
 
+<<<<<<< TREE
   case 757:
 
 /* Line 678 of lalr1.cc  */
 #line 6380 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 755:
+/* Line 661 of lalr1.cc  */
+#line 6364 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::exactly, (yysemantic_stack_[(2) - (2)].expr) );
         }
     break;
 
+<<<<<<< TREE
   case 758:
 
 /* Line 678 of lalr1.cc  */
 #line 6384 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 756:
+/* Line 661 of lalr1.cc  */
+#line 6368 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::at_least, (yysemantic_stack_[(3) - (3)].expr) );
         }
     break;
 
+<<<<<<< TREE
   case 759:
 
 /* Line 678 of lalr1.cc  */
 #line 6388 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 757:
+/* Line 661 of lalr1.cc  */
+#line 6372 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::at_most, (yysemantic_stack_[(3) - (3)].expr) );
         }
     break;
 
+<<<<<<< TREE
   case 760:
 
 /* Line 678 of lalr1.cc  */
 #line 6392 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 758:
+/* Line 661 of lalr1.cc  */
+#line 6376 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::from_to, (yysemantic_stack_[(4) - (2)].expr), (yysemantic_stack_[(4) - (4)].expr) );
         }
     break;
 
+<<<<<<< TREE
   case 761:
 
 /* Line 678 of lalr1.cc  */
 #line 6400 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 759:
+/* Line 661 of lalr1.cc  */
+#line 6384 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTScope(
                 LOC((yyloc)),
@@ -10275,10 +16300,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 762:
 
 /* Line 678 of lalr1.cc  */
 #line 6408 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 760:
+/* Line 661 of lalr1.cc  */
+#line 6392 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTScope(
                 LOC((yyloc)),
@@ -10288,105 +16319,171 @@
         }
     break;
 
+<<<<<<< TREE
   case 763:
 
 /* Line 678 of lalr1.cc  */
 #line 6420 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 761:
+/* Line 661 of lalr1.cc  */
+#line 6404 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::sentence );
         }
     break;
 
+<<<<<<< TREE
   case 764:
 
 /* Line 678 of lalr1.cc  */
 #line 6424 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 762:
+/* Line 661 of lalr1.cc  */
+#line 6408 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::paragraph );
         }
     break;
 
+<<<<<<< TREE
   case 765:
 
 /* Line 678 of lalr1.cc  */
 #line 6432 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 763:
+/* Line 661 of lalr1.cc  */
+#line 6416 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTIgnoreOption( LOC((yyloc)), static_cast<UnionExpr*>((yysemantic_stack_[(3) - (3)].expr)) );
         }
     break;
 
+<<<<<<< TREE
   case 766:
 
 /* Line 678 of lalr1.cc  */
 #line 6446 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 764:
+/* Line 661 of lalr1.cc  */
+#line 6430 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), NULL );
         }
     break;
 
+<<<<<<< TREE
   case 767:
 
 /* Line 678 of lalr1.cc  */
 #line 6450 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 765:
+/* Line 661 of lalr1.cc  */
+#line 6434 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
         }
     break;
 
+<<<<<<< TREE
   case 768:
 
 /* Line 678 of lalr1.cc  */
 #line 6457 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 766:
+/* Line 661 of lalr1.cc  */
+#line 6441 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), NULL, false);
         }
     break;
 
+<<<<<<< TREE
   case 769:
 
 /* Line 678 of lalr1.cc  */
 #line 6462 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 767:
+/* Line 661 of lalr1.cc  */
+#line 6446 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), false);
         }
     break;
 
+<<<<<<< TREE
   case 770:
 
 /* Line 678 of lalr1.cc  */
 #line 6470 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 768:
+/* Line 661 of lalr1.cc  */
+#line 6454 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), NULL, true);
         }
     break;
 
+<<<<<<< TREE
   case 771:
 
 /* Line 678 of lalr1.cc  */
 #line 6475 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 769:
+/* Line 661 of lalr1.cc  */
+#line 6459 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), true);
         }
     break;
 
+<<<<<<< TREE
   case 772:
 
 /* Line 678 of lalr1.cc  */
 #line 6484 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 770:
+/* Line 661 of lalr1.cc  */
+#line 6468 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new JSONDirectObjectConstructor(LOC((yyloc)),
                                                dynamic_cast<JSONPairList*>((yysemantic_stack_[(3) - (2)].node)));
         }
     break;
 
+<<<<<<< TREE
   case 773:
 
 /* Line 678 of lalr1.cc  */
 #line 6492 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 771:
+/* Line 661 of lalr1.cc  */
+#line 6476 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           JSONPairList* jpl = new JSONPairList(LOC((yyloc)));
           jpl->push_back(new JSONPairConstructor(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)));
@@ -10394,10 +16491,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 774:
 
 /* Line 678 of lalr1.cc  */
 #line 6498 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 772:
+/* Line 661 of lalr1.cc  */
+#line 6482 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (1)].node));
           assert(jpl);
@@ -10406,39 +16509,63 @@
         }
     break;
 
+<<<<<<< TREE
   case 775:
 
 /* Line 678 of lalr1.cc  */
 #line 6508 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 773:
+/* Line 661 of lalr1.cc  */
+#line 6492 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new JSONObjectInsertExpr(LOC((yyloc)),
-                                        static_cast<JSONPairList*>((yysemantic_stack_[(7) - (4)].node)),
-                                        (yysemantic_stack_[(7) - (7)].expr));
+                                        (yysemantic_stack_[(5) - (3)].expr),
+                                        (yysemantic_stack_[(5) - (5)].expr));
         }
     break;
 
+<<<<<<< TREE
   case 776:
 
 /* Line 678 of lalr1.cc  */
 #line 6514 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 774:
+/* Line 661 of lalr1.cc  */
+#line 6498 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-          (yyval.expr) = new JSONArrayInsertExpr(LOC((yyloc)), (yysemantic_stack_[(10) - (4)].expr), (yysemantic_stack_[(10) - (7)].expr), (yysemantic_stack_[(10) - (10)].expr));
+          (yyval.expr) = new JSONArrayInsertExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), (yysemantic_stack_[(8) - (5)].expr), (yysemantic_stack_[(8) - (8)].expr));
         }
     break;
 
+<<<<<<< TREE
   case 777:
 
 /* Line 678 of lalr1.cc  */
 #line 6521 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 775:
+/* Line 661 of lalr1.cc  */
+#line 6505 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new JSONArrayAppendExpr(LOC((yyloc)), (yysemantic_stack_[(7) - (4)].expr), (yysemantic_stack_[(7) - (7)].expr));
         }
     break;
 
+<<<<<<< TREE
   case 778:
 
 /* Line 678 of lalr1.cc  */
 #line 6528 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 776:
+/* Line 661 of lalr1.cc  */
+#line 6512 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(3) - (3)].expr));
@@ -10466,10 +16593,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 779:
 
 /* Line 678 of lalr1.cc  */
 #line 6557 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 777:
+/* Line 661 of lalr1.cc  */
+#line 6541 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(5) - (3)].expr));
@@ -10497,10 +16630,16 @@
         }
     break;
 
+<<<<<<< TREE
   case 780:
 
 /* Line 678 of lalr1.cc  */
 #line 6586 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 778:
+/* Line 661 of lalr1.cc  */
+#line 6570 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(7) - (5)].expr));
@@ -10528,16 +16667,41 @@
         }
     break;
 
+<<<<<<< TREE
+=======
+  case 779:
+/* Line 661 of lalr1.cc  */
+#line 6599 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+          (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 780:
+/* Line 661 of lalr1.cc  */
+#line 6603 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+    {
+          (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+>>>>>>> MERGE-SOURCE
   case 781:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 6615 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 6607 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 782:
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 6619 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
@@ -10559,33 +16723,55 @@
 
 /* Line 678 of lalr1.cc  */
 #line 6630 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+/* Line 661 of lalr1.cc  */
+#line 6614 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonItem);
         }
     break;
 
+<<<<<<< TREE
   case 785:
 
 /* Line 678 of lalr1.cc  */
 #line 6637 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 783:
+/* Line 661 of lalr1.cc  */
+#line 6621 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonObject);
         }
     break;
 
+<<<<<<< TREE
   case 786:
 
 /* Line 678 of lalr1.cc  */
 #line 6644 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 784:
+/* Line 661 of lalr1.cc  */
+#line 6628 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonArray);
         }
     break;
 
+<<<<<<< TREE
   case 789:
 
 /* Line 678 of lalr1.cc  */
 #line 6661 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 787:
+/* Line 661 of lalr1.cc  */
+#line 6645 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           auto_ptr<QName> lQName( static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
           zstring const &tmp = lQName->get_qname();
@@ -10597,1560 +16783,2902 @@
         }
     break;
 
+<<<<<<< TREE
   case 791:
 
 /* Line 678 of lalr1.cc  */
 #line 6674 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 789:
+/* Line 661 of lalr1.cc  */
+#line 6658 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("attribute"))); }
     break;
 
+<<<<<<< TREE
   case 792:
 
 /* Line 678 of lalr1.cc  */
 #line 6675 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 790:
+/* Line 661 of lalr1.cc  */
+#line 6659 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("comment"))); }
     break;
 
+<<<<<<< TREE
   case 793:
 
 /* Line 678 of lalr1.cc  */
 #line 6676 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 791:
+/* Line 661 of lalr1.cc  */
+#line 6660 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("document-node"))); }
     break;
 
+<<<<<<< TREE
   case 794:
 
 /* Line 678 of lalr1.cc  */
 #line 6677 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 792:
+/* Line 661 of lalr1.cc  */
+#line 6661 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("element"))); }
     break;
 
+<<<<<<< TREE
   case 795:
 
 /* Line 678 of lalr1.cc  */
 #line 6678 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 793:
+/* Line 661 of lalr1.cc  */
+#line 6662 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("item"))); }
     break;
 
+<<<<<<< TREE
   case 796:
 
 /* Line 678 of lalr1.cc  */
 #line 6679 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 794:
+/* Line 661 of lalr1.cc  */
+#line 6663 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("if"))); }
     break;
 
+<<<<<<< TREE
   case 797:
 
 /* Line 678 of lalr1.cc  */
 #line 6680 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 795:
+/* Line 661 of lalr1.cc  */
+#line 6664 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("node"))); }
     break;
 
+<<<<<<< TREE
   case 798:
 
 /* Line 678 of lalr1.cc  */
 #line 6681 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 796:
+/* Line 661 of lalr1.cc  */
+#line 6665 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("processing-instruction"))); }
     break;
 
+<<<<<<< TREE
   case 799:
 
 /* Line 678 of lalr1.cc  */
 #line 6682 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 797:
+/* Line 661 of lalr1.cc  */
+#line 6666 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema-attribute"))); }
     break;
 
+<<<<<<< TREE
   case 800:
 
 /* Line 678 of lalr1.cc  */
 #line 6683 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 798:
+/* Line 661 of lalr1.cc  */
+#line 6667 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema-element"))); }
     break;
 
+<<<<<<< TREE
   case 801:
 
 /* Line 678 of lalr1.cc  */
 #line 6684 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 799:
+/* Line 661 of lalr1.cc  */
+#line 6668 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("text"))); }
     break;
 
+<<<<<<< TREE
   case 802:
 
 /* Line 678 of lalr1.cc  */
 #line 6685 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 800:
+/* Line 661 of lalr1.cc  */
+#line 6669 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("typeswitch"))); }
     break;
 
+<<<<<<< TREE
   case 803:
 
 /* Line 678 of lalr1.cc  */
 #line 6686 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 801:
+/* Line 661 of lalr1.cc  */
+#line 6670 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("switch"))); }
     break;
 
+<<<<<<< TREE
   case 804:
 
 /* Line 678 of lalr1.cc  */
 #line 6687 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 802:
+/* Line 661 of lalr1.cc  */
+#line 6671 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("empty-sequence"))); }
     break;
 
+<<<<<<< TREE
   case 805:
 
 /* Line 678 of lalr1.cc  */
 #line 6688 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 803:
+/* Line 661 of lalr1.cc  */
+#line 6672 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("while"))); }
     break;
 
+<<<<<<< TREE
   case 807:
 
 /* Line 678 of lalr1.cc  */
 #line 6693 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 805:
+/* Line 661 of lalr1.cc  */
+#line 6677 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))); }
     break;
 
+<<<<<<< TREE
   case 808:
 
 /* Line 678 of lalr1.cc  */
 #line 6694 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 806:
+/* Line 661 of lalr1.cc  */
+#line 6678 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("xquery"))); }
     break;
 
+<<<<<<< TREE
   case 809:
 
 /* Line 678 of lalr1.cc  */
 #line 6695 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 807:
+/* Line 661 of lalr1.cc  */
+#line 6679 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("empty"))); }
     break;
 
+<<<<<<< TREE
   case 810:
 
 /* Line 678 of lalr1.cc  */
 #line 6696 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 808:
+/* Line 661 of lalr1.cc  */
+#line 6680 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("boundary-space"))); }
     break;
 
+<<<<<<< TREE
   case 811:
 
 /* Line 678 of lalr1.cc  */
 #line 6697 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 809:
+/* Line 661 of lalr1.cc  */
+#line 6681 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ft-option"))); }
     break;
 
+<<<<<<< TREE
   case 812:
 
 /* Line 678 of lalr1.cc  */
 #line 6698 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 810:
+/* Line 661 of lalr1.cc  */
+#line 6682 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("base-uri"))); }
     break;
 
+<<<<<<< TREE
   case 813:
 
 /* Line 678 of lalr1.cc  */
 #line 6699 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 811:
+/* Line 661 of lalr1.cc  */
+#line 6683 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lax"))); }
     break;
 
+<<<<<<< TREE
   case 814:
 
 /* Line 678 of lalr1.cc  */
 #line 6700 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 812:
+/* Line 661 of lalr1.cc  */
+#line 6684 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("strict"))); }
     break;
 
+<<<<<<< TREE
   case 815:
 
 /* Line 678 of lalr1.cc  */
 #line 6701 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 813:
+/* Line 661 of lalr1.cc  */
+#line 6685 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("idiv"))); }
     break;
 
+<<<<<<< TREE
   case 816:
 
 /* Line 678 of lalr1.cc  */
 #line 6702 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 814:
+/* Line 661 of lalr1.cc  */
+#line 6686 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("document"))); }
     break;
 
+<<<<<<< TREE
   case 817:
 
 /* Line 678 of lalr1.cc  */
 #line 6703 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 815:
+/* Line 661 of lalr1.cc  */
+#line 6687 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ftnot"))); }
     break;
 
+<<<<<<< TREE
   case 818:
 
 /* Line 678 of lalr1.cc  */
 #line 6704 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 816:
+/* Line 661 of lalr1.cc  */
+#line 6688 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("not"))); }
     break;
 
+<<<<<<< TREE
   case 819:
 
 /* Line 678 of lalr1.cc  */
 #line 6705 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 817:
+/* Line 661 of lalr1.cc  */
+#line 6689 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sensitive"))); }
     break;
 
+<<<<<<< TREE
   case 820:
 
 /* Line 678 of lalr1.cc  */
 #line 6706 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 818:
+/* Line 661 of lalr1.cc  */
+#line 6690 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("insensitive"))); }
     break;
 
+<<<<<<< TREE
   case 821:
 
 /* Line 678 of lalr1.cc  */
 #line 6707 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 819:
+/* Line 661 of lalr1.cc  */
+#line 6691 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("diacritics"))); }
     break;
 
+<<<<<<< TREE
   case 822:
 
 /* Line 678 of lalr1.cc  */
 #line 6708 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 820:
+/* Line 661 of lalr1.cc  */
+#line 6692 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("without"))); }
     break;
 
+<<<<<<< TREE
   case 823:
 
 /* Line 678 of lalr1.cc  */
 #line 6709 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 821:
+/* Line 661 of lalr1.cc  */
+#line 6693 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stemming"))); }
     break;
 
+<<<<<<< TREE
   case 824:
 
 /* Line 678 of lalr1.cc  */
 #line 6710 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 822:
+/* Line 661 of lalr1.cc  */
+#line 6694 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("thesaurus"))); }
     break;
 
+<<<<<<< TREE
   case 825:
 
 /* Line 678 of lalr1.cc  */
 #line 6711 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 823:
+/* Line 661 of lalr1.cc  */
+#line 6695 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stop"))); }
     break;
 
+<<<<<<< TREE
   case 826:
 
 /* Line 678 of lalr1.cc  */
 #line 6712 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 824:
+/* Line 661 of lalr1.cc  */
+#line 6696 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("wildcards"))); }
     break;
 
+<<<<<<< TREE
   case 827:
 
 /* Line 678 of lalr1.cc  */
 #line 6713 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 825:
+/* Line 661 of lalr1.cc  */
+#line 6697 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("entire"))); }
     break;
 
+<<<<<<< TREE
   case 828:
 
 /* Line 678 of lalr1.cc  */
 #line 6714 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 826:
+/* Line 661 of lalr1.cc  */
+#line 6698 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("content"))); }
     break;
 
+<<<<<<< TREE
   case 829:
 
 /* Line 678 of lalr1.cc  */
 #line 6715 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 827:
+/* Line 661 of lalr1.cc  */
+#line 6699 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("word"))); }
     break;
 
+<<<<<<< TREE
   case 830:
 
 /* Line 678 of lalr1.cc  */
 #line 6716 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 828:
+/* Line 661 of lalr1.cc  */
+#line 6700 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("start"))); }
     break;
 
+<<<<<<< TREE
   case 831:
 
 /* Line 678 of lalr1.cc  */
 #line 6717 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 829:
+/* Line 661 of lalr1.cc  */
+#line 6701 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("end"))); }
     break;
 
+<<<<<<< TREE
   case 832:
 
 /* Line 678 of lalr1.cc  */
 #line 6718 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 830:
+/* Line 661 of lalr1.cc  */
+#line 6702 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("most"))); }
     break;
 
+<<<<<<< TREE
   case 833:
 
 /* Line 678 of lalr1.cc  */
 #line 6719 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 831:
+/* Line 661 of lalr1.cc  */
+#line 6703 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("skip"))); }
     break;
 
+<<<<<<< TREE
   case 834:
 
 /* Line 678 of lalr1.cc  */
 #line 6720 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 832:
+/* Line 661 of lalr1.cc  */
+#line 6704 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("copy"))); }
     break;
 
+<<<<<<< TREE
   case 835:
 
 /* Line 678 of lalr1.cc  */
 #line 6721 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 833:
+/* Line 661 of lalr1.cc  */
+#line 6705 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("general"))); }
     break;
 
+<<<<<<< TREE
   case 836:
 
 /* Line 678 of lalr1.cc  */
 #line 6722 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 834:
+/* Line 661 of lalr1.cc  */
+#line 6706 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("value"))); }
     break;
 
+<<<<<<< TREE
   case 837:
 
 /* Line 678 of lalr1.cc  */
 #line 6723 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 835:
+/* Line 661 of lalr1.cc  */
+#line 6707 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("eq"))); }
     break;
 
+<<<<<<< TREE
   case 838:
 
 /* Line 678 of lalr1.cc  */
 #line 6724 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 836:
+/* Line 661 of lalr1.cc  */
+#line 6708 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ne"))); }
     break;
 
+<<<<<<< TREE
   case 839:
 
 /* Line 678 of lalr1.cc  */
 #line 6725 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 837:
+/* Line 661 of lalr1.cc  */
+#line 6709 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lt"))); }
     break;
 
+<<<<<<< TREE
   case 840:
 
 /* Line 678 of lalr1.cc  */
 #line 6726 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 838:
+/* Line 661 of lalr1.cc  */
+#line 6710 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("le"))); }
     break;
 
+<<<<<<< TREE
   case 841:
 
 /* Line 678 of lalr1.cc  */
 #line 6727 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 839:
+/* Line 661 of lalr1.cc  */
+#line 6711 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("gt"))); }
     break;
 
+<<<<<<< TREE
   case 842:
 
 /* Line 678 of lalr1.cc  */
 #line 6728 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 840:
+/* Line 661 of lalr1.cc  */
+#line 6712 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ge"))); }
     break;
 
+<<<<<<< TREE
   case 843:
 
 /* Line 678 of lalr1.cc  */
 #line 6729 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 841:
+/* Line 661 of lalr1.cc  */
+#line 6713 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("at"))); }
     break;
 
+<<<<<<< TREE
   case 844:
 
 /* Line 678 of lalr1.cc  */
 #line 6730 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 842:
+/* Line 661 of lalr1.cc  */
+#line 6714 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("context"))); }
     break;
 
+<<<<<<< TREE
   case 845:
 
 /* Line 678 of lalr1.cc  */
 #line 6731 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 843:
+/* Line 661 of lalr1.cc  */
+#line 6715 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("variable"))); }
     break;
 
+<<<<<<< TREE
   case 846:
 
 /* Line 678 of lalr1.cc  */
 #line 6732 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 844:
+/* Line 661 of lalr1.cc  */
+#line 6716 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("return"))); }
     break;
 
+<<<<<<< TREE
   case 847:
 
 /* Line 678 of lalr1.cc  */
 #line 6733 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 845:
+/* Line 661 of lalr1.cc  */
+#line 6717 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("for"))); }
     break;
 
+<<<<<<< TREE
   case 848:
 
 /* Line 678 of lalr1.cc  */
 #line 6734 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 846:
+/* Line 661 of lalr1.cc  */
+#line 6718 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("allowing"))); }
     break;
 
+<<<<<<< TREE
   case 849:
 
 /* Line 678 of lalr1.cc  */
 #line 6735 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 847:
+/* Line 661 of lalr1.cc  */
+#line 6719 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sliding"))); }
     break;
 
+<<<<<<< TREE
   case 850:
 
 /* Line 678 of lalr1.cc  */
 #line 6736 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 848:
+/* Line 661 of lalr1.cc  */
+#line 6720 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("tumbling"))); }
     break;
 
+<<<<<<< TREE
   case 851:
 
 /* Line 678 of lalr1.cc  */
 #line 6737 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 849:
+/* Line 661 of lalr1.cc  */
+#line 6721 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("previous"))); }
     break;
 
+<<<<<<< TREE
   case 852:
 
 /* Line 678 of lalr1.cc  */
 #line 6738 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 850:
+/* Line 661 of lalr1.cc  */
+#line 6722 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("next"))); }
     break;
 
+<<<<<<< TREE
   case 853:
 
 /* Line 678 of lalr1.cc  */
 #line 6739 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 851:
+/* Line 661 of lalr1.cc  */
+#line 6723 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("only"))); }
     break;
 
+<<<<<<< TREE
   case 854:
 
 /* Line 678 of lalr1.cc  */
 #line 6740 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 852:
+/* Line 661 of lalr1.cc  */
+#line 6724 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("when"))); }
     break;
 
+<<<<<<< TREE
   case 855:
 
 /* Line 678 of lalr1.cc  */
 #line 6741 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 853:
+/* Line 661 of lalr1.cc  */
+#line 6725 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("count"))); }
     break;
 
+<<<<<<< TREE
   case 856:
 
 /* Line 678 of lalr1.cc  */
 #line 6742 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 854:
+/* Line 661 of lalr1.cc  */
+#line 6726 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("in"))); }
     break;
 
+<<<<<<< TREE
   case 857:
 
 /* Line 678 of lalr1.cc  */
 #line 6743 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 855:
+/* Line 661 of lalr1.cc  */
+#line 6727 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("let"))); }
     break;
 
+<<<<<<< TREE
   case 858:
 
 /* Line 678 of lalr1.cc  */
 #line 6744 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 856:
+/* Line 661 of lalr1.cc  */
+#line 6728 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("where"))); }
     break;
 
+<<<<<<< TREE
   case 859:
 
 /* Line 678 of lalr1.cc  */
 #line 6745 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 857:
+/* Line 661 of lalr1.cc  */
+#line 6729 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("by"))); }
     break;
 
+<<<<<<< TREE
   case 860:
 
 /* Line 678 of lalr1.cc  */
 #line 6746 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 858:
+/* Line 661 of lalr1.cc  */
+#line 6730 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("group"))); }
     break;
 
+<<<<<<< TREE
   case 861:
 
 /* Line 678 of lalr1.cc  */
 #line 6747 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 859:
+/* Line 661 of lalr1.cc  */
+#line 6731 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("order"))); }
     break;
 
+<<<<<<< TREE
   case 862:
 
 /* Line 678 of lalr1.cc  */
 #line 6748 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 860:
+/* Line 661 of lalr1.cc  */
+#line 6732 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stable"))); }
     break;
 
+<<<<<<< TREE
   case 863:
 
 /* Line 678 of lalr1.cc  */
 #line 6749 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 861:
+/* Line 661 of lalr1.cc  */
+#line 6733 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ascending"))); }
     break;
 
+<<<<<<< TREE
   case 864:
 
 /* Line 678 of lalr1.cc  */
 #line 6750 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 862:
+/* Line 661 of lalr1.cc  */
+#line 6734 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descending"))); }
     break;
 
+<<<<<<< TREE
   case 865:
 
 /* Line 678 of lalr1.cc  */
 #line 6751 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 863:
+/* Line 661 of lalr1.cc  */
+#line 6735 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("greatest"))); }
     break;
 
+<<<<<<< TREE
   case 866:
 
 /* Line 678 of lalr1.cc  */
 #line 6752 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 864:
+/* Line 661 of lalr1.cc  */
+#line 6736 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("least"))); }
     break;
 
+<<<<<<< TREE
   case 867:
 
 /* Line 678 of lalr1.cc  */
 #line 6753 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 865:
+/* Line 661 of lalr1.cc  */
+#line 6737 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("collation"))); }
     break;
 
+<<<<<<< TREE
   case 868:
 
 /* Line 678 of lalr1.cc  */
 #line 6754 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 866:
+/* Line 661 of lalr1.cc  */
+#line 6738 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("some"))); }
     break;
 
+<<<<<<< TREE
   case 869:
 
 /* Line 678 of lalr1.cc  */
 #line 6755 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 867:
+/* Line 661 of lalr1.cc  */
+#line 6739 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("every"))); }
     break;
 
+<<<<<<< TREE
   case 870:
 
 /* Line 678 of lalr1.cc  */
 #line 6756 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 868:
+/* Line 661 of lalr1.cc  */
+#line 6740 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("satisfies"))); }
     break;
 
+<<<<<<< TREE
   case 871:
 
 /* Line 678 of lalr1.cc  */
 #line 6757 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 869:
+/* Line 661 of lalr1.cc  */
+#line 6741 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("case"))); }
     break;
 
+<<<<<<< TREE
   case 872:
 
 /* Line 678 of lalr1.cc  */
 #line 6758 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 870:
+/* Line 661 of lalr1.cc  */
+#line 6742 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("as"))); }
     break;
 
+<<<<<<< TREE
   case 873:
 
 /* Line 678 of lalr1.cc  */
 #line 6759 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 871:
+/* Line 661 of lalr1.cc  */
+#line 6743 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("then"))); }
     break;
 
+<<<<<<< TREE
   case 874:
 
 /* Line 678 of lalr1.cc  */
 #line 6760 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 872:
+/* Line 661 of lalr1.cc  */
+#line 6744 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("else"))); }
     break;
 
+<<<<<<< TREE
   case 875:
 
 /* Line 678 of lalr1.cc  */
 #line 6761 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 873:
+/* Line 661 of lalr1.cc  */
+#line 6745 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("or"))); }
     break;
 
+<<<<<<< TREE
   case 876:
 
 /* Line 678 of lalr1.cc  */
 #line 6762 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 874:
+/* Line 661 of lalr1.cc  */
+#line 6746 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("and"))); }
     break;
 
+<<<<<<< TREE
   case 877:
 
 /* Line 678 of lalr1.cc  */
 #line 6763 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 875:
+/* Line 661 of lalr1.cc  */
+#line 6747 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("instance"))); }
     break;
 
+<<<<<<< TREE
   case 878:
 
 /* Line 678 of lalr1.cc  */
 #line 6764 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 876:
+/* Line 661 of lalr1.cc  */
+#line 6748 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("of"))); }
     break;
 
+<<<<<<< TREE
   case 879:
 
 /* Line 678 of lalr1.cc  */
 #line 6765 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 877:
+/* Line 661 of lalr1.cc  */
+#line 6749 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("castable"))); }
     break;
 
+<<<<<<< TREE
   case 880:
 
 /* Line 678 of lalr1.cc  */
 #line 6766 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 878:
+/* Line 661 of lalr1.cc  */
+#line 6750 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("to"))); }
     break;
 
+<<<<<<< TREE
   case 881:
 
 /* Line 678 of lalr1.cc  */
 #line 6767 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 879:
+/* Line 661 of lalr1.cc  */
+#line 6751 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("div"))); }
     break;
 
+<<<<<<< TREE
   case 882:
 
 /* Line 678 of lalr1.cc  */
 #line 6768 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 880:
+/* Line 661 of lalr1.cc  */
+#line 6752 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("mod"))); }
     break;
 
+<<<<<<< TREE
   case 883:
 
 /* Line 678 of lalr1.cc  */
 #line 6769 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 881:
+/* Line 661 of lalr1.cc  */
+#line 6753 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("union"))); }
     break;
 
+<<<<<<< TREE
   case 884:
 
 /* Line 678 of lalr1.cc  */
 #line 6770 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 882:
+/* Line 661 of lalr1.cc  */
+#line 6754 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("intersect"))); }
     break;
 
+<<<<<<< TREE
   case 885:
 
 /* Line 678 of lalr1.cc  */
 #line 6771 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 883:
+/* Line 661 of lalr1.cc  */
+#line 6755 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("except"))); }
     break;
 
+<<<<<<< TREE
   case 886:
 
 /* Line 678 of lalr1.cc  */
 #line 6772 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 884:
+/* Line 661 of lalr1.cc  */
+#line 6756 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("validate"))); }
     break;
 
+<<<<<<< TREE
   case 887:
 
 /* Line 678 of lalr1.cc  */
 #line 6773 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 885:
+/* Line 661 of lalr1.cc  */
+#line 6757 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("type"))); }
     break;
 
+<<<<<<< TREE
   case 888:
 
 /* Line 678 of lalr1.cc  */
 #line 6774 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 886:
+/* Line 661 of lalr1.cc  */
+#line 6758 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("cast"))); }
     break;
 
+<<<<<<< TREE
   case 889:
 
 /* Line 678 of lalr1.cc  */
 #line 6775 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 887:
+/* Line 661 of lalr1.cc  */
+#line 6759 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("treat"))); }
     break;
 
+<<<<<<< TREE
   case 890:
 
 /* Line 678 of lalr1.cc  */
 #line 6776 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 888:
+/* Line 661 of lalr1.cc  */
+#line 6760 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("is"))); }
     break;
 
+<<<<<<< TREE
   case 891:
 
 /* Line 678 of lalr1.cc  */
 #line 6777 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 889:
+/* Line 661 of lalr1.cc  */
+#line 6761 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preserve"))); }
     break;
 
+<<<<<<< TREE
   case 892:
 
 /* Line 678 of lalr1.cc  */
 #line 6778 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 890:
+/* Line 661 of lalr1.cc  */
+#line 6762 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("strip"))); }
     break;
 
+<<<<<<< TREE
   case 893:
 
 /* Line 678 of lalr1.cc  */
 #line 6779 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 891:
+/* Line 661 of lalr1.cc  */
+#line 6763 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("namespace"))); }
     break;
 
+<<<<<<< TREE
   case 894:
 
 /* Line 678 of lalr1.cc  */
 #line 6780 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 892:
+/* Line 661 of lalr1.cc  */
+#line 6764 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("external"))); }
     break;
 
+<<<<<<< TREE
   case 895:
 
 /* Line 678 of lalr1.cc  */
 #line 6781 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 893:
+/* Line 661 of lalr1.cc  */
+#line 6765 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("encoding"))); }
     break;
 
+<<<<<<< TREE
   case 896:
 
 /* Line 678 of lalr1.cc  */
 #line 6782 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 894:
+/* Line 661 of lalr1.cc  */
+#line 6766 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("no-preserve"))); }
     break;
 
+<<<<<<< TREE
   case 897:
 
 /* Line 678 of lalr1.cc  */
 #line 6783 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 895:
+/* Line 661 of lalr1.cc  */
+#line 6767 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("inherit"))); }
     break;
 
+<<<<<<< TREE
   case 898:
 
 /* Line 678 of lalr1.cc  */
 #line 6784 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 896:
+/* Line 661 of lalr1.cc  */
+#line 6768 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("no-inherit"))); }
     break;
 
+<<<<<<< TREE
   case 899:
 
 /* Line 678 of lalr1.cc  */
 #line 6785 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 897:
+/* Line 661 of lalr1.cc  */
+#line 6769 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("declare"))); }
     break;
 
+<<<<<<< TREE
   case 900:
 
 /* Line 678 of lalr1.cc  */
 #line 6786 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 898:
+/* Line 661 of lalr1.cc  */
+#line 6770 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("construction"))); }
     break;
 
+<<<<<<< TREE
   case 901:
 
 /* Line 678 of lalr1.cc  */
 #line 6787 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 899:
+/* Line 661 of lalr1.cc  */
+#line 6771 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ordering"))); }
     break;
 
+<<<<<<< TREE
   case 902:
 
 /* Line 678 of lalr1.cc  */
 #line 6788 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 900:
+/* Line 661 of lalr1.cc  */
+#line 6772 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("default"))); }
     break;
 
+<<<<<<< TREE
   case 903:
 
 /* Line 678 of lalr1.cc  */
 #line 6789 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 901:
+/* Line 661 of lalr1.cc  */
+#line 6773 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("copy-namespaces"))); }
     break;
 
+<<<<<<< TREE
   case 904:
 
 /* Line 678 of lalr1.cc  */
 #line 6790 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 902:
+/* Line 661 of lalr1.cc  */
+#line 6774 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("option"))); }
     break;
 
+<<<<<<< TREE
   case 905:
 
 /* Line 678 of lalr1.cc  */
 #line 6791 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 903:
+/* Line 661 of lalr1.cc  */
+#line 6775 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("version"))); }
     break;
 
+<<<<<<< TREE
   case 906:
 
 /* Line 678 of lalr1.cc  */
 #line 6792 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 904:
+/* Line 661 of lalr1.cc  */
+#line 6776 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("import"))); }
     break;
 
+<<<<<<< TREE
   case 907:
 
 /* Line 678 of lalr1.cc  */
 #line 6793 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 905:
+/* Line 661 of lalr1.cc  */
+#line 6777 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema"))); }
     break;
 
+<<<<<<< TREE
   case 908:
 
 /* Line 678 of lalr1.cc  */
 #line 6794 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 906:
+/* Line 661 of lalr1.cc  */
+#line 6778 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("module"))); }
     break;
 
+<<<<<<< TREE
   case 909:
 
 /* Line 678 of lalr1.cc  */
 #line 6795 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 907:
+/* Line 661 of lalr1.cc  */
+#line 6779 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("function"))); }
     break;
 
+<<<<<<< TREE
   case 910:
 
 /* Line 678 of lalr1.cc  */
 #line 6796 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 908:
+/* Line 661 of lalr1.cc  */
+#line 6780 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("score"))); }
     break;
 
+<<<<<<< TREE
   case 911:
 
 /* Line 678 of lalr1.cc  */
 #line 6797 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 909:
+/* Line 661 of lalr1.cc  */
+#line 6781 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("contains"))); }
     break;
 
+<<<<<<< TREE
   case 912:
 
 /* Line 678 of lalr1.cc  */
 #line 6798 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 910:
+/* Line 661 of lalr1.cc  */
+#line 6782 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("weight"))); }
     break;
 
+<<<<<<< TREE
   case 913:
 
 /* Line 678 of lalr1.cc  */
 #line 6799 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 911:
+/* Line 661 of lalr1.cc  */
+#line 6783 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("window"))); }
     break;
 
+<<<<<<< TREE
   case 914:
 
 /* Line 678 of lalr1.cc  */
 #line 6800 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 912:
+/* Line 661 of lalr1.cc  */
+#line 6784 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("distance"))); }
     break;
 
+<<<<<<< TREE
   case 915:
 
 /* Line 678 of lalr1.cc  */
 #line 6801 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 913:
+/* Line 661 of lalr1.cc  */
+#line 6785 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("occurs"))); }
     break;
 
+<<<<<<< TREE
   case 916:
 
 /* Line 678 of lalr1.cc  */
 #line 6802 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 914:
+/* Line 661 of lalr1.cc  */
+#line 6786 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("times"))); }
     break;
 
+<<<<<<< TREE
   case 917:
 
 /* Line 678 of lalr1.cc  */
 #line 6803 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 915:
+/* Line 661 of lalr1.cc  */
+#line 6787 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("same"))); }
     break;
 
+<<<<<<< TREE
   case 918:
 
 /* Line 678 of lalr1.cc  */
 #line 6804 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 916:
+/* Line 661 of lalr1.cc  */
+#line 6788 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("different"))); }
     break;
 
+<<<<<<< TREE
   case 919:
 
 /* Line 678 of lalr1.cc  */
 #line 6805 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 917:
+/* Line 661 of lalr1.cc  */
+#line 6789 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lowercase"))); }
     break;
 
+<<<<<<< TREE
   case 920:
 
 /* Line 678 of lalr1.cc  */
 #line 6806 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 918:
+/* Line 661 of lalr1.cc  */
+#line 6790 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("uppercase"))); }
     break;
 
+<<<<<<< TREE
   case 921:
 
 /* Line 678 of lalr1.cc  */
 #line 6807 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 919:
+/* Line 661 of lalr1.cc  */
+#line 6791 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("relationship"))); }
     break;
 
+<<<<<<< TREE
   case 922:
 
 /* Line 678 of lalr1.cc  */
 #line 6808 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 920:
+/* Line 661 of lalr1.cc  */
+#line 6792 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("levels"))); }
     break;
 
+<<<<<<< TREE
   case 923:
 
 /* Line 678 of lalr1.cc  */
 #line 6809 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 921:
+/* Line 661 of lalr1.cc  */
+#line 6793 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("language"))); }
     break;
 
+<<<<<<< TREE
   case 924:
 
 /* Line 678 of lalr1.cc  */
 #line 6810 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 922:
+/* Line 661 of lalr1.cc  */
+#line 6794 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("any"))); }
     break;
 
+<<<<<<< TREE
   case 925:
 
 /* Line 678 of lalr1.cc  */
 #line 6811 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 923:
+/* Line 661 of lalr1.cc  */
+#line 6795 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("all"))); }
     break;
 
+<<<<<<< TREE
   case 926:
 
 /* Line 678 of lalr1.cc  */
 #line 6812 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 924:
+/* Line 661 of lalr1.cc  */
+#line 6796 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("exactly"))); }
     break;
 
+<<<<<<< TREE
   case 927:
 
 /* Line 678 of lalr1.cc  */
 #line 6813 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 925:
+/* Line 661 of lalr1.cc  */
+#line 6797 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("from"))); }
     break;
 
+<<<<<<< TREE
   case 928:
 
 /* Line 678 of lalr1.cc  */
 #line 6814 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 926:
+/* Line 661 of lalr1.cc  */
+#line 6798 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("words"))); }
     break;
 
+<<<<<<< TREE
   case 929:
 
 /* Line 678 of lalr1.cc  */
 #line 6815 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 927:
+/* Line 661 of lalr1.cc  */
+#line 6799 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sentences"))); }
     break;
 
+<<<<<<< TREE
   case 930:
 
 /* Line 678 of lalr1.cc  */
 #line 6816 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 928:
+/* Line 661 of lalr1.cc  */
+#line 6800 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sentence"))); }
     break;
 
+<<<<<<< TREE
   case 931:
 
 /* Line 678 of lalr1.cc  */
 #line 6817 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 929:
+/* Line 661 of lalr1.cc  */
+#line 6801 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("phrase"))); }
     break;
 
+<<<<<<< TREE
   case 932:
 
 /* Line 678 of lalr1.cc  */
 #line 6818 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 930:
+/* Line 661 of lalr1.cc  */
+#line 6802 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("paragraph"))); }
     break;
 
+<<<<<<< TREE
   case 933:
 
 /* Line 678 of lalr1.cc  */
 #line 6819 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 931:
+/* Line 661 of lalr1.cc  */
+#line 6803 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("paragraphs"))); }
     break;
 
+<<<<<<< TREE
   case 934:
 
 /* Line 678 of lalr1.cc  */
 #line 6820 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 932:
+/* Line 661 of lalr1.cc  */
+#line 6804 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("replace"))); }
     break;
 
+<<<<<<< TREE
   case 935:
 
 /* Line 678 of lalr1.cc  */
 #line 6821 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 933:
+/* Line 661 of lalr1.cc  */
+#line 6805 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("modify"))); }
     break;
 
+<<<<<<< TREE
   case 936:
 
 /* Line 678 of lalr1.cc  */
 #line 6822 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 934:
+/* Line 661 of lalr1.cc  */
+#line 6806 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("first"))); }
     break;
 
+<<<<<<< TREE
   case 937:
 
 /* Line 678 of lalr1.cc  */
 #line 6823 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 935:
+/* Line 661 of lalr1.cc  */
+#line 6807 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("insert"))); }
     break;
 
+<<<<<<< TREE
   case 938:
 
 /* Line 678 of lalr1.cc  */
 #line 6824 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 936:
+/* Line 661 of lalr1.cc  */
+#line 6808 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("before"))); }
     break;
 
+<<<<<<< TREE
   case 939:
 
 /* Line 678 of lalr1.cc  */
 #line 6825 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 937:
+/* Line 661 of lalr1.cc  */
+#line 6809 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("after"))); }
     break;
 
+<<<<<<< TREE
   case 940:
 
 /* Line 678 of lalr1.cc  */
 #line 6826 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 938:
+/* Line 661 of lalr1.cc  */
+#line 6810 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("revalidation"))); }
     break;
 
+<<<<<<< TREE
   case 941:
 
 /* Line 678 of lalr1.cc  */
 #line 6827 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 939:
+/* Line 661 of lalr1.cc  */
+#line 6811 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("with"))); }
     break;
 
+<<<<<<< TREE
   case 942:
 
 /* Line 678 of lalr1.cc  */
 #line 6828 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 940:
+/* Line 661 of lalr1.cc  */
+#line 6812 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("nodes"))); }
     break;
 
+<<<<<<< TREE
   case 943:
 
 /* Line 678 of lalr1.cc  */
 #line 6829 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 941:
+/* Line 661 of lalr1.cc  */
+#line 6813 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("rename"))); }
     break;
 
+<<<<<<< TREE
   case 944:
 
 /* Line 678 of lalr1.cc  */
 #line 6830 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 942:
+/* Line 661 of lalr1.cc  */
+#line 6814 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("last"))); }
     break;
 
+<<<<<<< TREE
   case 945:
 
 /* Line 678 of lalr1.cc  */
 #line 6831 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 943:
+/* Line 661 of lalr1.cc  */
+#line 6815 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("delete"))); }
     break;
 
+<<<<<<< TREE
   case 946:
 
 /* Line 678 of lalr1.cc  */
 #line 6832 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 944:
+/* Line 661 of lalr1.cc  */
+#line 6816 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("into"))); }
     break;
 
+<<<<<<< TREE
   case 947:
 
 /* Line 678 of lalr1.cc  */
 #line 6833 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 945:
+/* Line 661 of lalr1.cc  */
+#line 6817 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("simple"))); }
     break;
 
+<<<<<<< TREE
   case 948:
 
 /* Line 678 of lalr1.cc  */
 #line 6834 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 946:
+/* Line 661 of lalr1.cc  */
+#line 6818 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sequential"))); }
     break;
 
+<<<<<<< TREE
   case 949:
 
 /* Line 678 of lalr1.cc  */
 #line 6835 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 947:
+/* Line 661 of lalr1.cc  */
+#line 6819 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("updating"))); }
     break;
 
+<<<<<<< TREE
   case 950:
 
 /* Line 678 of lalr1.cc  */
 #line 6836 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 948:
+/* Line 661 of lalr1.cc  */
+#line 6820 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ordered"))); }
     break;
 
+<<<<<<< TREE
   case 951:
 
 /* Line 678 of lalr1.cc  */
 #line 6837 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 949:
+/* Line 661 of lalr1.cc  */
+#line 6821 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("unordered"))); }
     break;
 
+<<<<<<< TREE
   case 952:
 
 /* Line 678 of lalr1.cc  */
 #line 6838 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 950:
+/* Line 661 of lalr1.cc  */
+#line 6822 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("returning"))); }
     break;
 
+<<<<<<< TREE
   case 953:
 
 /* Line 678 of lalr1.cc  */
 #line 6839 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 951:
+/* Line 661 of lalr1.cc  */
+#line 6823 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("exit"))); }
     break;
 
+<<<<<<< TREE
   case 954:
 
 /* Line 678 of lalr1.cc  */
 #line 6840 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 952:
+/* Line 661 of lalr1.cc  */
+#line 6824 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("loop"))); }
     break;
 
+<<<<<<< TREE
   case 955:
 
 /* Line 678 of lalr1.cc  */
 #line 6841 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 953:
+/* Line 661 of lalr1.cc  */
+#line 6825 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("break"))); }
     break;
 
+<<<<<<< TREE
   case 956:
 
 /* Line 678 of lalr1.cc  */
 #line 6842 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 954:
+/* Line 661 of lalr1.cc  */
+#line 6826 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("continue"))); }
     break;
 
+<<<<<<< TREE
   case 957:
 
 /* Line 678 of lalr1.cc  */
 #line 6843 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 955:
+/* Line 661 of lalr1.cc  */
+#line 6827 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("try"))); }
     break;
 
+<<<<<<< TREE
   case 958:
 
 /* Line 678 of lalr1.cc  */
 #line 6844 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 956:
+/* Line 661 of lalr1.cc  */
+#line 6828 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("catch"))); }
     break;
 
+<<<<<<< TREE
   case 959:
 
 /* Line 678 of lalr1.cc  */
 #line 6845 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 957:
+/* Line 661 of lalr1.cc  */
+#line 6829 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("using"))); }
     break;
 
+<<<<<<< TREE
   case 960:
 
 /* Line 678 of lalr1.cc  */
 #line 6846 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 958:
+/* Line 661 of lalr1.cc  */
+#line 6830 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("set"))); }
     break;
 
+<<<<<<< TREE
   case 961:
 
 /* Line 678 of lalr1.cc  */
 #line 6847 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 959:
+/* Line 661 of lalr1.cc  */
+#line 6831 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("index"))); }
     break;
 
+<<<<<<< TREE
   case 962:
 
 /* Line 678 of lalr1.cc  */
 #line 6848 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 960:
+/* Line 661 of lalr1.cc  */
+#line 6832 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("unique"))); }
     break;
 
+<<<<<<< TREE
   case 963:
 
 /* Line 678 of lalr1.cc  */
 #line 6849 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 961:
+/* Line 661 of lalr1.cc  */
+#line 6833 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("non"))); }
     break;
 
+<<<<<<< TREE
   case 964:
 
 /* Line 678 of lalr1.cc  */
 #line 6850 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 962:
+/* Line 661 of lalr1.cc  */
+#line 6834 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("on"))); }
     break;
 
+<<<<<<< TREE
   case 965:
 
 /* Line 678 of lalr1.cc  */
 #line 6851 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 963:
+/* Line 661 of lalr1.cc  */
+#line 6835 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("range"))); }
     break;
 
+<<<<<<< TREE
   case 966:
 
 /* Line 678 of lalr1.cc  */
 #line 6852 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 964:
+/* Line 661 of lalr1.cc  */
+#line 6836 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("equality"))); }
     break;
 
+<<<<<<< TREE
   case 967:
 
 /* Line 678 of lalr1.cc  */
 #line 6853 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 965:
+/* Line 661 of lalr1.cc  */
+#line 6837 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("manually"))); }
     break;
 
+<<<<<<< TREE
   case 968:
 
 /* Line 678 of lalr1.cc  */
 #line 6854 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 966:
+/* Line 661 of lalr1.cc  */
+#line 6838 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("automatically"))); }
     break;
 
+<<<<<<< TREE
   case 969:
 
 /* Line 678 of lalr1.cc  */
 #line 6855 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 967:
+/* Line 661 of lalr1.cc  */
+#line 6839 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("maintained"))); }
     break;
 
+<<<<<<< TREE
   case 970:
 
 /* Line 678 of lalr1.cc  */
 #line 6856 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 968:
+/* Line 661 of lalr1.cc  */
+#line 6840 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("decimal-format"))); }
     break;
 
+<<<<<<< TREE
   case 971:
 
 /* Line 678 of lalr1.cc  */
 #line 6857 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 969:
+/* Line 661 of lalr1.cc  */
+#line 6841 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("decimal-separator"))); }
     break;
 
+<<<<<<< TREE
   case 972:
 
 /* Line 678 of lalr1.cc  */
 #line 6858 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 970:
+/* Line 661 of lalr1.cc  */
+#line 6842 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("grouping-separator"))); }
     break;
 
+<<<<<<< TREE
   case 973:
 
 /* Line 678 of lalr1.cc  */
 #line 6859 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 971:
+/* Line 661 of lalr1.cc  */
+#line 6843 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("infinity"))); }
     break;
 
+<<<<<<< TREE
   case 974:
 
 /* Line 678 of lalr1.cc  */
 #line 6860 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 972:
+/* Line 661 of lalr1.cc  */
+#line 6844 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("minus-sign"))); }
     break;
 
+<<<<<<< TREE
   case 975:
 
 /* Line 678 of lalr1.cc  */
 #line 6861 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 973:
+/* Line 661 of lalr1.cc  */
+#line 6845 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("NaN"))); }
     break;
 
+<<<<<<< TREE
   case 976:
 
 /* Line 678 of lalr1.cc  */
 #line 6862 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 974:
+/* Line 661 of lalr1.cc  */
+#line 6846 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("percent"))); }
     break;
 
+<<<<<<< TREE
   case 977:
 
 /* Line 678 of lalr1.cc  */
 #line 6863 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 975:
+/* Line 661 of lalr1.cc  */
+#line 6847 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("per-mille"))); }
     break;
 
+<<<<<<< TREE
   case 978:
 
 /* Line 678 of lalr1.cc  */
 #line 6864 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 976:
+/* Line 661 of lalr1.cc  */
+#line 6848 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("zero-digit"))); }
     break;
 
+<<<<<<< TREE
   case 979:
 
 /* Line 678 of lalr1.cc  */
 #line 6865 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 977:
+/* Line 661 of lalr1.cc  */
+#line 6849 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("digit"))); }
     break;
 
+<<<<<<< TREE
   case 980:
 
 /* Line 678 of lalr1.cc  */
 #line 6866 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 978:
+/* Line 661 of lalr1.cc  */
+#line 6850 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("pattern-separator"))); }
     break;
 
+<<<<<<< TREE
   case 981:
 
 /* Line 678 of lalr1.cc  */
 #line 6867 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 979:
+/* Line 661 of lalr1.cc  */
+#line 6851 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("collection"))); }
     break;
 
+<<<<<<< TREE
   case 982:
 
 /* Line 678 of lalr1.cc  */
 #line 6868 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 980:
+/* Line 661 of lalr1.cc  */
+#line 6852 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("const"))); }
     break;
 
+<<<<<<< TREE
   case 983:
 
 /* Line 678 of lalr1.cc  */
 #line 6869 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 981:
+/* Line 661 of lalr1.cc  */
+#line 6853 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("append-only"))); }
     break;
 
+<<<<<<< TREE
   case 984:
 
 /* Line 678 of lalr1.cc  */
 #line 6870 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 982:
+/* Line 661 of lalr1.cc  */
+#line 6854 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("queue"))); }
     break;
 
+<<<<<<< TREE
   case 985:
 
 /* Line 678 of lalr1.cc  */
 #line 6871 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 983:
+/* Line 661 of lalr1.cc  */
+#line 6855 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("mutable"))); }
     break;
 
+<<<<<<< TREE
   case 986:
 
 /* Line 678 of lalr1.cc  */
 #line 6872 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 984:
+/* Line 661 of lalr1.cc  */
+#line 6856 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("read-only"))); }
     break;
 
+<<<<<<< TREE
   case 987:
 
 /* Line 678 of lalr1.cc  */
 #line 6873 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 985:
+/* Line 661 of lalr1.cc  */
+#line 6857 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("integrity"))); }
     break;
 
+<<<<<<< TREE
   case 988:
 
 /* Line 678 of lalr1.cc  */
 #line 6874 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 986:
+/* Line 661 of lalr1.cc  */
+#line 6858 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("constraint"))); }
     break;
 
+<<<<<<< TREE
   case 989:
 
 /* Line 678 of lalr1.cc  */
 #line 6875 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 987:
+/* Line 661 of lalr1.cc  */
+#line 6859 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("check"))); }
     break;
 
+<<<<<<< TREE
   case 990:
 
 /* Line 678 of lalr1.cc  */
 #line 6876 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 988:
+/* Line 661 of lalr1.cc  */
+#line 6860 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("key"))); }
     break;
 
+<<<<<<< TREE
   case 991:
 
 /* Line 678 of lalr1.cc  */
 #line 6877 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 989:
+/* Line 661 of lalr1.cc  */
+#line 6861 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("foreach"))); }
     break;
 
+<<<<<<< TREE
   case 992:
 
 /* Line 678 of lalr1.cc  */
 #line 6878 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 990:
+/* Line 661 of lalr1.cc  */
+#line 6862 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("foreign"))); }
     break;
 
+<<<<<<< TREE
   case 993:
 
 /* Line 678 of lalr1.cc  */
 #line 6879 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 991:
+/* Line 661 of lalr1.cc  */
+#line 6863 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("keys"))); }
     break;
 
+<<<<<<< TREE
   case 994:
 
 /* Line 678 of lalr1.cc  */
 #line 6880 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 992:
+/* Line 661 of lalr1.cc  */
+#line 6864 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ancestor"))); }
     break;
 
+<<<<<<< TREE
   case 995:
 
 /* Line 678 of lalr1.cc  */
 #line 6881 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 993:
+/* Line 661 of lalr1.cc  */
+#line 6865 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("child"))); }
     break;
 
+<<<<<<< TREE
   case 996:
 
 /* Line 678 of lalr1.cc  */
 #line 6882 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 994:
+/* Line 661 of lalr1.cc  */
+#line 6866 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descendant"))); }
     break;
 
+<<<<<<< TREE
   case 997:
 
 /* Line 678 of lalr1.cc  */
 #line 6883 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 995:
+/* Line 661 of lalr1.cc  */
+#line 6867 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("parent"))); }
     break;
 
+<<<<<<< TREE
   case 998:
 
 /* Line 678 of lalr1.cc  */
 #line 6884 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 996:
+/* Line 661 of lalr1.cc  */
+#line 6868 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preceding"))); }
     break;
 
+<<<<<<< TREE
   case 999:
 
 /* Line 678 of lalr1.cc  */
 #line 6885 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 997:
+/* Line 661 of lalr1.cc  */
+#line 6869 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("self"))); }
     break;
 
+<<<<<<< TREE
   case 1000:
 
 /* Line 678 of lalr1.cc  */
 #line 6886 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 998:
+/* Line 661 of lalr1.cc  */
+#line 6870 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("following"))); }
     break;
 
+<<<<<<< TREE
   case 1001:
 
 /* Line 678 of lalr1.cc  */
 #line 6887 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 999:
+/* Line 661 of lalr1.cc  */
+#line 6871 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ancestor-or-self"))); }
     break;
 
+<<<<<<< TREE
   case 1002:
 
 /* Line 678 of lalr1.cc  */
 #line 6888 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 1000:
+/* Line 661 of lalr1.cc  */
+#line 6872 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descendant-or-self"))); }
     break;
 
+<<<<<<< TREE
   case 1003:
 
 /* Line 678 of lalr1.cc  */
 #line 6889 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 1001:
+/* Line 661 of lalr1.cc  */
+#line 6873 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("following-sibling"))); }
     break;
 
+<<<<<<< TREE
   case 1004:
 
 /* Line 678 of lalr1.cc  */
 #line 6890 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 1002:
+/* Line 661 of lalr1.cc  */
+#line 6874 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preceding-sibling"))); }
     break;
 
+<<<<<<< TREE
   case 1005:
 
 /* Line 678 of lalr1.cc  */
 #line 6891 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 1003:
+/* Line 661 of lalr1.cc  */
+#line 6875 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("json"))); }
     break;
 
+<<<<<<< TREE
   case 1006:
 
 /* Line 678 of lalr1.cc  */
 #line 6892 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 1004:
+/* Line 661 of lalr1.cc  */
+#line 6876 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("append"))); }
     break;
 
+<<<<<<< TREE
   case 1007:
 
 /* Line 678 of lalr1.cc  */
 #line 6893 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 1005:
+/* Line 661 of lalr1.cc  */
+#line 6877 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("position"))); }
     break;
 
+<<<<<<< TREE
   case 1008:
 
 /* Line 678 of lalr1.cc  */
 #line 6894 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 1006:
+/* Line 661 of lalr1.cc  */
+#line 6878 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("json-item"))); }
     break;
 
+<<<<<<< TREE
   case 1009:
 
 /* Line 678 of lalr1.cc  */
 #line 6895 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 1007:
+/* Line 661 of lalr1.cc  */
+#line 6879 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("array"))); }
     break;
 
+<<<<<<< TREE
   case 1010:
 
 /* Line 678 of lalr1.cc  */
 #line 6896 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 1008:
+/* Line 661 of lalr1.cc  */
+#line 6880 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("object"))); }
     break;
 
+<<<<<<< TREE
   case 1011:
 
 /* Line 678 of lalr1.cc  */
 #line 6897 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 1009:
+/* Line 661 of lalr1.cc  */
+#line 6881 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("structured-item"))); }
     break;
 
+<<<<<<< TREE
   case 1012:
 
 /* Line 678 of lalr1.cc  */
 #line 6902 "/home/markos/zorba/repo/gen-flwor-opt/src/compiler/parser/xquery_parser.y"
+=======
+  case 1010:
+/* Line 661 of lalr1.cc  */
+#line 6886 "/Users/zorba/Code/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), true); }
     break;
 
 
+<<<<<<< TREE
 
 /* Line 678 of lalr1.cc  */
 #line 12151 "/home/markos/zorba/repo/gen-flwor-opt/build/src/compiler/parser/xquery_parser.cpp"
+=======
+/* Line 661 of lalr1.cc  */
+#line 10657 "/Users/zorba/Code/zorba/debug/src/compiler/parser/xquery_parser.cpp"
+>>>>>>> MERGE-SOURCE
 	default:
           break;
       }
+    /* User semantic actions sometimes alter yychar, and that requires
+       that yytoken be updated with the new translation.  We take the
+       approach of translating immediately before every use of yytoken.
+       One alternative is translating here after every semantic action,
+       but that translation would be missed if the semantic action
+       invokes YYABORT, YYACCEPT, or YYERROR immediately after altering
+       yychar.  In the case of YYABORT or YYACCEPT, an incorrect
+       destructor might then be invoked immediately.  In the case of
+       YYERROR, subsequent parser actions might lead to an incorrect
+       destructor call or verbose syntax error message before the
+       lookahead is translated.  */
     YY_SYMBOL_PRINT ("-> $$ =", yyr1_[yyn], &yyval, &yyloc);
 
     yypop_ (yylen);
@@ -12174,14 +19702,20 @@
   | yyerrlab -- here on detecting error |
   `------------------------------------*/
   yyerrlab:
+    /* Make sure we have latest lookahead translation.  See comments at
+       user semantic actions for why this is necessary.  */
+    yytoken = yytranslate_ (yychar);
+
     /* If not already recovering from an error, report this error.  */
     if (!yyerrstatus_)
       {
 	++yynerrs_;
+	if (yychar == yyempty_)
+	  yytoken = yyempty_;
 	error (yylloc, yysyntax_error_ (yystate, yytoken));
       }
 
-    yyerror_range[0] = yylloc;
+    yyerror_range[1] = yylloc;
     if (yyerrstatus_ == 3)
       {
 	/* If just tried and failed to reuse lookahead token after an
@@ -12216,7 +19750,7 @@
     if (false)
       goto yyerrorlab;
 
-    yyerror_range[0] = yylocation_stack_[yylen - 1];
+    yyerror_range[1] = yylocation_stack_[yylen - 1];
     /* Do not reclaim the symbols of the rule which action triggered
        this YYERROR.  */
     yypop_ (yylen);
@@ -12233,7 +19767,7 @@
     for (;;)
       {
 	yyn = yypact_[yystate];
-	if (yyn != yypact_ninf_)
+	if (!yy_pact_value_is_default_ (yyn))
 	{
 	  yyn += yyterror_;
 	  if (0 <= yyn && yyn <= yylast_ && yycheck_[yyn] == yyterror_)
@@ -12248,7 +19782,7 @@
 	if (yystate_stack_.height () == 1)
 	YYABORT;
 
-	yyerror_range[0] = yylocation_stack_[0];
+	yyerror_range[1] = yylocation_stack_[0];
 	yydestruct_ ("Error: popping",
 		     yystos_[yystate],
 		     &yysemantic_stack_[0], &yylocation_stack_[0]);
@@ -12257,10 +19791,10 @@
 	YY_STACK_PRINT ();
       }
 
-    yyerror_range[1] = yylloc;
+    yyerror_range[2] = yylloc;
     // Using YYLLOC is tempting, but would change the location of
     // the lookahead.  YYLOC is available though.
-    YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
+    YYLLOC_DEFAULT (yyloc, yyerror_range, 2);
     yysemantic_stack_.push (yylval);
     yylocation_stack_.push (yyloc);
 
@@ -12283,7 +19817,13 @@
 
   yyreturn:
     if (yychar != yyempty_)
-      yydestruct_ ("Cleanup: discarding lookahead", yytoken, &yylval, &yylloc);
+      {
+        /* Make sure we have latest lookahead translation.  See comments
+           at user semantic actions for why this is necessary.  */
+        yytoken = yytranslate_ (yychar);
+        yydestruct_ ("Cleanup: discarding lookahead", yytoken, &yylval,
+                     &yylloc);
+      }
 
     /* Do not reclaim the symbols of the rule which action triggered
        this YYABORT or YYACCEPT.  */
@@ -12302,60 +19842,111 @@
 
   // Generate an error message.
   std::string
-  xquery_parser::yysyntax_error_ (int yystate, int tok)
+  xquery_parser::yysyntax_error_ (int yystate, int yytoken)
   {
-    std::string res;
-    YYUSE (yystate);
-#if YYERROR_VERBOSE
-    int yyn = yypact_[yystate];
-    if (yypact_ninf_ < yyn && yyn <= yylast_)
-      {
-	/* Start YYX at -YYN if negative to avoid negative indexes in
-	   YYCHECK.  */
-	int yyxbegin = yyn < 0 ? -yyn : 0;
-
-	/* Stay within bounds of both yycheck and yytname.  */
-	int yychecklim = yylast_ - yyn + 1;
-	int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_;
-	int count = 0;
-	for (int x = yyxbegin; x < yyxend; ++x)
-	  if (yycheck_[x + yyn] == x && x != yyterror_)
-	    ++count;
-
-	// FIXME: This method of building the message is not compatible
-	// with internationalization.  It should work like yacc.c does it.
-	// That is, first build a string that looks like this:
-	// "syntax error, unexpected %s or %s or %s"
-	// Then, invoke YY_ on this string.
-	// Finally, use the string as a format to output
-	// yytname_[tok], etc.
-	// Until this gets fixed, this message appears in English only.
-	res = "syntax error, unexpected ";
-	res += yytnamerr_ (yytname_[tok]);
-	if (count < 5)
-	  {
-	    count = 0;
-	    for (int x = yyxbegin; x < yyxend; ++x)
-	      if (yycheck_[x + yyn] == x && x != yyterror_)
-		{
-		  res += (!count++) ? ", expecting " : " or ";
-		  res += yytnamerr_ (yytname_[x]);
-		}
-	  }
-      }
-    else
-#endif
-      res = YY_("syntax error");
-    return res;
+    std::string yyres;
+    // Number of reported tokens (one for the "unexpected", one per
+    // "expected").
+    size_t yycount = 0;
+    // Its maximum.
+    enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+    // Arguments of yyformat.
+    char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+
+    /* There are many possibilities here to consider:
+       - If this state is a consistent state with a default action, then
+         the only way this function was invoked is if the default action
+         is an error action.  In that case, don't check for expected
+         tokens because there are none.
+       - The only way there can be no lookahead present (in yytoken) is
+         if this state is a consistent state with a default action.
+         Thus, detecting the absence of a lookahead is sufficient to
+         determine that there is no unexpected or expected token to
+         report.  In that case, just report a simple "syntax error".
+       - Don't assume there isn't a lookahead just because this state is
+         a consistent state with a default action.  There might have
+         been a previous inconsistent state, consistent state with a
+         non-default action, or user semantic action that manipulated
+         yychar.
+       - Of course, the expected token list depends on states to have
+         correct lookahead information, and it depends on the parser not
+         to perform extra reductions after fetching a lookahead from the
+         scanner and before detecting a syntax error.  Thus, state
+         merging (from LALR or IELR) and default reductions corrupt the
+         expected token list.  However, the list is correct for
+         canonical LR with one exception: it will still contain any
+         token that will not be accepted due to an error action in a
+         later state.
+    */
+    if (yytoken != yyempty_)
+      {
+        yyarg[yycount++] = yytname_[yytoken];
+        int yyn = yypact_[yystate];
+        if (!yy_pact_value_is_default_ (yyn))
+          {
+            /* Start YYX at -YYN if negative to avoid negative indexes in
+               YYCHECK.  In other words, skip the first -YYN actions for
+               this state because they are default actions.  */
+            int yyxbegin = yyn < 0 ? -yyn : 0;
+            /* Stay within bounds of both yycheck and yytname.  */
+            int yychecklim = yylast_ - yyn + 1;
+            int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_;
+            for (int yyx = yyxbegin; yyx < yyxend; ++yyx)
+              if (yycheck_[yyx + yyn] == yyx && yyx != yyterror_
+                  && !yy_table_value_is_error_ (yytable_[yyx + yyn]))
+                {
+                  if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                    {
+                      yycount = 1;
+                      break;
+                    }
+                  else
+                    yyarg[yycount++] = yytname_[yyx];
+                }
+          }
+      }
+
+    char const* yyformat = YY_NULL;
+    switch (yycount)
+      {
+#define YYCASE_(N, S)                         \
+        case N:                               \
+          yyformat = S;                       \
+        break
+        YYCASE_(0, YY_("syntax error"));
+        YYCASE_(1, YY_("syntax error, unexpected %s"));
+        YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+        YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+        YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+        YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+#undef YYCASE_
+      }
+
+    // Argument number.
+    size_t yyi = 0;
+    for (char const* yyp = yyformat; *yyp; ++yyp)
+      if (yyp[0] == '%' && yyp[1] == 's' && yyi < yycount)
+        {
+          yyres += yytnamerr_ (yyarg[yyi++]);
+          ++yyp;
+        }
+      else
+        yyres += *yyp;
+    return yyres;
   }
 
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
+<<<<<<< TREE
   const short int xquery_parser::yypact_ninf_ = -1512;
+=======
+  const short int xquery_parser::yypact_ninf_ = -1500;
+>>>>>>> MERGE-SOURCE
   const short int
   xquery_parser::yypact_[] =
   {
+<<<<<<< TREE
       3462, -1512, -1512, -1512,  5320,  5320,  5320, -1512, -1512,    61,
      280, -1512,   636,    18, -1512, -1512, -1512,   826, -1512, -1512,
    -1512,   311,   326,   832,  2591,   349,   385,   136, -1512,    46,
@@ -12539,11 +20130,195 @@
    -1512,  1192,  1196, 15563, -1512, -1512,  9646,  6865,  1281,  1193,
     9646,  1197,  6865, 10264, -1512, 10264, -1512,  1264,  1205, 15563,
     1247,  1345, 15563,  1206, 10264, -1512
+=======
+      3175, -1500, -1500, -1500,  5033,  5033,  5033, -1500, -1500,    21,
+     253, -1500,   449,   212, -1500, -1500, -1500,   814, -1500, -1500,
+   -1500,   289,   326,   818,  2895,   429,   433,   146, -1500,     1,
+   -1500, -1500, -1500, -1500, -1500, -1500,   819, -1500,   537,   555,
+   -1500, -1500, -1500, -1500,   604, -1500,   823, -1500,   588,   673,
+   -1500,   109, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500, -1500,   342,   734, -1500, -1500,
+   -1500, -1500,   668, 10904, -1500, -1500, -1500,   742, -1500, -1500,
+   -1500,   807, -1500,   769,   811, -1500, -1500, 15276, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500, -1500,   859, -1500, -1500,   874,
+     893, -1500, -1500, -1500, -1500, -1500, -1500, -1500,  3797,  6887,
+    7196, 15276, -1500, -1500, -1500, -1500, -1500, -1500, -1500,   849,
+   -1500, -1500,   895, 11796, -1500, 12098,   907,   908, -1500, -1500,
+   -1500,   909, -1500, 10286, -1500, -1500, -1500, -1500, -1500, -1500,
+     867, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,   106,
+     817, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,   -89,
+     877,   -86, -1500,   -79,   -85, -1500, -1500, -1500, -1500, -1500,
+   -1500,   916, -1500,   797,   798,   799, -1500, -1500,   883,   888,
+   -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500,  7505,  7814, -1500,   731, -1500, -1500, -1500,
+   -1500, -1500,  3486,  5342,  1045, -1500,  5651, -1500, -1500,   150,
+      96, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500,    98, -1500, -1500, -1500, -1500,
+   -1500, -1500,   166, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500,  5033, -1500, -1500, -1500, -1500,   119, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500,   939, -1500,   857, -1500, -1500,
+   -1500,   545, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+     882,   960, -1500,   758,   806,   954,   529,   577,   707,    52,
+   -1500,  1006,   858,   957,   958,  9050, -1500, -1500, -1500,    37,
+   -1500, -1500, 10595, -1500,   447, -1500,   905, 10904, -1500,   905,
+   10904, -1500, -1500, -1500,   765, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500, -1500,   919,   910, -1500, -1500,
+   -1500, -1500, -1500,   881, -1500,  5033,   884,   885,   298,   298,
+    1032,   144,   676,    30, 15563, 15276,    12,  1020, 15276,   918,
+     953,   582, 11796,   737,   827, 15276, 15276,   770,   689,    49,
+   -1500, -1500, -1500, 11796,  5033,   887,  5033,   149,  9359, 12980,
+   15276, -1500,   792,   793, 15276,   959,    33,   926,  9359,  1079,
+      84,    82, 15276,   963,   940,   976, -1500,  9359, 11500, 15276,
+   15276, 15276,  5033,   897,  9359,  9359, 15276,  5033,   932,   933,
+   -1500, -1500, -1500,  9359, 13267,   931, -1500,   934, -1500, -1500,
+   -1500, -1500,   935, -1500,   936, -1500, -1500, -1500, -1500, -1500,
+     937, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, 15276,
+   -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500,   947, 15276, -1500, -1500, -1500,   911,  4106,   973,
+     249,   941,   942,   944, 15276,  5033, -1500,   948,    58, -1500,
+     601, -1500,   231,  1067,  9359, -1500, -1500,    74, -1500, -1500,
+   -1500,  1089, -1500, -1500, -1500, -1500,  9359,   894, -1500,  1080,
+    9359,  9359, 12397,   921,  9359,  9359,  9359,  9359, 12397,  9359,
+     886,   889, 15276,   924,   927,  9359,  9359,  3797,   871, -1500,
+     -15, -1500,   -27,   965,  5342, -1500, -1500, -1500, -1500, -1500,
+     449,   146,   100,   108,  1117,  5960,  5960,  6269,  6269,   807,
+   -1500, -1500,   939,   807, -1500,  9359, -1500,  1003,   674,     1,
+     955,   952,   956,  5033,  9359, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500,  9668,  9668,  9668, -1500,  9668,  9668, -1500,
+    9668, -1500,  9668, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+    9668,  9668,  1055,  9668,  9668,  9668,  9668,  9668,  9668,  9668,
+    9668,  9668,  9668,  9668,  9668,   899,  1033,  1034,  1036, -1500,
+   -1500, -1500,  8123, -1500, -1500, 10286, 10286,  9359,   905, -1500,
+   -1500,   905, -1500,  8432,   905,   982,  8741, -1500, -1500, -1500,
+     244, -1500,   263, -1500, -1500, -1500, -1500, -1500, -1500,  1026,
+    1027,   429,  1106, -1500, -1500, 15563,   901,   620, 15276,   977,
+     978,   901,  1032,  1009,  1007, -1500, -1500, -1500,    68,   896,
+    1046,   845, 15276,  1002,  9359,  1028, 15276, 15276, -1500,  1013,
+     964,  5033, -1500,   966,   934,   555, -1500,   962,   968,   333,
+   -1500,   275,   283,  1040, -1500,    31, -1500, -1500,  1040, 15276,
+      55, 15276,  1057,   304, -1500,  5033, -1500,   310, -1500, 11796,
+    1056,  1108, 11796,  1032,  1060,   626, 15276,  9359,     1,   381,
+     970, -1500,   972,   974,   975,    35, -1500,    70,   979, -1500,
+     314,   320,  1011, -1500,   981,  5033,  5033,   444, -1500,   327,
+     332,   640,  9359,   257, -1500, -1500,  9359,  9359, -1500,  9359,
+    9359,  9359, -1500,  9359, -1500,  9359, -1500, 15276,  1067, -1500,
+      25,   475, -1500, -1500, -1500,   479, -1500,    28, -1500, -1500,
+    1014,  1015,  1016,  1017,  1018,   765,   919, -1500,    13,   325,
+     928,  1072,   398,   938,   951,   946,     7, -1500,  1030, -1500,
+   -1500,   987,   334,  4415,   495, 11204,   871, -1500, -1500, -1500,
+    9359, -1500,   150,   562,  1145,  1145, -1500, -1500,   111, -1500,
+   -1500,   117, -1500,   126, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, 15276,  1010,  9359,  1061, -1500, -1500, -1500,   960, -1500,
+   -1500, -1500, -1500, -1500,  9668, -1500, -1500, -1500,    48, -1500,
+     577,   577,    40,   707,   707,   707,   707,    52,    52, -1500,
+   -1500, 14415, 14415, 15276, 15276, -1500,   512, -1500, -1500,   268,
+   -1500, -1500, -1500,   372, -1500, -1500,   397,   298, -1500, -1500,
+     428,   533,   584, -1500,   429, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500,   901, -1500,  1049, 14702,  1041,
+    9359, -1500, -1500, -1500,  1090,  1032,  1032,   901, -1500,   878,
+    1032,   672, 15276,   308,   649,  1156, -1500, -1500,   902,   650,
+   -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500,    68,    87,   967,   552,  9359, -1500, 15276,  1092,   890,
+    1032, -1500, -1500, -1500, -1500,  1037, 15276, -1500, 15276, -1500,
+   14989,  1062, 14415,  1074,  9359,    -6,  1047,    32,   291,   945,
+   -1500, -1500,   722,    55,  1090, 14415,  1077,  1103,  1019,  1004,
+    1068,  1032,  1039,  1070,  1109,  1032,  9359,   -40, -1500, -1500,
+   -1500,  1051, -1500, -1500, -1500, -1500,  1091,  9359,  9359,  1063,
+   -1500,  1107,  1111,  5033, -1500,  1024,  1029,  1059, 15276, -1500,
+   15276, -1500,  9359,  1073,  1031,  9359, -1500,  1093,   401,   423,
+     434,  1181, -1500,    26, -1500,   446, -1500, -1500,  1188, -1500,
+     762,  9359,  9359,  9359,   772,  9359,  9359,  9359,  9359,  9359,
+    9359,  9359,  9359, 12397,  1101,  9359,  9359, -1500,  6578,  1064,
+    1066,  1069,  1071,   857,   732,   983, -1500,   -38, -1500,   309,
+     120,   594,   126,  6269,  6269,  6269,  1144, -1500,  9359,   733,
+    1121, -1500, 15276,  1122, -1500, -1500,  9359,    48,   204,   614,
+   -1500,   949,    71,   980,   971, -1500, -1500,   827, -1500,   984,
+     658,  1075,  1076, 14702,  1082,  1083,  1084,  1085,  1086, -1500,
+     632, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500,  1099, -1500, -1500, -1500,  9359, -1500,
+   -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,   647, -1500,
+    1207,   805, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500,   961, -1500, -1500,  1215, -1500, -1500, -1500, -1500, -1500,
+     709,  1216, -1500,   773, -1500, -1500, -1500,   931,   326,   935,
+     537,   936,   937,   877,  1083,  1084,  1085, -1500,   632,   632,
+    9977,   969,   943, -1500,  1090,    87,  1021,  1078,  5033,  1087,
+    1095,  1105,  1096,  1100, 15276, -1500,   382, -1500, 15276, -1500,
+    9359,  1110,  9359,  1129,  9359,     3,  1112,  9359,  1113, -1500,
+    1143,  1146,  9359, 15276,   898,  1186, -1500, -1500, -1500, -1500,
+   -1500, -1500, 14415, -1500,  5033,  1032,  1159, -1500, -1500, -1500,
+    1032,  1159, -1500,  9359,  1127,  5033, 15276, -1500, -1500,  9359,
+    9359,   766, -1500,     5,   780, -1500, 13554,   810, -1500,   831,
+   -1500,  1094, -1500, -1500,  5033,  1102,  1104, -1500,  9359, -1500,
+   -1500,  9359,  1097,  1107,  1171, -1500,  1147, -1500,   636, -1500,
+   -1500,  1269, -1500, -1500,  5033, 15276, -1500,   663, -1500, -1500,
+   -1500,  1098,  1048,  1054, -1500, -1500, -1500,  1058,  1065, -1500,
+   -1500, -1500,  1197, -1500, -1500, -1500,  1081,   207, 15276,  1115,
+   -1500, -1500,  9359,  9359,  9359,  4724,  6578, 11204,   983, -1500,
+   11204, -1500,  1116,  1145,   331, -1500, -1500, -1500,  1121, -1500,
+    1032, -1500,   880, -1500,   688,  1189, -1500,  9359,   591,  1061,
+     542,  1118, -1500,    48,  1053, -1500, -1500,   -50, -1500,   -98,
+       2,  1088,    48,   -98,  9668, -1500,   178, -1500, -1500, -1500,
+   -1500, -1500, -1500,    48,  1130,  1022,   896,     2, -1500, -1500,
+    1023,  1218, -1500, -1500, -1500, 12693,  1119,  1120,  1123,  1124,
+    1126,  1128,  1131, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+   -1500, -1500, -1500, -1500, -1500,  1280,    72,  1287,    72,  1050,
+    1191, -1500, -1500,  1151, 15276,  1114, -1500, -1500,  9977, -1500,
+    1138, -1500, -1500, -1500, -1500, -1500, -1500,  9359,  1176, -1500,
+   -1500,  9359, -1500,   578, -1500,  9359,  1177,  9359, -1500,  9359,
+   15276, 15276, -1500,   756, -1500,  9359, -1500,  1200,  1201,  1232,
+    1032,  1159, -1500,  9359,  1150, -1500, -1500, -1500,  1152, -1500,
+      43,  9359,  5033,  1153,    60, -1500, 15276,  1155, 13841,   317,
+   -1500, 14128,  1161, -1500, -1500,  1158, -1500, -1500, -1500, -1500,
+    9359,   839,  1181, 15276,   694, -1500,  1164,  1181, 15276, -1500,
+   -1500,  9359,  9359,  9359,  9359,  1043,  9359,  9359, -1500,  9359,
+     468,   470,   491,   216, -1500, -1500,  9359, -1500, -1500, -1500,
+    1189, -1500, -1500, -1500,  1032,  9359, -1500,  1187, -1500, -1500,
+   -1500, -1500,  1168,  9668, -1500, -1500, -1500, -1500, -1500,   619,
+    9668,  9668,   570, -1500,   980, -1500,   183, -1500,   971,    48,
+    1202, -1500, -1500,  1125, -1500, -1500, -1500, -1500,  1262,  1172,
+   -1500,   493, -1500, -1500, -1500, -1500, -1500, -1500, -1500, -1500,
+     301,   301, -1500,    72, -1500, -1500,   530, -1500,  1333,     2,
+    1267,  1179,  9977,    11,  1132,  1194, -1500, -1500,  9359, -1500,
+    9359,  1220, -1500,  9359, -1500, -1500, -1500,  1316, -1500, -1500,
+    6578,  9359,  1032, -1500, -1500, -1500,  9359,  9359, -1500, -1500,
+   -1500,  6578,  6578,  1278,  5033, 15276,  1190, 15276,  9359, 15276,
+    1192,  6578, -1500,   380,    24,  1181, 15276, -1500,  1193,  1181,
+   -1500, -1500, -1500, -1500,  9359, -1500, -1500, -1500,  1180,  1107,
+    1111,  9359, -1500, -1500, -1500, -1500,  1276,  9359, -1500,   707,
+    9668,  9668,    40,   566, -1500, -1500, -1500, -1500, -1500, -1500,
+    9359, -1500, 14415, -1500, 14415,  1279, -1500, -1500, -

Follow ups