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

[Nicolae Brinza]

Merging of xquery and jsoniq grammar files step 1

Merging of xquery and jsoniq grammar files step 1

[Zorba Build Bot (zorba-buildbot)]

Attempt to merge into lp:zorba failed due to conflicts:

text conflict in src/compiler/parser/jsoniq_parser.cpp
text conflict in src/compiler/parser/jsoniq_parser.hpp
text conflict in src/compiler/parser/jsoniq_scanner.cpp
text conflict in src/compiler/parser/xquery_parser.cpp
text conflict in src/compiler/parser/xquery_parser.hpp
text conflict in src/compiler/parser/xquery_scanner.cpp

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/new-jsoniq-2013-04-17T01-23-48.66Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba failed. Below is the output from the failed tests.

Traceback (most recent call last):
  File "/home/ceej/zo/testing/zorbatest/tester/proposal_comment.py", line 36, in <module>
    sys.exit(main(sys.argv))
  File "/home/ceej/zo/testing/zorbatest/tester/proposal_comment.py", line 34, in main
    proposal.lp_save()
  File "/home/ceej/python/lib/python2.7/site-packages/lazr/restfulclient/resource.py", line 744, in lp_save
    URI(self.self_link), representation, headers)
  File "/home/ceej/python/lib/python2.7/site-packages/lazr/restfulclient/_browser.py", line 456, in patch
    'PATCH', extra_headers=extra_headers)
  File "/home/ceej/python/lib/python2.7/site-packages/lazr/restfulclient/_browser.py", line 401, in _request
    raise error
lazr.restfulclient.errors.PreconditionFailed: HTTP Error 412: Precondition Failed
Response headers:
---
-content-encoding: gzip
content-length: 0
content-type: text/plain
date: Wed, 17 Apr 2013 01:23:53 GMT
server: zope.server.http (HTTP)
status: 412
strict-transport-security: max-age=2592000
vary: Accept,Accept-Encoding
via: 1.1 api.launchpad.net
x-content-type-options: nosniff
x-content-type-warning: guessed from content
x-frame-options: SAMEORIGIN
x-lazr-notifications: []
x-powered-by: Zope (www.zope.org), Python (www.python.org)
x-xss-protection: 1; mode=block
---
Response body:
---

---

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job new-jsoniq-2013-04-17T01-23-48.66Z is finished. The
  final status was:

  Undetermined, probably an error - please email <email address hidden> with the
  number of this job!

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/new-jsoniq-2013-04-17T01-24-44.705Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job new-jsoniq-2013-04-17T01-24-44.705Z is finished. The
  final status was:

  70 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/new-jsoniq-2013-04-17T18-23-02.191Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/new-jsoniq into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job new-jsoniq-2013-04-17T18-23-02.191Z is finished. The
  final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

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

11324. By Nicolae Brinza on 2013-04-17

Merging of xquery and jsoniq grammar files step 3

11325. By Nicolae Brinza on 2013-04-17

Merged with Zorba trunk

11326. By Nicolae Brinza on 2013-04-17

Fixed: memory leaks in JSONObjectLookup parsenode; build problem with bash's internal "echo"; bumped required flex version to 2.5.37 because of memory leaks in .33.

11327. By Nicolae Brinza on 2013-04-18

The new JSONiq grammar now accepts C++ style comments -- singleline // and multiline /**/

11328. By Nicolae Brinza on 2013-04-18

Fixed the build for the Mac platform

11329. By Nicolae Brinza on 2013-04-19

Fixed the flex Mac issue.

11330. By Matthias Brantner on 2013-04-19

added tests

11331. By Matthias Brantner on 2013-04-19

more testing

11332. By Nicolae Brinza on 2013-04-19

Commented out the C++ style comments and marked associated tests as expected failures.

11333. By Nicolae Brinza on 2013-04-19

Updated the known failures file

11334. By Nicolae Brinza on 2013-04-19

Added known failures

11335. By Nicolae Brinza on 2013-05-01

Enabled path expressions in JSONiq grammar. Committing .y files to run the RQ tests.

11336. By Nicolae Brinza on 2013-05-01

Committed generated files.

11337. By Nicolae Brinza on 2013-05-01

Merged with Zorba trunk

11338. By Nicolae Brinza on 2013-05-03

Added "common" language option and warnings. Re-enabled path expressions in JSONiq grammar.

11339. By Nicolae Brinza on 2013-05-03

Merged with Zorba trunk

11340. By Nicolae Brinza on 2013-05-03

Renamed the common language warning from ZWST0008 to ZWST0009 as someone has beaten me to it.

11341. By Nicolae Brinza on 2013-05-08

Added common language warning for version declaration

11342. By Ghislain Fourny on 2013-05-10

Merged trunk back.

11343. By Nicolae Brinza on 2013-05-11

Common language work in progress

11344. By Nicolae Brinza on 2013-05-12

Common language work in progress

11345. By Nicolae Brinza on 2013-05-13

Common language warnings + step exprs at the start of path exprs raise a syntax error in JSONIQ grammar

11346. By Nicolae Brinza on 2013-05-13

Fixed failing test -- adapted it to the new JSONiq grammar

11347. By Ghislain Fourny on 2013-05-13

Fixing distinction between implicit and explicit context item.

11348. By Nicolae Brinza on 2013-05-13

Improved warning messages + warning for axis step at the beginning of a step expression in XQuery mode

11349. By Nicolae Brinza on 2013-05-15

Moved the common-language flag from the parser driver to the compiler control block so that now version declarations raise warnings properly

11350. By Nicolae Brinza on 2013-05-15

Merged with Zorba trunk

11351. By Nicolae Brinza on 2013-05-15

Mentioned common-language in ChangeLog

11352. By Ghislain Fourny on 2013-05-15

Merging null-type-fix.

11353. By Nicolae Brinza on 2013-05-15

Regenerated parser files

11354. By Chris Hillery on 2013-05-15

Update # of predeclared namespaces for JSONiq.

11355. By Nicolae Brinza on 2013-06-06

Merged with Zorba trunk

11356. By Nicolae Brinza on 2013-06-06

