← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba

 

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

Commit message:
Merging of xquery and jsoniq grammar files step 1

Requested reviews:
  Nicolae Brinza (nbrinza)

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

Merging of xquery and jsoniq grammar files step 1
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/159267
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'cmake_modules/CMakeUseBison.cmake'
--- cmake_modules/CMakeUseBison.cmake	2013-02-07 17:24:36 +0000
+++ cmake_modules/CMakeUseBison.cmake	2013-04-17 00:55:39 +0000
@@ -71,24 +71,24 @@
     ELSE(BISON_PREFIX_OUTPUTS)
       SET(PREFIX "yy")
     ENDIF(BISON_PREFIX_OUTPUTS)
-    SET(OUTFILE "${CMAKE_CURRENT_BINARY_DIR}/${PATH}/${HEAD}.cpp")
+    SET(OUTFILE "${PATH}/${HEAD}.cpp")
     IF(BISON_GENERATE_DEFINES)
-      SET(HEADER "${CMAKE_CURRENT_BINARY_DIR}/${PATH}/${HEAD}.hpp")
-	  SET(LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${PATH}/location.hh")
-	  SET(POSITION "${CMAKE_CURRENT_BINARY_DIR}/${PATH}/position.hh")
-	  SET(STACK "${CMAKE_CURRENT_BINARY_DIR}/${PATH}/stack.hh")
+      SET(HEADER "${PATH}/${HEAD}.hpp")
+      SET(LOCATION "${PATH}/location.hh")
+      SET(POSITION "${PATH}/position.hh")
+      SET(STACK "${PATH}/stack.hh")
 	  
       ADD_CUSTOM_COMMAND(
         OUTPUT "${OUTFILE}" "${HEADER}" "${LOCATION}" "${POSITION}" "${STACK}"
         COMMAND "${BISON_EXECUTABLE}"
         ARGS "--name-prefix=${PREFIX}"
         "--defines"
-		"-t"
-		"-rall"
-		"--locations"
+        "-t"
+        "-rall"
+        "--locations"
         "--output-file=${OUTFILE}"
-        "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}"
-        DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}")
+        "${FILENAME}"
+        DEPENDS "${FILENAME}")
       SET_SOURCE_FILES_PROPERTIES("${OUTFILE}" "${HEADER}" "${LOCATION}" "${POSITION}" "${STACK}" PROPERTIES GENERATED TRUE)
       SET_SOURCE_FILES_PROPERTIES("${HEADER}" "${LOCATION}" "${POSITION}" "${STACK}" PROPERTIES HEADER_FILE_ONLY TRUE)
     ELSE(BISON_GENERATE_DEFINES)
@@ -97,8 +97,8 @@
         COMMAND "${BISON_EXECUTABLE}"
         ARGS "--name-prefix=${PREFIX}"
         "--output-file=${OUTFILE}"
-        "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}"
-        DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}")
+        "${FILENAME}"
+        DEPENDS "${FILENAME}")
       SET_SOURCE_FILES_PROPERTIES("${OUTFILE}" PROPERTIES GENERATED TRUE)
     ENDIF(BISON_GENERATE_DEFINES)
   ENDMACRO(BISON_FILE)

=== modified file 'cmake_modules/CMakeUseFlex.cmake'
--- cmake_modules/CMakeUseFlex.cmake	2013-02-07 17:24:36 +0000
+++ cmake_modules/CMakeUseFlex.cmake	2013-04-17 00:55:39 +0000
@@ -81,14 +81,14 @@
       ARGS -E copy_if_different
          "${FLEX_INCLUDE_DIR}/FlexLexer.h"
          "${FLEXLEXERH}")
-    SET(OUTFILE "${CMAKE_CURRENT_BINARY_DIR}/${PATH}/${PREFIX}.cpp")
+    SET(OUTFILE "${PATH}/${PREFIX}.cpp")
     ADD_CUSTOM_COMMAND(
       OUTPUT "${OUTFILE}"
       COMMAND "${FLEX_EXECUTABLE}"
-      ARGS -t --debug "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}"
+      ARGS -t --debug "${FILENAME}"
       # flex's --outfile doesn't seem to work right, so redirect stdout
           > "${OUTFILE}"
-      DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}"
+      DEPENDS "${FILENAME}"
          "${FLEXLEXERH}")
     SET_SOURCE_FILES_PROPERTIES("${OUTFILE}" PROPERTIES GENERATED TRUE)
   ENDMACRO(FLEX_FILE)

=== modified file 'src/compiler/parser/CMakeLists.txt'
--- src/compiler/parser/CMakeLists.txt	2013-03-17 16:30:51 +0000
+++ src/compiler/parser/CMakeLists.txt	2013-04-17 00:55:39 +0000
@@ -47,13 +47,40 @@
 
 COMPARE_BISON_VERSION("${BISON_VERSION_FULL}" "2.4")
 
+
+MACRO(GENERATE_GRAMMAR_FILE PARSER_TYPE)
+  SET(TARGET_PATH "${CMAKE_CURRENT_BINARY_DIR}/compiler/parser")
+  SET_SOURCE_FILES_PROPERTIES(${TARGET_PATH}/${PARSER_TYPE}.y PROPERTIES GENERATED TRUE)
+  STRING(TOUPPER ${PARSER_TYPE} PARSER_DEFINE)
+  ADD_CUSTOM_COMMAND(
+      OUTPUT ${TARGET_PATH}/${PARSER_TYPE}.y
+      COMMAND "echo"
+      ARGS "-e" "\"%{\\n#define" "${PARSER_DEFINE}\\n%}\">${TARGET_PATH}/${PARSER_TYPE}.y"
+      COMMAND "cat"
+      ARGS "${CMAKE_CURRENT_SOURCE_DIR}/compiler/parser/parser_y_includes.h" 
+            ">>"
+           "${TARGET_PATH}/${PARSER_TYPE}.y"
+      COMMAND ${CMAKE_CXX_COMPILER} 
+      ARGS "-xc++" "-P" "-D${PARSER_DEFINE}"
+           "-E" "${CMAKE_CURRENT_SOURCE_DIR}/compiler/parser/parser.y"
+           ">>" "${TARGET_PATH}/${PARSER_TYPE}.y"
+      DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/compiler/parser/parser.y" "${CMAKE_CURRENT_SOURCE_DIR}/compiler/parser/parser_y_includes.h"
+    )
+  
+  BISON_FILE(${TARGET_PATH}/${PARSER_TYPE}.y)
+  LIST(APPEND PARSER_BUILD_SRCS ${TARGET_PATH}/${PARSER_TYPE}.cpp)
+ENDMACRO(GENERATE_GRAMMAR_FILE PARSER_TYPE)
+
 # Bison setup for the parser
 IF (GENERATE_BISON_FILES)
     SET(BISON_GENERATE_DEFINES TRUE)
