Merge lp:~zorba-coders/zorba/concat_operator into lp:zorba

[William Candillon]

Add the XQuery 3.0 concat operator

Add the XQuery 3.0 concat operator

[Matthias Brantner (matthias-brantner)]

Looks pretty good. One question: shouldn't the StringConcatExpr not be added to the %destructor directive in xquery_parser.y?

review: Needs Information

[Matthias Brantner (matthias-brantner)]

Can you please replace the tab with spaces in the ChangeLog?

review: Needs Fixing

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/concat_operator-2012-02-20T16-10-08.516Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job concat_operator-2012-02-20T16-10-08.516Z is finished.
  The final status was:

  No tests were run - build or configure step must have failed.

  Not commiting changes.

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

[William Candillon (wcandillon)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/concat_operator-2012-02-20T17-36-08.312Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job concat_operator-2012-02-20T17-36-08.312Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve, 3 Pending.

[William Candillon (wcandillon)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/concat_operator-2012-02-21T17-12-08.91Z/log.html

[Matthias Brantner (matthias-brantner)]

- I talked to Paul about the error message. He said it should be:

multi-item sequence can not be operand for concatenation

- NoSeqForFnOp_3: the "_3" usually indicates that this error message has 3 parameters which is wrong in this case

review: Needs Fixing

[Zorba Build Bot (zorba-buildbot)]

Validation queue job concat_operator-2012-02-21T17-12-08.91Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve, 1 Needs Fixing, 2 Pending.

[lp:~zorba-coders/zorba/concat_operator]

10672. By William Candillon on 2012-02-21

Improve error message for concatenation.

10673. By William Candillon on 2012-02-27

 Optimize iterator generation for the concat operator.

10674. By William Candillon on 2012-02-29

Improvement in the concat expr casting.

Unmerged revisions

=== modified file 'ChangeLog'
--- ChangeLog	2012-02-18 00:36:22 +0000
+++ ChangeLog	2012-02-21 15:49:21 +0000
@@ -2,6 +2,7 @@
 
 version 2.2
 
+  * Add XQuery 3.0 concat operator (http://www.w3.org/TR/xquery-30/#id-string-concat-expr) 
   * Fixed bug 923015 (clone() not implemented for full-text expressions)
   * No-copy optimization: avoids copying nodes during node-constructor expressions.
   * Added external function annotations %ann:propagates-input-nodes and 
 
=== modified file 'src/compiler/parser/xquery_parser.cpp'
--- src/compiler/parser/xquery_parser.cpp	2011-08-19 22:45:54 +0000
+++ src/compiler/parser/xquery_parser.cpp	2012-02-21 15:49:21 +0000
@@ -1,10 +1,8 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.5.  */
 
 /* Skeleton implementation for Bison LALR(1) parsers in C++
    
-      Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
-   Foundation, Inc.
+      Copyright (C) 2002-2011 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -37,8 +35,8 @@
 
 /* First part of user declarations.  */
 
-/* Line 311 of lalr1.cc  */
-#line 87 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
+/* Line 293 of lalr1.cc  */
+#line 87 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
 
 
 #include "common/common.h"
@@ -74,16 +72,16 @@
 
 
 
-/* Line 311 of lalr1.cc  */
-#line 79 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
+/* Line 293 of lalr1.cc  */
+#line 77 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
 
 
 #include "xquery_parser.hpp"
 
 /* User implementation prologue.  */
 
-/* Line 317 of lalr1.cc  */
-#line 876 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
+/* Line 299 of lalr1.cc  */
+#line 878 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_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...
@@ -94,8 +92,8 @@
     }
 }
 
-/* Line 317 of lalr1.cc  */
-#line 976 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
+/* Line 299 of lalr1.cc  */
+#line 978 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
 
 #include "compiler/parser/xquery_scanner.h"
 
@@ -104,11 +102,11 @@
 
 
 
-/* Line 317 of lalr1.cc  */
-#line 109 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
+/* Line 299 of lalr1.cc  */
+#line 107 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* FIXME: INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -119,6 +117,26 @@
 # endif
 #endif
 
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)                               \
+ do                                                                    \
+   if (N)                                                              \
+     {                                                                 \
+       (Current).begin = YYRHSLOC (Rhs, 1).begin;                      \
+       (Current).end   = YYRHSLOC (Rhs, N).end;                        \
+     }                                                                 \
+   else                                                                \
+     {                                                                 \
+       (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;        \
+     }                                                                 \
+ while (false)
+#endif
+
 /* Suppress unused-variable warnings by "using" E.  */
 #define YYUSE(e) ((void) (e))
 
@@ -168,14 +186,10 @@
 #define YYRECOVERING()  (!!yyerrstatus_)
 
 
-/* Line 380 of lalr1.cc  */
-#line 1 "[Bison:b4_percent_define_default]"
-
 namespace zorba {
 
-/* Line 380 of lalr1.cc  */
-#line 178 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-#if YYERROR_VERBOSE
+/* Line 382 of lalr1.cc  */
+#line 193 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
 
   /* Return YYSTR after stripping away unnecessary quotes and
      backslashes, so that it's suitable for yyerror.  The heuristic is
@@ -214,7 +228,6 @@
     return yystr;
   }
 
-#endif
 
   /// Build a parser object.
   xquery_parser::xquery_parser (xquery_driver& driver_yyarg)
@@ -274,2417 +287,2426 @@
 
     switch (yytype)
       {
-        case 109: /* "\"'DECIMAL'\"" */
+        case 110: /* "\"'DECIMAL'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 874 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
+#line 876 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->decval); };
 
 /* Line 480 of lalr1.cc  */
-#line 285 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
+#line 298 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
 	break;
-      case 123: /* "\"'DOUBLE'\"" */
+      case 124: /* "\"'DOUBLE'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 873 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
+#line 875 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->dval); };
 
 /* Line 480 of lalr1.cc  */
-#line 294 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
+#line 307 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
 	break;
-      case 148: /* "\"'INTEGER'\"" */
+      case 149: /* "\"'INTEGER'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 872 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
+#line 874 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->ival); };
 
 /* Line 480 of lalr1.cc  */
-#line 303 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 326: /* "VersionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 312 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 327: /* "MainModule" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 321 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 328: /* "LibraryModule" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 330 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 329: /* "ModuleDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 339 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 330: /* "SIND_DeclList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 348 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 331: /* "SIND_Decl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 357 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 332: /* "Setter" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 366 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 333: /* "BoundarySpaceDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 375 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 334: /* "DefaultCollationDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 384 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 335: /* "BaseURIDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 393 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 336: /* "ConstructionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 402 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 337: /* "OrderingModeDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 411 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 338: /* "EmptyOrderDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 420 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 339: /* "CopyNamespacesDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 429 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 340: /* "Import" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 438 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 341: /* "SchemaImport" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 447 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 342: /* "URILiteralList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 456 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 343: /* "SchemaPrefix" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 465 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 344: /* "ModuleImport" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 474 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 345: /* "NamespaceDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 483 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 346: /* "DefaultNamespaceDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 492 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 347: /* "VFO_DeclList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 501 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 348: /* "VFO_Decl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 510 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 349: /* "DecimalFormatDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 519 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 350: /* "DecimalFormatParamList" */
-
-/* Line 480 of lalr1.cc  */
-#line 897 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
+#line 316 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 327: /* "VersionDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 325 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 328: /* "MainModule" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 334 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 329: /* "LibraryModule" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 343 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 330: /* "ModuleDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 352 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 331: /* "SIND_DeclList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 361 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 332: /* "SIND_Decl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 370 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 333: /* "Setter" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 379 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 334: /* "BoundarySpaceDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 388 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 335: /* "DefaultCollationDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 397 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 336: /* "BaseURIDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 406 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 337: /* "ConstructionDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 415 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 338: /* "OrderingModeDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 424 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 339: /* "EmptyOrderDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 433 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 340: /* "CopyNamespacesDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 442 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 341: /* "Import" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 451 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 342: /* "SchemaImport" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 460 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 343: /* "URILiteralList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 469 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 344: /* "SchemaPrefix" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 478 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 345: /* "ModuleImport" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 487 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 346: /* "NamespaceDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 496 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 347: /* "DefaultNamespaceDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 505 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 348: /* "VFO_DeclList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 514 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 349: /* "VFO_Decl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 523 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 350: /* "DecimalFormatDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 532 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 351: /* "DecimalFormatParamList" */
+
+/* Line 480 of lalr1.cc  */
+#line 899 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->vstrpair); };
 
 /* Line 480 of lalr1.cc  */
-#line 528 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
+#line 541 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
 	break;
-      case 351: /* "DecimalFormatParam" */
+      case 352: /* "DecimalFormatParam" */
 
 /* Line 480 of lalr1.cc  */
-#line 897 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
+#line 899 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->strpair); };
 
 /* Line 480 of lalr1.cc  */
-#line 537 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 353: /* "OptionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 546 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 354: /* "FTOptionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 555 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 355: /* "CtxItemDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 564 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 356: /* "CtxItemDecl2" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 573 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 357: /* "CtxItemDecl3" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 582 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 358: /* "CtxItemDecl4" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 591 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 359: /* "VarDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 600 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 360: /* "VarNameAndType" */
-
-/* Line 480 of lalr1.cc  */
-#line 897 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
+#line 550 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 354: /* "OptionDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 559 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 355: /* "FTOptionDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 568 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 356: /* "CtxItemDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 577 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 357: /* "CtxItemDecl2" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 586 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 358: /* "CtxItemDecl3" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 595 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 359: /* "CtxItemDecl4" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 604 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 360: /* "VarDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 613 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 361: /* "VarNameAndType" */
+
+/* Line 480 of lalr1.cc  */
+#line 899 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->varnametype); };
 
 /* Line 480 of lalr1.cc  */
-#line 609 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 361: /* "AnnotationList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 618 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 362: /* "Annotation" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 627 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 363: /* "AnnotationLiteralList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 636 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 364: /* "FunctionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 645 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 365: /* "FunctionDecl2" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 654 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 366: /* "FunctionDeclSimple" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 663 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 367: /* "FunctionDeclUpdating" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 672 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 368: /* "FunctionSig" */
-
-/* Line 480 of lalr1.cc  */
-#line 897 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
+#line 622 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 362: /* "AnnotationList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 631 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 363: /* "Annotation" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 640 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 364: /* "AnnotationLiteralList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 649 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 365: /* "FunctionDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 658 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 366: /* "FunctionDecl2" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 667 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 367: /* "FunctionDeclSimple" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 676 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 368: /* "FunctionDeclUpdating" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 685 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 369: /* "FunctionSig" */
+
+/* Line 480 of lalr1.cc  */
+#line 899 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->fnsig); };
 
 /* Line 480 of lalr1.cc  */
-#line 681 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 369: /* "ParamList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 690 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 370: /* "Param" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 699 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 371: /* "CollectionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 708 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 373: /* "IndexDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 717 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 374: /* "IndexKeyList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 726 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 375: /* "IndexKeySpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 735 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 376: /* "IntegrityConstraintDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 744 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 377: /* "QueryBody" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 753 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 378: /* "StatementsAndOptionalExprTop" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 762 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 379: /* "StatementsAndOptionalExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 771 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 380: /* "StatementsAndExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 780 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 381: /* "Statements" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 789 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 382: /* "Statement" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 798 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 383: /* "BlockStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 807 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 384: /* "BlockExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 816 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 385: /* "EnclosedStatementsAndOptionalExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 825 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 386: /* "VarDeclStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 834 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 389: /* "AssignStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 843 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 390: /* "ApplyStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 852 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 391: /* "ExitStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 861 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 392: /* "WhileStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 870 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 393: /* "FlowCtlStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 879 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 394: /* "FLWORStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 395: /* "ReturnStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 897 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 396: /* "IfStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 906 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 397: /* "TryStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 915 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 398: /* "CatchListStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 924 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 399: /* "CatchStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 933 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 400: /* "Expr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 942 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 401: /* "ExprSingle" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 951 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 402: /* "ExprSimple" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 960 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 403: /* "FLWORExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 969 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 404: /* "ReturnExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 978 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 407: /* "FLWORWinCond" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 987 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 408: /* "WindowClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 996 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 409: /* "CountClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1005 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 410: /* "ForLetWinClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1014 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 412: /* "FLWORClauseList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1023 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 413: /* "ForClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1032 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 414: /* "VarInDeclList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1041 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 415: /* "VarInDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1050 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 416: /* "PositionalVar" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1059 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 417: /* "FTScoreVar" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1068 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 418: /* "LetClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1077 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 419: /* "VarGetsDeclList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1086 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 420: /* "VarGetsDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1095 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 421: /* "WindowVarDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1104 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 422: /* "WindowVars" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1113 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 423: /* "WindowVars3" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1122 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 424: /* "WindowVars2" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1131 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 425: /* "WhereClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1140 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 426: /* "GroupByClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1149 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 427: /* "GroupSpecList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1158 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 428: /* "GroupSpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1167 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 429: /* "GroupCollationSpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1176 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 430: /* "OrderByClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1185 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 431: /* "OrderSpecList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1194 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 432: /* "OrderSpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1203 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 433: /* "OrderModifier" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1212 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 434: /* "OrderDirSpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1221 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 435: /* "OrderEmptySpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1230 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 436: /* "OrderCollationSpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1239 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 437: /* "QuantifiedExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1248 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 438: /* "QVarInDeclList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1257 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 439: /* "QVarInDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1266 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 440: /* "SwitchExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1275 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 441: /* "SwitchCaseClauseList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1284 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 442: /* "SwitchCaseClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1293 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 443: /* "SwitchCaseOperandList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1302 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 444: /* "SwitchStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1311 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 447: /* "TypeswitchExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1320 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 448: /* "TypeswitchStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1329 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 449: /* "CaseClauseList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1338 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 450: /* "CaseClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1347 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 453: /* "IfExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1356 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 454: /* "OrExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1365 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 455: /* "AndExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1374 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 456: /* "ComparisonExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1383 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 458: /* "FTContainsExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1392 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 459: /* "opt_FTIgnoreOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1401 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 460: /* "RangeExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1410 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 461: /* "AdditiveExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1419 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 462: /* "MultiplicativeExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1428 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 463: /* "UnionExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1437 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 464: /* "IntersectExceptExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1446 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 465: /* "InstanceofExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1455 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 466: /* "TreatExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1464 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 467: /* "CastableExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1473 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 468: /* "CastExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1482 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 469: /* "UnaryExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1491 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 470: /* "SignList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1500 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 471: /* "ValueExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1509 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 472: /* "ValueComp" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1518 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 473: /* "NodeComp" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1527 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 474: /* "ValidateExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1536 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 475: /* "ExtensionExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1545 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 476: /* "Pragma_list" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1554 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 477: /* "Pragma" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1563 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 478: /* "PathExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1572 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 480: /* "RelativePathExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1581 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 481: /* "StepExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1590 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 482: /* "AxisStep" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1599 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 483: /* "ForwardStep" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1608 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 484: /* "ForwardAxis" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1617 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 485: /* "AbbrevForwardStep" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1626 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 486: /* "ReverseStep" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1635 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 487: /* "ReverseAxis" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1644 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 488: /* "NodeTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1653 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 489: /* "NameTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1662 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 490: /* "Wildcard" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1671 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 491: /* "FilterExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1680 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 492: /* "PredicateList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1689 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 493: /* "Predicate" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1698 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 494: /* "PrimaryExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1707 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 495: /* "Literal" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1716 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 496: /* "NumericLiteral" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1725 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 497: /* "VarRef" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1734 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 498: /* "ParenthesizedExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1743 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 499: /* "ContextItemExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1752 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 500: /* "OrderedExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1761 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 501: /* "UnorderedExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1770 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 502: /* "FunctionCall" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1779 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 503: /* "ArgList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1788 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 504: /* "Constructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1797 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 505: /* "DirectConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1806 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 506: /* "DirElemConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1815 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 507: /* "DirElemContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1824 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 508: /* "DirAttributeList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1833 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 509: /* "DirAttr" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1842 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 511: /* "DirAttributeValue" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1851 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 512: /* "opt_QuoteAttrContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1860 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 513: /* "QuoteAttrContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1869 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 514: /* "opt_AposAttrContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1878 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 515: /* "AposAttrContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1887 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 516: /* "QuoteAttrValueContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1896 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 517: /* "AposAttrValueContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1905 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 518: /* "DirElemContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1914 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 519: /* "CommonContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1923 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 520: /* "DirCommentConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1932 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 521: /* "DirPIConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1941 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 522: /* "CDataSection" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1950 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 523: /* "ComputedConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1959 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 524: /* "CompDocConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1968 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 525: /* "CompElemConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1977 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 526: /* "CompAttrConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1986 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 527: /* "CompTextConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1995 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 528: /* "CompCommentConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2004 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 529: /* "CompPIConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2013 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 530: /* "SingleType" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2022 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 531: /* "TypeDeclaration" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2031 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 532: /* "SequenceType" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2040 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 533: /* "OccurrenceIndicator" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2049 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 534: /* "ItemType" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2058 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 535: /* "TypeList" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2067 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 536: /* "AtomicType" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2076 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 537: /* "KindTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2085 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 538: /* "AnyKindTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2094 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 539: /* "DocumentTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2103 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 540: /* "TextTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2112 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 541: /* "CommentTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2121 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 542: /* "PITest" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2130 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 543: /* "AttributeTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2139 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 544: /* "SchemaAttributeTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2148 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 545: /* "ElementTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2157 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 546: /* "SchemaElementTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2166 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 547: /* "TypeName" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2175 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 548: /* "TypeName_WITH_HOOK" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2184 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 549: /* "StringLiteral" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2193 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 554: /* "AnyFunctionTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2202 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 555: /* "TypedFunctionTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2211 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 558: /* "InsertExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2220 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 559: /* "DeleteExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2229 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 560: /* "ReplaceExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2238 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 561: /* "RenameExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2247 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 562: /* "TransformExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2256 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 563: /* "VarNameList" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2265 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 564: /* "VarNameDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2274 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 565: /* "TryExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2283 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 566: /* "CatchListExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2292 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 567: /* "CatchExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2301 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 568: /* "BracedExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2310 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 569: /* "NameTestList" */
-
-/* Line 480 of lalr1.cc  */
-#line 897 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
+#line 694 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 370: /* "ParamList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 703 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 371: /* "Param" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 712 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 372: /* "CollectionDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 721 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 374: /* "IndexDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 730 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 375: /* "IndexKeyList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 739 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 376: /* "IndexKeySpec" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 748 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 377: /* "IntegrityConstraintDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 757 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 378: /* "QueryBody" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 766 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 379: /* "StatementsAndOptionalExprTop" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 775 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 380: /* "StatementsAndOptionalExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 784 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 381: /* "StatementsAndExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 793 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 382: /* "Statements" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 802 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 383: /* "Statement" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 811 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 384: /* "BlockStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 820 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 385: /* "BlockExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 829 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 386: /* "EnclosedStatementsAndOptionalExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 838 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 387: /* "VarDeclStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 847 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 390: /* "AssignStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 856 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 391: /* "ApplyStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 865 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 392: /* "ExitStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 874 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 393: /* "WhileStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 883 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 394: /* "FlowCtlStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 892 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 395: /* "FLWORStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 901 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 396: /* "ReturnStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 910 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 397: /* "IfStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 919 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 398: /* "TryStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 928 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 399: /* "CatchListStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 937 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 400: /* "CatchStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 946 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 401: /* "Expr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 955 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 402: /* "ExprSingle" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 964 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 403: /* "ExprSimple" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 973 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 404: /* "FLWORExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 982 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 405: /* "ReturnExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 991 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 408: /* "FLWORWinCond" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1000 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 409: /* "WindowClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1009 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 410: /* "CountClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1018 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 411: /* "ForLetWinClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1027 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 413: /* "FLWORClauseList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1036 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 414: /* "ForClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1045 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 415: /* "VarInDeclList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1054 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 416: /* "VarInDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1063 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 417: /* "PositionalVar" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1072 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 418: /* "FTScoreVar" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1081 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 419: /* "LetClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1090 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 420: /* "VarGetsDeclList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1099 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 421: /* "VarGetsDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1108 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 422: /* "WindowVarDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1117 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 423: /* "WindowVars" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1126 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 424: /* "WindowVars3" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1135 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 425: /* "WindowVars2" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1144 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 426: /* "WhereClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1153 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 427: /* "GroupByClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1162 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 428: /* "GroupSpecList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1171 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 429: /* "GroupSpec" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1180 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 430: /* "GroupCollationSpec" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1189 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 431: /* "OrderByClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1198 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 432: /* "OrderSpecList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1207 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 433: /* "OrderSpec" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1216 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 434: /* "OrderModifier" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1225 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 435: /* "OrderDirSpec" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1234 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 436: /* "OrderEmptySpec" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1243 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 437: /* "OrderCollationSpec" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1252 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 438: /* "QuantifiedExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1261 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 439: /* "QVarInDeclList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1270 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 440: /* "QVarInDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1279 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 441: /* "SwitchExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1288 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 442: /* "SwitchCaseClauseList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1297 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 443: /* "SwitchCaseClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1306 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 444: /* "SwitchCaseOperandList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1315 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 445: /* "SwitchStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1324 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 448: /* "TypeswitchExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1333 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 449: /* "TypeswitchStatement" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1342 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 450: /* "CaseClauseList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1351 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 451: /* "CaseClause" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1360 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 454: /* "IfExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1369 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 455: /* "OrExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1378 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 456: /* "AndExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1387 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 457: /* "ComparisonExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1396 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 459: /* "FTContainsExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1405 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 460: /* "StringConcatExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1414 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 461: /* "opt_FTIgnoreOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1423 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 462: /* "RangeExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1432 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 463: /* "AdditiveExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1441 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 464: /* "MultiplicativeExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1450 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 465: /* "UnionExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1459 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 466: /* "IntersectExceptExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1468 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 467: /* "InstanceofExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1477 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 468: /* "TreatExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1486 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 469: /* "CastableExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1495 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 470: /* "CastExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1504 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 471: /* "UnaryExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1513 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 472: /* "SignList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1522 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 473: /* "ValueExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1531 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 474: /* "ValueComp" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1540 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 475: /* "NodeComp" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1549 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 476: /* "ValidateExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1558 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 477: /* "ExtensionExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1567 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 478: /* "Pragma_list" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1576 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 479: /* "Pragma" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1585 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 480: /* "PathExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1594 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 482: /* "RelativePathExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1603 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 483: /* "StepExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1612 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 484: /* "AxisStep" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1621 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 485: /* "ForwardStep" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1630 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 486: /* "ForwardAxis" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1639 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 487: /* "AbbrevForwardStep" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1648 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 488: /* "ReverseStep" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1657 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 489: /* "ReverseAxis" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1666 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 490: /* "NodeTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1675 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 491: /* "NameTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1684 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 492: /* "Wildcard" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1693 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 493: /* "FilterExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1702 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 494: /* "PredicateList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1711 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 495: /* "Predicate" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1720 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 496: /* "PrimaryExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1729 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 497: /* "Literal" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1738 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 498: /* "NumericLiteral" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1747 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 499: /* "VarRef" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1756 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 500: /* "ParenthesizedExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1765 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 501: /* "ContextItemExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1774 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 502: /* "OrderedExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1783 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 503: /* "UnorderedExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1792 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 504: /* "FunctionCall" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1801 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 505: /* "ArgList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1810 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 506: /* "Constructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1819 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 507: /* "DirectConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1828 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 508: /* "DirElemConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1837 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 509: /* "DirElemContentList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1846 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 510: /* "DirAttributeList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1855 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 511: /* "DirAttr" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1864 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 513: /* "DirAttributeValue" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1873 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 514: /* "opt_QuoteAttrContentList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1882 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 515: /* "QuoteAttrContentList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1891 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 516: /* "opt_AposAttrContentList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1900 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 517: /* "AposAttrContentList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1909 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 518: /* "QuoteAttrValueContent" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1918 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 519: /* "AposAttrValueContent" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1927 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 520: /* "DirElemContent" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1936 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 521: /* "CommonContent" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1945 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 522: /* "DirCommentConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1954 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 523: /* "DirPIConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1963 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 524: /* "CDataSection" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1972 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 525: /* "ComputedConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1981 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 526: /* "CompDocConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1990 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 527: /* "CompElemConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1999 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 528: /* "CompAttrConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2008 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 529: /* "CompTextConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2017 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 530: /* "CompCommentConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2026 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 531: /* "CompPIConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2035 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 532: /* "SingleType" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2044 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 533: /* "TypeDeclaration" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2053 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 534: /* "SequenceType" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2062 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 535: /* "OccurrenceIndicator" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2071 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 536: /* "ItemType" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2080 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 537: /* "TypeList" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2089 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 538: /* "AtomicType" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2098 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 539: /* "KindTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2107 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 540: /* "AnyKindTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2116 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 541: /* "DocumentTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2125 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 542: /* "TextTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2134 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 543: /* "CommentTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2143 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 544: /* "PITest" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2152 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 545: /* "AttributeTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2161 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 546: /* "SchemaAttributeTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2170 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 547: /* "ElementTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2179 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 548: /* "SchemaElementTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2188 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 549: /* "TypeName" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2197 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 550: /* "TypeName_WITH_HOOK" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2206 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 551: /* "StringLiteral" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2215 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 556: /* "AnyFunctionTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2224 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 557: /* "TypedFunctionTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 890 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2233 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 560: /* "InsertExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2242 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 561: /* "DeleteExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2251 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 562: /* "ReplaceExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2260 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 563: /* "RenameExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2269 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 564: /* "TransformExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2278 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 565: /* "VarNameList" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2287 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 566: /* "VarNameDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2296 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 567: /* "TryExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2305 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 568: /* "CatchListExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2314 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 569: /* "CatchExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2323 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 570: /* "BracedExpr" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2332 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 571: /* "NameTestList" */
+
+/* Line 480 of lalr1.cc  */
+#line 899 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->name_test_list); };
 
 /* Line 480 of lalr1.cc  */
-#line 2319 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 570: /* "FTSelection" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2328 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 573: /* "FTOr" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2337 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 574: /* "FTAnd" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2346 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 575: /* "FTMildNot" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2355 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 576: /* "FTUnaryNot" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2364 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 577: /* "FTPrimaryWithOptions" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2373 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 578: /* "opt_FTMatchOptions" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2382 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 580: /* "FTWeight" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2391 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 581: /* "FTPrimary" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2400 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 582: /* "opt_FTTimes" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2409 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 583: /* "FTExtensionSelection" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2418 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 585: /* "FTWords" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2427 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 586: /* "FTWordsValue" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2436 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 588: /* "FTAnyallOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2445 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 591: /* "FTPosFilter" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2454 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 592: /* "FTOrder" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2463 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 593: /* "FTWindow" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2472 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 594: /* "FTDistance" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2481 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 595: /* "FTUnit" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2490 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 596: /* "FTMatchOptions" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2499 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 597: /* "FTMatchOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2508 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 598: /* "FTCaseOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2517 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 599: /* "FTDiacriticsOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2526 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 600: /* "FTExtensionOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2535 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 601: /* "FTStemOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2544 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 602: /* "FTThesaurusOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2553 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 606: /* "FTThesaurusID" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2562 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 609: /* "FTStopWordOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2571 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 610: /* "FTStopWords" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2580 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 614: /* "FTStopWordsInclExcl" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2589 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 615: /* "FTLanguageOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2598 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 616: /* "FTWildCardOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2607 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 617: /* "FTContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2616 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 618: /* "FTTimes" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2625 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 619: /* "FTRange" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2634 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 620: /* "FTScope" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2643 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 621: /* "FTBigUnit" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2652 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 622: /* "FTIgnoreOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 891 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2661 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 625: /* "QNAME" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2670 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 626: /* "FUNCTION_NAME" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2679 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 627: /* "EQNAME" */
-
-/* Line 480 of lalr1.cc  */
-#line 894 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2688 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
+#line 2341 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 572: /* "FTSelection" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2350 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 575: /* "FTOr" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2359 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 576: /* "FTAnd" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2368 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 577: /* "FTMildNot" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2377 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 578: /* "FTUnaryNot" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2386 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 579: /* "FTPrimaryWithOptions" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2395 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 580: /* "opt_FTMatchOptions" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2404 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 582: /* "FTWeight" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2413 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 583: /* "FTPrimary" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2422 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 584: /* "opt_FTTimes" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2431 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 585: /* "FTExtensionSelection" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2440 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 587: /* "FTWords" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2449 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 588: /* "FTWordsValue" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2458 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 590: /* "FTAnyallOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2467 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 593: /* "FTPosFilter" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2476 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 594: /* "FTOrder" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2485 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 595: /* "FTWindow" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2494 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 596: /* "FTDistance" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2503 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 597: /* "FTUnit" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2512 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 598: /* "FTMatchOptions" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2521 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 599: /* "FTMatchOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2530 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 600: /* "FTCaseOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2539 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 601: /* "FTDiacriticsOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2548 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 602: /* "FTExtensionOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2557 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 603: /* "FTStemOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2566 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 604: /* "FTThesaurusOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2575 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 608: /* "FTThesaurusID" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2584 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 611: /* "FTStopWordOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2593 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 612: /* "FTStopWords" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2602 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 616: /* "FTStopWordsInclExcl" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2611 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 617: /* "FTLanguageOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2620 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 618: /* "FTWildCardOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2629 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 619: /* "FTContent" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2638 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 620: /* "FTTimes" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2647 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 621: /* "FTRange" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2656 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 622: /* "FTScope" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2665 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 623: /* "FTBigUnit" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2674 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 624: /* "FTIgnoreOption" */
+
+/* Line 480 of lalr1.cc  */
+#line 893 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2683 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 627: /* "QNAME" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2692 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 628: /* "FUNCTION_NAME" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2701 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 629: /* "EQNAME" */
+
+/* Line 480 of lalr1.cc  */
+#line 896 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2710 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
 	break;
 
 	default:
@@ -2727,6 +2749,18 @@
   }
 #endif
 
+  inline bool
+  xquery_parser::yy_pact_value_is_default_ (int yyvalue)
+  {
+    return yyvalue == yypact_ninf_;
+  }
+
+  inline bool
+  xquery_parser::yy_table_value_is_error_ (int yyvalue)
+  {
+    return yyvalue == yytable_ninf_;
+  }
+
   int
   xquery_parser::parse ()
   {
@@ -2748,7 +2782,7 @@
     /// Location of the lookahead.
     location_type yylloc;
     /// The locations where the error started and ended.
-    location_type yyerror_range[2];
+    location_type yyerror_range[3];
 
     /// $$.
     semantic_type yyval;
@@ -2762,14 +2796,14 @@
 
     /* User initialization code.  */
     
-/* Line 553 of lalr1.cc  */
-#line 140 "/home/mbrantner/zorba/trunk/core/src/compiler/parser/xquery_parser.y"
+/* Line 565 of lalr1.cc  */
+#line 140 "/Users/wcandillon/28msec/zorba/sandbox/src/compiler/parser/xquery_parser.y"
 {
     yylloc.begin.filename = yylloc.end.filename = &(driver.theFilename2);
 }
 
-/* Line 553 of lalr1.cc  */
-#line 2773 "/home/mbrantner/zorba/trunk/build/src/compiler/parser/xquery_parser.cpp"
+/* Line 565 of lalr1.cc  */
+#line 2807 "/Users/wcandillon/28msec/zorba/build/src/compiler/parser/xquery_parser.cpp"
 
     /* Initialize the stacks.  The initial state will be pushed in
        yynewstate, since the latter expects the semantical and the
@@ -2797,7 +2831,7 @@
 
     /* Try to take a decision without lookahead.  */
     yyn = yypact_[yystate];
-    if (yyn == yypact_ninf_)
+    if (yy_pact_value_is_default_ (yyn))
       goto yydefault;
 
     /* Read a lookahead token.  */
@@ -2830,8 +2864,8 @@
     yyn = yytable_[yyn];
     if (yyn <= 0)