The grouping variable in a group by clause is now optional

11357. By Nicolae Brinza on 2013-06-06

Regenerated parser files with Bison 2.5

11358. By Nicolae Brinza on 2013-06-10

Fixed remaining shift/reduce conflicts and regressions.

11359. By Nicolae Brinza on 2013-06-10

Merged with Zorba trunk

11360. By Matthias Brantner on 2013-06-11

merge with trunk

11361. By Nicolae Brinza on 2013-08-22

Merged with Zorba trunk

11362. By Nicolae Brinza on 2013-09-02

Parsers unification.

11363. By Nicolae Brinza on 2013-09-02

Merged with Zorba trunk

11364. By Nicolae Brinza on 2013-09-02

Parsers updates.

11365. By Nicolae Brinza on 2013-09-02

Fixed regressions.

11366. By Nicolae Brinza on 2013-09-03

Fixed regressions.

11367. By Nicolae Brinza on 2013-09-03

Pushed some tests.

11368. By Nicolae Brinza on 2013-09-03

Parser updates.

11369. By Nicolae Brinza on 2013-09-04

Parser updates.

11370. By Nicolae Brinza on 2013-09-05

Parser updates.

11371. By Nicolae Brinza on 2013-09-05

Updated a testcase.

11372. By Ghislain Fourny on 2013-09-11

Added comments and some clean-up.

11373. By Ghislain Fourny on 2013-09-11

A fix.

11374. By Ghislain Fourny on 2013-09-11

Copying regenerated parser files.

11375. By Ghislain Fourny on 2013-09-12

Regenerated pregenerated files.

11376. By Ghislain Fourny on 2013-09-12

Merged trunk.

Unmerged revisions

=== modified file 'cmake_modules/CMakeUseBison.cmake'
--- cmake_modules/CMakeUseBison.cmake	2013-02-07 17:24:36 +0000
+++ cmake_modules/CMakeUseBison.cmake	2013-04-17 19:18:26 +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 19:18:26 +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/api/compiler_api.cpp'
--- src/compiler/api/compiler_api.cpp	2013-04-10 10:13:31 +0000
+++ src/compiler/api/compiler_api.cpp	2013-04-17 19:18:26 +0000
@@ -39,7 +39,6 @@
 #include "compiler/api/compilercb.h"
 
 #include "compiler/parser/xquery_driver.h"
-#include "compiler/parser/jsoniq_driver.h"
 #include "compiler/parsetree/parsenodes.h"
 #include "compiler/parsetree/parsenode_print_xml_visitor.h"
 #include "compiler/parsetree/parsenode_print_xqdoc_visitor.h"
@@ -225,15 +224,15 @@
   
   bool lXQueryMode = getLanguageMode(xquery_stream);
 
-  if (!lXQueryMode)
+  if (lXQueryMode)
   {
-    jsoniq_driver lDriver(&*theCompilerCB);
+    xquery_driver lDriver(&*theCompilerCB, xquery_driver::XQUERY_GRAMMAR);
     lDriver.parse_stream(xquery_stream, aFileName);
     node =  lDriver.get_expr();
   }
   else
   {
-    xquery_driver lDriver(&*theCompilerCB);
+    xquery_driver lDriver(&*theCompilerCB, xquery_driver::JSONIQ_GRAMMAR);
     lDriver.parse_stream(xquery_stream, aFileName);
     node =  lDriver.get_expr();
   }

=== 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 19:18:26 +0000
@@ -19,7 +19,6 @@
     ft_types.cpp
     symbol_table.cpp
     xquery_driver.cpp
-    jsoniq_driver.cpp
     query_loc.cpp
     xqdoc_comment.cpp
     parser_helpers.cpp
@@ -47,13 +46,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 +111,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")