-    BISON_FILE(compiler/parser/xquery_parser.y)
-    LIST(APPEND PARSER_BUILD_SRCS ${CMAKE_BINARY_DIR}/src/compiler/parser/xquery_parser.cpp)
-    BISON_FILE(compiler/parser/jsoniq_parser.y)
-    LIST(APPEND PARSER_BUILD_SRCS ${CMAKE_BINARY_DIR}/src/compiler/parser/jsoniq_parser.cpp)
+    IF(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/compiler/parser")
+      FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/compiler/parser")
+    ENDIF(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/compiler/parser")
+    
+    GENERATE_GRAMMAR_FILE(xquery_parser)
+    GENERATE_GRAMMAR_FILE(jsoniq_parser)
+    
 ELSE (GENERATE_BISON_FILES)
     IF (BISON_EXECUTABLE)
         MESSAGE(STATUS "         GNU Bison's version " ${BISON_VERSION_FULL} " is less than required (2.4) -- the parser will not be regenerated")
@@ -85,13 +112,43 @@
 
 COMPARE_FLEX_VERSION("${FLEX_VERSION_FULL}" "2.5.33")
 
+MACRO(GENERATE_FLEX_FILE SCANNER_TYPE)
+  SET(TARGET_PATH ${CMAKE_CURRENT_BINARY_DIR}/compiler/parser)  
+  SET_SOURCE_FILES_PROPERTIES(${TARGET_PATH}/${SCANNER_TYPE}.l PROPERTIES GENERATED TRUE)
+  STRING(TOUPPER ${SCANNER_TYPE} SCANNER_DEFINE)
+  
+  ADD_CUSTOM_COMMAND(
+      OUTPUT ${TARGET_PATH}/${SCANNER_TYPE}.l
+      COMMAND "echo"
+      ARGS "-e" "\"%{\\n#define" "${SCANNER_DEFINE}\\n%}\">${TARGET_PATH}/${SCANNER_TYPE}.l"
+      COMMAND "cat"
+      ARGS "${CMAKE_CURRENT_SOURCE_DIR}/compiler/parser/scanner_l_includes.h" 
+            ">>"
+           "${TARGET_PATH}/${SCANNER_TYPE}.l"
+      COMMAND ${CMAKE_CXX_COMPILER} 
+      ARGS "-xc++" "-P" "-D${SCANNER_DEFINE}"
+           "-E" "${CMAKE_CURRENT_SOURCE_DIR}/compiler/parser/scanner.l"
+           ">>" "${TARGET_PATH}/${SCANNER_TYPE}.l"
+      DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/compiler/parser/scanner.l" "${CMAKE_CURRENT_SOURCE_DIR}/compiler/parser/scanner_l_includes.h"
+    )
+    
+  FLEX_FILE(${TARGET_PATH}/${SCANNER_TYPE}.l)  
+  LIST(APPEND PARSER_BUILD_SRCS ${CMAKE_BINARY_DIR}/src/compiler/parser/${SCANNER_TYPE}.cpp)
+ENDMACRO(GENERATE_FLEX_FILE SCANNER_TYPE)
+
+
 # Flex setup for the scanner
 IF (GENERATE_FLEX_FILES AND ZORBA_HAVE_FLEXLEXER_H)
+    IF(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/compiler/parser")
+      FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/compiler/parser")
+    ENDIF(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/compiler/parser")
+              
     SET(FLEX_PREFIX_OUTPUTS TRUE)
-    FLEX_FILE(compiler/parser/xquery_scanner.l)
-    FLEX_FILE(compiler/parser/jsoniq_scanner.l)
     ADD_DEFINITIONS(-DFLEX_FILES_REGENERATED)
-    LIST(APPEND PARSER_BUILD_SRCS ${CMAKE_BINARY_DIR}/src/compiler/parser/xquery_scanner.cpp ${CMAKE_BINARY_DIR}/src/compiler/parser/jsoniq_scanner.cpp)
+    
+    GENERATE_FLEX_FILE(xquery_scanner)
+    GENERATE_FLEX_FILE(jsoniq_scanner)
+        
 ELSE (GENERATE_FLEX_FILES AND ZORBA_HAVE_FLEXLEXER_H)
     IF (NOT ZORBA_HAVE_FLEXLEXER_H)
         MESSAGE(STATUS "         FlexLexer.h has not been found -- the lexer will not be regenerated")

=== modified file 'src/compiler/parser/jsoniq_parser.cpp'
--- src/compiler/parser/jsoniq_parser.cpp	2013-04-16 06:58:24 +0000
+++ src/compiler/parser/jsoniq_parser.cpp	2013-04-17 00:55:39 +0000
@@ -36,7 +36,16 @@
 /* First part of user declarations.  */
 
 /* Line 293 of lalr1.cc  */
+<<<<<<< TREE
 #line 88 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+
+#define JSONIQ_PARSER
+
+/* Line 293 of lalr1.cc  */
+#line 58 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
 
 
 #include "common/common.h"
@@ -49,7 +58,13 @@
 #include "compiler/parser/parse_constants.h"
 #include "compiler/api/compilercb.h"
 #include "store/api/update_consts.h"
+
+#ifdef XQUERY_PARSER
+#include "compiler/parser/xquery_driver.h"
+#else
 #include "compiler/parser/jsoniq_driver.h"
+#endif
+
 #include "compiler/parser/parser_helpers.h"
 
 #define SYMTAB( n ) driver.symtab.get( (off_t)n )
@@ -63,9 +78,28 @@
 using namespace zorba;
 
 
+<<<<<<< TREE
 
 /* Line 293 of lalr1.cc  */
 #line 69 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+/* Line 293 of lalr1.cc  */
+#line 97 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+
+#ifdef XQUERY_PARSER
+#include "compiler/parser/xquery_scanner.h"
+#else
+#include "compiler/parser/jsoniq_scanner.h"
+#endif
+
+#undef yylex
+#define yylex driver.lexer->lex
+
+
+
+/* Line 293 of lalr1.cc  */
+#line 93 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
 
 
 #include "jsoniq_parser.hpp"
@@ -73,10 +107,12 @@
 /* User implementation prologue.  */
 
 /* Line 299 of lalr1.cc  */
+<<<<<<< TREE
 #line 917 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 776 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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...
 template<typename T> inline void release_hack( T *ref ) {
     if ( ref ) {
         RCHelper::addReference( ref );
@@ -85,17 +121,25 @@
 }
 
 /* Line 299 of lalr1.cc  */
+<<<<<<< TREE
 #line 1053 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 
 #include "compiler/parser/jsoniq_scanner.h"
 
 #undef yylex
 #define yylex driver.lexer->lex
+=======
+#line 831 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
 
 
 
 /* Line 299 of lalr1.cc  */
+<<<<<<< TREE
 #line 99 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 116 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
 
 #ifndef YY_
 # if defined YYENABLE_NLS && YYENABLE_NLS
@@ -181,7 +225,11 @@
 namespace zorba {
 
 /* Line 382 of lalr1.cc  */
+<<<<<<< TREE
 #line 185 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 202 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
 
   /* Return YYSTR after stripping away unnecessary quotes and
      backslashes, so that it's suitable for yyerror.  The heuristic is
@@ -282,28 +330,49 @@
         case 112: /* "\"'DECIMAL'\"" */
 
 /* Line 480 of lalr1.cc  */
+<<<<<<< TREE
 #line 915 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 775 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
 	{ delete (yyvaluep->decval); };
 
 /* Line 480 of lalr1.cc  */
+<<<<<<< TREE
 #line 290 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 307 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
 	break;
       case 127: /* "\"'DOUBLE'\"" */
 
 /* Line 480 of lalr1.cc  */
+<<<<<<< TREE
 #line 914 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 774 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
 	{ delete (yyvaluep->dval); };
 
 /* Line 480 of lalr1.cc  */
+<<<<<<< TREE
 #line 299 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 316 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
 	break;
       case 152: /* "\"'INTEGER'\"" */
 
 /* Line 480 of lalr1.cc  */
+<<<<<<< TREE
 #line 913 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 773 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
 	{ delete (yyvaluep->ival); };
 
 /* Line 480 of lalr1.cc  */
+<<<<<<< TREE
 #line 308 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 346: /* "VersionDecl" */
@@ -526,18 +595,251 @@
 
 /* Line 480 of lalr1.cc  */
 #line 947 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 325 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 345: /* "VersionDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 795 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 334 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 346: /* "MainModule" */
+
+/* Line 480 of lalr1.cc  */
+#line 788 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 343 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 347: /* "LibraryModule" */
+
+/* Line 480 of lalr1.cc  */
+#line 788 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 352 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 348: /* "ModuleDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 788 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 361 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 349: /* "SIND_DeclList" */
+
+/* Line 480 of lalr1.cc  */
+#line 791 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 370 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 350: /* "SIND_Decl" */
+
+/* Line 480 of lalr1.cc  */
+#line 791 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 379 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 351: /* "Setter" */
+
+/* Line 480 of lalr1.cc  */
+#line 792 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 388 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 352: /* "BoundarySpaceDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 785 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 397 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 353: /* "DefaultCollationDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 786 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 406 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 354: /* "BaseURIDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 785 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 415 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 355: /* "ConstructionDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 785 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 424 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 356: /* "OrderingModeDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 790 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 433 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 357: /* "EmptyOrderDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 787 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 442 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 358: /* "CopyNamespacesDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 786 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 451 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 359: /* "Import" */
+
+/* Line 480 of lalr1.cc  */
+#line 787 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 460 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 360: /* "SchemaImport" */
+
+/* Line 480 of lalr1.cc  */
+#line 791 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 469 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 361: /* "URILiteralList" */
+
+/* Line 480 of lalr1.cc  */
+#line 793 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 478 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 362: /* "SchemaPrefix" */
+
+/* Line 480 of lalr1.cc  */
+#line 792 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 487 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 363: /* "ModuleImport" */
+
+/* Line 480 of lalr1.cc  */
+#line 788 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 496 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 364: /* "NamespaceDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 788 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 505 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 365: /* "DefaultNamespaceDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 786 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 514 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 366: /* "VFO_DeclList" */
+
+/* Line 480 of lalr1.cc  */
+#line 795 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 523 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 367: /* "VFO_Decl" */
+
+/* Line 480 of lalr1.cc  */
+#line 795 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 532 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 368: /* "DecimalFormatDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 795 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 541 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 369: /* "DecimalFormatParamList" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
 	{ delete (yyvaluep->vstrpair); };
 
 /* Line 480 of lalr1.cc  */
+<<<<<<< TREE
 #line 533 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 550 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
 	break;
-      case 371: /* "DecimalFormatParam" */
+      case 370: /* "DecimalFormatParam" */
 
 /* Line 480 of lalr1.cc  */
+<<<<<<< TREE
 #line 947 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
 	{ delete (yyvaluep->strpair); };
 
 /* Line 480 of lalr1.cc  */
+<<<<<<< TREE
 #line 542 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 373: /* "OptionDecl" */
@@ -607,9 +909,81 @@
 
 /* Line 480 of lalr1.cc  */
 #line 947 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 559 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 372: /* "OptionDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 789 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 568 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 373: /* "FTOptionDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 577 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 374: /* "CtxItemDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 793 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 586 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 375: /* "CtxItemDecl2" */
+
+/* Line 480 of lalr1.cc  */
+#line 793 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 595 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 376: /* "CtxItemDecl3" */
+
+/* Line 480 of lalr1.cc  */
+#line 793 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 604 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 377: /* "CtxItemDecl4" */
+
+/* Line 480 of lalr1.cc  */
+#line 794 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 613 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 378: /* "VarDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 794 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 622 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 379: /* "VarNameAndType" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
 	{ delete (yyvaluep->varnametype); };
 
 /* Line 480 of lalr1.cc  */
+<<<<<<< TREE
 #line 614 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 381: /* "AnnotationList" */
@@ -679,9 +1053,81 @@
 
 /* Line 480 of lalr1.cc  */
 #line 947 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 631 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 380: /* "AnnotationList" */
+
+/* Line 480 of lalr1.cc  */
+#line 784 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 640 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 381: /* "Annotation" */
+
+/* Line 480 of lalr1.cc  */
+#line 784 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 649 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 382: /* "AnnotationLiteralList" */
+
+/* Line 480 of lalr1.cc  */
+#line 784 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 658 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 383: /* "FunctionDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 787 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 667 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 384: /* "FunctionDecl2" */
+
+/* Line 480 of lalr1.cc  */
+#line 787 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 676 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 385: /* "FunctionDeclSimple" */
+
+/* Line 480 of lalr1.cc  */
+#line 787 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 685 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 386: /* "FunctionDeclUpdating" */
+
+/* Line 480 of lalr1.cc  */
+#line 787 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 694 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 387: /* "FunctionSig" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
 	{ delete (yyvaluep->fnsig); };
 
 /* Line 480 of lalr1.cc  */
+<<<<<<< TREE
 #line 686 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 389: /* "ParamList" */
@@ -2308,9 +2754,1647 @@
 
 /* Line 480 of lalr1.cc  */
 #line 947 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 703 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 388: /* "ParamList" */
+
+/* Line 480 of lalr1.cc  */
+#line 790 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 712 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 389: /* "Param" */
+
+/* Line 480 of lalr1.cc  */
+#line 790 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 721 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 390: /* "CollectionDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 793 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 730 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 392: /* "IndexDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 793 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 739 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 393: /* "IndexKeyList" */
+
+/* Line 480 of lalr1.cc  */
+#line 793 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 748 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 394: /* "IndexKeySpec" */
+
+/* Line 480 of lalr1.cc  */
+#line 793 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 757 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 395: /* "IntegrityConstraintDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 793 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 766 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 396: /* "QueryBody" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 775 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 397: /* "StatementsAndOptionalExprTop" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 784 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 398: /* "StatementsAndOptionalExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 793 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 399: /* "StatementsAndExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 802 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 400: /* "Statements" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 811 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 401: /* "Statement" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 820 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 402: /* "BlockStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 829 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 403: /* "BlockExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 838 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 404: /* "EnclosedStatementsAndOptionalExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 847 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 405: /* "VarDeclStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 856 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 408: /* "AssignStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 865 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 409: /* "ApplyStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 874 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 410: /* "ExitStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 883 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 411: /* "WhileStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 892 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 412: /* "FlowCtlStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 901 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 413: /* "FLWORStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 910 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 414: /* "ReturnStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 919 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 415: /* "IfStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 928 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 416: /* "TryStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 937 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 417: /* "CatchListStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 946 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 418: /* "CatchStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 955 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 419: /* "VoidStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 797 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 964 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 420: /* "Expr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 973 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 421: /* "ExprSingle" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 982 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 422: /* "ExprSimple" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 991 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 423: /* "FLWORExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1000 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 424: /* "ReturnExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1009 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 427: /* "FLWORWinCond" */
+
+/* Line 480 of lalr1.cc  */
+#line 794 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1018 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 428: /* "WindowClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 787 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1027 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 429: /* "CountClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 795 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1036 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 430: /* "ForLetWinClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 787 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1045 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 432: /* "FLWORClauseList" */
+
+/* Line 480 of lalr1.cc  */
+#line 787 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1054 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 433: /* "ForClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 787 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1063 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 435: /* "VarInDeclList" */
+
+/* Line 480 of lalr1.cc  */
+#line 794 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1072 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 436: /* "VarInDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 794 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1081 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 437: /* "PositionalVar" */
+
+/* Line 480 of lalr1.cc  */
+#line 790 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1090 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 438: /* "FTScoreVar" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1099 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 439: /* "LetClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 788 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1108 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 440: /* "VarGetsDeclList" */
+
+/* Line 480 of lalr1.cc  */
+#line 794 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1117 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 441: /* "VarGetsDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 794 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1126 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 442: /* "WindowVarDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 794 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1135 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 443: /* "WindowVars" */
+
+/* Line 480 of lalr1.cc  */
+#line 794 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1144 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 444: /* "WindowVars3" */
+
+/* Line 480 of lalr1.cc  */
+#line 794 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1153 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 445: /* "WindowVars2" */
+
+/* Line 480 of lalr1.cc  */
+#line 794 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1162 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 446: /* "WhereClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 795 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1171 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 447: /* "GroupByClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 789 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1180 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 448: /* "GroupSpecList" */
+
+/* Line 480 of lalr1.cc  */
+#line 789 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1189 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 449: /* "GroupSpec" */
+
+/* Line 480 of lalr1.cc  */
+#line 789 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1198 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 450: /* "GroupCollationSpec" */
+
+/* Line 480 of lalr1.cc  */
+#line 789 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1207 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 451: /* "OrderByClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 789 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1216 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 452: /* "OrderSpecList" */
+
+/* Line 480 of lalr1.cc  */
+#line 790 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1225 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 453: /* "OrderSpec" */
+
+/* Line 480 of lalr1.cc  */
+#line 790 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1234 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 454: /* "OrderModifier" */
+
+/* Line 480 of lalr1.cc  */
+#line 789 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1243 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 455: /* "OrderDirSpec" */
+
+/* Line 480 of lalr1.cc  */
+#line 789 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1252 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 456: /* "OrderEmptySpec" */
+
+/* Line 480 of lalr1.cc  */
+#line 789 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1261 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 457: /* "OrderCollationSpec" */
+
+/* Line 480 of lalr1.cc  */
+#line 789 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1270 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 458: /* "QuantifiedExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1279 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 459: /* "QVarInDeclList" */
+
+/* Line 480 of lalr1.cc  */
+#line 790 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1288 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 460: /* "QVarInDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 790 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1297 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 461: /* "SwitchExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1306 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 462: /* "SwitchCaseClauseList" */
+
+/* Line 480 of lalr1.cc  */
+#line 796 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1315 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 463: /* "SwitchCaseClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 796 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1324 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 464: /* "SwitchCaseOperandList" */
+
+/* Line 480 of lalr1.cc  */
+#line 796 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1333 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 465: /* "SwitchStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1342 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 468: /* "TypeswitchExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1351 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 469: /* "TypeswitchStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1360 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 470: /* "CaseClauseList" */
+
+/* Line 480 of lalr1.cc  */
+#line 785 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1369 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 471: /* "CaseClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 785 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1378 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 474: /* "SequenceTypeList" */
+
+/* Line 480 of lalr1.cc  */
+#line 792 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1387 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 475: /* "IfExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1396 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 476: /* "OrExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1405 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 477: /* "AndExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1414 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 478: /* "NotExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 797 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1423 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 479: /* "ComparisonExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1432 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 480: /* "FTContainsExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1441 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 481: /* "StringConcatExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1450 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 482: /* "opt_FTIgnoreOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1459 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 483: /* "RangeExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1468 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 484: /* "AdditiveExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1477 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 485: /* "MultiplicativeExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1486 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 486: /* "UnionExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1495 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 487: /* "IntersectExceptExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1504 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 488: /* "InstanceofExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1513 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 489: /* "TreatExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1522 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 490: /* "CastableExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1531 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 491: /* "CastExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1540 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 492: /* "SingleType" */
+
+/* Line 480 of lalr1.cc  */
+#line 792 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1549 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 493: /* "UnaryExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1558 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 494: /* "SignList" */
+
+/* Line 480 of lalr1.cc  */
+#line 792 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1567 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 495: /* "ValueExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1576 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 496: /* "SimpleMapExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1585 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 497: /* "ValueComp" */
+
+/* Line 480 of lalr1.cc  */
+#line 793 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1594 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 498: /* "ValidateExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1603 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 499: /* "ExtensionExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1612 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 500: /* "Pragma_list" */
+
+/* Line 480 of lalr1.cc  */
+#line 790 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1621 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 501: /* "Pragma" */
+
+/* Line 480 of lalr1.cc  */
+#line 790 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1630 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 502: /* "PathExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1639 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 503: /* "RelativePathExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1648 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 504: /* "StepExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1657 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 505: /* "NameTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 788 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1666 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 506: /* "Wildcard" */
+
+/* Line 480 of lalr1.cc  */
+#line 795 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1675 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 507: /* "FilterExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1684 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 508: /* "PredicateList" */
+
+/* Line 480 of lalr1.cc  */
+#line 790 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1693 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 509: /* "Predicate" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1702 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 510: /* "PrimaryExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1711 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 511: /* "Literal" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1720 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 512: /* "NumericLiteral" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1729 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 514: /* "VarRef" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1738 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 515: /* "ParenthesizedExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1747 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 516: /* "ContextItemExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1756 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 517: /* "OrderedExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1765 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 518: /* "UnorderedExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1774 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 519: /* "FunctionCall" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1783 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 520: /* "ArgList" */
+
+/* Line 480 of lalr1.cc  */
+#line 784 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1792 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 524: /* "Constructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 525: /* "DirectConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1810 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 526: /* "DirElemConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1819 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 527: /* "DirElemContentList" */
+
+/* Line 480 of lalr1.cc  */
+#line 786 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1828 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 528: /* "DirAttributeList" */
+
+/* Line 480 of lalr1.cc  */
+#line 786 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1837 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 529: /* "DirAttr" */
+
+/* Line 480 of lalr1.cc  */
+#line 786 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1846 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 531: /* "DirAttributeValue" */
+
+/* Line 480 of lalr1.cc  */
+#line 786 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1855 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 532: /* "opt_QuoteAttrContentList" */
+
+/* Line 480 of lalr1.cc  */
+#line 791 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1864 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 533: /* "QuoteAttrContentList" */
+
+/* Line 480 of lalr1.cc  */
+#line 791 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1873 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 534: /* "opt_AposAttrContentList" */
+
+/* Line 480 of lalr1.cc  */
+#line 784 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1882 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 535: /* "AposAttrContentList" */
+
+/* Line 480 of lalr1.cc  */
+#line 784 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1891 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 536: /* "QuoteAttrValueContent" */
+
+/* Line 480 of lalr1.cc  */
+#line 791 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1900 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 537: /* "AposAttrValueContent" */
+
+/* Line 480 of lalr1.cc  */
+#line 784 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1909 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 538: /* "DirElemContent" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1918 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 539: /* "CommonContent" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1927 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 540: /* "DirCommentConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1936 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 541: /* "DirPIConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1945 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 542: /* "CDataSection" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1954 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 543: /* "ComputedConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1963 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 544: /* "CompDocConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1972 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 545: /* "CompElemConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1981 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 546: /* "CompAttrConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1990 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 547: /* "CompTextConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1999 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 548: /* "CompCommentConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2008 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 549: /* "CompPIConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2017 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 550: /* "CompNamespaceConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2026 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 551: /* "TypeDeclaration" */
+
+/* Line 480 of lalr1.cc  */
+#line 792 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2035 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 552: /* "SequenceType" */
+
+/* Line 480 of lalr1.cc  */
+#line 792 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2044 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 553: /* "OccurrenceIndicator" */
+
+/* Line 480 of lalr1.cc  */
+#line 788 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2053 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 554: /* "ItemType" */
+
+/* Line 480 of lalr1.cc  */
+#line 788 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2062 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 555: /* "TypeList" */
+
+/* Line 480 of lalr1.cc  */
+#line 795 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2071 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 556: /* "GeneralizedAtomicType" */
+
+/* Line 480 of lalr1.cc  */
+#line 785 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2080 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 557: /* "SimpleType" */
+
+/* Line 480 of lalr1.cc  */
+#line 785 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2089 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 558: /* "KindTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 788 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2098 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 559: /* "AnyKindTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 784 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2107 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 560: /* "DocumentTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 786 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2116 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 561: /* "NamespaceTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 792 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2125 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 562: /* "TextTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 792 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2134 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 563: /* "CommentTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 785 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2143 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 564: /* "PITest" */
+
+/* Line 480 of lalr1.cc  */
+#line 790 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2152 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 565: /* "AttributeTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 785 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2161 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 566: /* "SchemaAttributeTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 791 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2170 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 567: /* "ElementTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 786 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2179 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 568: /* "SchemaElementTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 791 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2188 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 569: /* "TypeName" */
+
+/* Line 480 of lalr1.cc  */
+#line 792 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2197 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 570: /* "TypeName_WITH_HOOK" */
+
+/* Line 480 of lalr1.cc  */
+#line 792 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2206 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 571: /* "StringLiteral" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2215 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 573: /* "AnyFunctionTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 795 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2224 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 574: /* "TypedFunctionTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 795 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2233 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 577: /* "InsertExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2242 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 578: /* "DeleteExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2251 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 579: /* "ReplaceExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2260 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 580: /* "RenameExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2269 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 581: /* "TransformExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2278 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 582: /* "VarNameList" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2287 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 583: /* "VarNameDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2296 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 584: /* "TryExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2305 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 585: /* "CatchListExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2314 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 586: /* "CatchExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2323 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 587: /* "BracedExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2332 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 588: /* "NameTestList" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
 	{ delete (yyvaluep->name_test_list); };
 
 /* Line 480 of lalr1.cc  */
+<<<<<<< TREE
 #line 2315 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 590: /* "FTSelection" */
@@ -2771,6 +4855,468 @@
 
 /* Line 480 of lalr1.cc  */
 #line 2774 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 2341 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 589: /* "FTSelection" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2350 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 592: /* "FTOr" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2359 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 593: /* "FTAnd" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2368 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 594: /* "FTMildNot" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2377 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 595: /* "FTUnaryNot" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2386 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 596: /* "FTPrimaryWithOptions" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2395 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 597: /* "opt_FTMatchOptions" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2404 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 599: /* "FTWeight" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2413 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 600: /* "FTPrimary" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2422 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 601: /* "opt_FTTimes" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2431 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 602: /* "FTExtensionSelection" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2440 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 604: /* "FTWords" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2449 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 605: /* "FTWordsValue" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2458 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 607: /* "FTAnyallOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2467 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 610: /* "FTPosFilter" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2476 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 611: /* "FTOrder" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2485 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 612: /* "FTWindow" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2494 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 613: /* "FTDistance" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2503 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 614: /* "FTUnit" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2512 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 615: /* "FTMatchOptions" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2521 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 616: /* "FTMatchOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2530 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 617: /* "FTCaseOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2539 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 618: /* "FTDiacriticsOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2548 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 619: /* "FTExtensionOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2557 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 620: /* "FTStemOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2566 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 621: /* "FTThesaurusOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2575 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 625: /* "FTThesaurusID" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2584 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 628: /* "FTStopWordOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2593 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 629: /* "FTStopWords" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2602 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 633: /* "FTStopWordsInclExcl" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2611 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 634: /* "FTLanguageOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2620 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 635: /* "FTWildCardOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2629 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 636: /* "FTContent" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2638 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 637: /* "FTTimes" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2647 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 638: /* "FTRange" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2656 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 639: /* "FTScope" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2665 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 640: /* "FTBigUnit" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2674 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 641: /* "FTIgnoreOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2683 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 642: /* "JSONArrayConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 799 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2692 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 643: /* "JSONSimpleObjectUnion" */
+
+/* Line 480 of lalr1.cc  */
+#line 799 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2701 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 644: /* "JSONAccumulatorObjectUnion" */
+
+/* Line 480 of lalr1.cc  */
+#line 799 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2710 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 645: /* "JSONObjectConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 799 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2719 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 646: /* "JSONPairList" */
+
+/* Line 480 of lalr1.cc  */
+#line 799 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2728 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 647: /* "JSONInsertExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 799 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2737 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 648: /* "JSONAppendExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 799 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2746 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 649: /* "JSONDeleteExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 799 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2755 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 650: /* "JSONRenameExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 799 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2764 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 651: /* "JSONReplaceExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 799 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2773 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 658: /* "QNAME" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2782 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 659: /* "FUNCTION_NAME" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2791 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 660: /* "EQNAME" */
+
+/* Line 480 of lalr1.cc  */
+#line 800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
 	break;
 
 	default:
@@ -2861,13 +5407,21 @@
     /* User initialization code.  */
     
 /* Line 565 of lalr1.cc  */
+<<<<<<< TREE
 #line 133 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 119 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
 {
     yylloc.begin.filename = yylloc.end.filename = &(driver.theFilename2);
 }
 
 /* Line 565 of lalr1.cc  */
+<<<<<<< TREE
 #line 2871 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 2897 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
 
     /* Initialize the stacks.  The initial state will be pushed in
        yynewstate, since the latter expects the semantical and the
@@ -2986,7 +5540,11 @@
 	  case 3:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1071 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 838 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
         (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       }
@@ -2995,7 +5553,11 @@
   case 4:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1075 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 842 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
         (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       }
@@ -3004,7 +5566,11 @@
   case 5:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1079 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 846 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
         (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       }
@@ -3013,7 +5579,11 @@
   case 6:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1087 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 852 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
         (yyval.node) = NULL;
       }
@@ -3022,7 +5592,11 @@
   case 7:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1093 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 856 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
         (yyval.node) = NULL; YYABORT;
       }
@@ -3031,7 +5605,11 @@
   case 8:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1097 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 860 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
         (yyval.node) = NULL; YYABORT;
       }
@@ -3040,7 +5618,11 @@
   case 9:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1106 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 866 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
       driver.set_expr( (yyval.node) );
@@ -3050,7 +5632,11 @@
   case 10:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1112 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 872 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)) );
@@ -3062,7 +5648,11 @@
   case 11:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1120 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 880 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
       driver.set_expr( (yyval.node) );
@@ -3072,7 +5662,11 @@
   case 12:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1126 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 886 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)) );
@@ -3084,7 +5678,11 @@
   case 13:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1137 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 895 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)), "utf-8" );
     }
@@ -3093,7 +5691,11 @@
   case 14:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1142 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 900 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)) );
     }
@@ -3102,7 +5704,11 @@
   case 15:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1146 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 905 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)), "utf-8", VersionDecl::jsoniq );
     }
@@ -3111,20 +5717,26 @@
   case 16:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1151 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 910 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-      (yyval.node) = new VersionDecl(
-        LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)), VersionDecl::jsoniq );
+      (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)), VersionDecl::jsoniq );
     }
     break;
 
   case 17:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1160 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 916 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (1)].node)), NULL);
-
       (yyval.node) = new MainModule(LOC((yyloc)), static_cast<QueryBody*>((yysemantic_stack_[(3) - (3)].expr)), prolog);
     }
     break;
@@ -3132,10 +5744,13 @@
   case 18:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1167 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 922 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (1)].node)));
-
       (yyval.node) = new MainModule(LOC((yyloc)), static_cast<QueryBody*>((yysemantic_stack_[(3) - (3)].expr)), prolog);
     }
     break;
@@ -3143,12 +5758,15 @@
   case 19:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1174 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 928 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       Prolog* prolog = new Prolog(LOC((yyloc)),
                                   static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (1)].node)),
                                   static_cast<VFO_DeclList*>((yysemantic_stack_[(5) - (3)].node)));
-
       (yyval.node) = new MainModule(LOC((yyloc)), static_cast<QueryBody*>((yysemantic_stack_[(5) - (5)].expr)), prolog);
     }
     break;
@@ -3156,7 +5774,11 @@
   case 20:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1183 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 936 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new MainModule( LOC((yyloc)), static_cast<QueryBody*>((yysemantic_stack_[(1) - (1)].expr)), NULL );
     }
@@ -3165,9 +5787,13 @@
   case 21:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1190 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 941 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-      (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
+      (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr);
       (yylocation_stack_[(3) - (1)]).step();
       error((yylocation_stack_[(3) - (1)]), "syntax error, missing semicolon \";\" after statement.");
       YYERROR;
@@ -3177,9 +5803,13 @@
   case 22:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1198 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 949 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-      (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
+      (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr);
       (yylocation_stack_[(3) - (1)]).step();
       error((yylocation_stack_[(3) - (1)]), "syntax error, missing semicolon \";\" after declaration.");
       YYERROR;
@@ -3189,9 +5819,13 @@
   case 23:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1206 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 957 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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
+      (yyval.node) = (yysemantic_stack_[(5) - (1)].node); (yyval.node) = (yysemantic_stack_[(5) - (3)].node); (yyval.node) = (yysemantic_stack_[(5) - (5)].expr);
       (yylocation_stack_[(5) - (3)]).step();
       error((yylocation_stack_[(5) - (3)]), "syntax error, missing semicolon \";\" after declaration.");
       YYERROR;
@@ -3201,9 +5835,13 @@
   case 24:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1214 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 965 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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
+      (yyval.node) = (yysemantic_stack_[(5) - (1)].node); (yyval.node) = (yysemantic_stack_[(5) - (3)].node); (yyval.node) = (yysemantic_stack_[(5) - (5)].expr);
       (yylocation_stack_[(5) - (1)]).step();
       error((yylocation_stack_[(5) - (1)]), "syntax error, missing semicolon \";\" after statement.");
       YYERROR;
@@ -3213,7 +5851,11 @@
   case 25:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1225 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 974 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new LibraryModule(LOC((yyloc)), static_cast<ModuleDecl*>((yysemantic_stack_[(1) - (1)].node)), NULL);
     }
@@ -3222,10 +5864,13 @@
   case 26:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1230 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 979 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (2)].node)), NULL);
-
       (yyval.node) = new LibraryModule(LOC((yyloc)), static_cast<ModuleDecl*>((yysemantic_stack_[(3) - (1)].node)), prolog);
     }
     break;
@@ -3233,10 +5878,13 @@
   case 27:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1237 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 985 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (2)].node)));
-
       (yyval.node) = new LibraryModule(LOC((yyloc)), static_cast<ModuleDecl*>((yysemantic_stack_[(3) - (1)].node)), prolog);
     }
     break;
@@ -3244,12 +5892,15 @@
   case 28:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1244 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 991 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       Prolog* prolog = new Prolog(LOC((yyloc)),
                                   static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (2)].node)),
                                   static_cast<VFO_DeclList*>((yysemantic_stack_[(5) - (4)].node)));
-
       (yyval.node) = new LibraryModule(LOC((yyloc)), static_cast<ModuleDecl*>((yysemantic_stack_[(5) - (1)].node)), prolog);
     }
     break;
@@ -3257,10 +5908,13 @@
   case 29:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1256 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1000 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ModuleDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)) );
-
       dynamic_cast<ModuleDecl*>((yyval.node))->setComment( SYMTAB((yysemantic_stack_[(6) - (1)].sval)) );
     }
     break;
@@ -3268,7 +5922,11 @@
   case 30:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1266 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1007 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       SIND_DeclList *sdl = new SIND_DeclList( LOC((yyloc)) );
       sdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -3279,7 +5937,11 @@
   case 31:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1273 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1014 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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);
@@ -3289,10 +5951,13 @@
   case 32:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1280 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1020 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-      // error
-      (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
+      (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       (yylocation_stack_[(3) - (1)]).step();
       error((yylocation_stack_[(3) - (1)]), "syntax error, missing semicolon \";\" after declaration.");
       YYERROR;
@@ -3302,7 +5967,11 @@
   case 46:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1315 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1046 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::preserve_space);
     }
@@ -3311,7 +5980,11 @@
   case 47:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1320 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1051 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::strip_space);
     }
@@ -3320,7 +5993,11 @@
   case 48:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1328 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1057 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new DefaultCollationDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)) );
     }
@@ -3329,7 +6006,11 @@
   case 49:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1336 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1063 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new BaseURIDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
     }
@@ -3338,7 +6019,11 @@
   case 50:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1344 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1069 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_preserve);
     }
@@ -3347,7 +6032,11 @@
   case 51:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1349 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1074 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_strip);
     }
@@ -3356,7 +6045,11 @@
   case 52:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1357 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1080 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::ordered);
     }
@@ -3365,7 +6058,11 @@
   case 53:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1362 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1085 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::unordered);
     }
@@ -3374,7 +6071,11 @@
   case 54:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1370 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1091 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_greatest);
     }
@@ -3383,7 +6084,11 @@
   case 55:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1375 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1096 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_least);
     }
@@ -3392,7 +6097,11 @@
   case 56:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1383 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1102 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, true);
     }
@@ -3401,7 +6110,11 @@
   case 57:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1388 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1107 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, false);
     }
@@ -3410,7 +6123,11 @@
   case 58:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1393 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1112 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, true);
     }
@@ -3419,7 +6136,11 @@
   case 59:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1398 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1117 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, false);
     }
@@ -3428,9 +6149,13 @@
   case 62:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1411 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1127 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-      (yyval.node) = (yyval.node); // to prevent the Bison warning
+      (yyval.node) = (yyval.node);
       error((yylocation_stack_[(3) - (2)]), "syntax error, \"import\" should be followed by either \"schema\" or \"module\".");
       YYERROR;
     }
@@ -3439,7 +6164,11 @@
   case 63:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1421 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1135 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SchemaImport( LOC((yyloc)), NULL, SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL );
     }
@@ -3448,7 +6177,11 @@
   case 64:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1426 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1140 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(4) - (3)].node)),
@@ -3460,7 +6193,11 @@
   case 65:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1434 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1148 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             NULL,
@@ -3472,7 +6209,11 @@
   case 66:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1442 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1156 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(6) - (3)].node)),
@@ -3484,7 +6225,11 @@
   case 67:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1453 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1165 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       URILiteralList *ull = new URILiteralList( LOC((yyloc)));
       ull->push_back( SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
@@ -3495,11 +6240,14 @@
   case 68:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1460 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1172 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       if ( URILiteralList *ull = dynamic_cast<URILiteralList*>((yysemantic_stack_[(3) - (1)].node)) )
         ull->push_back( SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
-
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
     }
     break;
@@ -3507,7 +6255,11 @@
   case 69:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1471 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1180 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SchemaPrefix( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
@@ -3516,7 +6268,11 @@
   case 70:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1476 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1185 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SchemaPrefix( LOC((yyloc)), true );
     }
@@ -3525,10 +6281,13 @@
   case 71:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1484 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1191 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL);
-
       dynamic_cast<ModuleImport *>((yyval.node))->setComment(SYMTAB((yysemantic_stack_[(3) - (2)].sval)));
     }
     break;
@@ -3536,10 +6295,13 @@
   case 72:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1491 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1197 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (4)].sval)), SYMTAB((yysemantic_stack_[(6) - (6)].sval)), NULL);
-
       dynamic_cast<ModuleImport *>((yyval.node))->setComment(SYMTAB((yysemantic_stack_[(6) - (2)].sval)));
     }
     break;
@@ -3547,12 +6309,15 @@
   case 73:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1498 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1203 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)),
                             SYMTAB((yysemantic_stack_[(5) - (3)].sval)),
                             dynamic_cast<URILiteralList*>((yysemantic_stack_[(5) - (5)].node)));
-
       dynamic_cast<ModuleImport *>((yyval.node))->setComment(SYMTAB((yysemantic_stack_[(5) - (2)].sval)));
     }
     break;
@@ -3560,13 +6325,16 @@
   case 74:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1507 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1211 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)),
                             SYMTAB((yysemantic_stack_[(8) - (4)].sval)),
                             SYMTAB((yysemantic_stack_[(8) - (6)].sval)),
                             dynamic_cast<URILiteralList*>((yysemantic_stack_[(8) - (8)].node)));
-
       dynamic_cast<ModuleImport *>((yyval.node))->setComment(SYMTAB((yysemantic_stack_[(8) - (2)].sval)));
     }
     break;
@@ -3574,7 +6342,11 @@
   case 75:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1520 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1221 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new NamespaceDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(5) - (3)].sval)), SYMTAB((yysemantic_stack_[(5) - (5)].sval)) );
     }
@@ -3583,7 +6355,11 @@
   case 76:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1528 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1227 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_element_default,
@@ -3594,7 +6370,11 @@
   case 77:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1535 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1234 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_function_default,
@@ -3605,7 +6385,11 @@
   case 78:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1545 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1242 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       VFO_DeclList *vdl = new VFO_DeclList( LOC((yyloc)));
       vdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -3616,7 +6400,11 @@
   case 79:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1552 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1249 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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);
@@ -3626,9 +6414,13 @@
   case 80:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1559 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1255 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-      (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
+      (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       (yylocation_stack_[(3) - (1)]).step();
       error((yylocation_stack_[(3) - (1)]), "syntax error, missing semicolon \";\" after declaration.");
       YYERROR;
@@ -3638,7 +6430,11 @@
   case 89:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1582 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1274 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new DecimalFormatNode(LOC((yyloc)), (yysemantic_stack_[(4) - (4)].vstrpair));
       delete (yysemantic_stack_[(4) - (4)].vstrpair);
@@ -3648,7 +6444,11 @@
   case 90:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1588 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1280 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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);
@@ -3658,7 +6458,11 @@
   case 91:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1597 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1287 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.vstrpair) = new vector<string_pair_t>();
       (yyval.vstrpair)->push_back( *(yysemantic_stack_[(1) - (1)].strpair) );
@@ -3669,7 +6473,11 @@
   case 92:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1604 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1294 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yysemantic_stack_[(2) - (1)].vstrpair)->push_back( *(yysemantic_stack_[(2) - (2)].strpair) );
       delete (yysemantic_stack_[(2) - (2)].strpair);
@@ -3680,7 +6488,11 @@
   case 93:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1614 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1302 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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() );
@@ -3691,77 +6503,121 @@
   case 94:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1623 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1309 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "decimal-separator"; }
     break;
 
   case 95:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1624 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1310 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "digit"; }
     break;
 
   case 96:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1625 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1311 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "grouping-separator"; }
     break;
 
   case 97:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1626 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1312 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "infinity"; }
     break;
 
   case 98:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1627 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1313 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "minus-sign"; }
     break;
 
   case 99:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1628 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1314 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "NaN"; }
     break;
 
   case 100:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1629 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1315 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "pattern-separator"; }
     break;
 
   case 101:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1630 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1316 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "percent"; }
     break;
 
   case 102:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1631 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1317 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "per-mille"; }
     break;
 
   case 103:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1632 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1318 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.strval) = "zero-digit"; }
     break;
 
   case 104:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1638 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1322 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new OptionDecl(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)));
     }
@@ -3770,7 +6626,11 @@
   case 105:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1646 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1328 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new FTOptionDecl( LOC((yyloc)), dynamic_cast<FTMatchOptions*>((yysemantic_stack_[(3) - (3)].node)) );
     }
@@ -3779,7 +6639,11 @@
   case 106:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1654 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1334 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(4) - (4)].node);
     }
@@ -3788,7 +6652,11 @@
   case 107:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1662 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1340 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(3) - (3)].node));
       d->theType = (yysemantic_stack_[(3) - (2)].node);
@@ -3799,7 +6667,11 @@
   case 108:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1669 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1347 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -3808,7 +6680,11 @@
   case 109:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1677 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1353 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(1) - (1)].node));
       d->theIsExternal = false;
@@ -3819,7 +6695,11 @@
   case 110:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1684 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1360 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CtxItemDecl(LOC((yyloc)), NULL);
     }
@@ -3828,7 +6708,11 @@
   case 111:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1689 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1365 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
     }
@@ -3837,7 +6721,11 @@
   case 112:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1697 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1371 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CtxItemDecl(LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
     }
@@ -3846,17 +6734,19 @@
   case 113:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1705 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1377 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(4) - (2)].varnametype)));
-
       (yyval.node) = new GlobalVarDecl(LOC((yyloc)),
                              nt->theName,
                              nt->theType,
                              (yysemantic_stack_[(4) - (4)].expr),
                              nt->get_annotations(),
-                             false);  // not external
-
+                             false);
       static_cast<GlobalVarDecl*>((yyval.node))->setComment(SYMTAB((yysemantic_stack_[(4) - (1)].sval)));
     }
     break;
@@ -3864,17 +6754,19 @@
   case 114:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1719 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1389 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(3) - (2)].varnametype)));
-
       (yyval.node) = new GlobalVarDecl(LOC((yyloc)),
                              nt->theName,
                              nt->theType,
-                             NULL,   // no init expr
+                             NULL,
                              nt->get_annotations(),
-                             true);  // external
-
+                             true);
       static_cast<GlobalVarDecl*>((yyval.node))->setComment(SYMTAB((yysemantic_stack_[(3) - (1)].sval)));
     }
     break;
@@ -3882,17 +6774,19 @@
   case 115:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1733 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1401 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(5) - (2)].varnametype)));
-
       (yyval.node) = new GlobalVarDecl(LOC((yyloc)),
                              nt->theName,
                              nt->theType,
-                             (yysemantic_stack_[(5) - (5)].expr),     // init expr
+                             (yysemantic_stack_[(5) - (5)].expr),
                              nt->get_annotations(),
-                             true);  // external
-
+                             true);
       static_cast<GlobalVarDecl*>((yyval.node))->setComment(SYMTAB((yysemantic_stack_[(5) - (1)].sval)));
     }
     break;
@@ -3900,7 +6794,11 @@
   case 116:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1750 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1414 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL, NULL);
     }
@@ -3909,7 +6807,11 @@
   case 117:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1755 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1419 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)),
@@ -3921,7 +6823,11 @@
   case 118:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1763 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1427 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
@@ -3933,7 +6839,11 @@
   case 119:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1771 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1435 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(5) - (4)].expr)),
@@ -3945,7 +6855,11 @@
   case 120:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1782 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1444 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AnnotationListParsenode(LOC((yyloc)), static_cast<AnnotationParsenode*>((yysemantic_stack_[(1) - (1)].node)));
     }
@@ -3954,7 +6868,11 @@
   case 121:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1787 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1449 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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);
@@ -3964,7 +6882,11 @@
   case 122:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1796 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1456 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))), NULL);
     }
@@ -3973,7 +6895,11 @@
   case 123:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1801 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1461 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
                                    new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval))),
@@ -3984,7 +6910,11 @@
   case 124:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1808 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1468 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), true), NULL);
     }
@@ -3993,7 +6923,11 @@
   case 125:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1813 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1473 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
                                    new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval)), true),
@@ -4004,7 +6938,11 @@
   case 126:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1823 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1481 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AnnotationLiteralListParsenode(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr));
     }
@@ -4013,7 +6951,11 @@
   case 127:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1828 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1486 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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);
@@ -4023,7 +6965,11 @@
   case 128:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1837 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1493 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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);
@@ -4033,12 +6979,14 @@
   case 129:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1843 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1499 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       FunctionDecl* fdecl = static_cast<FunctionDecl*>((yysemantic_stack_[(3) - (3)].node));
-
       fdecl->setComment( SYMTAB((yysemantic_stack_[(3) - (1)].sval)) );
-
       fdecl->set_annotations(static_cast<AnnotationListParsenode*>((yysemantic_stack_[(3) - (2)].node)));
       (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
     }
@@ -4047,7 +6995,11 @@
   case 130:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1856 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1508 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -4056,7 +7008,11 @@
   case 131:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1861 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1513 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -4065,15 +7021,19 @@
   case 132:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1869 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1519 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new FunctionDecl(LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
                             &* (yysemantic_stack_[(4) - (3)].fnsig)->theParams,
                             &* (yysemantic_stack_[(4) - (3)].fnsig)->theReturnType,
-                            (yysemantic_stack_[(4) - (4)].expr),      // body
-                            false,   // not explicitly updating
-                            false);  // not external
+                            (yysemantic_stack_[(4) - (4)].expr),
+                            false,
+                            false);
       delete (yysemantic_stack_[(4) - (3)].fnsig);
     }
     break;
@@ -4081,15 +7041,19 @@
   case 133:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1880 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1530 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new FunctionDecl(LOC ((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
                             (yysemantic_stack_[(4) - (3)].fnsig)->theParams.getp(),
                             (yysemantic_stack_[(4) - (3)].fnsig)->theReturnType.getp(),
-                            NULL,   // no body
-                            false,   // not explicitly updating
-                            true);  // external
+                            NULL,
+                            false,
+                            true);
       delete (yysemantic_stack_[(4) - (3)].fnsig);
     }
     break;
@@ -4097,15 +7061,19 @@
   case 134:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1895 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1543 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new FunctionDecl(LOC ((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
                             (yysemantic_stack_[(5) - (4)].fnsig)->theParams.getp(),
                             (yysemantic_stack_[(5) - (4)].fnsig)->theReturnType.getp(),
-                            (yysemantic_stack_[(5) - (5)].expr),    // body
-                            true,  // updating
-                            false);// not external
+                            (yysemantic_stack_[(5) - (5)].expr),
+                            true,
+                            false);
       delete (yysemantic_stack_[(5) - (4)].fnsig);
     }
     break;
@@ -4113,15 +7081,19 @@
   case 135:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1907 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1555 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new FunctionDecl(LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
                             (yysemantic_stack_[(5) - (4)].fnsig)->theParams.getp(),
                             (yysemantic_stack_[(5) - (4)].fnsig)->theReturnType.getp(),
-                            NULL,  // no body
-                            true,  // updating
-                            true); // external
+                            NULL,
+                            true,
+                            true);
       delete (yysemantic_stack_[(5) - (4)].fnsig);
     }
     break;
@@ -4129,7 +7101,11 @@
   case 136:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1922 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1568 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.fnsig) = new FunctionSig(NULL);
     }
@@ -4138,7 +7114,11 @@
   case 137:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1927 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1573 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(3) - (2)].node)));
     }
@@ -4147,7 +7127,11 @@
   case 138:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1578 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.fnsig) = new FunctionSig(NULL, dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node)));
     }
@@ -4156,7 +7140,11 @@
   case 139:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1937 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1583 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(5) - (2)].node)), dynamic_cast<SequenceType*>((yysemantic_stack_[(5) - (5)].node)));
     }
@@ -4165,7 +7153,11 @@
   case 140:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1945 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1589 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       ParamList *pl = new ParamList( LOC((yyloc)) );
       pl->push_back( dynamic_cast<Param*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -4176,11 +7168,14 @@
   case 141:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1952 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1596 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)) );
-
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
     }
     break;
@@ -4188,7 +7183,11 @@
   case 142:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1963 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1604 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new Param(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL);
     }
@@ -4197,7 +7196,11 @@
   case 143:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1968 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1609 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new Param(LOC((yyloc)),
                      static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4208,13 +7211,16 @@
   case 144:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1978 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1617 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)),
                               NULL,
                               NULL);
-
       static_cast<CollectionDecl*>((yyval.node))->setComment(SYMTAB((yysemantic_stack_[(3) - (1)].sval)));
     }
     break;
@@ -4222,13 +7228,16 @@
   case 145:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1987 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1625 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
                               0,
                               static_cast<SequenceType*>((yysemantic_stack_[(5) - (5)].node)));
-
       static_cast<CollectionDecl*>((yyval.node))->setComment(SYMTAB((yysemantic_stack_[(5) - (1)].sval)));
     }
     break;
@@ -4236,13 +7245,16 @@
   case 146:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 1996 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1633 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                                static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
                                static_cast<AnnotationListParsenode*>((yysemantic_stack_[(4) - (2)].node)),
                                0);
-
       static_cast<CollectionDecl*>((yyval.node))->setComment(SYMTAB((yysemantic_stack_[(4) - (1)].sval)));
     }
     break;
@@ -4250,13 +7262,16 @@
   case 147:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2005 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1641 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                                static_cast<QName*>((yysemantic_stack_[(6) - (4)].expr)),
                                static_cast<AnnotationListParsenode*>((yysemantic_stack_[(6) - (2)].node)),
                                static_cast<SequenceType*>((yysemantic_stack_[(6) - (6)].node)));
-
       static_cast<CollectionDecl*>((yyval.node))->setComment(SYMTAB((yysemantic_stack_[(6) - (1)].sval)));
     }
     break;
@@ -4264,7 +7279,11 @@
   case 148:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2017 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1651 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
     }
@@ -4273,7 +7292,11 @@
   case 149:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2021 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1655 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
                                                     (yysemantic_stack_[(2) - (1)].node),
@@ -4284,7 +7307,11 @@
   case 150:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2027 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1661 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
     }
@@ -4293,26 +7320,32 @@
   case 151:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2031 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1665 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
                                                     (yysemantic_stack_[(2) - (1)].node),
                                                     dynamic_cast<OccurrenceIndicator*>((yysemantic_stack_[(2) - (2)].node))));
-
     }
     break;
 
   case 152:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2041 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1672 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AST_IndexDecl(LOC((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(8) - (3)].expr)),
                              (yysemantic_stack_[(8) - (6)].expr),
                              dynamic_cast<IndexKeyList*>((yysemantic_stack_[(8) - (8)].node)),
                              NULL);
-
       static_cast<AST_IndexDecl*>((yyval.node))->setComment( SYMTAB((yysemantic_stack_[(8) - (1)].sval)) );
     }
     break;
@@ -4320,14 +7353,17 @@
   case 153:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2051 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1681 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AST_IndexDecl(LOC((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(9) - (4)].expr)),
                              (yysemantic_stack_[(9) - (7)].expr),
                              dynamic_cast<IndexKeyList*>((yysemantic_stack_[(9) - (9)].node)),
                              static_cast<AnnotationListParsenode*>((yysemantic_stack_[(9) - (2)].node)));
-
       static_cast<AST_IndexDecl*>((yyval.node))->setComment( SYMTAB((yysemantic_stack_[(9) - (1)].sval)) );
     }
     break;
@@ -4335,7 +7371,11 @@
   case 154:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2064 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1692 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       IndexKeyList* keyList = new IndexKeyList(LOC((yyloc)));
       keyList->addKeySpec(dynamic_cast<IndexKeySpec*>((yysemantic_stack_[(1) - (1)].node)));
@@ -4346,7 +7386,11 @@
   case 155:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2070 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1698 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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);
@@ -4356,7 +7400,11 @@
   case 156:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2079 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1705 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL, NULL);
     }
@@ -4365,7 +7413,11 @@
   case 157:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2084 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1710 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -4377,7 +7429,11 @@
   case 158:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2091 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1717 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -4389,7 +7445,11 @@
   case 159:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2098 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1724 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(3) - (1)].expr),
@@ -4401,7 +7461,11 @@
   case 160:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2110 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1734 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ICCollSimpleCheck(LOC((yyloc)),
                                  static_cast<QName*>((yysemantic_stack_[(11) - (4)].expr)),
@@ -4414,7 +7478,11 @@
   case 161:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2120 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1744 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ICCollUniqueKeyCheck(LOC((yyloc)),
                                     static_cast<QName*>((yysemantic_stack_[(14) - (4)].expr)),
@@ -4427,7 +7495,11 @@
   case 162:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2130 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1754 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ICCollForeachNode(LOC((yyloc)),
                                  static_cast<QName*>((yysemantic_stack_[(13) - (4)].expr)),
@@ -4440,7 +7512,11 @@
   case 163:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2141 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1765 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ICForeignKey( LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(22) - (4)].expr)),
@@ -4456,20 +7532,22 @@
   case 164:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2157 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1778 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       if ((yysemantic_stack_[(1) - (1)].expr) == NULL)
       {
         error((yylocation_stack_[(1) - (1)]), "syntax error, unexpected end of file, the query body should not be empty");
         YYERROR;
       }
-
       if (dynamic_cast<BlockBody*>((yysemantic_stack_[(1) - (1)].expr)) != NULL)
       {
         BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(1) - (1)].expr));
         blk->setTopLevel(true);
       }
-
       (yyval.expr) = new QueryBody(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr));
     }
     break;
@@ -4477,7 +7555,11 @@
   case 165:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2177 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1794 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4486,7 +7568,11 @@
   case 166:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2181 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4495,16 +7581,24 @@
   case 167:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2185 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1802 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-      (yyval.expr) =  NULL;
+      (yyval.expr) = NULL;
     }
     break;
 
   case 168:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2193 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1808 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4513,7 +7607,11 @@
   case 169:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2197 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1812 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4522,16 +7620,24 @@
   case 170:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2201 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1816 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-      (yyval.expr) =  new BlockBody(LOC((yyloc)));
+      (yyval.expr) = new BlockBody(LOC((yyloc)));
     }
     break;
 
   case 171:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2209 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1822 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4540,12 +7646,14 @@
   case 172:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2214 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1827 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
-
       blk->add((yysemantic_stack_[(2) - (2)].expr));
-
       (yyval.expr) = blk;
     }
     break;
@@ -4553,7 +7661,11 @@
   case 173:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2226 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1835 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       BlockBody* blk = new BlockBody(LOC((yyloc)));
       blk->add((yysemantic_stack_[(1) - (1)].expr));
@@ -4564,12 +7676,14 @@
   case 174:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2233 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1842 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
-
       blk->add((yysemantic_stack_[(2) - (2)].expr));
-
       (yyval.expr) = blk;
     }
     break;
@@ -4577,13 +7691,17 @@
   case 175:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2243 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1849 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-      (yyval.expr) = (yysemantic_stack_[(4) - (1)].expr); // to prevent the Bison warning
-      (yyval.expr) = (yysemantic_stack_[(4) - (2)].expr); // to prevent the Bison warning
-      (yyval.expr) = (yysemantic_stack_[(4) - (4)].expr); // to prevent the Bison warning
+      (yyval.expr) = (yysemantic_stack_[(4) - (1)].expr);
+      (yyval.expr) = (yysemantic_stack_[(4) - (2)].expr);
+      (yyval.expr) = (yysemantic_stack_[(4) - (4)].expr);
       error((yylocation_stack_[(4) - (3)]), "syntax error, unexpected statement (missing semicolon \";\" between statements?)");
-      delete (yysemantic_stack_[(4) - (1)].expr); // these need to be deleted here because the parser deallocator will skip them
+      delete (yysemantic_stack_[(4) - (1)].expr);
       delete (yysemantic_stack_[(4) - (2)].expr);
       delete (yysemantic_stack_[(4) - (4)].expr);
       YYERROR;
@@ -4593,7 +7711,11 @@
   case 189:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2276 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1877 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -4602,14 +7724,19 @@
   case 190:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2284 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1883 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       BlockBody* block = dynamic_cast<BlockBody*>((yysemantic_stack_[(3) - (2)].expr));
       if ((yysemantic_stack_[(3) - (2)].expr) == NULL || (block != NULL && block->isEmpty()))
       {
         (yyval.expr) = new JSONDirectObjectConstructor(LOC((yyloc)));
       }
-      else if (block == NULL)
+      else
+      if (block == NULL)
       {
         BlockBody* blk = new BlockBody(LOC((yyloc)));
         blk->add((yysemantic_stack_[(3) - (2)].expr));
@@ -4625,7 +7752,11 @@
   case 191:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2306 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1904 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -4634,7 +7765,11 @@
   case 192:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2314 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1910 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(2) - (1)].expr);
     }
@@ -4643,7 +7778,11 @@
   case 193:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2322 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1916 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       VarDeclStmt* vdecl = static_cast<VarDeclStmt*>((yysemantic_stack_[(3) - (1)].expr));
       vdecl->add((yysemantic_stack_[(3) - (3)].node));
@@ -4654,7 +7793,11 @@
   case 194:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2329 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1923 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)), NULL);
       vdecl->add((yysemantic_stack_[(2) - (2)].node));
@@ -4665,7 +7808,11 @@
   case 195:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2336 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1930 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)),
                                            static_cast<AnnotationListParsenode*>((yysemantic_stack_[(3) - (1)].node)));
@@ -4677,13 +7824,17 @@
   case 196:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2347 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1939 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)),
-                                          NULL,  // no type
-                                          NULL,  // no init expr
-                                          NULL); // no annotations
+                                          NULL,
+                                          NULL,
+                                          NULL);
       (yyval.node) = vd;
     }
     break;
@@ -4691,13 +7842,17 @@
   case 197:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2356 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1948 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
-                                          dynamic_cast<SequenceType*>((yysemantic_stack_[(3) - (3)].node)), // type
-                                          NULL,  // no init expr
-                                          NULL); // no annotations
+                                          dynamic_cast<SequenceType*>((yysemantic_stack_[(3) - (3)].node)),
+                                          NULL,
+                                          NULL);
       (yyval.node) = vd;
     }
     break;
@@ -4705,13 +7860,17 @@
   case 198:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2365 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1957 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
-                                          NULL,  // no type
-                                          (yysemantic_stack_[(4) - (4)].expr),    // init expr
-                                          NULL); // no annotations
+                                          NULL,
+                                          (yysemantic_stack_[(4) - (4)].expr),
+                                          NULL);
       (yyval.node) = vd;
     }
     break;
@@ -4719,13 +7878,17 @@
   case 199:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2374 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1966 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
-                                          dynamic_cast<SequenceType*>((yysemantic_stack_[(5) - (3)].node)), // type
-                                          (yysemantic_stack_[(5) - (5)].expr),    // init expr
-                                          NULL); // no annotations
+                                          dynamic_cast<SequenceType*>((yysemantic_stack_[(5) - (3)].node)),
+                                          (yysemantic_stack_[(5) - (5)].expr),
+                                          NULL);
       (yyval.node) = vd;
     }
     break;
@@ -4733,7 +7896,11 @@
   case 200:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2387 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1977 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new AssignExpr(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)), (yysemantic_stack_[(5) - (4)].expr));
     }
@@ -4742,7 +7909,11 @@
   case 201:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2395 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1983 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new ApplyExpr(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr));
     }
@@ -4751,7 +7922,11 @@
   case 202:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2403 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1989 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new ExitExpr(LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr));
     }
@@ -4760,7 +7935,11 @@
   case 203:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2411 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1995 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       BlockBody* bb = dynamic_cast<BlockBody *>((yysemantic_stack_[(5) - (5)].expr));
       if (bb == NULL)
@@ -4768,7 +7947,6 @@
         bb = new BlockBody((yysemantic_stack_[(5) - (5)].expr)->get_location());
         bb->add((yysemantic_stack_[(5) - (5)].expr));
       }
-
       (yyval.expr) = new WhileExpr(LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), bb);
     }
     break;
@@ -4776,7 +7954,11 @@
   case 204:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2426 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2007 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new FlowCtlStatement(LOC((yyloc)), FlowCtlStatement::BREAK);
     }
@@ -4785,7 +7967,11 @@
   case 205:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2431 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2012 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new FlowCtlStatement( LOC((yyloc)), FlowCtlStatement::CONTINUE );
     }
@@ -4794,7 +7980,11 @@
   case 206:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2439 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2018 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       ReturnExpr* re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
       (yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4809,17 +7999,19 @@
   case 207:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2453 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2030 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       exprnode* retExpr = (yysemantic_stack_[(2) - (2)].expr);
-
       if (dynamic_cast<VarDeclStmt*>(retExpr) != NULL)
       {
         BlockBody* blk = new BlockBody(LOC((yyloc)));
         blk->add(retExpr);
         retExpr = blk;
       }
-
       (yyval.expr) = new ReturnExpr(LOC((yyloc)), retExpr);
     }
     break;
@@ -4827,25 +8019,26 @@
   case 208:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2470 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2043 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       exprnode* thenExpr = (yysemantic_stack_[(8) - (6)].expr);
       exprnode* elseExpr = (yysemantic_stack_[(8) - (8)].expr);
-
       if (dynamic_cast<VarDeclStmt*>(thenExpr) != NULL)
       {
         BlockBody* blk = new BlockBody(LOC((yyloc)));
         blk->add(thenExpr);
         thenExpr = blk;
       }
-
       if (dynamic_cast<VarDeclStmt*>(elseExpr) != NULL)
       {
         BlockBody* blk = new BlockBody(LOC((yyloc)));
         blk->add(elseExpr);
         elseExpr = blk;
       }
-
       (yyval.expr) = new IfExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), thenExpr, elseExpr);
     }
     break;
@@ -4853,7 +8046,11 @@
   case 209:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2495 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2063 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new TryExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), (yysemantic_stack_[(3) - (3)].expr));
     }
@@ -4862,7 +8059,11 @@
   case 210:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2503 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2069 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CatchListExpr* cle = new CatchListExpr( LOC((yyloc)) );
       cle->push_back( static_cast<CatchExpr*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -4873,7 +8074,11 @@
   case 211:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2510 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2076 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
       if ( cle )
@@ -4885,7 +8090,11 @@
   case 212:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2521 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2085 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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);
@@ -4895,7 +8104,11 @@
   case 213:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2530 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2092 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new BlockBody(LOC((yyloc)));
     }
@@ -4904,7 +8117,11 @@
   case 214:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2537 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2098 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4913,7 +8130,11 @@
   case 215:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2542 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2103 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       Expr* expr = dynamic_cast<Expr*>((yysemantic_stack_[(3) - (1)].expr));
       if ( !expr )
@@ -4929,16 +8150,17 @@
   case 216:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2555 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2115 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-      (yyval.expr) = (yysemantic_stack_[(3) - (1)].expr); // to prevent the Bison warning
-      (yyval.expr) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
-      // Heuristics to improve the error message: if the $1 Expr is a QName (which in turn gets
-      // promoted to a PathExpr), chances are that it's not a missing comma, so don't modify
-      // the error message.
+      (yyval.expr) = (yysemantic_stack_[(3) - (1)].expr);
+      (yyval.expr) = (yysemantic_stack_[(3) - (3)].expr);
       if (dynamic_cast<PathExpr*>((yysemantic_stack_[(3) - (1)].expr)) == NULL)
         error((yylocation_stack_[(3) - (2)]), "syntax error, unexpected expression (missing comma \",\" between expressions?)");
-      delete (yysemantic_stack_[(3) - (1)].expr); // these need to be deleted here because the parser deallocator will skip them
+      delete (yysemantic_stack_[(3) - (1)].expr);
       delete (yysemantic_stack_[(3) - (3)].expr);
       YYERROR;
     }
@@ -4947,7 +8169,11 @@
   case 235:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2602 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2149 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       ReturnExpr *re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
       (yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4962,7 +8188,11 @@
   case 236:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2616 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2161 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new ReturnExpr( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr) );
     }
@@ -4971,7 +8201,11 @@
   case 237:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2624 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2167 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.strval) = parser::the_sliding;
     }
@@ -4980,7 +8214,11 @@
   case 238:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2629 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2172 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.strval) = parser::the_tumbling;
     }
@@ -4989,7 +8227,11 @@
   case 239:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2637 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2178 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.strval) = parser::the_start;
     }
@@ -4998,7 +8240,11 @@
   case 240:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2642 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2183 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.strval) = parser::the_end;
     }
@@ -5007,7 +8253,11 @@
   case 241:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2647 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2188 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
     (yyval.strval) = parser::the_only_end;
   }
@@ -5016,7 +8266,11 @@
   case 242:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2655 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2194 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new FLWORWinCond(LOC((yyloc)),
                             dynamic_cast<WindowVars*>((yysemantic_stack_[(4) - (2)].node)),
@@ -5029,7 +8283,11 @@
   case 243:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2664 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2203 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new FLWORWinCond(LOC((yyloc)),
                             NULL,
@@ -5042,7 +8300,11 @@
   case 244:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2676 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2214 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WindowClause (LOC ((yyloc)),
                              ((yysemantic_stack_[(5) - (2)].strval) == parser::the_tumbling ?
@@ -5057,7 +8319,11 @@
   case 245:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2686 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2226 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WindowClause (LOC ((yyloc)),
                              ((yysemantic_stack_[(4) - (2)].strval) == parser::the_tumbling ?
@@ -5071,7 +8337,11 @@
   case 246:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2699 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2237 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CountClause(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -5080,7 +8350,11 @@
   case 255:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2723 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2255 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       FLWORClauseList *fcl = new FLWORClauseList( LOC((yyloc)) );
       fcl->push_back( dynamic_cast<FLWORClause*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5091,7 +8365,11 @@
   case 256:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2730 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2262 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)) );
@@ -5102,7 +8380,11 @@
   case 257:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2740 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2271 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new ForClause(LOC((yyloc)), dynamic_cast<VarInDeclList*>((yysemantic_stack_[(3) - (3)].node)));
     }
@@ -5111,9 +8393,13 @@
   case 258:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2746 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2277 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-      (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
+      (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       error((yylocation_stack_[(3) - (2)]), "syntax error, unexpected qualified name \""
           + static_cast<VarInDeclList*>((yysemantic_stack_[(3) - (3)].node))->operator[](0)->get_var_name()->get_qname().str() + "\" (missing \"$\" sign?)");
       delete (yysemantic_stack_[(3) - (3)].node);
@@ -5124,10 +8410,14 @@
   case 259:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2755 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2287 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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
+      (yyval.node) = NULL;
+      error((yylocation_stack_[(2) - (2)]), "");
       YYERROR;
     }
     break;
@@ -5135,16 +8425,23 @@
   case 261:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2765 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2296 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-      // this adds on shift-reduce conflict (probably with FTRange expression)
     }
     break;
 
   case 262:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2773 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2301 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       VarInDeclList* vdl = new VarInDeclList( LOC((yyloc)) );
       vdl->push_back( dynamic_cast<VarInDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5155,7 +8452,11 @@
   case 263:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2780 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2308 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)) );
@@ -5166,9 +8467,13 @@
   case 264:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2788 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2315 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-      (yyval.node) = (yysemantic_stack_[(3) - (1)].node); // to prevent the Bison warning
+      (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
       error((yylocation_stack_[(3) - (3)]), "syntax error, unexpected QName \""
           + static_cast<VarInDecl*>((yysemantic_stack_[(3) - (3)].node))->get_var_name()->get_qname().str() + "\" (missing \"$\" sign?)");
       delete (yysemantic_stack_[(3) - (1)].node);
@@ -5179,7 +8484,11 @@
   case 265:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2800 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2325 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)),
@@ -5194,7 +8503,11 @@
   case 266:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2810 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2335 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5209,7 +8522,11 @@
   case 267:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2820 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2345 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5224,7 +8541,11 @@
   case 268:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2830 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2355 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5239,7 +8560,11 @@
   case 269:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2840 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2365 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5254,7 +8579,11 @@
   case 270:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2850 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2375 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5269,7 +8598,11 @@
   case 271:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2860 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2385 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5284,7 +8617,11 @@
   case 272:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2870 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2395 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(7) - (1)].expr)),
@@ -5299,7 +8636,11 @@
   case 273:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2881 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2405 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5313,7 +8654,11 @@
   case 274:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2890 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2414 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5328,7 +8673,11 @@
   case 275:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2900 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2424 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC ((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5343,7 +8692,11 @@
   case 276:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2910 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2434 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarInDecl(LOC ((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5358,7 +8711,11 @@
   case 277:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2926 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2446 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new PositionalVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -5367,7 +8724,11 @@
   case 278:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2452 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new FTScoreVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -5376,7 +8737,11 @@
   case 279:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2458 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new LetClause( LOC((yyloc)), dynamic_cast<VarGetsDeclList*>((yysemantic_stack_[(2) - (2)].node)) );
         }
@@ -5385,7 +8750,11 @@
   case 280:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2952 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2464 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             VarGetsDeclList *vgdl = new VarGetsDeclList( LOC((yyloc)) );
             vgdl->push_back( dynamic_cast<VarGetsDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5396,7 +8765,11 @@
   case 281:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2958 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2470 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)) );
@@ -5407,7 +8780,11 @@
   case 282:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2970 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2478 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -5420,7 +8797,11 @@
   case 283:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2978 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2486 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5433,7 +8814,11 @@
   case 284:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2988 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2494 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            dynamic_cast<FTScoreVar*>((yysemantic_stack_[(3) - (1)].node))->get_var_name(),
@@ -5446,7 +8831,11 @@
   case 285:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 2996 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2502 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -5459,7 +8848,11 @@
   case 286:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3008 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2512 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WindowVarDecl(LOC ((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -5470,7 +8863,11 @@
   case 287:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3014 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2518 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WindowVarDecl(LOC ((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5482,7 +8879,11 @@
   case 289:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3027 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2528 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL, NULL);
     }
@@ -5491,7 +8892,11 @@
   case 290:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3031 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2532 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)));
@@ -5501,7 +8906,11 @@
   case 291:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3039 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2539 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), dynamic_cast<PositionalVar*>((yysemantic_stack_[(1) - (1)].node)), NULL, NULL, NULL);
     }
@@ -5510,7 +8919,11 @@
   case 292:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3043 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2543 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)));
@@ -5520,7 +8933,11 @@
   case 294:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3052 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2551 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)));
     }
@@ -5529,7 +8946,11 @@
   case 295:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3056 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2555 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, NULL, static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
@@ -5538,7 +8959,11 @@
   case 296:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3060 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2559 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL);
     }
@@ -5547,7 +8972,11 @@
   case 297:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3070 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2565 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new WhereClause(LOC ((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
     }
@@ -5556,7 +8985,11 @@
   case 298:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3078 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2571 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new GroupByClause(LOC((yyloc)), dynamic_cast<GroupSpecList*>((yysemantic_stack_[(3) - (3)].node)));
     }
@@ -5565,7 +8998,11 @@
   case 299:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3085 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2577 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       GroupSpecList* gsl = new GroupSpecList(LOC((yyloc)));
       gsl->push_back(static_cast<GroupSpec*>((yysemantic_stack_[(1) - (1)].node)));
@@ -5576,7 +9013,11 @@
   case 300:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3091 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2583 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)));
@@ -5587,7 +9028,11 @@
   case 301:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3101 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2591 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL, NULL, NULL);
     }
@@ -5596,7 +9041,11 @@
   case 302:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3105 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2595 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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);
     }
@@ -5605,7 +9054,11 @@
   case 303:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3109 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2599 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5618,7 +9071,11 @@
   case 304:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3117 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2607 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -5631,7 +9088,11 @@
   case 305:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3125 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2615 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5644,7 +9105,11 @@
   case 306:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3133 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2623 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -5657,7 +9122,11 @@
   case 307:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3145 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2633 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new GroupCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
     }
@@ -5666,7 +9135,11 @@
   case 308:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3153 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2639 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderByClause(
                 LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(3) - (3)].node))
@@ -5677,7 +9150,11 @@
   case 309:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3159 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2645 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderByClause(
                 LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(4) - (4)].node)), true
@@ -5688,7 +9165,11 @@
   case 310:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3169 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2653 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             OrderSpecList *osl = new OrderSpecList( LOC((yyloc)) );
             osl->push_back( dynamic_cast<OrderSpec*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5699,7 +9180,11 @@
   case 311:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3175 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2659 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)) );
@@ -5710,7 +9195,11 @@
   case 312:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3185 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2667 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderSpec( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL );
         }
@@ -5719,7 +9208,11 @@
   case 313:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3189 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2671 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderSpec(
                 LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr), dynamic_cast<OrderModifierPN*>((yysemantic_stack_[(2) - (2)].node))
@@ -5730,7 +9223,11 @@
   case 314:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3199 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2679 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), dynamic_cast<OrderDirSpec*>((yysemantic_stack_[(1) - (1)].node)), NULL, NULL
@@ -5741,7 +9238,11 @@
   case 315:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3205 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2685 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), NULL, dynamic_cast<OrderEmptySpec*>((yysemantic_stack_[(1) - (1)].node)), NULL
@@ -5752,7 +9253,11 @@
   case 316:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3211 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2691 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), NULL, NULL, dynamic_cast<OrderCollationSpec*>((yysemantic_stack_[(1) - (1)].node))
@@ -5763,7 +9268,11 @@
   case 317:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3217 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2697 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5777,7 +9286,11 @@
   case 318:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3226 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2706 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5791,7 +9304,11 @@
   case 319:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3235 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2715 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5805,7 +9322,11 @@
   case 320:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3244 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2724 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5819,7 +9340,11 @@
   case 321:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3257 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2735 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_ascending );
         }
@@ -5828,7 +9353,11 @@
   case 322:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3261 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2739 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_descending );
         }
@@ -5837,7 +9366,11 @@
   case 323:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3269 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2745 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderEmptySpec(
                 LOC((yyloc)), StaticContextConsts::empty_greatest
@@ -5848,7 +9381,11 @@
   case 324:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3275 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2751 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderEmptySpec(
                 LOC((yyloc)), StaticContextConsts::empty_least
@@ -5859,7 +9396,11 @@
   case 325:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3285 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2759 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OrderCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
         }
@@ -5868,7 +9409,11 @@
   case 326:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3293 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2765 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new QuantifiedExpr(
                 LOC((yyloc)),
@@ -5882,7 +9427,11 @@
   case 327:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3302 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2774 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new QuantifiedExpr(
                 LOC((yyloc)),
@@ -5896,19 +9445,26 @@
   case 328:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3315 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2785 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       QVarInDeclList *qvidl = new QVarInDeclList( LOC((yyloc)) );
       qvidl->push_back( dynamic_cast<QVarInDecl*>((yysemantic_stack_[(1) - (1)].node)) );
       (yyval.node) = qvidl;
-
     }
     break;
 
   case 329:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3322 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2791 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)) );
@@ -5919,7 +9475,11 @@
   case 330:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3334 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2799 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new QVarInDecl(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), (yysemantic_stack_[(3) - (3)].expr));
     }
@@ -5928,7 +9488,11 @@
   case 331:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3338 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2803 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new QVarInDecl(LOC((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5940,7 +9504,11 @@
   case 332:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3350 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2812 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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));
     }
@@ -5949,7 +9517,11 @@
   case 333:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3357 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2818 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)));
@@ -5960,7 +9532,11 @@
   case 334:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3363 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2824 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)));
@@ -5971,7 +9547,11 @@
   case 335:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3372 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2832 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SwitchCaseClause(LOC((yyloc)), dynamic_cast<SwitchCaseOperandList*>((yysemantic_stack_[(3) - (1)].node)), (yysemantic_stack_[(3) - (3)].expr));
     }
@@ -5980,7 +9560,11 @@
   case 336:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3379 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2838 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       SwitchCaseOperandList* sco_list_p = new SwitchCaseOperandList(LOC((yyloc)));
       sco_list_p->push_back((yysemantic_stack_[(2) - (2)].expr));
@@ -5991,7 +9575,11 @@
   case 337:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3385 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2844 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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));
@@ -6002,7 +9590,11 @@
   case 338:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3396 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2852 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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));
     }
@@ -6011,7 +9603,11 @@
   case 339:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3403 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2858 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)));
@@ -6022,7 +9618,11 @@
   case 340:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3409 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2864 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)));
@@ -6033,7 +9633,11 @@
   case 341:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3418 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2872 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SwitchCaseClause(LOC((yyloc)), dynamic_cast<SwitchCaseOperandList*>((yysemantic_stack_[(3) - (1)].node)), (yysemantic_stack_[(3) - (3)].expr));
     }
@@ -6042,7 +9646,11 @@
   case 342:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3427 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2878 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
                               (yysemantic_stack_[(8) - (3)].expr),
@@ -6054,7 +9662,11 @@
   case 343:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3434 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2885 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
                               (yysemantic_stack_[(10) - (3)].expr),
@@ -6067,7 +9679,11 @@
   case 344:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3445 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2895 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
                               (yysemantic_stack_[(8) - (3)].expr),
@@ -6079,7 +9695,11 @@
   case 345:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3452 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2902 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
                               (yysemantic_stack_[(10) - (3)].expr),
@@ -6092,7 +9712,11 @@
   case 346:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3464 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2912 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CaseClauseList* cc_list_p = new CaseClauseList(LOC ((yyloc)));
       cc_list_p->push_back(static_cast<CaseClause*>((yysemantic_stack_[(1) - (1)].node)));
@@ -6103,7 +9727,11 @@
   case 347:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3470 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2918 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CaseClauseList* cc_list_p = dynamic_cast<CaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
       cc_list_p->push_back(static_cast<CaseClause*>((yysemantic_stack_[(2) - (2)].node)));
@@ -6114,7 +9742,11 @@
   case 348:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3482 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2926 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<SequenceTypeList*>((yysemantic_stack_[(4) - (2)].node)),
@@ -6125,7 +9757,11 @@
   case 349:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3488 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2932 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
@@ -6137,7 +9773,11 @@
   case 350:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3499 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2941 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CaseClauseList* cc_list_p = new CaseClauseList(LOC ((yyloc)));
       cc_list_p->push_back(static_cast<CaseClause*>((yysemantic_stack_[(1) - (1)].node)));
@@ -6148,7 +9788,11 @@
   case 351:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3505 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2947 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CaseClauseList* cc_list_p = static_cast<CaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
       cc_list_p->push_back(static_cast<CaseClause*>((yysemantic_stack_[(2) - (2)].node)));
@@ -6159,7 +9803,11 @@
   case 352:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3516 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2955 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<SequenceTypeList*>((yysemantic_stack_[(4) - (2)].node)),
@@ -6170,7 +9818,11 @@
   case 353:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3522 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2961 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CaseClause(LOC ((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
@@ -6182,7 +9834,11 @@
   case 354:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3533 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2970 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       SequenceTypeList* seqList = new SequenceTypeList(LOC((yyloc)));
       seqList->push_back(static_cast<SequenceType*>((yysemantic_stack_[(1) - (1)].node)));
@@ -6193,7 +9849,11 @@
   case 355:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3539 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2976 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       SequenceTypeList* seqList = static_cast<SequenceTypeList*>((yysemantic_stack_[(3) - (1)].node));
       seqList->push_back(static_cast<SequenceType*>((yysemantic_stack_[(3) - (3)].node)));
@@ -6204,7 +9864,11 @@
   case 356:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3550 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2984 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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));
     }
@@ -6213,7 +9877,11 @@
   case 357:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3559 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2990 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -6222,7 +9890,11 @@
   case 358:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3563 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2994 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new OrExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
     }
@@ -6231,7 +9903,11 @@
   case 359:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3572 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3000 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6240,7 +9916,11 @@
   case 360:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3576 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3005 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new AndExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -6249,7 +9929,11 @@
   case 361:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3583 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3011 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6258,7 +9942,11 @@
   case 362:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3587 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3015 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new ComparisonExpr(
               LOC((yyloc)),
@@ -6272,7 +9960,11 @@
   case 363:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3600 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3026 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6281,9 +9973,12 @@
   case 364:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3604 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3030 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-            /*  ::=  "eq" | "ne" | "lt" | "le" | "gt" | "ge" */
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
                 dynamic_cast<ValueComp*>((yysemantic_stack_[(3) - (2)].node)),
@@ -6296,7 +9991,11 @@
   case 365:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3684 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3041 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6305,7 +10004,11 @@
   case 366:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3688 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3045 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new FTContainsExpr(
                 LOC((yyloc)),
@@ -6319,7 +10022,11 @@
   case 367:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3700 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3056 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6328,7 +10035,11 @@
   case 368:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3704 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3060 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new StringConcatExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
         }
@@ -6337,7 +10048,11 @@
   case 369:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3711 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3065 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = NULL;
         }
@@ -6346,7 +10061,11 @@
   case 370:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3715 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3069 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -6355,7 +10074,11 @@
   case 371:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3722 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3075 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6364,7 +10087,11 @@
   case 372:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3726 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3079 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new RangeExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -6373,7 +10100,11 @@
   case 373:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3735 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3085 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6382,7 +10113,11 @@
   case 374:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3739 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3089 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new AdditiveExpr( LOC((yyloc)), ParseConstants::op_plus, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -6391,7 +10126,11 @@
   case 375:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3743 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3093 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new AdditiveExpr( LOC((yyloc)), ParseConstants::op_minus, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -6400,7 +10139,11 @@
   case 376:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3751 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3099 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6409,7 +10152,11 @@
   case 377:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3755 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3103 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new MultiplicativeExpr(
                 LOC((yyloc)), ParseConstants::op_mul, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -6420,7 +10167,11 @@
   case 378:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3761 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3109 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new MultiplicativeExpr(
                 LOC((yyloc)), ParseConstants::op_div, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -6431,7 +10182,11 @@
   case 379:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3767 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3115 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new MultiplicativeExpr(
                 LOC((yyloc)), ParseConstants::op_idiv, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -6442,7 +10197,11 @@
   case 380:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3773 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3121 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new MultiplicativeExpr(
                 LOC((yyloc)), ParseConstants::op_mod, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -6453,7 +10212,11 @@
   case 381:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3783 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3129 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6462,7 +10225,11 @@
   case 382:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3787 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3133 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -6471,7 +10238,11 @@
   case 383:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3791 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3137 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -6480,7 +10251,11 @@
   case 384:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3799 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3143 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6489,7 +10264,11 @@
   case 385:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3803 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3147 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new IntersectExceptExpr(
                 LOC((yyloc)), ParseConstants::op_intersect, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -6500,7 +10279,11 @@
   case 386:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3809 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3153 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new IntersectExceptExpr(
                 LOC((yyloc)), ParseConstants::op_except, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
@@ -6511,7 +10294,11 @@
   case 387:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3819 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3161 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6520,7 +10307,11 @@
   case 388:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3823 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3165 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new InstanceofExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node))
@@ -6531,7 +10322,11 @@
   case 389:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3833 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3173 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6540,7 +10335,11 @@
   case 390:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3837 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3177 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new TreatExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node))
@@ -6551,7 +10350,11 @@
   case 391:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3847 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3185 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6560,7 +10363,11 @@
   case 392:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3851 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3189 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new CastableExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SingleType*>((yysemantic_stack_[(4) - (4)].node))
@@ -6571,7 +10378,11 @@
   case 393:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3861 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3197 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6580,7 +10391,11 @@
   case 394:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3865 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3201 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new CastExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SingleType*>((yysemantic_stack_[(4) - (4)].node))
@@ -6591,7 +10406,11 @@
   case 395:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3875 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3209 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SingleType(LOC((yyloc)), dynamic_cast<SimpleType*>((yysemantic_stack_[(1) - (1)].node)), false);
     }
@@ -6600,7 +10419,11 @@
   case 396:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3879 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3213 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SingleType(LOC((yyloc)), dynamic_cast<SimpleType*>((yysemantic_stack_[(2) - (1)].node)), true);
     }
@@ -6609,7 +10432,11 @@
   case 397:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3888 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3219 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6618,7 +10445,11 @@
   case 398:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3892 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3223 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new UnaryExpr( LOC((yyloc)), dynamic_cast<SignList*>((yysemantic_stack_[(2) - (1)].node)), (yysemantic_stack_[(2) - (2)].expr) );
         }
@@ -6627,7 +10458,11 @@
   case 399:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3900 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3229 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new SignList( LOC((yyloc)), true );
         }
@@ -6636,7 +10471,11 @@
   case 400:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3904 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3233 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new SignList( LOC((yyloc)), false );
         }
@@ -6645,7 +10484,11 @@
   case 401:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3908 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3237 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
         }
@@ -6654,7 +10497,11 @@
   case 402:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3912 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3241 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             if ( SignList *sl = dynamic_cast<SignList*>((yysemantic_stack_[(2) - (1)].node)) )
                 sl->negate();
@@ -6665,7 +10512,11 @@
   case 403:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3922 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3249 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6674,7 +10525,11 @@
   case 404:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3926 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3253 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6683,7 +10538,11 @@
   case 405:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3930 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3257 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6692,7 +10551,11 @@
   case 406:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3937 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3263 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
         (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
       }
@@ -6701,7 +10564,11 @@
   case 407:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3942 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3268 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
         (yyval.expr) = new SimpleMapExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
       }
@@ -6710,7 +10577,11 @@
   case 408:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3950 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3274 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_eq );
         }
@@ -6719,7 +10590,11 @@
   case 409:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3954 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3278 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ne );
         }
@@ -6728,7 +10603,11 @@
   case 410:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3958 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3282 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_lt );
         }
@@ -6737,7 +10616,11 @@
   case 411:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3962 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3286 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_le );
         }
@@ -6746,7 +10629,11 @@
   case 412:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3966 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3290 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_gt );
         }
@@ -6755,7 +10642,11 @@
   case 413:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3970 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3294 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ge );
         }
@@ -6764,7 +10655,11 @@
   case 414:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3994 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3300 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -6773,7 +10668,11 @@
   case 415:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 3998 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3304 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "lax", (yysemantic_stack_[(5) - (4)].expr) );
         }
@@ -6782,7 +10681,11 @@
   case 416:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4002 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3308 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(5) - (4)].expr) );
         }
@@ -6791,7 +10694,11 @@
   case 417:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4006 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3312 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)
@@ -6803,7 +10710,11 @@
   case 418:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4017 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3321 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ExtensionExpr(
                 LOC((yyloc)), dynamic_cast<PragmaList*>((yysemantic_stack_[(3) - (1)].node)), NULL
@@ -6814,7 +10725,11 @@
   case 419:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4023 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3327 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ExtensionExpr(
                 LOC((yyloc)), dynamic_cast<PragmaList*>((yysemantic_stack_[(4) - (1)].node)), (yysemantic_stack_[(4) - (3)].expr)
@@ -6825,7 +10740,11 @@
   case 420:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4033 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3335 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             PragmaList *pl = new PragmaList( LOC((yyloc)) );
             pl->push_back( dynamic_cast<Pragma*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -6836,7 +10755,11 @@
   case 421:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4039 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3341 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)) );