=== removed file 'src/compiler/parser/jsoniq_driver.cpp'
--- src/compiler/parser/jsoniq_driver.cpp	2013-03-16 00:58:28 +0000
+++ src/compiler/parser/jsoniq_driver.cpp	1970-01-01 00:00:00 +0000
@@ -1,223 +0,0 @@
-/*
- * Copyright 2006-2008 The FLWOR Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include "stdafx.h"
-
-#include <fstream>
-#include "system/properties.h"
-#include "compiler/parser/jsoniq_driver.h"
-
-#ifdef __GNUC__
-  // disable a warning in location.hh which comes with bison
-  // position.hh:141: warning: suggest parentheses around && within ||
-#  pragma GCC diagnostic ignored "-Wparentheses"
-#endif
-
-#include "compiler/parser/jsoniq_scanner.h"
-#include "compiler/parser/jsoniq_parser.hpp"
-
-#ifdef __GNUC__
-#  pragma GCC diagnostic warning "-Wparentheses"
-#endif
-
-#include "compiler/parser/zorba_parser_error.h"
-#include "compiler/api/compilercb.h"
-#include "context/static_context.h"
-#include "diagnostics/xquery_diagnostics.h"
-#include "util/xml_util.h"
-
-
-namespace zorba
-{
-
-jsoniq_driver::jsoniq_driver(CompilerCB* aCompilerCB, uint32_t initial_heapsize)
-  :
-  symtab(initial_heapsize),
-  expr_p (NULL),
-  theCompilerCB(aCompilerCB),
-  parserError(NULL)
-{
-}
-
-jsoniq_driver::~jsoniq_driver()
-{
-  if (parserError)
-    delete parserError;
-}
-
-// Error generators
-ZorbaParserError* jsoniq_driver::unrecognizedCharErr(const char* _error_token, const location& loc)
-{
-  std::string token;
-    // translate some common non-printable characters for better readability.
-  if (*_error_token == '\t')
-    token = "\\t";
-  else if (*_error_token == '\n')
-    token = "\\n";
-  else if (*_error_token == '\r')
-    token = "\\r";
-  else if (*_error_token == ' ')
-    token = "<blank>";
-  else
-    token = _error_token;
-
-  parserError = new ZorbaParserError("syntax error, unexpected character \"" + token + "\"", loc);
-  return parserError;
-};
-
-ZorbaParserError* jsoniq_driver::unterminatedCommentErr(const location& loc)
-{
-  parserError = new ZorbaParserError("syntax error, unexpected end of file, unterminated comment", loc);
-  return parserError;
-}
-
-ZorbaParserError* jsoniq_driver::unterminatedElementConstructor(const location& loc)
-{
-  parserError = new ZorbaParserError("syntax error, unexpected end of file, unterminated direct element constructor", loc);
-  return parserError;
-}
-
-ZorbaParserError* jsoniq_driver::noClosingTagForElementConstructor(const location& loc)
-{
-  parserError = new ZorbaParserError("syntax error, unexpected end of file, no closing tag for direct element constructor", loc);
-  return parserError;
-}
-
-ZorbaParserError* jsoniq_driver::unrecognizedToken(const char* _error_token, const location& loc)
-{
-  parserError = new ZorbaParserError(std::string("syntax error, unexpected \"") + _error_token + "\"", loc);
-  return parserError;
-}
-
-ZorbaParserError* jsoniq_driver::invalidCharRef(const char* _message, const location& loc)
-{
-  std::string ref = "";
-  std::string temp = _message;
-  std::string out;
-  temp = temp.substr(temp.find("&"));
-
-  while (temp.size()>0 && xml::parse_entity(temp, &out) != -1)
-  {
-    temp = temp.substr(temp.find(";") + 1);
-    if (temp.find("&") != std::string::npos)
-      temp = temp.substr(temp.find("&"));
-  }
-
-  if (temp.find("&") != std::string::npos)
-  {
-    ref = "\"" + temp.substr(temp.find("&"), 6);
-    if (temp.size() == 7)
-      ref += "\"";
-    else if (temp.size() > 7)
-      ref += "...\"";
-    ref += " ";
-  }
-
-  parserError = new ZorbaParserError(std::string("syntax error, invalid character or entity reference "
-      + ref + "in the string literal ") + _message + ".", loc);
-  return parserError;
-}
-
-ZorbaParserError* jsoniq_driver::parserErr(const std::string& _message, const location& loc, Error const &code)
-{
-  parserError = new ZorbaParserError(_message, loc, code);
-  return parserError;
-}
-
-ZorbaParserError* jsoniq_driver::parserErr(const std::string& _message, const QueryLoc& loc, Error const &code)
-{
-  parserError = new ZorbaParserError(_message, loc, code);
-  return parserError;
-}
-
-bool jsoniq_driver::parse_stream(std::istream& in, const zstring& aFilename)
-{
-  int ch[3];
-
-  theFilename = aFilename;
-  theFilename2 = theFilename.str();
-
-  // process the UTF16 Byte Order Mark = \xEF\xBB\xBF
-  if (in.peek() == 0xEF)
-  {
-    int i;
-    for (i=0; i<3; i++)
-      if (in.good())
-        ch[i] = in.get();
-      else
-        break;
-
-    if (i<3 || ch[0] != 0xEF || ch[1] != 0xBB || ch[2] != 0xBF)
-    {
-      if (i==3) i--;
-      for ( ; i>=0; i--)
-        in.putback(ch[i]);
-    }
-  }
-
-  // process the UTF16 (LE) Byte Order Mark = \xFF\xFE, not supported yet
-  //else if (in.peek() == 0xFF)
-  //{
-    // transcode the input to UTF8
-  //}
-
-  jsoniq_scanner scanner(this, &in);
-  scanner.set_yy_flex_debug(Properties::instance()->traceScanning());
-  this->lexer = &scanner;
-  // scanner.set_yy_flex_debug(true); // debugging purposes
-
-  jsoniq_parser parser(*this);
-  parser.set_debug_level(Properties::instance()->traceParsing());
-  // parser.set_debug_level(true); // debugging purposes
-
-  return (parser.parse() == 0);
-}
-
-bool jsoniq_driver::parse_file(const zstring& aFilename)
-{
-  std::ifstream in(aFilename.c_str());
-  return parse_stream(in, aFilename);
-}
-
-bool jsoniq_driver::parse_string(const zstring& input)
-{
-  std::istringstream iss(input.str());
-  return parse_stream(iss);
-}
-
-void jsoniq_driver::set_expr(parsenode* e_p)
-{
-  if (theCompilerCB->theConfig.parse_cb != NULL)
-  {
-    zstring uri;
-    theCompilerCB->theRootSctx->get_entity_retrieval_uri(uri);
-    theCompilerCB->theConfig.parse_cb(e_p, uri.str());
-  }
-  expr_p = e_p;
-}
-
-QueryLoc jsoniq_driver::createQueryLoc(const location& aLoc) const
-{
-  QueryLoc lLoc;
-  lLoc.setFilename(theFilename);
-  lLoc.setLineBegin(aLoc.begin.line);
-  lLoc.setColumnBegin(aLoc.begin.column);
-  lLoc.setLineEnd(aLoc.end.line);
-  lLoc.setColumnEnd(aLoc.end.column);
-  return lLoc;
-}
-
-}	/* namespace zorba */
-/* vim:set et sw=2 ts=2: */