@@ -6847,7 +10770,11 @@
   case 422:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4049 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3349 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new Pragma( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
         }
@@ -6856,7 +10783,11 @@
   case 423:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4053 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3353 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new Pragma( LOC((yyloc)), new QName( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) ), "" );
         }
@@ -6865,7 +10796,11 @@
   case 424:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4057 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3357 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new Pragma( LOC((yyloc)), new QName( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)), true ), "" );
         }
@@ -6874,7 +10809,11 @@
   case 425:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4120 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3363 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       RelativePathExpr* rpe = dynamic_cast<RelativePathExpr*>((yysemantic_stack_[(1) - (1)].expr));
       (yyval.expr) = (!rpe ?
@@ -6886,7 +10825,11 @@
   case 426:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4142 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3372 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       AxisStep* as = dynamic_cast<AxisStep*>((yysemantic_stack_[(1) - (1)].expr));
       (yyval.expr) = (as ?
@@ -6901,7 +10844,11 @@
   case 427:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4170 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3384 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -6910,7 +10857,11 @@
   case 428:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4334 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3390 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new NameTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
         }
@@ -6919,7 +10870,11 @@
   case 429:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4338 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3394 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new NameTest( LOC((yyloc)), dynamic_cast<Wildcard*>((yysemantic_stack_[(1) - (1)].node)) );
         }