=== removed file 'src/compiler/parser/jsoniq_driver.h'
--- src/compiler/parser/jsoniq_driver.h	2013-03-16 00:58:28 +0000
+++ src/compiler/parser/jsoniq_driver.h	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-/*
- * Copyright 2006-2008 The FLWOR Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#pragma once
-#ifndef ZORBA_JSONIQ_DRIVER_H
-#define ZORBA_JSONIQ_DRIVER_H
-
-#include <ostream>
-#include <string>
-#include <zorba/config.h>
-#include "compiler/parser/symbol_table.h"
-#include "compiler/parser/zorba_parser_error.h"
-
-// needed because we have to delete the main module node
-#include "compiler/parsetree/parsenode_base.h"
-
-namespace zorba {
-
-class location;
-class parsenode;
-class CompilerCB;
-class ZorbaParserError;
-
-
-// exported for unit testing only
-class ZORBA_DLL_PUBLIC jsoniq_driver
-{
-public:
-  std::stringstream theDocComment;
-  std::string theMainModuleDocComment;
-  zstring theFilename;
-  std::string theFilename2;
-  symbol_table symtab;
-  rchandle<parsenode> expr_p;
-  CompilerCB* theCompilerCB;
-  ZorbaParserError* parserError;
-  class jsoniq_scanner* lexer;
-
-  jsoniq_driver(CompilerCB* aCompilerCB, uint32_t initial_heapsize = 1024);
-
-  virtual ~jsoniq_driver();
-
-  bool parse_stream(std::istream& in, const zstring& aFilename = "");
-
-  bool parse_string(const zstring& input);
-
-  bool parse_file(const zstring& aFilename);
-
-  void set_expr(parsenode* e_p);
-
-  parsenode* get_expr() { return expr_p; }
-
-  QueryLoc createQueryLoc(const location& aLoc) const;
-
-  // Error generators
-  ZorbaParserError* unrecognizedCharErr(const char* _error_token, const location& loc);
-  ZorbaParserError* unterminatedCommentErr(const location& loc);
-  ZorbaParserError* unterminatedElementConstructor(const location& loc);
-  ZorbaParserError* noClosingTagForElementConstructor(const location& loc);
-  ZorbaParserError* unrecognizedToken(const char* _error_token, const location& loc);
-  ZorbaParserError* invalidCharRef(const char* _error_token, const location& loc);
-  ZorbaParserError* parserErr(const std::string& _message, const location& loc, Error const &code = err::XPST0003);
-  ZorbaParserError* parserErr(const std::string& _message, const QueryLoc& loc, Error const &code = err::XPST0003);
-};
-
-}	/* namespace zorba */
-#endif /* ZORBA_JSONIQ_DRIVER_H */
-
-/*
- * Local variables:
- * mode: c++
- * End:
- */
-/* vim:set et sw=2 ts=2: */

=== modified file 'src/compiler/parser/jsoniq_parser.cpp'
--- src/compiler/parser/jsoniq_parser.cpp	2013-04-17 18:19:28 +0000
+++ src/compiler/parser/jsoniq_parser.cpp	2013-04-17 19:18:26 +0000
@@ -37,7 +37,12 @@
 /* First part of user declarations.  */
 
 /* Line 293 of lalr1.cc  */
-#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"
 
 
 #include "common/common.h"
@@ -50,7 +55,9 @@
 #include "compiler/parser/parse_constants.h"
 #include "compiler/api/compilercb.h"
 #include "store/api/update_consts.h"
-#include "compiler/parser/jsoniq_driver.h"
+
+#include "compiler/parser/xquery_driver.h"
+
 #include "compiler/parser/parser_helpers.h"
 
 #define SYMTAB( n ) driver.symtab.get( (off_t)n )
@@ -64,9 +71,27 @@
 using namespace zorba;
 
 
-
-/* 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 93 "/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
+#ifdef XQUERY_PARSER
+#define yylex driver.getXqueryLexer()->lex
+#else
+#define yylex driver.getJsoniqLexer()->lex
+#endif
+
+
+
+/* Line 293 of lalr1.cc  */
+#line 94 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 
 
 #include "jsoniq_parser.hpp"
@@ -74,10 +99,8 @@
 /* User implementation prologue.  */
 
 /* Line 299 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+#line 777 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
 
-// HACK to trigger rchandle release: rchandles are freed when refcount == 0
-// (not <= 0); but Bison never increments the refcount, so we do it manually...
 template<typename T> inline void release_hack( T *ref ) {
     if ( ref ) {
         RCHelper::addReference( ref );
@@ -85,18 +108,9 @@
     }
 }
 
-/* Line 299 of lalr1.cc  */
-#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 299 of lalr1.cc  */
-#line 99 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
+
+/* Line 299 of lalr1.cc  */
+#line 113 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 
 #ifndef YY_
 # if defined YYENABLE_NLS && YYENABLE_NLS
@@ -182,7 +196,7 @@
 namespace zorba {
 
 /* Line 382 of lalr1.cc  */
-#line 185 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 199 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 
   /* Return YYSTR after stripping away unnecessary quotes and
      backslashes, so that it's suitable for yyerror.  The heuristic is
@@ -223,7 +237,7 @@
 
 
   /// Build a parser object.
-  jsoniq_parser::jsoniq_parser (jsoniq_driver& driver_yyarg)
+  jsoniq_parser::jsoniq_parser (xquery_driver& driver_yyarg)
     :
 #if YYDEBUG
       yydebug_ (false),
@@ -283,2495 +297,2504 @@
         case 112: /* "\"'DECIMAL'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 915 "/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"
 	{ delete (yyvaluep->decval); };
 
 /* Line 480 of lalr1.cc  */
-#line 290 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 304 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 127: /* "\"'DOUBLE'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/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"
 	{ delete (yyvaluep->dval); };
 
 /* Line 480 of lalr1.cc  */
-#line 299 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 313 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 152: /* "\"'INTEGER'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 913 "/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"
 	{ delete (yyvaluep->ival); };
 
 /* Line 480 of lalr1.cc  */
-#line 308 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 346: /* "VersionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 317 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 347: /* "MainModule" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 326 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 348: /* "LibraryModule" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 335 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 349: /* "ModuleDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 344 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 350: /* "SIND_DeclList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 353 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 351: /* "SIND_Decl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 362 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 352: /* "Setter" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 371 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 353: /* "BoundarySpaceDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 380 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 354: /* "DefaultCollationDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 389 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 355: /* "BaseURIDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 398 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 356: /* "ConstructionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 407 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 357: /* "OrderingModeDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 416 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 358: /* "EmptyOrderDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 425 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 359: /* "CopyNamespacesDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 434 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 360: /* "Import" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 443 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 361: /* "SchemaImport" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 452 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 362: /* "URILiteralList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 461 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 363: /* "SchemaPrefix" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 470 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 364: /* "ModuleImport" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 479 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 365: /* "NamespaceDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 488 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 366: /* "DefaultNamespaceDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 497 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 367: /* "VFO_DeclList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 506 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 368: /* "VFO_Decl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 515 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 369: /* "DecimalFormatDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 524 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 370: /* "DecimalFormatParamList" */
-
-/* Line 480 of lalr1.cc  */
-#line 947 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+#line 322 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 345: /* "VersionDecl" */
+
+/* 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 331 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 346: /* "MainModule" */
+
+/* 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 340 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 347: /* "LibraryModule" */
+
+/* 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 349 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 348: /* "ModuleDecl" */
+
+/* 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 358 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 349: /* "SIND_DeclList" */
+
+/* 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 367 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 350: /* "SIND_Decl" */
+
+/* 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 376 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 351: /* "Setter" */
+
+/* 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 385 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 352: /* "BoundarySpaceDecl" */
+
+/* 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 394 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 353: /* "DefaultCollationDecl" */
+
+/* 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 403 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 354: /* "BaseURIDecl" */
+
+/* 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 412 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 355: /* "ConstructionDecl" */
+
+/* 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 421 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 356: /* "OrderingModeDecl" */
+
+/* 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 430 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 357: /* "EmptyOrderDecl" */
+
+/* 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 439 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 358: /* "CopyNamespacesDecl" */
+
+/* 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 448 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 359: /* "Import" */
+
+/* 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 457 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 360: /* "SchemaImport" */
+
+/* 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 466 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 361: /* "URILiteralList" */
+
+/* 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 475 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 362: /* "SchemaPrefix" */
+
+/* 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 484 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 363: /* "ModuleImport" */
+
+/* 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 493 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 364: /* "NamespaceDecl" */
+
+/* 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 502 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 365: /* "DefaultNamespaceDecl" */
+
+/* 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 511 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 366: /* "VFO_DeclList" */
+
+/* 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 520 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 367: /* "VFO_Decl" */
+
+/* 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 529 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 368: /* "DecimalFormatDecl" */
+
+/* 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 538 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 369: /* "DecimalFormatParamList" */
+
+/* Line 480 of lalr1.cc  */
+#line 802 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->vstrpair); };
 
 /* Line 480 of lalr1.cc  */
-#line 533 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 547 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
-      case 371: /* "DecimalFormatParam" */
+      case 370: /* "DecimalFormatParam" */
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+#line 802 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->strpair); };
 
 /* Line 480 of lalr1.cc  */
-#line 542 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 373: /* "OptionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 551 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 374: /* "FTOptionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 560 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 375: /* "CtxItemDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 569 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 376: /* "CtxItemDecl2" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 578 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 377: /* "CtxItemDecl3" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 587 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 378: /* "CtxItemDecl4" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 596 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 379: /* "VarDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 605 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 380: /* "VarNameAndType" */
-
-/* Line 480 of lalr1.cc  */
-#line 947 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+#line 556 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 372: /* "OptionDecl" */
+
+/* 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 565 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 373: /* "FTOptionDecl" */
+
+/* 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 574 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 374: /* "CtxItemDecl" */
+
+/* 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 583 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 375: /* "CtxItemDecl2" */
+
+/* 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 592 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 376: /* "CtxItemDecl3" */
+
+/* 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 601 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 377: /* "CtxItemDecl4" */
+
+/* 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 610 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 378: /* "VarDecl" */
+
+/* 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 619 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 379: /* "VarNameAndType" */
+
+/* Line 480 of lalr1.cc  */
+#line 802 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->varnametype); };
 
 /* Line 480 of lalr1.cc  */
-#line 614 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 381: /* "AnnotationList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 623 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 382: /* "Annotation" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 632 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 383: /* "AnnotationLiteralList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 641 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 384: /* "FunctionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 650 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 385: /* "FunctionDecl2" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 659 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 386: /* "FunctionDeclSimple" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 668 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 387: /* "FunctionDeclUpdating" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 677 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 388: /* "FunctionSig" */
-
-/* Line 480 of lalr1.cc  */
-#line 947 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+#line 628 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 380: /* "AnnotationList" */
+
+/* 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 637 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 381: /* "Annotation" */
+
+/* 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 646 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 382: /* "AnnotationLiteralList" */
+
+/* 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 655 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 383: /* "FunctionDecl" */
+
+/* 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 664 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 384: /* "FunctionDecl2" */
+
+/* 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 673 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 385: /* "FunctionDeclSimple" */
+
+/* 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 682 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 386: /* "FunctionDeclUpdating" */
+
+/* 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 691 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 387: /* "FunctionSig" */
+
+/* Line 480 of lalr1.cc  */
+#line 802 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->fnsig); };
 
 /* Line 480 of lalr1.cc  */
-#line 686 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 389: /* "ParamList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 695 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 390: /* "Param" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 704 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 391: /* "CollectionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 713 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 393: /* "IndexDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 722 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 394: /* "IndexKeyList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 731 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 395: /* "IndexKeySpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 740 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 396: /* "IntegrityConstraintDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 749 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 397: /* "QueryBody" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 758 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 398: /* "StatementsAndOptionalExprTop" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 767 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 399: /* "StatementsAndOptionalExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 776 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 400: /* "StatementsAndExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 785 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 401: /* "Statements" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 794 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 402: /* "Statement" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 803 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 403: /* "BlockStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 812 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 404: /* "BlockExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 821 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 405: /* "EnclosedStatementsAndOptionalExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 830 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 406: /* "VarDeclStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 839 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 409: /* "AssignStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 848 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 410: /* "ApplyStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 857 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 411: /* "ExitStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 866 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 412: /* "WhileStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 875 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 413: /* "FlowCtlStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 884 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 414: /* "FLWORStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 893 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 415: /* "ReturnStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 902 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 416: /* "IfStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 911 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 417: /* "TryStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 920 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 418: /* "CatchListStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 929 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 419: /* "CatchStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 938 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 421: /* "Expr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 947 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 422: /* "ExprSingle" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 956 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 423: /* "ExprSimple" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 965 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 424: /* "FLWORExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 974 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 425: /* "ReturnExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 983 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 428: /* "FLWORWinCond" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 992 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 429: /* "WindowClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1001 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 430: /* "CountClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1010 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 431: /* "ForLetWinClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1019 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 433: /* "FLWORClauseList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1028 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 434: /* "ForClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1037 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 436: /* "VarInDeclList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1046 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 437: /* "VarInDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1055 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 438: /* "PositionalVar" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1064 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 439: /* "FTScoreVar" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1073 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 440: /* "LetClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1082 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 441: /* "VarGetsDeclList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1091 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 442: /* "VarGetsDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1100 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 443: /* "WindowVarDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1109 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 444: /* "WindowVars" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1118 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 445: /* "WindowVars3" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1127 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 446: /* "WindowVars2" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1136 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 447: /* "WhereClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1145 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 448: /* "GroupByClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1154 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 449: /* "GroupSpecList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1163 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 450: /* "GroupSpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1172 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 451: /* "GroupCollationSpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1181 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 452: /* "OrderByClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1190 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 453: /* "OrderSpecList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1199 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 454: /* "OrderSpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1208 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 455: /* "OrderModifier" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1217 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 456: /* "OrderDirSpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1226 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 457: /* "OrderEmptySpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1235 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 458: /* "OrderCollationSpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1244 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 459: /* "QuantifiedExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1253 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 460: /* "QVarInDeclList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1262 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 461: /* "QVarInDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1271 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 462: /* "SwitchExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1280 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 463: /* "SwitchCaseClauseList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1289 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 464: /* "SwitchCaseClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1298 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 465: /* "SwitchCaseOperandList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1307 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 466: /* "SwitchStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1316 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 469: /* "TypeswitchExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1325 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 470: /* "TypeswitchStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1334 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 471: /* "CaseClauseList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1343 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 472: /* "CaseClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1352 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 475: /* "SequenceTypeList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1361 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 476: /* "IfExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1370 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 477: /* "OrExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1379 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 478: /* "AndExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1388 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 479: /* "NotExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1397 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 480: /* "ComparisonExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1406 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 481: /* "FTContainsExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1415 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 482: /* "StringConcatExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1424 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 483: /* "opt_FTIgnoreOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1433 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 484: /* "RangeExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1442 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 485: /* "AdditiveExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1451 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 486: /* "MultiplicativeExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1460 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 487: /* "UnionExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1469 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 488: /* "IntersectExceptExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1478 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 489: /* "InstanceofExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1487 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 490: /* "TreatExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1496 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 491: /* "CastableExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1505 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 492: /* "CastExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1514 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 493: /* "SingleType" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1523 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 494: /* "UnaryExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1532 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 495: /* "SignList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1541 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 496: /* "ValueExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1550 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 497: /* "SimpleMapExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1559 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 498: /* "ValueComp" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1568 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 499: /* "ValidateExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1577 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 500: /* "ExtensionExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1586 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 501: /* "Pragma_list" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1595 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 502: /* "Pragma" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1604 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 503: /* "PathExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1613 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 504: /* "RelativePathExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1622 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 505: /* "StepExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1631 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 506: /* "NameTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1640 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 507: /* "Wildcard" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1649 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 508: /* "FilterExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1658 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 509: /* "PredicateList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1667 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 510: /* "Predicate" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1676 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 511: /* "PrimaryExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1685 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 512: /* "Literal" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1694 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 513: /* "NumericLiteral" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1703 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 515: /* "VarRef" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1712 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 516: /* "ParenthesizedExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1721 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 517: /* "ContextItemExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1730 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 518: /* "OrderedExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1739 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 519: /* "UnorderedExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1748 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 520: /* "FunctionCall" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1757 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 521: /* "ArgList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1766 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 525: /* "Constructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1775 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 526: /* "DirectConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1784 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 527: /* "DirElemConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1793 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 528: /* "DirElemContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1802 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 529: /* "DirAttributeList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1811 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 530: /* "DirAttr" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1820 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 532: /* "DirAttributeValue" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1829 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 533: /* "opt_QuoteAttrContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1838 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 534: /* "QuoteAttrContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1847 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 535: /* "opt_AposAttrContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1856 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 536: /* "AposAttrContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1865 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 537: /* "QuoteAttrValueContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1874 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 538: /* "AposAttrValueContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1883 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 539: /* "DirElemContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1892 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 540: /* "CommonContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1901 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 541: /* "DirCommentConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1910 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 542: /* "DirPIConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1919 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 543: /* "CDataSection" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1928 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 544: /* "ComputedConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1937 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 545: /* "CompDocConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1946 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 546: /* "CompElemConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1955 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 547: /* "CompAttrConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1964 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 548: /* "CompTextConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1973 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 549: /* "CompCommentConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1982 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 550: /* "CompPIConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1991 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 551: /* "CompNamespaceConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2000 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 552: /* "TypeDeclaration" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2009 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 553: /* "SequenceType" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2018 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 554: /* "OccurrenceIndicator" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2027 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 555: /* "ItemType" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2036 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 556: /* "TypeList" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2045 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 557: /* "GeneralizedAtomicType" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2054 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 558: /* "SimpleType" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2063 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 559: /* "KindTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2072 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 560: /* "AnyKindTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2081 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 561: /* "DocumentTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2090 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 562: /* "NamespaceTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2099 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 563: /* "TextTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2108 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 564: /* "CommentTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2117 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 565: /* "PITest" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2126 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 566: /* "AttributeTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2135 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 567: /* "SchemaAttributeTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2144 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 568: /* "ElementTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2153 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 569: /* "SchemaElementTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2162 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 570: /* "TypeName" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2171 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 571: /* "TypeName_WITH_HOOK" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2180 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 572: /* "StringLiteral" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2189 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 574: /* "AnyFunctionTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2198 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 575: /* "TypedFunctionTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2207 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 578: /* "InsertExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2216 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 579: /* "DeleteExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2225 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 580: /* "ReplaceExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2234 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 581: /* "RenameExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2243 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 582: /* "TransformExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2252 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 583: /* "VarNameList" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2261 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 584: /* "VarNameDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2270 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 585: /* "TryExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2279 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 586: /* "CatchListExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2288 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 587: /* "CatchExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2297 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 588: /* "BracedExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2306 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 589: /* "NameTestList" */
-
-/* Line 480 of lalr1.cc  */
-#line 947 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
+#line 700 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 388: /* "ParamList" */
+
+/* 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 709 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 389: /* "Param" */
+
+/* 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 718 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 390: /* "CollectionDecl" */
+
+/* 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 727 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 392: /* "IndexDecl" */
+
+/* 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 736 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 393: /* "IndexKeyList" */
+
+/* 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 745 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 394: /* "IndexKeySpec" */
+
+/* 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 754 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 395: /* "IntegrityConstraintDecl" */
+
+/* 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 763 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 396: /* "QueryBody" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 772 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 397: /* "StatementsAndOptionalExprTop" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 781 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 398: /* "StatementsAndOptionalExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 790 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 399: /* "StatementsAndExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 799 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 400: /* "Statements" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 808 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 401: /* "Statement" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 817 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 402: /* "BlockStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 826 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 403: /* "BlockExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 835 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 404: /* "EnclosedStatementsAndOptionalExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 844 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 405: /* "VarDeclStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 853 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 408: /* "AssignStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 862 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 409: /* "ApplyStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 871 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 410: /* "ExitStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 880 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 411: /* "WhileStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 889 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 412: /* "FlowCtlStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 898 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 413: /* "FLWORStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 907 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 414: /* "ReturnStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 916 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 415: /* "IfStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 925 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 416: /* "TryStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 934 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 417: /* "CatchListStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 943 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 418: /* "CatchStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 952 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 419: /* "VoidStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 961 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 420: /* "Expr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 970 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 421: /* "ExprSingle" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 979 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 422: /* "ExprSimple" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 988 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 423: /* "FLWORExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 997 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 424: /* "ReturnExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1006 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 427: /* "FLWORWinCond" */
+
+/* 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 1015 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 428: /* "WindowClause" */
+
+/* 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 1024 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 429: /* "CountClause" */
+
+/* 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 1033 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 430: /* "ForLetWinClause" */
+
+/* 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 1042 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 432: /* "FLWORClauseList" */
+
+/* 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 1051 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 433: /* "ForClause" */
+
+/* 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 1060 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 435: /* "VarInDeclList" */
+
+/* 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 1069 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 436: /* "VarInDecl" */
+
+/* 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 1078 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 437: /* "PositionalVar" */
+
+/* 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 1087 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 438: /* "FTScoreVar" */
+
+/* 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 1096 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 439: /* "LetClause" */
+
+/* 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 1105 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 440: /* "VarGetsDeclList" */
+
+/* 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 1114 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 441: /* "VarGetsDecl" */
+
+/* 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 1123 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 442: /* "WindowVarDecl" */
+
+/* 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 1132 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 443: /* "WindowVars" */
+
+/* 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 1141 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 444: /* "WindowVars3" */
+
+/* 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 1150 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 445: /* "WindowVars2" */
+
+/* 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 1159 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 446: /* "WhereClause" */
+
+/* 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 1168 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 447: /* "GroupByClause" */
+
+/* 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 1177 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 448: /* "GroupSpecList" */
+
+/* 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 1186 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 449: /* "GroupSpec" */
+
+/* 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 1195 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 450: /* "GroupCollationSpec" */
+
+/* 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 1204 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 451: /* "OrderByClause" */
+
+/* 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 1213 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 452: /* "OrderSpecList" */
+
+/* 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 1222 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 453: /* "OrderSpec" */
+
+/* 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 1231 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 454: /* "OrderModifier" */
+
+/* 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 1240 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 455: /* "OrderDirSpec" */
+
+/* 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 1249 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 456: /* "OrderEmptySpec" */
+
+/* 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 1258 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 457: /* "OrderCollationSpec" */
+
+/* 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 1267 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 458: /* "QuantifiedExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1276 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 459: /* "QVarInDeclList" */
+
+/* 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 1285 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 460: /* "QVarInDecl" */
+
+/* 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 1294 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 461: /* "SwitchExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1303 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 462: /* "SwitchCaseClauseList" */
+
+/* Line 480 of lalr1.cc  */
+#line 797 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1312 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 463: /* "SwitchCaseClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 797 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1321 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 464: /* "SwitchCaseOperandList" */
+
+/* Line 480 of lalr1.cc  */
+#line 797 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1330 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 465: /* "SwitchStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1339 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 468: /* "TypeswitchExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1348 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 469: /* "TypeswitchStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1357 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 470: /* "CaseClauseList" */
+
+/* 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 1366 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 471: /* "CaseClause" */
+
+/* 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 1375 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 474: /* "SequenceTypeList" */
+
+/* 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 1384 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 475: /* "IfExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1393 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 476: /* "OrExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1402 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 477: /* "AndExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1411 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 478: /* "NotExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1420 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 479: /* "ComparisonExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1429 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 480: /* "FTContainsExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1438 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 481: /* "StringConcatExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1447 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 482: /* "opt_FTIgnoreOption" */
+
+/* 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 1456 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 483: /* "RangeExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1465 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 484: /* "AdditiveExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1474 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 485: /* "MultiplicativeExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1483 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 486: /* "UnionExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1492 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 487: /* "IntersectExceptExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1501 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 488: /* "InstanceofExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1510 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 489: /* "TreatExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1519 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 490: /* "CastableExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1528 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 491: /* "CastExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1537 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 492: /* "SingleType" */
+
+/* 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 1546 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 493: /* "UnaryExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1555 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 494: /* "SignList" */
+
+/* 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 1564 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 495: /* "ValueExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1573 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 496: /* "SimpleMapExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1582 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 497: /* "ValueComp" */
+
+/* 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 1591 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 498: /* "ValidateExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1600 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 499: /* "ExtensionExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1609 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 500: /* "Pragma_list" */
+
+/* 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 1618 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 501: /* "Pragma" */
+
+/* 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 1627 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 502: /* "PathExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1636 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 503: /* "RelativePathExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1645 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 504: /* "StepExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1654 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 505: /* "NameTest" */
+
+/* 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 1663 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 506: /* "Wildcard" */
+
+/* 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 1672 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 507: /* "FilterExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1681 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 508: /* "PredicateList" */
+
+/* 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 1690 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 509: /* "Predicate" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1699 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 510: /* "PrimaryExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1708 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 511: /* "Literal" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1717 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 512: /* "NumericLiteral" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1726 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 514: /* "VarRef" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1735 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 515: /* "ParenthesizedExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1744 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 516: /* "ContextItemExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1753 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 517: /* "OrderedExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1762 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 518: /* "UnorderedExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1771 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 519: /* "FunctionCall" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1780 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 520: /* "ArgList" */
+
+/* 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 1789 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 524: /* "Constructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1798 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 525: /* "DirectConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1807 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 526: /* "DirElemConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1816 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 527: /* "DirElemContentList" */
+
+/* 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 1825 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 528: /* "DirAttributeList" */
+
+/* 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 1834 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 529: /* "DirAttr" */
+
+/* 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 1843 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 531: /* "DirAttributeValue" */
+
+/* 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 1852 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 532: /* "opt_QuoteAttrContentList" */
+
+/* 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 1861 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 533: /* "QuoteAttrContentList" */
+
+/* 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 1870 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 534: /* "opt_AposAttrContentList" */
+
+/* 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 1879 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 535: /* "AposAttrContentList" */
+
+/* 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 1888 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 536: /* "QuoteAttrValueContent" */
+
+/* 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 1897 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 537: /* "AposAttrValueContent" */
+
+/* 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 1906 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 538: /* "DirElemContent" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1915 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 539: /* "CommonContent" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1924 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 540: /* "DirCommentConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1933 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 541: /* "DirPIConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1942 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 542: /* "CDataSection" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1951 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 543: /* "ComputedConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1960 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 544: /* "CompDocConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1969 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 545: /* "CompElemConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1978 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 546: /* "CompAttrConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1987 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 547: /* "CompTextConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1996 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 548: /* "CompCommentConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2005 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 549: /* "CompPIConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2014 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 550: /* "CompNamespaceConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2023 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 551: /* "TypeDeclaration" */
+
+/* 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 2032 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 552: /* "SequenceType" */
+
+/* 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 2041 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 553: /* "OccurrenceIndicator" */
+
+/* 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 2050 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 554: /* "ItemType" */
+
+/* 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 2059 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 555: /* "TypeList" */
+
+/* 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 2068 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 556: /* "GeneralizedAtomicType" */
+
+/* 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 2077 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 557: /* "SimpleType" */
+
+/* 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 2086 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 558: /* "KindTest" */
+
+/* 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 2095 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 559: /* "AnyKindTest" */
+
+/* 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 2104 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 560: /* "DocumentTest" */
+
+/* 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 2113 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 561: /* "NamespaceTest" */
+
+/* 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 2122 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 562: /* "TextTest" */
+
+/* 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 2131 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 563: /* "CommentTest" */
+
+/* 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 2140 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 564: /* "PITest" */
+
+/* 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 2149 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 565: /* "AttributeTest" */
+
+/* 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 2158 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 566: /* "SchemaAttributeTest" */
+
+/* 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 2167 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 567: /* "ElementTest" */
+
+/* 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 2176 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 568: /* "SchemaElementTest" */
+
+/* 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 2185 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 569: /* "TypeName" */
+
+/* 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 2194 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 570: /* "TypeName_WITH_HOOK" */
+
+/* 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 2203 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 571: /* "StringLiteral" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2212 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 573: /* "AnyFunctionTest" */
+
+/* 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 2221 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 574: /* "TypedFunctionTest" */
+
+/* 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 2230 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 577: /* "InsertExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2239 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 578: /* "DeleteExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2248 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 579: /* "ReplaceExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2257 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 580: /* "RenameExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2266 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 581: /* "TransformExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2275 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 582: /* "VarNameList" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2284 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 583: /* "VarNameDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2293 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 584: /* "TryExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2302 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 585: /* "CatchListExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2311 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 586: /* "CatchExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2320 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 587: /* "BracedExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 801 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2329 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 588: /* "NameTestList" */
+
+/* Line 480 of lalr1.cc  */
+#line 802 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->name_test_list); };
 
 /* Line 480 of lalr1.cc  */
-#line 2315 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 590: /* "FTSelection" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2324 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 593: /* "FTOr" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2333 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 594: /* "FTAnd" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2342 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 595: /* "FTMildNot" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2351 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 596: /* "FTUnaryNot" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2360 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 597: /* "FTPrimaryWithOptions" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2369 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 598: /* "opt_FTMatchOptions" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2378 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 600: /* "FTWeight" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2387 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 601: /* "FTPrimary" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2396 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 602: /* "opt_FTTimes" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2405 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 603: /* "FTExtensionSelection" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2414 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 605: /* "FTWords" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2423 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 606: /* "FTWordsValue" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2432 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 608: /* "FTAnyallOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2441 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 611: /* "FTPosFilter" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2450 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 612: /* "FTOrder" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2459 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 613: /* "FTWindow" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2468 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 614: /* "FTDistance" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2477 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 615: /* "FTUnit" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2486 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 616: /* "FTMatchOptions" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2495 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 617: /* "FTMatchOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2504 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 618: /* "FTCaseOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2513 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 619: /* "FTDiacriticsOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2522 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 620: /* "FTExtensionOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2531 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 621: /* "FTStemOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2540 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 622: /* "FTThesaurusOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2549 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 626: /* "FTThesaurusID" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2558 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 629: /* "FTStopWordOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2567 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 630: /* "FTStopWords" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2576 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 634: /* "FTStopWordsInclExcl" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2585 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 635: /* "FTLanguageOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2594 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 636: /* "FTWildCardOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2603 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 637: /* "FTContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2612 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 638: /* "FTTimes" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2621 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 639: /* "FTRange" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2630 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 640: /* "FTScope" */
-
-/* Line 480 of lalr1.cc  */
-#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2639 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 641: /* "FTBigUnit" */