@@ -6928,7 +10883,11 @@
   case 430:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4348 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3400 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), "", "", ParseConstants::wild_all, false);
     }
@@ -6937,7 +10896,11 @@
   case 431:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4352 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3404 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, false);
     }
@@ -6946,7 +10909,11 @@
   case 432:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4356 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3408 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, true);
     }
@@ -6955,7 +10922,11 @@
   case 433:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4360 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3412 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), "", SYMTAB((yysemantic_stack_[(1) - (1)].sval)), ParseConstants::wild_prefix, false);
     }
@@ -6964,7 +10935,11 @@
   case 434:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4369 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3418 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
        (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
      }
@@ -6973,7 +10948,11 @@
   case 435:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4373 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3422 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
        (yyval.expr) = new FilterExpr(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr), dynamic_cast<PredicateList*>((yysemantic_stack_[(2) - (2)].node)));
      }
@@ -6982,25 +10961,37 @@
   case 436:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4377 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3426 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-       (yyval.expr) = new DynamicFunctionInvocation(LOC ((yyloc)), (yysemantic_stack_[(3) - (1)].expr), false);
+       (yyval.expr) = new DynamicFunctionInvocation(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), false);
      }
     break;
 
   case 437:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4381 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3430 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-       (yyval.expr) = new DynamicFunctionInvocation(LOC ((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<ArgList*>((yysemantic_stack_[(4) - (3)].node)), false);
+       (yyval.expr) = new DynamicFunctionInvocation(LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<ArgList*>((yysemantic_stack_[(4) - (3)].node)), false);
      }
     break;
 
   case 438:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4385 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3434 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
        StringLiteral* sl = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
        (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), sl);
@@ -7010,7 +11001,11 @@
   case 439:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4390 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3439 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
        (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
      }
@@ -7019,16 +11014,24 @@
   case 440:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4394 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3443 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-       (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
+        (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
      }
     break;
 
   case 441:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4398 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3447 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
        (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
      }
@@ -7037,7 +11040,11 @@
   case 442:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4407 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3453 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             PredicateList *pl = new PredicateList( LOC((yyloc)) );
             pl->push_back( dynamic_cast<exprnode*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -7048,7 +11055,11 @@
   case 443:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4413 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3459 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)) );
@@ -7059,7 +11070,11 @@
   case 444:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4423 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3467 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
         }
@@ -7068,7 +11083,11 @@
   case 445:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4431 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3473 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7077,7 +11096,11 @@
   case 446:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4435 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3477 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7086,7 +11109,11 @@
   case 447:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4439 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3481 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7095,7 +11122,11 @@
   case 448:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4443 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3485 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7104,7 +11135,11 @@
   case 449:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4447 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3489 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7113,7 +11148,11 @@
   case 450:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4451 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3493 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7122,7 +11161,11 @@
   case 451:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4455 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3497 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7131,7 +11174,11 @@
   case 452:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4459 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3501 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7140,7 +11187,11 @@
   case 453:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4463 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3505 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7149,7 +11200,11 @@
   case 454:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4467 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3509 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7158,7 +11213,11 @@
   case 455:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4472 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3513 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7167,7 +11226,11 @@
   case 456:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4476 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3517 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7176,7 +11239,11 @@
   case 457:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4480 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3521 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7185,7 +11252,11 @@
   case 458:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4484 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3525 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7194,7 +11265,11 @@
   case 459:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4492 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3531 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7203,7 +11278,11 @@
   case 460:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4496 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3535 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7212,7 +11291,11 @@
   case 461:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4500 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3539 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7221,7 +11304,11 @@
   case 462:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4504 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3543 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new NullLiteral(LOC((yyloc)));
         }
@@ -7230,7 +11317,11 @@
   case 463:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4512 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3549 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_decimal, *(yysemantic_stack_[(1) - (1)].decval)
@@ -7242,7 +11333,11 @@
   case 464:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4519 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3556 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_integer, *(yysemantic_stack_[(1) - (1)].ival)
@@ -7254,7 +11349,11 @@
   case 465:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4526 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3563 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_double, *(yysemantic_stack_[(1) - (1)].dval)
@@ -7266,7 +11365,11 @@
   case 466:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4536 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3572 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new BooleanLiteral(LOC((yyloc)), true);
         }
@@ -7275,7 +11378,11 @@
   case 467:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4540 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3576 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new BooleanLiteral(LOC((yyloc)), false);
         }
@@ -7284,7 +11391,11 @@
   case 468:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4548 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3582 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new VarRef(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)));
         }
@@ -7293,7 +11404,11 @@
   case 469:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4556 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3588 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), NULL);
         }
@@ -7302,7 +11417,11 @@
   case 470:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4560 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3592 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
         }
@@ -7311,7 +11430,11 @@
   case 471:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4568 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3598 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ContextItemExpr( LOC((yyloc)) );
         }
@@ -7320,7 +11443,11 @@
   case 472:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4572 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3602 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ContextItemExpr( LOC((yyloc)) );
         }
@@ -7329,7 +11456,11 @@
   case 473:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4580 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3608 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new OrderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -7338,7 +11469,11 @@
   case 474:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4588 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3614 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new UnorderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -7347,7 +11482,11 @@
   case 475:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4642 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3620 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new FunctionCall( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), NULL );
     }
@@ -7356,17 +11495,19 @@
   case 476:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4646 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3624 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       ArgList* argList = dynamic_cast<ArgList*>((yysemantic_stack_[(4) - (3)].node));
-
       if (argList->has_placeholder())
       {
-        LiteralFunctionItem* lfi = 
+        LiteralFunctionItem* lfi =
         new LiteralFunctionItem(LOC((yyloc)),
                                 dynamic_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
                                 new Integer(argList->size()));
-
         (yyval.expr) = new DynamicFunctionInvocation(LOC((yyloc)), lfi, argList, true);
       }
       else
@@ -7379,7 +11520,11 @@
   case 477:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4668 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3642 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       ArgList *al = new ArgList( LOC((yyloc)) );
       al->push_back(new ArgumentPlaceholder(LOC((yyloc))));
@@ -7390,7 +11535,11 @@
   case 478:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4674 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3648 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       if ( ArgList *al = dynamic_cast<ArgList*>((yysemantic_stack_[(3) - (1)].node)) )
         al->push_back( new ArgumentPlaceholder(LOC((yyloc))) );
@@ -7401,7 +11550,11 @@
   case 479:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4680 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3654 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       ArgList *al = new ArgList( LOC((yyloc)) );
       al->push_back( (yysemantic_stack_[(1) - (1)].expr) );
@@ -7412,7 +11565,11 @@
   case 480:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4686 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3660 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       if ( ArgList *al = dynamic_cast<ArgList*>((yysemantic_stack_[(3) - (1)].node)) )
         al->push_back( (yysemantic_stack_[(3) - (3)].expr) );
@@ -7423,7 +11580,11 @@
   case 481:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4696 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3668 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7432,7 +11593,11 @@
   case 482:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4700 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3672 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7441,7 +11606,11 @@
   case 483:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4708 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3678 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new LiteralFunctionItem(LOC ((yyloc)), dynamic_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), (yysemantic_stack_[(3) - (3)].ival));
     }
@@ -7450,7 +11619,11 @@
   case 484:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4716 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3684 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new InlineFunction(LOC((yyloc)),
                               &*(yysemantic_stack_[(3) - (2)].fnsig)->theParams,
@@ -7463,7 +11636,11 @@
   case 485:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4728 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3694 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7472,7 +11649,11 @@
   case 486:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4732 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3698 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7481,7 +11662,11 @@
   case 487:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4740 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3704 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7490,7 +11675,11 @@
   case 488:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4744 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3708 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7499,7 +11688,11 @@
   case 489:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4748 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3712 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7508,7 +11701,11 @@
   case 490:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4756 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3718 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new DirElemConstructor(LOC((yyloc)),
                                   static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -7521,7 +11718,11 @@
   case 491:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4764 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3726 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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())
       {
@@ -7531,7 +11732,6 @@
                   static_cast<QName*>((yysemantic_stack_[(8) - (2)].expr))->get_qname().str() + ">");
         YYERROR;
       }
-
       (yyval.expr) = new DirElemConstructor(LOC((yyloc)),
                                   static_cast<QName*>((yysemantic_stack_[(8) - (2)].expr)),
                                   static_cast<QName*>((yysemantic_stack_[(8) - (6)].expr)),
@@ -7543,7 +11743,11 @@
   case 492:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4781 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3742 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new DirElemConstructor(LOC((yyloc)),
                                   static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -7556,7 +11760,11 @@
   case 493:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4789 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3750 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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())
       {
@@ -7566,7 +11774,6 @@
                   static_cast<QName*>((yysemantic_stack_[(9) - (2)].expr))->get_qname().str() + ">");
         YYERROR;
       }
-
       (yyval.expr) = new DirElemConstructor(LOC((yyloc)),
                                   static_cast<QName*>((yysemantic_stack_[(9) - (2)].expr)),
                                   static_cast<QName*>((yysemantic_stack_[(9) - (7)].expr)),
@@ -7578,7 +11785,11 @@
   case 494:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4808 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3768 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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())
       {
@@ -7588,7 +11799,6 @@
                   static_cast<QName*>((yysemantic_stack_[(9) - (2)].expr))->get_qname().str() + ">");
         YYERROR;
       }
-
       (yyval.expr) = new DirElemConstructor(LOC((yyloc)),
                                   static_cast<QName*>((yysemantic_stack_[(9) - (2)].expr)),
                                   static_cast<QName*>((yysemantic_stack_[(9) - (7)].expr)),
@@ -7600,7 +11810,11 @@
   case 495:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4827 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3786 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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())
       {
@@ -7610,7 +11824,6 @@
                   static_cast<QName*>((yysemantic_stack_[(10) - (2)].expr))->get_qname().str() + ">");
         YYERROR;
       }
-
       (yyval.expr) = new DirElemConstructor(LOC((yyloc)),
                                   static_cast<QName*>((yysemantic_stack_[(10) - (2)].expr)),
                                   static_cast<QName*>((yysemantic_stack_[(10) - (8)].expr)),
@@ -7622,7 +11835,11 @@
   case 496:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4849 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3804 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       DirElemContentList *decl = new DirElemContentList( LOC((yyloc)) );
       decl->push_back( dynamic_cast<DirElemContent*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -7633,7 +11850,11 @@
   case 497:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4855 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3810 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       DirElemContentList *decl = dynamic_cast<DirElemContentList*>((yysemantic_stack_[(2) - (1)].node));
       if ( decl )
@@ -7645,7 +11866,11 @@
   case 498:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4866 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3819 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       DirAttributeList *dal = new DirAttributeList( LOC((yyloc)) );
       dal->push_back( dynamic_cast<DirAttr*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7656,7 +11881,11 @@
   case 499:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4872 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3825 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       DirAttributeList *dal = dynamic_cast<DirAttributeList*>((yysemantic_stack_[(2) - (1)].node));
       if ( dal )
@@ -7668,7 +11897,11 @@
   case 500:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4883 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3834 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new DirAttr(LOC((yyloc)),
                        static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -7679,7 +11912,11 @@
   case 503:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4898 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3844 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new DirAttributeValue(LOC((yyloc)),
                                  dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(3) - (2)].node)));
@@ -7689,7 +11926,11 @@
   case 504:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4903 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3849 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new DirAttributeValue( LOC((yyloc)),
                                   dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(3) - (2)].node)));
@@ -7699,7 +11940,11 @@
   case 505:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4912 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3855 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new QuoteAttrContentList( LOC((yyloc)) );
     }
@@ -7708,7 +11953,11 @@
   case 506:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4916 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3859 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7717,7 +11966,11 @@
   case 507:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4923 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3865 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
       qacl->push_back( new QuoteAttrValueContent( LOC((yyloc)), "\"" ) );
@@ -7728,7 +11981,11 @@
   case 508:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4929 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3871 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
       qacl->push_back( dynamic_cast<QuoteAttrValueContent*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7739,7 +11996,11 @@
   case 509:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3877 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       QuoteAttrContentList* qacl = dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
       if ( qacl )
@@ -7751,7 +12012,11 @@
   case 510:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4942 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3884 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       QuoteAttrContentList *qacl = dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
       if ( qacl )
@@ -7763,7 +12028,11 @@
   case 511:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4953 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3892 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AposAttrContentList( LOC((yyloc)) );
     }
@@ -7772,7 +12041,11 @@
   case 512:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4957 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3896 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -7781,7 +12054,11 @@
   case 513:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4964 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3902 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       AposAttrContentList *aacl = new AposAttrContentList( LOC((yyloc)) );
       aacl->push_back( new AposAttrValueContent( LOC((yyloc)),"'") );
@@ -7792,7 +12069,11 @@
   case 514:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4970 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3908 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       AposAttrContentList *aacl = new AposAttrContentList( LOC((yyloc)) );
       aacl->push_back( dynamic_cast<AposAttrValueContent*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7803,7 +12084,11 @@
   case 515:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4976 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3914 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
       if (aacl)
@@ -7815,7 +12100,11 @@
   case 516:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4983 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3921 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
       if ( aacl )
@@ -7827,7 +12116,11 @@
   case 517:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4994 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3930 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new QuoteAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
     }
@@ -7836,7 +12129,11 @@
   case 518:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 4998 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3934 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new QuoteAttrValueContent(LOC((yyloc)), dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr)));
     }
@@ -7845,7 +12142,11 @@
   case 519:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5006 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3940 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AposAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
     }
@@ -7854,7 +12155,11 @@
   case 520:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5010 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3944 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AposAttrValueContent(LOC((yyloc)), dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr)));
     }
@@ -7863,7 +12168,11 @@
   case 521:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5018 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3950 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new DirElemContent( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr) );
     }
@@ -7872,7 +12181,11 @@
   case 522:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5022 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3954 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new DirElemContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
     }
@@ -7881,7 +12194,11 @@
   case 523:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5026 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3958 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       rchandle<CDataSection> cdata_h = dynamic_cast<CDataSection*>((yysemantic_stack_[(1) - (1)].expr));
       (yyval.expr) = new DirElemContent( LOC((yyloc)), cdata_h );
@@ -7891,7 +12208,11 @@
   case 524:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5031 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3963 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       rchandle<CommonContent> cont_h = dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr));
       (yyval.expr) = new DirElemContent( LOC((yyloc)), cont_h );
@@ -7901,7 +12222,11 @@
   case 525:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5040 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3970 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_charref, SYMTAB((yysemantic_stack_[(1) - (1)].sval)));
     }
@@ -7910,7 +12235,11 @@
   case 526:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5044 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3974 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_escape_lbrace);
     }
@@ -7919,7 +12248,11 @@
   case 527:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5048 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3978 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_escape_rbrace);
     }
@@ -7928,7 +12261,11 @@
   case 528:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5052 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3982 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new CommonContent(LOC((yyloc)), new EnclosedExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr)));
     }
@@ -7937,7 +12274,11 @@
   case 529:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5060 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3988 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new DirCommentConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
@@ -7946,7 +12287,11 @@
   case 530:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5065 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3993 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new DirCommentConstructor( LOC((yyloc)), "" );
     }
@@ -7955,7 +12300,11 @@
   case 531:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5073 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3999 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new DirPIConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
@@ -7964,7 +12313,11 @@
   case 532:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5078 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4004 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new DirPIConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
     }
@@ -7973,7 +12326,11 @@
   case 533:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5086 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4010 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new CDataSection( LOC((yyloc)),SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
     }
@@ -7982,7 +12339,11 @@
   case 534:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5094 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4016 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7991,7 +12352,11 @@
   case 535:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5099 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4021 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8000,7 +12365,11 @@
   case 536:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5104 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4026 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8009,7 +12378,11 @@
   case 537:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5109 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4031 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8018,7 +12391,11 @@
   case 538:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5114 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4036 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8027,7 +12404,11 @@
   case 539:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5119 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4041 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8036,7 +12417,11 @@
   case 541:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5130 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4049 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new CompDocConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
     }
@@ -8045,7 +12430,11 @@
   case 542:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5138 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4055 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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));
     }
@@ -8054,7 +12443,11 @@
   case 543:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5142 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4059 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new CompElemConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
     }
@@ -8063,7 +12456,11 @@
   case 544:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5159 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4065 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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) );
     }
@@ -8072,7 +12469,11 @@
   case 545:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5163 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4069 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new CompAttrConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
     }
@@ -8081,7 +12482,11 @@
   case 546:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5171 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4075 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new CompTextConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
     }
@@ -8090,7 +12495,11 @@
   case 547:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5179 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4081 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new CompCommentConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
     }
@@ -8099,7 +12508,11 @@
   case 548:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5187 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4087 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new CompPIConstructor(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)), (yysemantic_stack_[(3) - (2)].expr));
     }
@@ -8108,7 +12521,11 @@
   case 549:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5191 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4091 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new CompPIConstructor(LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr));
     }
@@ -8117,7 +12534,11 @@
   case 550:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5199 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4097 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new CompNamespaceConstructor(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)), (yysemantic_stack_[(3) - (2)].expr));
     }
@@ -8126,7 +12547,11 @@
   case 551:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5203 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4101 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = new CompNamespaceConstructor(LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr));
     }
@@ -8135,7 +12560,11 @@
   case 552:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5211 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4107 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
     }
@@ -8144,7 +12573,11 @@
   case 553:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5219 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4113 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new SequenceType( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL );
         }
@@ -8153,7 +12586,11 @@
   case 554:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5223 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4117 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new SequenceType(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].node), dynamic_cast<OccurrenceIndicator*>((yysemantic_stack_[(2) - (2)].node)));
         }
@@ -8162,7 +12599,11 @@
   case 555:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5227 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4121 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new SequenceType( LOC((yyloc)), NULL, NULL );
         }
@@ -8171,7 +12612,11 @@
   case 556:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5232 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4125 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new SequenceType( LOC((yyloc)), NULL, NULL );
         }
@@ -8180,7 +12625,11 @@
   case 557:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5267 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4131 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_optionally
@@ -8191,7 +12640,11 @@
   case 558:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5273 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4137 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_zero_or_more
@@ -8202,7 +12655,11 @@
   case 559:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5279 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4143 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_one_or_more
@@ -8213,7 +12670,11 @@
   case 560:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5289 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4151 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8222,7 +12683,11 @@
   case 561:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5293 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4155 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8231,7 +12696,11 @@
   case 562:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5297 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4159 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ItemType( LOC((yyloc)), true );
         }
@@ -8240,7 +12709,11 @@
   case 563:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5302 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4163 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ItemType( LOC((yyloc)), true );
         }
@@ -8249,7 +12722,11 @@
   case 564:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5306 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4167 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new StructuredItemType(LOC((yyloc)));
         }
@@ -8258,7 +12735,11 @@
   case 565:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5311 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4171 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new StructuredItemType(LOC((yyloc)));
         }
@@ -8267,7 +12748,11 @@
   case 566:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5315 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4175 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8276,7 +12761,11 @@
   case 567:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5319 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4179 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8285,7 +12774,11 @@
   case 568:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5323 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4183 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8294,7 +12787,11 @@
   case 569:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5330 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4189 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           TypeList* aTypeList = new TypeList(LOC ((yyloc)));
           aTypeList->push_back(dynamic_cast<SequenceType *>((yysemantic_stack_[(1) - (1)].node)));
@@ -8305,7 +12802,11 @@
   case 570:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5336 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4195 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)));
@@ -8316,7 +12817,11 @@
   case 571:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5346 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4203 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new GeneralizedAtomicType( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
     }
@@ -8325,7 +12830,11 @@
   case 572:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5354 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4209 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new SimpleType( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
     }
@@ -8334,7 +12843,11 @@
   case 573:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5362 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4215 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8343,7 +12856,11 @@
   case 574:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5366 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4219 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8352,7 +12869,11 @@
   case 575:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5370 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4223 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8361,7 +12882,11 @@
   case 576:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5374 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4227 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8370,7 +12895,11 @@
   case 577:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5378 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4231 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8379,7 +12908,11 @@
   case 578:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5382 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4235 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8388,7 +12921,11 @@
   case 579:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5386 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4239 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8397,7 +12934,11 @@
   case 580:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5390 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4243 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8406,7 +12947,11 @@
   case 581:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5394 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4247 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8415,7 +12960,11 @@
   case 582:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5398 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4251 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8424,7 +12973,11 @@
   case 583:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5406 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4257 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AnyKindTest( LOC((yyloc)) );
     }
@@ -8433,7 +12986,11 @@
   case 584:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5414 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4263 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new DocumentTest(LOC((yyloc)));
     }
@@ -8442,7 +12999,11 @@
   case 585:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5418 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4267 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new DocumentTest(LOC((yyloc)), dynamic_cast<ElementTest*>((yysemantic_stack_[(4) - (3)].node)));
     }
@@ -8451,7 +13012,11 @@
   case 586:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5422 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4271 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new DocumentTest(LOC((yyloc)), dynamic_cast<SchemaElementTest*>((yysemantic_stack_[(4) - (3)].node)));
     }
@@ -8460,7 +13025,11 @@
   case 587:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5430 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4277 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new NamespaceTest(LOC((yyloc)));
     }
@@ -8469,7 +13038,11 @@
   case 588:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5437 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4282 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new TextTest(LOC((yyloc)));
     }
@@ -8478,7 +13051,11 @@
   case 589:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5445 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4288 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new CommentTest(LOC((yyloc)));
     }
@@ -8487,7 +13064,11 @@
   case 590:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5453 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4294 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new PITest( LOC((yyloc)), "" );
         }
@@ -8496,7 +13077,11 @@
   case 591:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5457 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4298 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
         }
@@ -8505,7 +13090,11 @@
   case 592:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5461 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4302 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
         }
@@ -8514,7 +13103,11 @@
   case 593:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5469 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4308 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
         }
@@ -8523,7 +13116,11 @@
   case 594:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5473 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4312 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new AttributeTest(
                 LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL
@@ -8534,7 +13131,11 @@
   case 595:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5479 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4318 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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))
@@ -8545,7 +13146,11 @@
   case 596:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5485 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4324 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
         }
@@ -8554,7 +13159,11 @@
   case 597:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5489 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4328 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new AttributeTest(
                 LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node))
@@ -8565,7 +13174,11 @@
   case 598:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5499 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4336 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new SchemaAttributeTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
@@ -8574,7 +13187,11 @@
   case 599:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5507 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4342 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ElementTest( LOC((yyloc)), NULL, NULL, true );
         }
@@ -8583,7 +13200,11 @@
   case 600:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5511 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4346 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL, true
@@ -8594,7 +13215,11 @@
   case 601:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5517 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4352 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)),
@@ -8608,7 +13233,11 @@
   case 602:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5526 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4361 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)),
@@ -8622,7 +13251,11 @@
   case 603:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5535 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4370 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), NULL, NULL, true
@@ -8633,7 +13266,11 @@
   case 604:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5541 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4376 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), false
@@ -8644,7 +13281,11 @@
   case 605:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5547 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4382 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), true
@@ -8655,7 +13296,11 @@
   case 606:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5557 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4390 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new SchemaElementTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
@@ -8664,7 +13309,11 @@
   case 607:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5574 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4396 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
         }
@@ -8673,7 +13322,11 @@
   case 608:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5581 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4402 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (1)].expr)), true );
         }
@@ -8682,7 +13335,11 @@
   case 609:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5596 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4408 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
         }
@@ -8691,7 +13348,11 @@
   case 610:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5623 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4414 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8700,7 +13361,11 @@
   case 611:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5627 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4418 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8709,7 +13374,11 @@
   case 612:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5635 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4424 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.node) = new AnyFunctionTest(LOC((yyloc)));
     }
@@ -8718,7 +13387,11 @@
   case 613:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5643 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4430 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.node) = new TypedFunctionTest(LOC ((yyloc)), dynamic_cast<SequenceType *>((yysemantic_stack_[(5) - (5)].node)));
         }
@@ -8727,7 +13400,11 @@
   case 614:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5647 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4434 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.node) = new TypedFunctionTest(LOC ((yyloc)),
               dynamic_cast<TypeList *>((yysemantic_stack_[(6) - (3)].node)),
@@ -8738,7 +13415,11 @@
   case 615:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5658 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4442 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
            (yyval.node) = (yysemantic_stack_[(3) - (2)].node);
         }
@@ -8747,7 +13428,11 @@
   case 616:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5675 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4448 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::strict_validation
@@ -8758,7 +13443,11 @@
   case 617:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5681 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4454 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::lax_validation
@@ -8769,7 +13458,11 @@
   case 618:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5687 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4460 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::skip_validation
@@ -8780,7 +13473,11 @@
   case 619:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5697 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4468 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::INTO, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
@@ -8789,7 +13486,11 @@
   case 620:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5701 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4472 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)
@@ -8800,7 +13501,11 @@
   case 621:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5707 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4478 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)
@@ -8811,7 +13516,11 @@
   case 622:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5713 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4484 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::AFTER, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
@@ -8820,7 +13529,11 @@
   case 623:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5717 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4488 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new InsertExpr(
                 LOC ((yyloc)), store::UpdateConsts::BEFORE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
@@ -8831,7 +13544,11 @@
   case 624:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5723 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4494 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::INTO, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
@@ -8840,7 +13557,11 @@
   case 625:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5727 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4498 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)
@@ -8851,7 +13572,11 @@
   case 626:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5733 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4504 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)
@@ -8862,7 +13587,11 @@
   case 627:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5739 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4510 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new InsertExpr(
                 LOC ((yyloc)),
@@ -8874,7 +13603,11 @@
   case 628:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5746 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4517 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new InsertExpr(
                 LOC ((yyloc)), store::UpdateConsts::BEFORE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
@@ -8885,7 +13618,11 @@
   case 629:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5756 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4525 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -8894,7 +13631,11 @@
   case 630:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5761 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4530 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -8903,7 +13644,11 @@
   case 631:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5769 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4536 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new ReplaceExpr(
                 LOC((yyloc)), store::UpdateConsts::NODE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
@@ -8914,7 +13659,11 @@
   case 632:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5775 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4542 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)
@@ -8925,7 +13674,11 @@
   case 633:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5785 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4550 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new RenameExpr( LOC ((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
@@ -8934,7 +13687,11 @@
   case 634:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5807 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4556 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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) );
@@ -8944,7 +13701,11 @@
   case 635:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5816 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4563 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CopyVarList* lList = new CopyVarList(LOC((yyloc)));
       lList->push_back (dynamic_cast<VarBinding*> ((yysemantic_stack_[(1) - (1)].expr)));
@@ -8955,7 +13716,11 @@
   case 636:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5822 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4569 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       CopyVarList* lList = dynamic_cast<CopyVarList*>((yysemantic_stack_[(4) - (1)].expr));
       VarBinding* lBinding = dynamic_cast<VarBinding*>((yysemantic_stack_[(4) - (4)].expr));
@@ -8967,7 +13732,11 @@
   case 637:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5835 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4578 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
        (yyval.expr) = new VarBinding(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), (yysemantic_stack_[(3) - (3)].expr));
     }
@@ -8976,7 +13745,11 @@
   case 638:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5849 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4584 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.expr) = new TryExpr( LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
@@ -8985,7 +13758,11 @@
   case 639:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5856 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4590 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             CatchListExpr *cle = new CatchListExpr( LOC((yyloc)) );
             cle->push_back( static_cast<CatchExpr*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -8996,7 +13773,11 @@
   case 640:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5862 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4596 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
             if ( cle )
@@ -9008,7 +13789,11 @@
   case 641:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5872 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4605 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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);
@@ -9018,7 +13803,11 @@
   case 642:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5881 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4612 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -9027,7 +13816,11 @@
   case 643:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5889 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4618 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             CatchExpr::NameTestList *ntl = new CatchExpr::NameTestList;
             ntl->push_back( static_cast<NameTest*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -9038,7 +13831,11 @@
   case 644:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5895 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4624 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             CatchExpr::NameTestList *ntl =
                 static_cast<CatchExpr::NameTestList*>((yysemantic_stack_[(3) - (1)].name_test_list));
@@ -9050,7 +13847,11 @@
   case 645:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5913 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4633 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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);
@@ -9060,7 +13861,11 @@
   case 646:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5921 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4640 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.pos_filter_list) = NULL;
         }
@@ -9069,7 +13874,11 @@
   case 647:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5925 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4644 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.pos_filter_list) = (yysemantic_stack_[(1) - (1)].pos_filter_list);
         }
@@ -9078,7 +13887,11 @@
   case 648:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4650 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)) );
@@ -9088,7 +13901,11 @@
   case 649:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5937 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4655 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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);
@@ -9098,7 +13915,11 @@
   case 650:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5945 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4662 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9107,7 +13928,11 @@
   case 651:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5949 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4666 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTOr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
         }
@@ -9116,7 +13941,11 @@
   case 652:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5956 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4672 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9125,7 +13954,11 @@
   case 653:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5960 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4676 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTAnd( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
         }
@@ -9134,7 +13967,11 @@
   case 654:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5967 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4682 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9143,7 +13980,11 @@
   case 655:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5971 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4686 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTMildNot( LOC((yyloc)), (yysemantic_stack_[(4) - (1)].node), (yysemantic_stack_[(4) - (4)].node) );
         }
@@ -9152,7 +13993,11 @@
   case 656:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5978 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4692 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9161,7 +14006,11 @@
   case 657:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5982 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4696 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTUnaryNot(
                 LOC((yyloc)), dynamic_cast<FTPrimaryWithOptions*>((yysemantic_stack_[(2) - (2)].node))
@@ -9172,7 +14021,11 @@
   case 658:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 5991 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4704 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTPrimaryWithOptions(
                 LOC((yyloc)),
@@ -9186,7 +14039,11 @@
   case 659:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6003 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4714 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = NULL;
         }
@@ -9195,7 +14052,11 @@
   case 660:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6007 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4718 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9204,7 +14065,11 @@
   case 661:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6014 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4723 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = NULL;
         }
@@ -9213,7 +14078,11 @@
   case 662:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6018 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4727 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9222,7 +14091,11 @@
   case 663:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6026 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4733 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTWeight( LOC((yyloc)), dynamic_cast<exprnode*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
@@ -9231,7 +14104,11 @@
   case 664:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6034 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4739 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTWordsTimes(
                 LOC((yyloc)),
@@ -9244,7 +14121,11 @@
   case 665:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6042 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4747 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(3) - (2)].node);
         }
@@ -9253,7 +14134,11 @@
   case 666:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6046 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4751 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9262,7 +14147,11 @@
   case 667:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6053 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4756 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = NULL;
         }
@@ -9271,7 +14160,11 @@
   case 668:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6057 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4760 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9280,7 +14173,11 @@
   case 669:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6065 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4766 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTExtensionSelection(
                 LOC((yyloc)),
@@ -9293,7 +14190,11 @@
   case 670:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6076 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4775 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = NULL;
         }
@@ -9302,7 +14203,11 @@
   case 671:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6080 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4779 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9311,7 +14216,11 @@
   case 672:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6088 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4785 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTWords(
                 LOC((yyloc)),
@@ -9324,7 +14233,11 @@
   case 673:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6100 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4795 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTWordsValue(
                 LOC((yyloc)), static_cast<StringLiteral*>((yysemantic_stack_[(1) - (1)].expr)), NULL
@@ -9335,7 +14248,11 @@
   case 674:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6106 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTWordsValue(
                 LOC((yyloc)), NULL, dynamic_cast<exprnode*>((yysemantic_stack_[(3) - (2)].expr))
@@ -9346,7 +14263,11 @@
   case 675:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6115 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4808 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::any );
         }
@@ -9355,7 +14276,11 @@
   case 676:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6119 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4812 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9364,7 +14289,11 @@
   case 677:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6127 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4818 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
         }
@@ -9373,7 +14302,11 @@
   case 678:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6131 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4822 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
         }
@@ -9382,7 +14315,11 @@
   case 679:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6135 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4826 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::phrase );
         }
@@ -9391,7 +14328,11 @@
   case 680:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6142 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4831 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::any;
         }
@@ -9400,7 +14341,11 @@
   case 681:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6146 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4835 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::any_word;
         }
@@ -9409,7 +14354,11 @@
   case 682:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6153 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4840 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::all;
         }
@@ -9418,7 +14367,11 @@
   case 683:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6157 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4844 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::all_words;
         }
@@ -9427,7 +14380,11 @@
   case 684:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6165 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4850 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9436,7 +14393,11 @@
   case 685:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6169 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4854 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9445,7 +14406,11 @@
   case 686:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6173 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4858 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9454,7 +14419,11 @@
   case 687:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6177 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4862 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9463,7 +14432,11 @@
   case 688:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6181 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4866 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9472,7 +14445,11 @@
   case 689:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6189 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4872 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTOrder( LOC((yyloc)) );
         }
@@ -9481,7 +14458,11 @@
   case 690:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6197 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4878 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTWindow(
                 LOC((yyloc)),
@@ -9494,7 +14475,11 @@
   case 691:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6209 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4888 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTDistance(
                 LOC((yyloc)),
@@ -9507,7 +14492,11 @@
   case 692:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6221 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4898 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::words );
         }
@@ -9516,7 +14505,11 @@
   case 693:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6225 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4902 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::sentences );
         }
@@ -9525,7 +14518,11 @@
   case 694:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6229 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4906 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::paragraphs );
         }
@@ -9534,7 +14531,11 @@
   case 695:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6237 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4912 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             FTMatchOptions *mo = new FTMatchOptions( LOC((yyloc)) );
             mo->push_back( dynamic_cast<FTMatchOption*>((yysemantic_stack_[(2) - (2)].node)) );
@@ -9545,7 +14546,11 @@
   case 696:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6243 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4918 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)) );
@@ -9556,7 +14561,11 @@
   case 697:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6253 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4926 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9565,7 +14574,11 @@
   case 698:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6257 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4930 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9574,7 +14587,11 @@
   case 699:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6261 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4934 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9583,7 +14600,11 @@
   case 700:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6265 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4938 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9592,7 +14613,11 @@
   case 701:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6269 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4942 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9601,7 +14626,11 @@
   case 702:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6273 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4946 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9610,7 +14639,11 @@
   case 703:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6277 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4950 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9619,7 +14652,11 @@
   case 704:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6281 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4954 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9628,7 +14665,11 @@
   case 705:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6289 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4960 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::sensitive );
         }
@@ -9637,7 +14678,11 @@
   case 706:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6293 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4964 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::insensitive );
         }
@@ -9646,7 +14691,11 @@
   case 707:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6297 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4968 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::lower );
         }
@@ -9655,7 +14704,11 @@
   case 708:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6301 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4972 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::upper );
         }
@@ -9664,7 +14717,11 @@
   case 709:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6309 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4978 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTDiacriticsOption(
                 LOC((yyloc)), ft_diacritics_mode::sensitive
@@ -9675,7 +14732,11 @@
   case 710:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6315 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4984 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTDiacriticsOption(
                 LOC((yyloc)), ft_diacritics_mode::insensitive
@@ -9686,7 +14747,11 @@
   case 711:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6325 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4992 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTExtensionOption(
                 LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)), SYMTAB((yysemantic_stack_[(3) - (3)].sval))
@@ -9697,7 +14762,11 @@
   case 712:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6335 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5000 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::stemming );
         }
@@ -9706,7 +14775,11 @@
   case 713:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6339 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5004 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::no_stemming );
         }
@@ -9715,7 +14788,11 @@
   case 714:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6347 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5010 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             FTThesaurusOption::thesaurus_id_list_t *til = NULL;
             if ( (yysemantic_stack_[(2) - (2)].node) ) {
@@ -9730,7 +14807,11 @@
   case 715:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6357 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5020 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             FTThesaurusOption::thesaurus_id_list_t *til = (yysemantic_stack_[(5) - (4)].thesaurus_id_list);
             if ( (yysemantic_stack_[(5) - (3)].node) ) {
@@ -9746,7 +14827,11 @@
   case 716:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6368 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5031 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTThesaurusOption( LOC((yyloc)), NULL, false, true );
         }
@@ -9755,7 +14840,11 @@
   case 717:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6375 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5037 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9764,7 +14853,11 @@
   case 718:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6379 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5041 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = NULL;
         }
@@ -9773,7 +14866,11 @@
   case 719:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6386 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5046 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.thesaurus_id_list) = NULL;
         }
@@ -9782,7 +14879,11 @@
   case 720:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6390 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5050 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.thesaurus_id_list) = (yysemantic_stack_[(2) - (2)].thesaurus_id_list);
         }
@@ -9791,7 +14892,11 @@
   case 721:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6397 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5056 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)) );
@@ -9801,7 +14906,11 @@
   case 722:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6402 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5061 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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);
@@ -9811,7 +14920,11 @@
   case 723:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6411 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5068 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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))
@@ -9822,7 +14935,11 @@
   case 724:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6420 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5075 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.sval) = 0;
         }
@@ -9831,7 +14948,11 @@
   case 725:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6424 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5079 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.sval) = (yysemantic_stack_[(2) - (2)].sval);
         }
@@ -9840,7 +14961,11 @@
   case 726:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6431 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5085 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = NULL;
         }
@@ -9849,7 +14974,11 @@
   case 727:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6435 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5089 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
         }
@@ -9858,7 +14987,11 @@
   case 728:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6443 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5095 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStopWordOption(
                 LOC((yyloc)),
@@ -9872,7 +15005,11 @@
   case 729:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6452 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5104 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStopWordOption(
                 LOC((yyloc)), NULL, (yysemantic_stack_[(4) - (4)].incl_excl_list), ft_stop_words_mode::with_default
@@ -9884,7 +15021,11 @@
   case 730:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6459 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5111 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStopWordOption(
                 LOC((yyloc)), NULL, NULL, ft_stop_words_mode::without
@@ -9895,7 +15036,11 @@
   case 731:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6469 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5119 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStopWords( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)), NULL );
         }
@@ -9904,7 +15049,11 @@
   case 732:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6473 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5123 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStopWords( LOC((yyloc)), "", (yysemantic_stack_[(3) - (2)].strlist) );
         }
@@ -9913,7 +15062,11 @@
   case 733:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6480 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5129 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             string_list_t *sl = new string_list_t;
             sl->push_back( SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
@@ -9924,7 +15077,11 @@
   case 734:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6486 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5135 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             if ( (yysemantic_stack_[(3) - (1)].strlist) )
                 (yysemantic_stack_[(3) - (1)].strlist)->push_back( SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
@@ -9935,7 +15092,11 @@
   case 735:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6495 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5142 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.incl_excl_list) = NULL;
         }
@@ -9944,7 +15105,11 @@
   case 736:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6499 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5146 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.incl_excl_list) = (yysemantic_stack_[(1) - (1)].incl_excl_list);
         }
@@ -9953,7 +15118,11 @@
   case 737:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6506 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5152 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)) );
@@ -9963,7 +15132,11 @@
   case 738:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6511 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5157 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             FTStopWordOption::incl_excl_list_t *iel = (yysemantic_stack_[(2) - (1)].incl_excl_list);
             if ( !iel )
@@ -9976,7 +15149,11 @@
   case 739:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6523 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5167 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStopWordsInclExcl(
                 LOC((yyloc)),
@@ -9989,7 +15166,11 @@
   case 740:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6531 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5175 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTStopWordsInclExcl(
                 LOC((yyloc)),
@@ -10002,7 +15183,11 @@
   case 741:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6543 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5185 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTLanguageOption( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
         }
@@ -10011,7 +15196,11 @@
   case 742:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6551 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5191 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::with );
         }
@@ -10020,7 +15209,11 @@
   case 743:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6555 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5195 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::without );
         }
@@ -10029,7 +15222,11 @@
   case 744:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6563 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5201 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_start );
         }
@@ -10038,7 +15235,11 @@
   case 745:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6567 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5205 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_end );
         }
@@ -10047,7 +15248,11 @@
   case 746:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6571 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5209 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::entire );
         }
@@ -10056,7 +15261,11 @@
   case 747:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6579 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5215 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTTimes( LOC((yyloc)), dynamic_cast<FTRange*>((yysemantic_stack_[(3) - (2)].node)) );
         }
@@ -10065,7 +15274,11 @@
   case 748:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6587 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5221 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::exactly, (yysemantic_stack_[(2) - (2)].expr) );
         }
@@ -10074,7 +15287,11 @@
   case 749:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6591 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5225 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::at_least, (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -10083,7 +15300,11 @@
   case 750:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6595 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5229 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::at_most, (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -10092,7 +15313,11 @@
   case 751:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6599 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5233 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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) );
         }
@@ -10101,7 +15326,11 @@
   case 752:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6607 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5239 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTScope(
                 LOC((yyloc)),
@@ -10114,7 +15343,11 @@
   case 753:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6615 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5247 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTScope(
                 LOC((yyloc)),
@@ -10127,7 +15360,11 @@
   case 754:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6627 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5257 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::sentence );
         }
@@ -10136,7 +15373,11 @@
   case 755:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6631 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5261 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::paragraph );
         }
@@ -10145,7 +15386,11 @@
   case 756:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6639 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5267 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
             (yyval.node) = new FTIgnoreOption( LOC((yyloc)), static_cast<UnionExpr*>((yysemantic_stack_[(3) - (3)].expr)) );
         }
@@ -10154,7 +15399,11 @@
   case 757:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6653 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5273 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), NULL );
         }
@@ -10163,7 +15412,11 @@
   case 758:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6657 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5277 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
         }
@@ -10172,9 +15425,12 @@
   case 759:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6664 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5283 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-          // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), NULL, false);
         }
     break;
@@ -10182,9 +15438,12 @@
   case 760:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6669 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5287 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-          // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), false);
         }
     break;
@@ -10192,9 +15451,12 @@
   case 761:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6677 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5293 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-          // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), NULL, true);
         }
     break;
@@ -10202,9 +15464,12 @@
   case 762:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6682 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5297 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
-          // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), true);
         }
     break;
@@ -10212,7 +15477,11 @@
   case 763:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6691 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5303 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new JSONDirectObjectConstructor(LOC((yyloc)),
                                                dynamic_cast<JSONPairList*>((yysemantic_stack_[(3) - (2)].node)));
@@ -10222,7 +15491,11 @@
   case 764:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6703 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5310 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           StringLiteral* sl = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)) );
           JSONPairList* jpl = new JSONPairList(LOC((yyloc)));
@@ -10234,7 +15507,11 @@
   case 765:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6710 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5318 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_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)));
@@ -10245,7 +15522,11 @@
   case 766:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6716 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5324 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (1)].node));
           assert(jpl);
@@ -10257,7 +15538,11 @@
   case 767:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6723 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5331 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (1)].node));
           assert(jpl);
@@ -10270,7 +15555,11 @@
   case 768:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6734 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5341 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new JSONObjectInsertExpr(LOC((yyloc)),
                                         (yysemantic_stack_[(5) - (3)].expr),
@@ -10281,7 +15570,11 @@
   case 769:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6740 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5347 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (3)].node));
           (yyval.expr) = new JSONObjectInsertExpr(
@@ -10296,7 +15589,11 @@
   case 770:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6750 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5357 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new JSONArrayInsertExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), (yysemantic_stack_[(8) - (5)].expr), (yysemantic_stack_[(8) - (8)].expr));
         }
@@ -10305,7 +15602,11 @@
   case 771:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6755 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5361 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new JSONObjectInsertExpr(LOC((yyloc)),
                                         (yysemantic_stack_[(4) - (2)].expr),
@@ -10316,7 +15617,11 @@
   case 772:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6761 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5367 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(4) - (2)].node));
           (yyval.expr) = new JSONObjectInsertExpr(
@@ -10331,7 +15636,11 @@
   case 773:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6771 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5377 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new JSONArrayInsertExpr(LOC((yyloc)), (yysemantic_stack_[(7) - (2)].expr), (yysemantic_stack_[(7) - (4)].expr), (yysemantic_stack_[(7) - (7)].expr));
         }
@@ -10340,7 +15649,11 @@
   case 774:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6778 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5383 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new JSONArrayAppendExpr(LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr));
         }
@@ -10349,7 +15662,11 @@
   case 775:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6782 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5387 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.expr) = new JSONArrayAppendExpr(LOC((yyloc)), (yysemantic_stack_[(4) - (2)].expr), (yysemantic_stack_[(4) - (4)].expr));
         }
@@ -10358,23 +15675,24 @@
   case 776:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6789 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5393 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(3) - (3)].expr));
-
           if (lDynamicFunctionInvocation == NULL)
           {
             error((yylocation_stack_[(3) - (3)]), "An object invocation is expected. A filter was found instead.");
             YYERROR;
           }
-
           if (lDynamicFunctionInvocation->getArgList()->size() != 1)
           {
             error((yylocation_stack_[(3) - (3)]), "An object invocation with exactly one argument is expected. Zero or more than one argument were found.");
             YYERROR;
           }
-
           (yyval.expr) = new JSONDeleteExpr(
                 LOC((yyloc)),
                 lDynamicFunctionInvocation->getPrimaryExpr(),
@@ -10385,23 +15703,24 @@
   case 777:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6811 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5412 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(2) - (2)].expr));
-
           if (lDynamicFunctionInvocation == NULL)
           {
             error((yylocation_stack_[(2) - (2)]), "An object invocation is expected. A filter was found instead.");
             YYERROR;
           }
-
           if (lDynamicFunctionInvocation->getArgList()->size() != 1)
           {
             error((yylocation_stack_[(2) - (2)]), "An object invocation with exactly one argument is expected. Zero or more than one argument were found.");
             YYERROR;
           }
-
           (yyval.expr) = new JSONDeleteExpr(
                 LOC((yyloc)),
                 lDynamicFunctionInvocation->getPrimaryExpr(),
@@ -10412,25 +15731,26 @@
   case 778:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6836 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5433 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(5) - (3)].expr));
-
           if(lDynamicFunctionInvocation == NULL)
           {
             error((yylocation_stack_[(5) - (3)]), "An object invocation is expected. A filter was found instead.");
             delete (yysemantic_stack_[(5) - (5)].expr);
             YYERROR;
           }
-
           if (lDynamicFunctionInvocation->getArgList()->size() != 1)
           {
             error((yylocation_stack_[(5) - (3)]), "An object invocation with exactly one argument is expected. Zero or more than one argument were found.");
             delete (yysemantic_stack_[(5) - (5)].expr);
             YYERROR;
           }
-
           (yyval.expr) = new JSONRenameExpr(
                 LOC((yyloc)),
                 lDynamicFunctionInvocation->getPrimaryExpr(),
@@ -10442,25 +15762,26 @@
   case 779:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6861 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5455 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(4) - (2)].expr));
-
           if(lDynamicFunctionInvocation == NULL)
           {
             error((yylocation_stack_[(4) - (2)]), "An object invocation is expected. A filter was found instead.");
             delete (yysemantic_stack_[(4) - (4)].expr);
             YYERROR;
           }
-
           if (lDynamicFunctionInvocation->getArgList()->size() != 1)
           {
             error((yylocation_stack_[(4) - (2)]), "An object invocation with exactly one argument is expected. Zero or more than one argument were found.");
             delete (yysemantic_stack_[(4) - (4)].expr);
             YYERROR;
           }
-
           (yyval.expr) = new JSONRenameExpr(
                 LOC((yyloc)),
                 lDynamicFunctionInvocation->getPrimaryExpr(),
@@ -10472,25 +15793,26 @@
   case 780:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6889 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5479 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(7) - (5)].expr));
-
           if(lDynamicFunctionInvocation == NULL)
           {
             error((yylocation_stack_[(7) - (3)]), "An object invocation is expected. A filter was found instead.");
             delete (yysemantic_stack_[(7) - (7)].expr);
             YYERROR;
           }
-
           if (lDynamicFunctionInvocation->getArgList()->size() != 1)
           {
             error((yylocation_stack_[(7) - (3)]), "An object invocation with exactly one argument is expected. Zero or more than one argument were found.");
             delete (yysemantic_stack_[(7) - (7)].expr);
             YYERROR;
           }
-
           (yyval.expr) = new JSONReplaceExpr(
                 LOC((yyloc)),
                 lDynamicFunctionInvocation->getPrimaryExpr(),
@@ -10502,25 +15824,26 @@
   case 781:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6914 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5501 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(6) - (4)].expr));
-
           if(lDynamicFunctionInvocation == NULL)
           {
             error((yylocation_stack_[(6) - (2)]), "An object invocation is expected. A filter was found instead.");
             delete (yysemantic_stack_[(6) - (6)].expr);
             YYERROR;
           }
-
           if (lDynamicFunctionInvocation->getArgList()->size() != 1)
           {
             error((yylocation_stack_[(6) - (2)]), "An object invocation with exactly one argument is expected. Zero or more than one argument were found.");
             delete (yysemantic_stack_[(6) - (6)].expr);
             YYERROR;
           }
-
           (yyval.expr) = new JSONReplaceExpr(
                 LOC((yyloc)),
                 lDynamicFunctionInvocation->getPrimaryExpr(),
@@ -10532,7 +15855,11 @@
   case 782:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6942 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5525 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -10541,7 +15868,11 @@
   case 783:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6946 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5529 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -10550,7 +15881,11 @@
   case 784:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6950 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5533 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -10559,7 +15894,11 @@
   case 785:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6957 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5539 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonItem);
         }
@@ -10568,7 +15907,11 @@
   case 786:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6962 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5543 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonItem);
         }
@@ -10577,7 +15920,11 @@
   case 787:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6969 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5549 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonObject);
         }
@@ -10586,7 +15933,11 @@
   case 788:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6974 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5553 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonObject);
         }
@@ -10595,7 +15946,11 @@
   case 789:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6981 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5559 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonArray);
         }
@@ -10604,7 +15959,11 @@
   case 790:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 6986 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5563 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonArray);
         }
@@ -10613,7 +15972,11 @@
   case 793:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7003 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5573 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     {
           auto_ptr<QName> lQName( static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
           zstring const &tmp = lQName->get_qname();
@@ -10628,1484 +15991,2332 @@
   case 795:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7016 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5585 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("attribute"))); }
     break;
 
   case 796:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7017 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5586 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("comment"))); }
     break;
 
   case 797:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7018 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5587 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("document-node"))); }
     break;
 
   case 798:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7019 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5588 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("namespace-node"))); }
     break;
 
   case 799:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7020 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5589 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("element"))); }
     break;
 
   case 800:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7022 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5590 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("if"))); }
     break;
 
   case 801:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7023 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5591 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("node"))); }
     break;
 
   case 802:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7024 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5592 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("processing-instruction"))); }
     break;
 
   case 803:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7025 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5593 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema-attribute"))); }
     break;
 
   case 804:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7026 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5594 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema-element"))); }
     break;
 
   case 805:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7027 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5595 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("text"))); }
     break;
 
   case 806:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7028 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5596 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("typeswitch"))); }
     break;
 
   case 807:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7029 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5597 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("switch"))); }
     break;
 
   case 808:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7030 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5598 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("empty-sequence"))); }
     break;
 
   case 809:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7031 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5599 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("while"))); }
     break;
 
   case 811:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7036 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5603 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))); }
     break;
 
   case 812:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7037 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5604 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("xquery"))); }
     break;
 
   case 813:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7038 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5605 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("empty"))); }
     break;
 
   case 814:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7039 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5606 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("boundary-space"))); }
     break;
 
   case 815:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7040 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5607 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ft-option"))); }
     break;
 
   case 816:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7041 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5608 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("base-uri"))); }
     break;
 
   case 817:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7042 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5609 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lax"))); }
     break;
 
   case 818:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7043 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5610 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("strict"))); }
     break;
 
   case 819:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7044 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5611 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("idiv"))); }
     break;
 
   case 820:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7045 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5612 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("document"))); }
     break;
 
   case 821:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7046 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5613 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ftnot"))); }
     break;
 
   case 822:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7047 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5614 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("not"))); }
     break;
 
   case 823:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7048 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5615 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sensitive"))); }
     break;
 
   case 824:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7049 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5616 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("insensitive"))); }
     break;
 
   case 825:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7050 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5617 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("diacritics"))); }
     break;
 
   case 826:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7051 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5618 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("without"))); }
     break;
 
   case 827:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7052 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5619 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stemming"))); }
     break;
 
   case 828:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7053 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5620 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("thesaurus"))); }
     break;
 
   case 829:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7054 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5621 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stop"))); }
     break;
 
   case 830:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7055 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5622 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("wildcards"))); }
     break;
 
   case 831:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7056 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5623 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("entire"))); }
     break;
 
   case 832:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7057 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5624 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("content"))); }
     break;
 
   case 833:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7058 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5625 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("word"))); }
     break;
 
   case 834:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7059 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5626 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("start"))); }
     break;
 
   case 835:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7060 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5627 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("end"))); }
     break;
 
   case 836:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7061 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5628 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("most"))); }
     break;
 
   case 837:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7062 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5629 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("skip"))); }
     break;
 
   case 838:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7063 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5630 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("copy"))); }
     break;
 
   case 839:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7064 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5631 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("general"))); }
     break;
 
   case 840:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7065 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5632 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("value"))); }
     break;
 
   case 841:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7066 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5633 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("eq"))); }
     break;
 
   case 842:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7067 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5634 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ne"))); }
     break;
 
   case 843:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7068 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5635 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lt"))); }
     break;
 
   case 844:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7069 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5636 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("le"))); }
     break;
 
   case 845:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7070 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5637 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("gt"))); }
     break;
 
   case 846:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7071 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5638 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ge"))); }
     break;
 
   case 847:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7072 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5639 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("at"))); }
     break;
 
   case 848:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7073 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5640 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("context"))); }
     break;
 
   case 849:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7074 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5641 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("variable"))); }
     break;
 
   case 850:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7075 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5642 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("return"))); }
     break;
 
   case 851:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7076 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5643 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("for"))); }
     break;
 
   case 852:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7077 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5644 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("allowing"))); }
     break;
 
   case 853:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7078 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5645 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sliding"))); }
     break;
 
   case 854:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7079 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5646 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("tumbling"))); }
     break;
 
   case 855:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7080 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5647 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("previous"))); }
     break;
 
   case 856:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7081 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5648 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("next"))); }
     break;
 
   case 857:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7082 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5649 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("only"))); }
     break;
 
   case 858:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7083 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5650 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("when"))); }
     break;
 
   case 859:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7084 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5651 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("count"))); }
     break;
 
   case 860:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7085 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5652 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("in"))); }
     break;
 
   case 861:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7086 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5653 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("let"))); }
     break;
 
   case 862:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7087 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5654 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("where"))); }
     break;
 
   case 863:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7088 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5655 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("by"))); }
     break;
 
   case 864:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7089 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5656 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("group"))); }
     break;
 
   case 865:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7090 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5657 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("order"))); }
     break;
 
   case 866:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7091 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5658 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stable"))); }
     break;
 
   case 867:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7092 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5659 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ascending"))); }
     break;
 
   case 868:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7093 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5660 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descending"))); }
     break;
 
   case 869:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7094 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5661 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("greatest"))); }
     break;
 
   case 870:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7095 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5662 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("least"))); }
     break;
 
   case 871:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7096 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5663 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("collation"))); }
     break;
 
   case 872:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7097 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5664 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("some"))); }
     break;
 
   case 873:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7098 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5665 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("every"))); }
     break;
 
   case 874:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7099 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5666 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("satisfies"))); }
     break;
 
   case 875:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7100 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5667 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("case"))); }
     break;
 
   case 876:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7101 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5668 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("as"))); }
     break;
 
   case 877:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7102 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5669 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("then"))); }
     break;
 
   case 878:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7103 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5670 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("else"))); }
     break;
 
   case 879:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7104 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5671 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("or"))); }
     break;
 
   case 880:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7105 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5672 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("and"))); }
     break;
 
   case 881:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7106 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5673 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("instance"))); }
     break;
 
   case 882:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7107 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5674 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("of"))); }
     break;
 
   case 883:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7108 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5675 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("castable"))); }
     break;
 
   case 884:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7109 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5676 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("to"))); }
     break;
 
   case 885:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7110 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5677 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("div"))); }
     break;
 
   case 886:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7111 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5678 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("mod"))); }
     break;
 
   case 887:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7112 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5679 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("union"))); }
     break;
 
   case 888:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7113 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5680 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("intersect"))); }
     break;
 
   case 889:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7114 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5681 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("except"))); }
     break;
 
   case 890:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7115 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5682 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("validate"))); }
     break;
 
   case 891:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7116 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5683 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("type"))); }
     break;
 
   case 892:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7117 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5684 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("cast"))); }
     break;
 
   case 893:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7118 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5685 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("treat"))); }
     break;
 
   case 894:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7119 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5686 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("is"))); }
     break;
 
   case 895:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7120 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5687 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preserve"))); }
     break;
 
   case 896:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7121 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5688 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("strip"))); }
     break;
 
   case 897:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7122 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5689 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("namespace"))); }
     break;
 
   case 898:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7123 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5690 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("external"))); }
     break;
 
   case 899:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7124 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5691 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("encoding"))); }
     break;
 
   case 900:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7125 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5692 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("no-preserve"))); }
     break;
 
   case 901:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7126 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5693 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("inherit"))); }
     break;
 
   case 902:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7127 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5694 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("no-inherit"))); }
     break;
 
   case 903:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7128 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5695 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("declare"))); }
     break;
 
   case 904:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7129 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5696 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("construction"))); }
     break;
 
   case 905:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7130 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5697 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ordering"))); }
     break;
 
   case 906:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7131 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5698 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("default"))); }
     break;
 
   case 907:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7132 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5699 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("copy-namespaces"))); }
     break;
 
   case 908:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7133 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5700 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("option"))); }
     break;
 
   case 909:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7134 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5701 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("version"))); }
     break;
 
   case 910:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7135 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5702 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("import"))); }
     break;
 
   case 911:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7136 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5703 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema"))); }
     break;
 
   case 912:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7137 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5704 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("module"))); }
     break;
 
   case 913:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7138 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5705 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("function"))); }
     break;
 
   case 914:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7139 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5706 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("score"))); }
     break;
 
   case 915:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7140 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5707 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("contains"))); }
     break;
 
   case 916:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7141 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5708 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("weight"))); }
     break;
 
   case 917:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7142 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5709 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("window"))); }
     break;
 
   case 918:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7143 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5710 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("distance"))); }
     break;
 
   case 919:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7144 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5711 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("occurs"))); }
     break;
 
   case 920:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7145 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5712 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("times"))); }
     break;
 
   case 921:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7146 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5713 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("same"))); }
     break;
 
   case 922:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7147 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5714 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("different"))); }
     break;
 
   case 923:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7148 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5715 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lowercase"))); }
     break;
 
   case 924:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7149 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5716 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("uppercase"))); }
     break;
 
   case 925:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7150 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5717 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("relationship"))); }
     break;
 
   case 926:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7151 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5718 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("levels"))); }
     break;
 
   case 927:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7152 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5719 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("language"))); }
     break;
 
   case 928:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7153 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5720 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("any"))); }
     break;
 
   case 929:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7154 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5721 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("all"))); }
     break;
 
   case 930:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7155 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5722 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("exactly"))); }
     break;
 
   case 931:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7156 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5723 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("from"))); }
     break;
 
   case 932:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7157 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5724 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("words"))); }
     break;
 
   case 933:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7158 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5725 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sentences"))); }
     break;
 
   case 934:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7159 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5726 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sentence"))); }
     break;
 
   case 935:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7160 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5727 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("phrase"))); }
     break;
 
   case 936:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7161 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5728 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("paragraph"))); }
     break;
 
   case 937:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7162 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5729 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("paragraphs"))); }
     break;
 
   case 938:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7164 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5730 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("modify"))); }
     break;
 
   case 939:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7165 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5731 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("first"))); }
     break;
 
   case 940:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7167 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5732 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("before"))); }
     break;
 
   case 941:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7168 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5733 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("after"))); }
     break;
 
   case 942:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7169 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5734 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("revalidation"))); }
     break;
 
   case 943:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7170 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5735 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("with"))); }
     break;
 
   case 944:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7171 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5736 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("nodes"))); }
     break;
 
   case 945:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7173 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5737 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("last"))); }
     break;
 
   case 946:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7175 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5738 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("into"))); }
     break;
 
   case 947:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7176 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5739 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("simple"))); }
     break;
 
   case 948:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7177 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5740 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sequential"))); }
     break;
 
   case 949:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7178 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5741 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("updating"))); }
     break;
 
   case 950:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7179 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5742 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ordered"))); }
     break;
 
   case 951:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7180 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5743 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("unordered"))); }
     break;
 
   case 952:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7181 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5744 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("returning"))); }
     break;
 
   case 953:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7182 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5745 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("exit"))); }
     break;
 
   case 954:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7183 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5746 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("loop"))); }
     break;
 
   case 955:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7184 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5747 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("break"))); }
     break;
 
   case 956:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7185 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5748 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("continue"))); }
     break;
 
   case 957:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7186 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5749 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("try"))); }
     break;
 
   case 958:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7187 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5750 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("catch"))); }
     break;
 
   case 959:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7188 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5751 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("using"))); }
     break;
 
   case 960:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7189 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5752 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("set"))); }
     break;
 
   case 961:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7190 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5753 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("index"))); }
     break;
 
   case 962:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7191 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5754 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("unique"))); }
     break;
 
   case 963:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7192 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5755 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("non"))); }
     break;
 
   case 964:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7193 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5756 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("on"))); }
     break;
 
   case 965:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7194 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5757 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("range"))); }
     break;
 
   case 966:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7195 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5758 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("equality"))); }
     break;
 
   case 967:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7196 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5759 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("manually"))); }
     break;
 
   case 968:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7197 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5760 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("automatically"))); }
     break;
 
   case 969:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7198 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5761 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("maintained"))); }
     break;
 
   case 970:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7199 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5762 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("decimal-format"))); }
     break;
 
   case 971:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7200 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5763 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("decimal-separator"))); }
     break;
 
   case 972:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7201 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5764 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("grouping-separator"))); }
     break;
 
   case 973:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7202 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5765 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("infinity"))); }
     break;
 
   case 974:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7203 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5766 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("minus-sign"))); }
     break;
 
   case 975:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7204 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5767 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("NaN"))); }
     break;
 
   case 976:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7205 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5768 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("percent"))); }
     break;
 
   case 977:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7206 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5769 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("per-mille"))); }
     break;
 
   case 978:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7207 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5770 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("zero-digit"))); }
     break;
 
   case 979:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7208 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5771 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("digit"))); }
     break;
 
   case 980:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7209 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5772 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("pattern-separator"))); }
     break;
 
   case 981:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7210 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5773 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("collection"))); }
     break;
 
   case 982:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7211 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5774 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("const"))); }
     break;
 
   case 983:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7212 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5775 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("append-only"))); }
     break;
 
   case 984:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7213 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5776 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("queue"))); }
     break;
 
   case 985:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7214 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5777 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("mutable"))); }
     break;
 
   case 986:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7215 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5778 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("read-only"))); }
     break;
 
   case 987:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7216 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5779 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("integrity"))); }
     break;
 
   case 988:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7217 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5780 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("constraint"))); }
     break;
 
   case 989:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7218 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5781 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("check"))); }
     break;
 
   case 990:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7219 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5782 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("key"))); }
     break;
 
   case 991:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7220 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5783 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("foreach"))); }
     break;
 
   case 992:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7221 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5784 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("foreign"))); }
     break;
 
   case 993:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7222 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5785 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("keys"))); }
     break;
 
   case 994:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7223 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5786 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ancestor"))); }
     break;
 
   case 995:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7224 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5787 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("child"))); }
     break;
 
   case 996:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7225 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5788 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descendant"))); }
     break;
 
   case 997:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7226 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5789 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("parent"))); }
     break;
 
   case 998:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7227 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5790 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preceding"))); }
     break;
 
   case 999:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7228 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5791 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("self"))); }
     break;
 
   case 1000:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7229 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5792 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("following"))); }
     break;
 
   case 1001:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7230 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5793 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ancestor-or-self"))); }
     break;
 
   case 1002:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7231 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5794 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descendant-or-self"))); }
     break;
 
   case 1003:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7232 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5795 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("following-sibling"))); }
     break;
 
   case 1004:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7233 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5796 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preceding-sibling"))); }
     break;
 
   case 1005:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7236 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5797 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("position"))); }
     break;
 
   case 1006:
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 7245 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5800 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), true); }
     break;
 
 
 
 /* Line 690 of lalr1.cc  */
+<<<<<<< TREE
 #line 12109 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 12060 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
 	default:
           break;
       }
@@ -12379,192 +18590,192 @@
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
-  const short int jsoniq_parser::yypact_ninf_ = -1495;
+  const short int jsoniq_parser::yypact_ninf_ = -1488;
   const short int
   jsoniq_parser::yypact_[] =
   {
-      5037,  8375,  8375,  8375,  8375, -1495, -1495,    -2,    39, -1495,
-     558,    50, -1495, -1495, -1495,   326, -1495, -1495, -1495,   396,
-   -1495,   402,   742,   348,   670,   701, -1495,    79, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495,   688, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495,   734, -1495,   716, -1495,   704,   745, -1495,
-     446, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495,   793, -1495, -1495, -1495, -1495, -1495, -1495, -1495,   790,
-   -1495, -1495, -1495, -1495, -1495, 18573, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495,   837, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495,  5655, 10496, 10799, 18573, -1495,
-   -1495,   828, -1495, -1495, -1495, -1495,   836, -1495, -1495, -1495,
-    7167, -1495,  7466, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495,   855, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495,    59,   747,   806, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, 14435, -1495,
-    5959, -1495, 14738,   183, -1495, -1495, -1495, -1495, -1495, -1495,
-     922, -1495,   817,   819,   805, -1495, -1495,   901,   914, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495,   752, -1495, 14132, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, 11102, 11405, 11708, -1495,  5346,  7769,  1068, -1495,
-    8678, -1495, -1495,   603,    88, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,    90,
-   -1495, -1495, -1495, -1495, -1495, -1495,   378, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495,  8375, -1495, -1495, -1495, -1495,
-      37, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-     387, -1495,   876, -1495, -1495, -1495,   132, -1495,   877, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495,   902,   977, -1495, -1495,
-     838,   822,   972,   736,   532,   775,   539, -1495,  1028,   878,
-     980,   981, 13223, -1495,   888, -1495, -1495,    25, -1495, -1495,
-   -1495, -1495,   766, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495,   938,   928, -1495, -1495,
-   -1495, -1495, -1495,   903, -1495,  8375,   904,   905,   906,  8375,
-      73,    73,  1058,   781,   784,   785, 18865, 18573,     4,  1041,
-   18573,   939,   975,    63,  7167,   811,   843, 18573, 18573,   786,
-     910,    44, -1495, -1495, -1495,  7167,  8375,  8375, 12617,    36,
-     942, 12617,  1098,   159,   142, 18573,   982,   955,   992, -1495,
-   12617, 18573,  8375, 12617, 12617, 18573,  8375,   948,   949, 12617,
-   18573, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,   958,
-   -1495, 18573, -1495,   919,  8072,   983,   444,   984,   938,   950,
-     951,   953, 18573,  5655, -1495,   957,   242, -1495,   541, -1495,
-      84,  1078, 12617, 12617,   172, -1495, -1495, -1495,  1099, 12617,
-     900, -1495,  1088,  1089, 12617, 12920, 15041,   766, 12617, 12920,
-    6263,   243,   154, 12617, 15041,   720, 12617,   884,   887, 18573,
-     932,   933, 12617, 12617,  8375,   879, -1495, -1495,    53, -1495,
-      60, 12617,   890,  7769, -1495, -1495, -1495, -1495, -1495,   558,
-     701,   101,   121,  1124,  8981,  3471,  9284,  3791,   790, -1495,
-   -1495,   428,   790, -1495, 12617,  4425, -1495,  1008, -1495,    79,
-     961,   960,   962,  8375, 12617, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, 18573, -1495,   845,   846, 18573,  1014,
-   13526, 13526, -1495, -1495, -1495, -1495, -1495, -1495, 13829,  1066,
-   13829, 13829, 13829, 13829, 13829, 13829, 13829, 13829, 13829, 13829,
-   13829, 13829,   907,  1043,  1044,  1045, -1495, -1495, -1495, 15041,
-   12011, -1495,  6565, 12617,  9890,   985, -1495,   991, 10193, -1495,
-   -1495, -1495, -1495,   267, -1495,   315, -1495, -1495, -1495, -1495,
-   -1495, -1495,  1035,  1037,   348,  1117, -1495, -1495, 18865,   947,
-     644, 18573,   986,   987,   947,  1058,  1018,  1016, -1495, -1495,
-   -1495,   319,   899,  1059,   850, 18573,  1012, 12617,  1040, 18573,
-   18573, -1495,  1026,   976,   978,   432, 18573,  1070,   331, -1495,
-    8375, -1495,    97, -1495,  7167,  1069,  1126,  7167,  1058,  1072,
-     495, 18573, 12617,    79,   440,   277, -1495,    65,   988,   128,
-     149,  1021, -1495,   994,  8375,  8375,   460,   498, 12617,   289,
-   -1495, -1495, 12617,  6263, -1495, 12617, 12617, 12617, 12617, -1495,
-   12617, -1495, 12617, -1495, 18573,  1078, -1495,   264,   461,   489,
-   -1495, -1495, -1495,   586, -1495,    15,   342, -1495, -1495,   766,
-     274,   420,   254,   257, 12617, 12617,  1082,   727, 12617,   930,
-   15344,   941,    82, -1495,  1038, -1495, -1495,   989,   150,  8072,
-     619,  4734,   879, -1495, -1495, -1495,   944, 12617, -1495,   603,
-     857,  1151,   667, -1495, -1495,   123, -1495, -1495, -1495,   124,
-   -1495,   107, -1495, -1495, -1495, -1495, -1495,  4108, -1495, -1495,
-   -1495, 18573,  1015, 12617,  1071, -1495, -1495, -1495,  1080, -1495,
-      45, -1495, -1495,  1080, 18573,    23,   977, -1495, -1495,    89,
-   -1495,   532,   532,    17,   775,   775,   775,   775,   539,   539,
-   -1495, -1495, 17109, 17109, 18573, 18573, -1495, -1495,   625, -1495,
-   -1495, -1495, -1495,   357, -1495, -1495, -1495,   354, -1495, -1495,
-   -1495,   361,    73, -1495, -1495,   379,   639,   815, -1495,   348,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-     947, -1495,  1057, 17403,  1048, 12617, -1495, -1495, -1495,  1100,
-    1058,  1058,   947, -1495,   842,  1058,   737, 18573,   167,   677,
-    1164, -1495, -1495,   909,   740, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495,   319,    67,   963,   442,
-   12617, -1495, 18573,  1104,   897,  1058, -1495, -1495,  1049,  1100,
-   17109,  1087,  1112,  1023,  1011,  1083,  1058,  1050,  1084,  1122,
-    1058, 17109, 12617,   -45, -1495, -1495, -1495,  1073,  1095, 12617,
-   12617,  1074, -1495,  1120,  1123,  8375, -1495,  1039,  1046,  1076,
-   12617,  1085,  1034, 12617, -1495,  1110,  1111, -1495,   151,   153,
-     166,  1192, -1495,   286, -1495,   562,  1081, -1495, -1495,  1208,
-   -1495,  1209, -1495,   424, 12617, 12617, 12617,   812, 12617, 12617,
-   12617, 12617, 12617,  1142, -1495, 12617, 12617, -1495, 12617, 12617,
-     675, 15041,  1121, 12617, 12617, -1495,  9587,   314,   993, -1495,
-   -1495, -1495, -1495, -1495, -1495,   382, -1495, -1495, 12617, -1495,
-     141,    55,   107,  9284,  3791,  9284,  1163, -1495, -1495, 12617,
-     650,  1137, -1495, 18573,  1138, -1495, 18281,  1118,  1130, 12617,
-     -42,  1102,    47,   548,   996, -1495, -1495,   113,    23, 12617,
-      89,   659,    30, -1495,   966,   212,   990,   995, -1495, -1495,
-     843, -1495,   979,   698,  1101,  1105,  1107,  1108,  1113,  1114,
-    1115,  1119,  1127,  1128,  1129, 15933,  1131,  1134,  1136,  1140,
-    1141,  1144, -1495,   544, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495,  1116, -1495, -1495,
-   -1495, -1495, 12314, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495,   816, -1495,  1224, 17403,   912, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495,   968, -1495, -1495,  1229,
-   -1495, -1495, -1495, -1495, -1495,   787,  1239, -1495,   750, -1495,
-   -1495, -1495,  1101,  1105,  1107,  1113,  1114,  1115,  1119,  1127,
-    1128,  1134, -1495,   544,   544, 15041,  1002,   964, -1495,  1100,
-      67,  1036,  1086,  8375, -1495, -1495, -1495, 17109, -1495,  8375,
-    1058,  1162, -1495, -1495, -1495,  1058,  1162, -1495, -1495, 12617,
-    1152,  8375, 18573, -1495, -1495, 12617, 12617,   707, -1495,    34,
-     875, -1495, 16227,   883, -1495,   891, -1495,  1094, -1495, -1495,
-    8375, -1495, 12617, -1495, -1495, 12617, 12617,  1075,  1120,  1180,
-   -1495,  1148, -1495,   648, -1495, -1495,  1278, -1495, -1495,  8375,
-   18573, -1495,   715, -1495, -1495, -1495,  8375,  1096,  1125,  1061,
-    1064, -1495, -1495, -1495,  1065,  1077, -1495, -1495, -1495,  1210,
-   -1495,   997, -1495, -1495, -1495,  1062, 12617,   676, 18573,  1132,
-   -1495,  1150,  1154,  1155,  1159, -1495,   876,   581,  4734,   993,
-   -1495,  9587,  4734, -1495, -1495,  1151,   410, -1495, -1495, -1495,
-    1137, -1495,  1058, -1495,   864, -1495,   335,  1203, -1495, 12617,
-     658,  1071, 18573, -1495,   305, 18573, -1495, 12617,  1166, 12617,
-    1189, 12617,    81,  1172, 12617,  1173, -1495,  1204,  1205, 12617,
-   18573,   472,  1247, -1495, -1495, -1495,   634,  1139, -1495,    89,
-    1079, -1495, -1495,   -44, -1495,   630,     1,  1090,    89,   630,
-   13829, -1495,   351, -1495, -1495, -1495, -1495, -1495, -1495,    89,
-    1177,  1042,   899,     1, -1495, -1495,  1047,  1248, -1495, -1495,
-   -1495,  1143,   118, 17697, 15639,  1145,  6866, 18573, 18573,  1147,
-   17989,  1149, -1495,  1156,  1158,  1160,  1161,  1165,  1168,  1169,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495,  1300,   240,  1302,   240,  1056,  1232, -1495,
-   -1495,  1176, 18573,  1092, -1495, -1495, 15041, -1495,  1167, -1495,
-    1216,  1223,  1240,  1058,  1162, -1495, 12617,  1174, -1495, -1495,
-   -1495,  1171, -1495,    51, 12617,  8375,  1175,   288, -1495, 18573,
-     222, -1495, 16521,    40, -1495, 16815,  1178, -1495, -1495,  1179,
-   -1495, -1495, -1495, 12617,   892,  1192, 18573,   804, -1495,  1181,
-    1192, 18573, -1495,  1182, -1495, -1495, 12617, 12617, 12617, 12617,
-    1030, 12617, 12617, -1495, 12617, -1495, 12617, 12617, 12617, 12617,
-    9587,   419, -1495, -1495, -1495, -1495, -1495,  1203, -1495, -1495,
-   -1495,  1058, 12617, -1495,  1217, -1495, -1495, 12617,  1213, -1495,
-   -1495, 12617, -1495,   338, -1495, 12617,  1215, 12617, -1495, 12617,
-   18573, 18573, -1495,   739, -1495, 12617, -1495, -1495, -1495,  1183,
-   13829, -1495, -1495, -1495, -1495, -1495,    87, 13829, 13829,   -89,
-   -1495,   990, -1495,   202, -1495,   995,    89,  1218, -1495, -1495,
-    1091, -1495, -1495, -1495, -1495, -1495, -1495,  1185,  1186, -1495,
-     459,   492,  1275,  1187, -1495,   509, -1495,  1191, -1495,  1193,
-    1194,  1195, -1495, -1495,   545,   575, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495,   491,   491, -1495,   240, -1495,
-   -1495,   577, -1495,  1342,     3,  1281,  1196, 15041,   -25,  1093,
-    1200, -1495,  9587, 12617,  1058, -1495, -1495, -1495, 12617, 12617,
-   -1495, -1495, -1495,  9587,  9587,  1284,  8375, 17109, 18573,   514,
-   18573, 12617, 18573,   580,  9587, -1495,    43,    38,  1192, 18573,
-   -1495,  1188,  1192, -1495, -1495, -1495, -1495, -1495, 12617, -1495,
-   -1495, -1495, -1495,   226,   235,   255, 12617, -1495, -1495, -1495,
-    1274, 12617, -1495, 12617, -1495, 12617,  1241, -1495, 12617, -1495,
-   -1495, -1495,  1334, -1495, -1495, -1495,   775, 13829, 13829,    17,
-     780, -1495, -1495, -1495, -1495, -1495, -1495, 12617, -1495, -1495,
-   -1495, 18573, -1495, 18573, -1495, 17109, -1495, 17109,  1294, -1495,
-   -1495, -1495, -1495, 18573, -1495, 18573, -1495, -1495, -1495, -1495,
-    1362, -1495, -1495, -1495,  1133,  1285, -1495, -1495,  1287, -1495,
-     754, 18573,  1273,  1170, 18573, 15041, -1495, -1495,  1162, -1495,
-   -1495, 17109, -1495, -1495, -1495,  1301, 12617,  1212, -1495,  1303,
-    9587, -1495, 18573,   674,   691, -1495,  1198,  1192, -1495,  1206,
-   -1495,  1202,  1120,  1123,   637, -1495,  1274, -1495, -1495, 12617,
-   -1495,  1290,    17,    17, 13829,   640,  1214,  1221,  1260,  1222,
-    1225, -1495, -1495, 17109,  1226,  1227, -1495, -1495,  1281, 15041,
-   -1495,  1203,  1106, 18573,  1293,  1197,  1287,   729, 17109,  8375,
-   17109,  1230, -1495, -1495,  1319,   770, -1495, -1495, -1495, -1495,
-    1234,   733, -1495, -1495, -1495,  1228, -1495,  9587,   913, -1495,
-   -1495, -1495, 18573,    17, -1495, -1495, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495, -1495, -1495, 12617,  1109, 18573,  1305,
-    8375,   738, -1495, -1495,   748, 12617, -1495, -1495, -1495, -1495,
-   -1495, -1495, -1495,  1306, -1495, -1495,  1135,  1146, 18573, -1495,
-   -1495, 12617,  9587, 18573,  1153, 12617,  1157,  1233, 15041, -1495,
-   15041,  9587, -1495,  1231,  1184, 18573,  1199,  1307, 18573,  1201,
-   15041, -1495
+      5032,  8359,  8359,  8359,  8359, -1488, -1488,    28,   326, -1488,
+     559,   384, -1488, -1488, -1488,   482, -1488, -1488, -1488,   539,
+   -1488,   545,   807,   641,   644,   830, -1488,   -35, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488,   677, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488,    82, -1488,   727, -1488,   801,   825, -1488,
+     235, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488,   733, -1488, -1488, -1488, -1488, -1488, -1488, -1488,   886,
+   -1488, -1488, -1488, -1488, -1488, 18523, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488,   891, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488,  5648, 10473, 10775, 18523, -1488,
+   -1488,   862, -1488, -1488, -1488, -1488,   866, -1488, -1488, -1488,
+    7155, -1488,  7453, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488,   870, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488,   139,   838,   840, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, 14399, -1488,
+    5951, -1488, 14701,   -51, -1488, -1488, -1488, -1488, -1488, -1488,
+     938, -1488,   813,   814,   815, -1488, -1488,   903,   908, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488,   808, -1488, 14097, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, 11077, 11379, 11681, -1488,  5340,  7755,  1065, -1488,
+    8661, -1488, -1488,   582,    83, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,    92,
+   -1488, -1488, -1488, -1488, -1488, -1488,   116, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488,  8359, -1488, -1488, -1488, -1488,
+     272, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+     106, -1488,   875, -1488, -1488, -1488,   124, -1488,   793, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488,   899,   975, -1488, -1488,
+     839,   816,   969,   596,   522,   739,    39, -1488,  1021,   876,
+     970,   977, 13191, -1488,   884, -1488, -1488,   315, -1488, -1488,
+   -1488, -1488,   725, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488,   935,   925, -1488, -1488,
+   -1488, -1488, -1488,   900, -1488,  8359,   901,   902,   904,  8359,
+     175,   175,  1055,   251,   460,   584, 18814, 18523,   -16,  1041,
+   18523,   936,   976,   422,  7155,   824,   843, 18523, 18523,   787,
+      37,    46, -1488, -1488, -1488,  7155,  8359,  8359, 12587,    30,
+     942, 12587,  1098,   215,   456, 18523,   980,   956,   993, -1488,
+   12587, 18523,  8359, 12587, 12587, 18523,  8359,   948,   950, 12587,
+   18523, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,   958,
+   -1488, 18523, -1488,   919,  8057,   983,   294,   984,   935,   951,
+     953,   954, 18523,  5648, -1488,   960,   128, -1488,   480, -1488,
+     107,  1073, 12587, 12587,    89, -1488, -1488, -1488,  1097, 12587,
+     906, -1488,  1087,  1088, 12587, 12889, 15003,   725, 12587, 12889,
+    6254,    -4,    -6, 12587, 15003,   564, 12587,   882,   888, 18523,
+     933,   934, 12587, 12587,  8359,   879, -1488, -1488,    53, -1488,
+      60, 12587,   889,  7755, -1488, -1488, -1488, -1488, -1488,   559,
+     830,    99,   101,  1124,  8963,  3471,  9265,  3790,   886, -1488,
+   -1488,   225,   886, -1488, 12587,  4422, -1488,  1011, -1488,   -35,
+     962,   961,   963,  8359, 12587, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, 18523, -1488,   844,   846, 18523,  1017,
+   13493, 13493, -1488, -1488, -1488, -1488, -1488, -1488, 13795,  1066,
+   13795, 13795, 13795, 13795, 13795, 13795, 13795, 13795, 13795, 13795,
+   13795, 13795,   905,  1043,  1044,  1045, -1488, -1488, -1488, 15003,
+   11983, -1488,  6555, 12587,  9869,   986, -1488,   992, 10171, -1488,
+   -1488, -1488, -1488,   307, -1488,   310, -1488, -1488, -1488, -1488,
+   -1488, -1488,  1036,  1037,   641,  1117, -1488, -1488, 18814,   949,
+     669, 18523,   985,   987,   949,  1055,  1019,  1016, -1488, -1488,
+   -1488,   532,   909,  1056,   850, 18523,  1012, 12587,  1040, 18523,
+   18523, -1488,  1028,   979,   981,   242, 18523,  1060,   327, -1488,
+    8359, -1488,   127, -1488,  7155,  1068,  1126,  7155,  1055,  1072,
+     448, 18523, 12587,   -35,   247,   250, -1488,   499,   988,   129,
+     132,  1022, -1488,   989,  8359,  8359,   257,   537, 12587,   267,
+   -1488, -1488, 12587,  6254, -1488, 12587, 12587, 12587, 12587, -1488,
+   12587, -1488, 12587, -1488, 18523,  1073, -1488,    -2,   258,   262,
+   -1488, -1488, -1488,   349, -1488,   544,   554, -1488, -1488,   725,
+     385,   387,   138,    40, 12587, 12587,  1081,   651, 12587,   939,
+   15305,   944,   -10, -1488,  1034, -1488, -1488,   991,   152,  8057,
+     363,  4730,   879, -1488, -1488, -1488,   945, 12587, -1488,   582,
+     779,  1151,   157, -1488, -1488,   103, -1488, -1488, -1488,   111,
+   -1488,   108, -1488, -1488, -1488, -1488, -1488,  4106, -1488, -1488,
+   -1488, 18523,  1020, 12587,  1069, -1488, -1488, -1488,  1079, -1488,
+      43, -1488, -1488,  1079, 18523,    29,   975, -1488, -1488,   425,
+   -1488,   522,   522,   702,   739,   739,   739,   739,    39,    39,
+   -1488, -1488, 17064, 17064, 18523, 18523, -1488, -1488,   383, -1488,
+   -1488, -1488, -1488,   233, -1488, -1488, -1488,   332, -1488, -1488,
+   -1488,   352,   175, -1488, -1488,   516,   525,   615, -1488,   641,
+   -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+     949, -1488,  1058, 17357,  1046, 12587, -1488, -1488, -1488,  1100,
+    1055,  1055,   949, -1488,   261,  1055,   712, 18523,   630,   705,
+    1164, -1488, -1488,   910,   409, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488,   532,   100,   964,   676,
+   12587, -1488, 18523,  1104,   898,  1055, -1488, -1488,  1049,  1100,
+   17064,  1090,  1111,  1026,  1008,  1078,  1055,  1052,  1083,  1121,
+    1055, 17064, 12587,   -47, -1488, -1488, -1488,  1064,  1102, 12587,
+   12587,  1074, -1488,  1123,  1125,  8359, -1488,  1042,  1047,  1070,
+   12587,  1084,  1038, 12587, -1488,  1108,  1110, -1488,   172,   197,
+     199,  1199, -1488,    19, -1488,   715,  1082, -1488, -1488,  1207,
+   -1488,  1209, -1488,   742, 12587, 12587, 12587,   777, 12587, 12587,
+   12587, 12587, 12587,  1142, -1488, 12587, 12587, -1488, 12587, 12587,
+     541, 15003,  1127, 12587, 12587, -1488,  9567,   379,   990, -1488,
+   -1488, -1488, -1488, -1488, -1488,    -5, -1488, -1488, 12587, -1488,
+     113,    50,   108,  9265,  3790,  9265,  1163, -1488, -1488, 12587,
+      78,  1136, -1488, 18523,  1137, -1488, 18232,  1118,  1130, 12587,
+     -39,  1103,    44,   585,   994, -1488, -1488,   799,    29, 12587,
+     425,   871,   321, -1488,   966,   508,   995,   996, -1488, -1488,
+     843, -1488,   982,   696,  1093,  1099,  1101,  1105,  1107,  1112,
+    1113,  1114,  1115,  1119,  1120, 15892,  1122,  1128,  1129,  1131,
+    1134,  1138, -1488,   646, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488, -1488,  1116, -1488, -1488,
+   -1488, -1488, 12285, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488,   678, -1488,  1231, 17357,   848, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488,   978, -1488, -1488,  1237,
+   -1488, -1488, -1488, -1488, -1488,   530,  1239, -1488,   854, -1488,
+   -1488, -1488,  1093,  1099,  1101,  1107,  1112,  1113,  1114,  1115,
+    1119,  1128, -1488,   646,   646, 15003,  1002,   965, -1488,  1100,
+     100,  1050,  1094,  8359, -1488, -1488, -1488, 17064, -1488,  8359,
+    1055,  1167, -1488, -1488, -1488,  1055,  1167, -1488, -1488, 12587,
+    1140,  8359, 18523, -1488, -1488, 12587, 12587,   389, -1488,    22,
+     723, -1488, 16185,   762, -1488,   803, -1488,  1096, -1488, -1488,
+    8359, -1488, 12587, -1488, -1488, 12587, 12587,  1089,  1123,  1194,
+   -1488,  1165, -1488,   730, -1488, -1488,  1292, -1488, -1488,  8359,
+   18523, -1488,   744, -1488, -1488, -1488,  8359,  1109,  1132,  1067,
+    1075, -1488, -1488, -1488,  1076,  1077, -1488, -1488, -1488,  1205,
+   -1488,   997, -1488, -1488, -1488,  1061, 12587,   569, 18523,  1133,
+   -1488,  1146,  1149,  1150,  1155, -1488,   875,   542,  4730,   990,
+   -1488,  9567,  4730, -1488, -1488,  1151,   557, -1488, -1488, -1488,
+    1136, -1488,  1055, -1488,   868, -1488,   612,  1210, -1488, 12587,
+     736,  1069, 18523, -1488,   368, 18523, -1488, 12587,  1170, 12587,
+    1183, 12587,    79,  1172, 12587,  1173, -1488,  1197,  1206, 12587,
+   18523,   947,  1246, -1488, -1488, -1488,   405,  1139, -1488,   425,
+    1071, -1488, -1488,   382, -1488,   556,   159,  1080,   425,   556,
+   13795, -1488,    85, -1488, -1488, -1488, -1488, -1488, -1488,   425,
+    1179,  1051,   909,   159, -1488, -1488,  1039,  1250, -1488, -1488,
+   -1488,  1143,   410, 17650, 15599,  1144,  6855, 18523, 18523,  1145,
+   17941,  1148, -1488,  1152,  1156,  1157,  1158,  1159,  1160,  1161,
+   -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488,  1305,   279,  1308,   279,  1063,  1242, -1488,
+   -1488,  1180, 18523,  1091, -1488, -1488, 15003, -1488,  1169, -1488,
+    1224,  1227,  1260,  1055,  1167, -1488, 12587,  1174, -1488, -1488,
+   -1488,  1171, -1488,    32, 12587,  8359,  1175,   288, -1488, 18523,
+     -31, -1488, 16478,   309, -1488, 16771,  1176, -1488, -1488,  1181,
+   -1488, -1488, -1488, 12587,   856,  1199, 18523,   797, -1488,  1182,
+    1199, 18523, -1488,  1184, -1488, -1488, 12587, 12587, 12587, 12587,
+    1053, 12587, 12587, -1488, 12587, -1488, 12587, 12587, 12587, 12587,
+    9567,    12, -1488, -1488, -1488, -1488, -1488,  1210, -1488, -1488,
+   -1488,  1055, 12587, -1488,  1216, -1488, -1488, 12587,  1212, -1488,
+   -1488, 12587, -1488,   553, -1488, 12587,  1215, 12587, -1488, 12587,
+   18523, 18523, -1488,   790, -1488, 12587, -1488, -1488, -1488,  1185,
+   13795, -1488, -1488, -1488, -1488, -1488,    72, 13795, 13795,   672,
+   -1488,   995, -1488,   459, -1488,   996,   425,  1213, -1488, -1488,
+    1086, -1488, -1488, -1488, -1488, -1488, -1488,  1177,  1187, -1488,
+     356,   369,  1277,  1188, -1488,   381, -1488,  1189, -1488,  1191,
+    1192,  1193, -1488, -1488,   386,   463, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488,   498,   498, -1488,   279, -1488,
+   -1488,   465, -1488,  1344,     3,  1281,  1195, 15003,   -30,  1092,
+    1211, -1488,  9567, 12587,  1055, -1488, -1488, -1488, 12587, 12587,
+   -1488, -1488, -1488,  9567,  9567,  1290,  8359, 17064, 18523,    -9,
+   18523, 12587, 18523,   487,  9567, -1488,   317,    26,  1199, 18523,
+   -1488,  1198,  1199, -1488, -1488, -1488, -1488, -1488, 12587, -1488,
+   -1488, -1488, -1488,   205,   216,   226, 12587, -1488, -1488, -1488,
+    1279, 12587, -1488, 12587, -1488, 12587,  1238, -1488, 12587, -1488,
+   -1488, -1488,  1334, -1488, -1488, -1488,   739, 13795, 13795,   702,
+     661, -1488, -1488, -1488, -1488, -1488, -1488, 12587, -1488, -1488,
+   -1488, 18523, -1488, 18523, -1488, 17064, -1488, 17064,  1294, -1488,
+   -1488, -1488, -1488, 18523, -1488, 18523, -1488, -1488, -1488, -1488,
+    1361, -1488, -1488, -1488,  1135,  1283, -1488, -1488,  1284, -1488,
+     667, 18523,  1274,  1168, 18523, 15003, -1488, -1488,  1167, -1488,
+   -1488, 17064, -1488, -1488, -1488,  1300, 12587,  1214, -1488,  1302,
+    9567, -1488, 18523,   622,   720, -1488,  1202,  1199, -1488,  1204,
+   -1488,  1217,  1123,  1125,   429, -1488,  1279, -1488, -1488, 12587,
+   -1488,  1285,   702,   702, 13795,   444,  1218,  1221,  1257,  1222,
+    1223, -1488, -1488, 17064,  1225,  1226, -1488, -1488,  1281, 15003,
+   -1488,  1210,  1141, 18523,  1293,  1196,  1284,   726, 17064,  8359,
+   17064,  1228, -1488, -1488,  1323,   634, -1488, -1488, -1488, -1488,
+    1234,   770, -1488, -1488, -1488,  1229, -1488,  9567,   877, -1488,
+   -1488, -1488, 18523,   702, -1488, -1488, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488, -1488, -1488, -1488, 12587,  1147, 18523,  1301,
+    8359,   749, -1488, -1488,   758, 12587, -1488, -1488, -1488, -1488,
+   -1488, -1488, -1488,  1303, -1488, -1488,  1154,  1153, 18523, -1488,
+   -1488, 12587,  9567, 18523,  1162, 12587,  1166,  1232, 15003, -1488,
+   15003,  9567, -1488,  1230,  1178, 18523,  1201,  1306, 18523,  1200,
+   15003, -1488
   };
 
   /* YYDEFACT[S] -- default reduction number in state S.  Performed when
@@ -12761,38 +18972,38 @@
   const short int
   jsoniq_parser::yypgoto_[] =
   {
-     -1495, -1495,  -199,  -178, -1495,  1211,  1219, -1495,  1207,  -477,
-   -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495, -1495,
-    -893, -1495, -1495, -1495, -1495,  -186,  -494, -1495,   769,   140,
-   -1495, -1495, -1495, -1495, -1495,   324,   568, -1495, -1495,    14,
-    -172,  1051, -1495,  1017, -1495, -1495,  -561, -1495,   525, -1495,
-     287, -1495,  -226,  -278, -1495,  -439, -1495,    16,    27,    33,
-    -272,  -164, -1495,  -771, -1495, -1495,  -140, -1495, -1495, -1495,
-   -1495, -1495, -1495, -1495

Follow ups