← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~nbrinza/zorba/error-messages into lp:zorba

 

Nicolae Brinza has proposed merging lp:~nbrinza/zorba/error-messages into lp:zorba.

Requested reviews:
  Nicolae Brinza (nbrinza)
  Matthias Brantner (matthias-brantner)
Related bugs:
  Bug #867227 in Zorba: "Confusing error message"
  https://bugs.launchpad.net/zorba/+bug/867227
  Bug #867357 in Zorba: "Improved parser error message"
  https://bugs.launchpad.net/zorba/+bug/867357
  Bug #997045 in Zorba: "EQName regressions"
  https://bugs.launchpad.net/zorba/+bug/997045

For more details, see:
https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/122401

Fixed bug #867227 -- improved error messages for missing commas
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/122401
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2012-08-31 15:21:31 +0000
+++ ChangeLog	2012-09-02 01:59:39 +0000
@@ -11,6 +11,7 @@
   * New memory management for compiler expressions (no more ref counting)
 
 Bug Fixes/Other Changes:
+  * Fixed bug #867227 (Improved error message for missing commas)
   * Fixed bug #1024033 and #1023170 (segfaults in parse-xml:parse())
   * Fixed bug #898792 (Dynamically computed strings can now be cast to xs:QName)
   * Fixed bugs #899364 and 899363 (throw XQST0103 in case of non-distinct window

=== modified file 'src/compiler/parser/xquery_parser.cpp'
--- src/compiler/parser/xquery_parser.cpp	2012-08-30 13:45:43 +0000
+++ src/compiler/parser/xquery_parser.cpp	2012-09-02 01:59:39 +0000
@@ -1,10 +1,8 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.6.2.  */
 
 /* Skeleton implementation for Bison LALR(1) parsers in C++
    
-      Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
-   Foundation, Inc.
+      Copyright (C) 2002-2012 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -36,9 +34,8 @@
 #define yylex   zorbalex
 
 /* First part of user declarations.  */
-
-/* Line 311 of lalr1.cc  */
-#line 87 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 278 of lalr1.cc  */
+#line 87 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 
 
 #include "common/common.h"
@@ -73,17 +70,15 @@
 using namespace zorba;
 
 
-
-/* Line 311 of lalr1.cc  */
-#line 79 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
+/* Line 278 of lalr1.cc  */
+#line 75 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 
 
 #include "xquery_parser.hpp"
 
 /* User implementation prologue.  */
-
-/* Line 317 of lalr1.cc  */
-#line 906 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 284 of lalr1.cc  */
+#line 906 "/home/colea/xquery_bzr/error-messages/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...
@@ -93,9 +88,8 @@
         RCHelper::removeReference( ref );
     }
 }
-
-/* Line 317 of lalr1.cc  */
-#line 1022 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 284 of lalr1.cc  */
+#line 1022 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 
 #include "compiler/parser/xquery_scanner.h"
 
@@ -103,12 +97,20 @@
 #define yylex driver.lexer->lex
 
 
-
-/* Line 317 of lalr1.cc  */
-#line 109 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
+/* Line 284 of lalr1.cc  */
+#line 102 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+
+
+# ifndef YY_NULL
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULL nullptr
+#  else
+#   define YY_NULL 0
+#  endif
+# endif
 
 #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 +121,27 @@
 # endif
 #endif
 
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+# ifndef YYLLOC_DEFAULT
+#  define YYLLOC_DEFAULT(Current, Rhs, N)                               \
+    do                                                                  \
+      if (N)                                                            \
+        {                                                               \
+          (Current).begin  = YYRHSLOC (Rhs, 1).begin;                   \
+          (Current).end    = YYRHSLOC (Rhs, N).end;                     \
+        }                                                               \
+      else                                                              \
+        {                                                               \
+          (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;      \
+        }                                                               \
+    while (/*CONSTCOND*/ false)
+# endif
+
+
 /* Suppress unused-variable warnings by "using" E.  */
 #define YYUSE(e) ((void) (e))
 
@@ -168,14 +191,9 @@
 #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/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-#if YYERROR_VERBOSE
+/* Line 352 of lalr1.cc  */
+#line 197 "/home/colea/xquery_bzr/error-messages/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 +232,6 @@
     return yystr;
   }
 
-#endif
 
   /// Build a parser object.
   xquery_parser::xquery_parser (xquery_driver& driver_yyarg)
@@ -242,6 +259,9 @@
   {
     YYUSE (yylocationp);
     YYUSE (yyvaluep);
+    std::ostream& yyo = debug_stream ();
+    std::ostream& yyoutput = yyo;
+    YYUSE (yyoutput);
     switch (yytype)
       {
          default:
@@ -274,2516 +294,1958 @@
 
     switch (yytype)
       {
-        case 110: /* "\"'DECIMAL'\"" */
-
-/* Line 480 of lalr1.cc  */
-#line 904 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ delete (yyvaluep->decval); };
-
-/* Line 480 of lalr1.cc  */
-#line 285 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 124: /* "\"'DOUBLE'\"" */
-
-/* Line 480 of lalr1.cc  */
-#line 903 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ delete (yyvaluep->dval); };
-
-/* Line 480 of lalr1.cc  */
-#line 294 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 149: /* "\"'INTEGER'\"" */
-
-/* Line 480 of lalr1.cc  */
-#line 902 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ delete (yyvaluep->ival); };
-
-/* Line 480 of lalr1.cc  */
-#line 303 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 336: /* "VersionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 312 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 337: /* "MainModule" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 321 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 338: /* "LibraryModule" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 330 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 339: /* "ModuleDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 339 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 340: /* "SIND_DeclList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 348 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 341: /* "SIND_Decl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 357 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 342: /* "Setter" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 366 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 343: /* "BoundarySpaceDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 375 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 344: /* "DefaultCollationDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 384 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 345: /* "BaseURIDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 393 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 346: /* "ConstructionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 402 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 347: /* "OrderingModeDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 411 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 348: /* "EmptyOrderDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 420 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 349: /* "CopyNamespacesDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 429 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 350: /* "Import" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 438 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 351: /* "SchemaImport" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 447 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 352: /* "URILiteralList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 456 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 353: /* "SchemaPrefix" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 465 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 354: /* "ModuleImport" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 474 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 355: /* "NamespaceDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 483 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 356: /* "DefaultNamespaceDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 492 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 357: /* "VFO_DeclList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 501 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 358: /* "VFO_Decl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 510 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 359: /* "DecimalFormatDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 519 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 360: /* "DecimalFormatParamList" */
-
-/* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ delete (yyvaluep->vstrpair); };
-
-/* Line 480 of lalr1.cc  */
-#line 528 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 361: /* "DecimalFormatParam" */
-
-/* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ delete (yyvaluep->strpair); };
-
-/* Line 480 of lalr1.cc  */
-#line 537 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 363: /* "OptionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 546 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 364: /* "FTOptionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 555 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 365: /* "CtxItemDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 564 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 366: /* "CtxItemDecl2" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 573 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 367: /* "CtxItemDecl3" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 582 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 368: /* "CtxItemDecl4" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 591 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 369: /* "VarDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 600 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 370: /* "VarNameAndType" */
-
-/* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ delete (yyvaluep->varnametype); };
-
-/* Line 480 of lalr1.cc  */
-#line 609 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 371: /* "AnnotationList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 618 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 372: /* "Annotation" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 627 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 373: /* "AnnotationLiteralList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 636 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 374: /* "FunctionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 645 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 375: /* "FunctionDecl2" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 654 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 376: /* "FunctionDeclSimple" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 663 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 377: /* "FunctionDeclUpdating" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 672 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 378: /* "FunctionSig" */
-
-/* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ delete (yyvaluep->fnsig); };
-
-/* Line 480 of lalr1.cc  */
-#line 681 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 379: /* "ParamList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 690 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 380: /* "Param" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 699 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 381: /* "CollectionDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 708 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 383: /* "IndexDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 717 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 384: /* "IndexKeyList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 726 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 385: /* "IndexKeySpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 735 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 386: /* "IntegrityConstraintDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 744 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 387: /* "QueryBody" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 753 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 388: /* "StatementsAndOptionalExprTop" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 762 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 389: /* "StatementsAndOptionalExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 771 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 390: /* "StatementsAndExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 780 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 391: /* "Statements" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 789 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 392: /* "Statement" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 798 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 393: /* "BlockStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 807 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 394: /* "BlockExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 816 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 395: /* "EnclosedStatementsAndOptionalExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 825 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 396: /* "VarDeclStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 834 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 399: /* "AssignStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 843 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 400: /* "ApplyStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 852 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 401: /* "ExitStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 861 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 402: /* "WhileStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 870 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 403: /* "FlowCtlStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 879 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 404: /* "FLWORStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 888 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 405: /* "ReturnStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 897 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 406: /* "IfStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 906 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 407: /* "TryStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 915 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 408: /* "CatchListStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 409: /* "CatchStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 933 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 410: /* "Expr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 942 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 411: /* "ExprSingle" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 951 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 412: /* "ExprSimple" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 960 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 413: /* "FLWORExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 969 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 414: /* "ReturnExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 978 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 417: /* "FLWORWinCond" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 987 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 418: /* "WindowClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 996 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 419: /* "CountClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1005 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 420: /* "ForLetWinClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1014 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 422: /* "FLWORClauseList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1023 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 423: /* "ForClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1032 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 424: /* "VarInDeclList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1041 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 425: /* "VarInDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1050 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 426: /* "PositionalVar" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1059 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 427: /* "FTScoreVar" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1068 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 428: /* "LetClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1077 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 429: /* "VarGetsDeclList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1086 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 430: /* "VarGetsDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1095 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 431: /* "WindowVarDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1104 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 432: /* "WindowVars" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1113 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 433: /* "WindowVars3" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1122 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 434: /* "WindowVars2" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1131 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 435: /* "WhereClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1140 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 436: /* "GroupByClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1149 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 437: /* "GroupSpecList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1158 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 438: /* "GroupSpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1167 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 439: /* "GroupCollationSpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1176 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 440: /* "OrderByClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1185 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 441: /* "OrderSpecList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1194 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 442: /* "OrderSpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1203 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 443: /* "OrderModifier" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1212 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 444: /* "OrderDirSpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1221 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 445: /* "OrderEmptySpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1230 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 446: /* "OrderCollationSpec" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1239 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 447: /* "QuantifiedExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1248 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 448: /* "QVarInDeclList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1257 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 449: /* "QVarInDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1266 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 450: /* "SwitchExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1275 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 451: /* "SwitchCaseClauseList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1284 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 452: /* "SwitchCaseClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1293 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 453: /* "SwitchCaseOperandList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1302 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 454: /* "SwitchStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1311 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 457: /* "TypeswitchExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1320 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 458: /* "TypeswitchStatement" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1329 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 459: /* "CaseClauseList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1338 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 460: /* "CaseClause" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1347 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 463: /* "IfExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1356 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 464: /* "OrExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1365 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 465: /* "AndExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1374 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 466: /* "ComparisonExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1383 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 468: /* "FTContainsExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1392 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 469: /* "StringConcatExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1401 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 470: /* "opt_FTIgnoreOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1410 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 471: /* "RangeExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1419 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 472: /* "AdditiveExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1428 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 473: /* "MultiplicativeExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1437 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 474: /* "UnionExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1446 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 475: /* "IntersectExceptExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1455 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 476: /* "InstanceofExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1464 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 477: /* "TreatExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1473 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 478: /* "CastableExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1482 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 479: /* "CastExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1491 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 480: /* "UnaryExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1500 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 481: /* "SignList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1509 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 482: /* "ValueExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1518 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 483: /* "ValueComp" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1527 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 484: /* "NodeComp" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1536 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 485: /* "ValidateExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1545 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 486: /* "ExtensionExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1554 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 487: /* "Pragma_list" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1563 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 488: /* "Pragma" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1572 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 489: /* "PathExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1581 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 491: /* "RelativePathExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1590 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 492: /* "StepExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1599 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 493: /* "AxisStep" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1608 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 494: /* "ForwardStep" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1617 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 495: /* "ForwardAxis" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1626 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 496: /* "AbbrevForwardStep" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1635 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 497: /* "ReverseStep" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1644 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 498: /* "ReverseAxis" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1653 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 499: /* "NodeTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1662 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 500: /* "NameTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1671 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 501: /* "Wildcard" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1680 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 502: /* "FilterExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1689 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 503: /* "PredicateList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1698 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 504: /* "Predicate" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1707 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 505: /* "PrimaryExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1716 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 506: /* "Literal" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1725 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 507: /* "NumericLiteral" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1734 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 508: /* "VarRef" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1743 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 509: /* "ParenthesizedExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1752 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 510: /* "ContextItemExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1761 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 511: /* "OrderedExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1770 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 512: /* "UnorderedExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1779 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 513: /* "FunctionCall" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1788 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 514: /* "ArgList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1797 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 515: /* "Constructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1806 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 516: /* "DirectConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1815 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 517: /* "DirElemConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1824 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 518: /* "DirElemContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1833 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 519: /* "DirAttributeList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1842 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 520: /* "DirAttr" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1851 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 522: /* "DirAttributeValue" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1860 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 523: /* "opt_QuoteAttrContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1869 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 524: /* "QuoteAttrContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1878 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 525: /* "opt_AposAttrContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1887 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 526: /* "AposAttrContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1896 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 527: /* "QuoteAttrValueContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1905 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 528: /* "AposAttrValueContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1914 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 529: /* "DirElemContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1923 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 530: /* "CommonContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1932 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 531: /* "DirCommentConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1941 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 532: /* "DirPIConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1950 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 533: /* "CDataSection" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1959 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 534: /* "ComputedConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1968 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 535: /* "CompDocConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1977 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 536: /* "CompElemConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1986 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 537: /* "CompAttrConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1995 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 538: /* "CompTextConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2004 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 539: /* "CompCommentConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2013 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 540: /* "CompPIConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2022 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 541: /* "SingleType" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2031 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 542: /* "TypeDeclaration" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2040 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 543: /* "SequenceType" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2049 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 544: /* "OccurrenceIndicator" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2058 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 545: /* "ItemType" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2067 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 546: /* "TypeList" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2076 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 547: /* "AtomicType" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2085 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 548: /* "KindTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2094 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 549: /* "AnyKindTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2103 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 550: /* "DocumentTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2112 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 551: /* "TextTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2121 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 552: /* "CommentTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2130 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 553: /* "PITest" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2139 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 554: /* "AttributeTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2148 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 555: /* "SchemaAttributeTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2157 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 556: /* "ElementTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2166 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 557: /* "SchemaElementTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2175 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 558: /* "TypeName" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2184 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 559: /* "TypeName_WITH_HOOK" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2193 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 560: /* "StringLiteral" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2202 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 565: /* "AnyFunctionTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2211 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 566: /* "TypedFunctionTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2220 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 569: /* "InsertExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2229 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 570: /* "DeleteExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2238 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 571: /* "ReplaceExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2247 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 572: /* "RenameExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2256 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 573: /* "TransformExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2265 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 574: /* "VarNameList" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2274 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 575: /* "VarNameDecl" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2283 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 576: /* "TryExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2292 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 577: /* "CatchListExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2301 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 578: /* "CatchExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2310 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 579: /* "BracedExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2319 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 580: /* "NameTestList" */
-
-/* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ delete (yyvaluep->name_test_list); };
-
-/* Line 480 of lalr1.cc  */
-#line 2328 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 581: /* "FTSelection" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2337 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 584: /* "FTOr" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2346 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 585: /* "FTAnd" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2355 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 586: /* "FTMildNot" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2364 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 587: /* "FTUnaryNot" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2373 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 588: /* "FTPrimaryWithOptions" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2382 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 589: /* "opt_FTMatchOptions" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2391 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 591: /* "FTWeight" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2400 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 592: /* "FTPrimary" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2409 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 593: /* "opt_FTTimes" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2418 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 594: /* "FTExtensionSelection" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2427 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 596: /* "FTWords" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2436 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 597: /* "FTWordsValue" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2445 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 599: /* "FTAnyallOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2454 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 602: /* "FTPosFilter" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2463 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 603: /* "FTOrder" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2472 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 604: /* "FTWindow" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2481 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 605: /* "FTDistance" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2490 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 606: /* "FTUnit" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2499 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 607: /* "FTMatchOptions" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2508 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 608: /* "FTMatchOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2517 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 609: /* "FTCaseOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2526 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 610: /* "FTDiacriticsOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2535 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 611: /* "FTExtensionOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2544 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 612: /* "FTStemOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2553 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 613: /* "FTThesaurusOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2562 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 617: /* "FTThesaurusID" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2571 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 620: /* "FTStopWordOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2580 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 621: /* "FTStopWords" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2589 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 625: /* "FTStopWordsInclExcl" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2598 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 626: /* "FTLanguageOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2607 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 627: /* "FTWildCardOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2616 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 628: /* "FTContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2625 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 629: /* "FTTimes" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2634 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 630: /* "FTRange" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2643 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 631: /* "FTScope" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2652 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 632: /* "FTBigUnit" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2661 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 633: /* "FTIgnoreOption" */
-
-/* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2670 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 634: /* "JSONArrayConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2679 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 635: /* "JSONSimpleObjectUnion" */
-
-/* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2688 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 636: /* "JSONAccumulatorObjectUnion" */
-
-/* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2697 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 637: /* "JSONObjectConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2706 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 638: /* "JSONPairList" */
-
-/* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2715 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 639: /* "JSONInsertExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2724 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 640: /* "JSONAppendExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2733 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 641: /* "JSONDeleteExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2742 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 642: /* "JSONRenameExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2751 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 643: /* "JSONReplaceExpr" */
-
-/* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2760 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 650: /* "QNAME" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2769 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 651: /* "FUNCTION_NAME" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2778 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 652: /* "EQNAME" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2787 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
+        case 110: /* "'DECIMAL'" */
+/* Line 453 of lalr1.cc  */
+#line 904 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ delete ((*yyvaluep).decval); };
+/* Line 453 of lalr1.cc  */
+#line 303 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 124: /* "'DOUBLE'" */
+/* Line 453 of lalr1.cc  */
+#line 903 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ delete ((*yyvaluep).dval); };
+/* Line 453 of lalr1.cc  */
+#line 310 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 149: /* "'INTEGER'" */
+/* Line 453 of lalr1.cc  */
+#line 902 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ delete ((*yyvaluep).ival); };
+/* Line 453 of lalr1.cc  */
+#line 317 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 336: /* VersionDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 324 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 337: /* MainModule */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 331 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 338: /* LibraryModule */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 338 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 339: /* ModuleDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 345 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 340: /* SIND_DeclList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 352 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 341: /* SIND_Decl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 359 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 342: /* Setter */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 366 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 343: /* BoundarySpaceDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 373 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 344: /* DefaultCollationDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 380 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 345: /* BaseURIDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 387 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 346: /* ConstructionDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 394 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 347: /* OrderingModeDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 401 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 348: /* EmptyOrderDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 408 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 349: /* CopyNamespacesDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 415 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 350: /* Import */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 422 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 351: /* SchemaImport */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 429 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 352: /* URILiteralList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 436 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 353: /* SchemaPrefix */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 443 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 354: /* ModuleImport */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 450 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 355: /* NamespaceDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 457 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 356: /* DefaultNamespaceDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 464 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 357: /* VFO_DeclList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 471 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 358: /* VFO_Decl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 478 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 359: /* DecimalFormatDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 485 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 360: /* DecimalFormatParamList */
+/* Line 453 of lalr1.cc  */
+#line 930 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ delete ((*yyvaluep).vstrpair); };
+/* Line 453 of lalr1.cc  */
+#line 492 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 361: /* DecimalFormatParam */
+/* Line 453 of lalr1.cc  */
+#line 930 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ delete ((*yyvaluep).strpair); };
+/* Line 453 of lalr1.cc  */
+#line 499 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 363: /* OptionDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 506 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 364: /* FTOptionDecl */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 513 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 365: /* CtxItemDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 520 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 366: /* CtxItemDecl2 */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 527 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 367: /* CtxItemDecl3 */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 534 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 368: /* CtxItemDecl4 */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 541 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 369: /* VarDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 548 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 370: /* VarNameAndType */
+/* Line 453 of lalr1.cc  */
+#line 930 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ delete ((*yyvaluep).varnametype); };
+/* Line 453 of lalr1.cc  */
+#line 555 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 371: /* AnnotationList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 562 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 372: /* Annotation */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 569 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 373: /* AnnotationLiteralList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 576 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 374: /* FunctionDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 583 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 375: /* FunctionDecl2 */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 590 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 376: /* FunctionDeclSimple */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 597 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 377: /* FunctionDeclUpdating */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 604 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 378: /* FunctionSig */
+/* Line 453 of lalr1.cc  */
+#line 930 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ delete ((*yyvaluep).fnsig); };
+/* Line 453 of lalr1.cc  */
+#line 611 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 379: /* ParamList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 618 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 380: /* Param */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 625 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 381: /* CollectionDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 632 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 383: /* IndexDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 639 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 384: /* IndexKeyList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 646 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 385: /* IndexKeySpec */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 653 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 386: /* IntegrityConstraintDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 660 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 387: /* QueryBody */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 667 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 388: /* StatementsAndOptionalExprTop */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 674 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 389: /* StatementsAndOptionalExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 681 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 390: /* StatementsAndExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 688 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 391: /* Statements */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 695 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 392: /* Statement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 702 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 393: /* BlockStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 709 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 394: /* BlockExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 716 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 395: /* EnclosedStatementsAndOptionalExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 723 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 396: /* VarDeclStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 730 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 399: /* AssignStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 737 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 400: /* ApplyStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 744 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 401: /* ExitStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 751 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 402: /* WhileStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 758 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 403: /* FlowCtlStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 765 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 404: /* FLWORStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 772 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 405: /* ReturnStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 779 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 406: /* IfStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 786 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 407: /* TryStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 793 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 408: /* CatchListStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 800 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 409: /* CatchStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 807 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 410: /* Expr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 814 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 411: /* ExprSingle */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 821 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 412: /* ExprSimple */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 828 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 413: /* FLWORExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 835 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 414: /* ReturnExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 842 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 417: /* FLWORWinCond */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 849 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 418: /* WindowClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 856 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 419: /* CountClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 863 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 420: /* ForLetWinClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 870 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 422: /* FLWORClauseList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 877 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 423: /* ForClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 884 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 424: /* VarInDeclList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 891 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 425: /* VarInDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 898 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 426: /* PositionalVar */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 905 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 427: /* FTScoreVar */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 912 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 428: /* LetClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 919 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 429: /* VarGetsDeclList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 926 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 430: /* VarGetsDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 933 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 431: /* WindowVarDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 940 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 432: /* WindowVars */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 947 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 433: /* WindowVars3 */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 954 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 434: /* WindowVars2 */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 961 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 435: /* WhereClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 968 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 436: /* GroupByClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 975 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 437: /* GroupSpecList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 982 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 438: /* GroupSpec */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 989 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 439: /* GroupCollationSpec */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 996 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 440: /* OrderByClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1003 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 441: /* OrderSpecList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1010 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 442: /* OrderSpec */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1017 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 443: /* OrderModifier */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1024 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 444: /* OrderDirSpec */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1031 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 445: /* OrderEmptySpec */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1038 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 446: /* OrderCollationSpec */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1045 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 447: /* QuantifiedExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1052 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 448: /* QVarInDeclList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1059 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 449: /* QVarInDecl */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1066 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 450: /* SwitchExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1073 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 451: /* SwitchCaseClauseList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1080 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 452: /* SwitchCaseClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1087 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 453: /* SwitchCaseOperandList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1094 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 454: /* SwitchStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1101 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 457: /* TypeswitchExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1108 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 458: /* TypeswitchStatement */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1115 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 459: /* CaseClauseList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1122 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 460: /* CaseClause */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1129 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 463: /* IfExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1136 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 464: /* OrExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1143 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 465: /* AndExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1150 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 466: /* ComparisonExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1157 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 468: /* FTContainsExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1164 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 469: /* StringConcatExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1171 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 470: /* opt_FTIgnoreOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1178 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 471: /* RangeExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1185 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 472: /* AdditiveExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1192 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 473: /* MultiplicativeExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1199 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 474: /* UnionExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1206 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 475: /* IntersectExceptExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1213 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 476: /* InstanceofExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1220 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 477: /* TreatExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1227 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 478: /* CastableExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1234 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 479: /* CastExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1241 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 480: /* UnaryExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1248 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 481: /* SignList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1255 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 482: /* ValueExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1262 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 483: /* ValueComp */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1269 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 484: /* NodeComp */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1276 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 485: /* ValidateExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1283 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 486: /* ExtensionExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1290 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 487: /* Pragma_list */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1297 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 488: /* Pragma */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1304 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 489: /* PathExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1311 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 491: /* RelativePathExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1318 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 492: /* StepExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1325 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 493: /* AxisStep */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1332 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 494: /* ForwardStep */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1339 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 495: /* ForwardAxis */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1346 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 496: /* AbbrevForwardStep */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1353 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 497: /* ReverseStep */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1360 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 498: /* ReverseAxis */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1367 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 499: /* NodeTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1374 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 500: /* NameTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1381 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 501: /* Wildcard */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1388 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 502: /* FilterExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1395 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 503: /* PredicateList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1402 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 504: /* Predicate */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1409 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 505: /* PrimaryExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1416 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 506: /* Literal */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1423 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 507: /* NumericLiteral */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1430 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 508: /* VarRef */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1437 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 509: /* ParenthesizedExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1444 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 510: /* ContextItemExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1451 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 511: /* OrderedExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1458 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 512: /* UnorderedExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1465 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 513: /* FunctionCall */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1472 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 514: /* ArgList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1479 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 515: /* Constructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1486 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 516: /* DirectConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1493 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 517: /* DirElemConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1500 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 518: /* DirElemContentList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1507 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 519: /* DirAttributeList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1514 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 520: /* DirAttr */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1521 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 522: /* DirAttributeValue */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1528 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 523: /* opt_QuoteAttrContentList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1535 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 524: /* QuoteAttrContentList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1542 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 525: /* opt_AposAttrContentList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1549 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 526: /* AposAttrContentList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1556 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 527: /* QuoteAttrValueContent */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1563 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 528: /* AposAttrValueContent */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1570 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 529: /* DirElemContent */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1577 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 530: /* CommonContent */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1584 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 531: /* DirCommentConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1591 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 532: /* DirPIConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1598 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 533: /* CDataSection */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1605 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 534: /* ComputedConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1612 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 535: /* CompDocConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1619 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 536: /* CompElemConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1626 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 537: /* CompAttrConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1633 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 538: /* CompTextConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1640 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 539: /* CompCommentConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1647 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 540: /* CompPIConstructor */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1654 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 541: /* SingleType */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1661 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 542: /* TypeDeclaration */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1668 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 543: /* SequenceType */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1675 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 544: /* OccurrenceIndicator */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1682 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 545: /* ItemType */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1689 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 546: /* TypeList */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1696 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 547: /* AtomicType */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1703 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 548: /* KindTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1710 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 549: /* AnyKindTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1717 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 550: /* DocumentTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1724 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 551: /* TextTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1731 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 552: /* CommentTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1738 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 553: /* PITest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1745 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 554: /* AttributeTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1752 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 555: /* SchemaAttributeTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1759 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 556: /* ElementTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1766 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 557: /* SchemaElementTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1773 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 558: /* TypeName */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1780 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 559: /* TypeName_WITH_HOOK */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1787 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 560: /* StringLiteral */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1794 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 565: /* AnyFunctionTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1801 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 566: /* TypedFunctionTest */
+/* Line 453 of lalr1.cc  */
+#line 918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1808 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 569: /* InsertExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1815 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 570: /* DeleteExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1822 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 571: /* ReplaceExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1829 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 572: /* RenameExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1836 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 573: /* TransformExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1843 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 574: /* VarNameList */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1850 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 575: /* VarNameDecl */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1857 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 576: /* TryExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1864 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 577: /* CatchListExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1871 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 578: /* CatchExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1878 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 579: /* BracedExpr */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 1885 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 580: /* NameTestList */
+/* Line 453 of lalr1.cc  */
+#line 930 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ delete ((*yyvaluep).name_test_list); };
+/* Line 453 of lalr1.cc  */
+#line 1892 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 581: /* FTSelection */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1899 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 584: /* FTOr */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1906 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 585: /* FTAnd */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1913 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 586: /* FTMildNot */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1920 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 587: /* FTUnaryNot */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1927 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 588: /* FTPrimaryWithOptions */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1934 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 589: /* opt_FTMatchOptions */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1941 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 591: /* FTWeight */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1948 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 592: /* FTPrimary */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1955 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 593: /* opt_FTTimes */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1962 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 594: /* FTExtensionSelection */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1969 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 596: /* FTWords */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1976 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 597: /* FTWordsValue */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1983 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 599: /* FTAnyallOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1990 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 602: /* FTPosFilter */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 1997 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 603: /* FTOrder */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2004 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 604: /* FTWindow */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2011 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 605: /* FTDistance */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2018 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 606: /* FTUnit */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2025 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 607: /* FTMatchOptions */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2032 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 608: /* FTMatchOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2039 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 609: /* FTCaseOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2046 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 610: /* FTDiacriticsOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2053 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 611: /* FTExtensionOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2060 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 612: /* FTStemOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2067 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 613: /* FTThesaurusOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2074 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 617: /* FTThesaurusID */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2081 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 620: /* FTStopWordOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2088 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 621: /* FTStopWords */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2095 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 625: /* FTStopWordsInclExcl */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2102 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 626: /* FTLanguageOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2109 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 627: /* FTWildCardOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2116 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 628: /* FTContent */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2123 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 629: /* FTTimes */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2130 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 630: /* FTRange */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2137 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 631: /* FTScope */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2144 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 632: /* FTBigUnit */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2151 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 633: /* FTIgnoreOption */
+/* Line 453 of lalr1.cc  */
+#line 921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2158 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 634: /* JSONArrayConstructor */
+/* Line 453 of lalr1.cc  */
+#line 924 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2165 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 635: /* JSONSimpleObjectUnion */
+/* Line 453 of lalr1.cc  */
+#line 924 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2172 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 636: /* JSONAccumulatorObjectUnion */
+/* Line 453 of lalr1.cc  */
+#line 924 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2179 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 637: /* JSONObjectConstructor */
+/* Line 453 of lalr1.cc  */
+#line 924 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2186 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 638: /* JSONPairList */
+/* Line 453 of lalr1.cc  */
+#line 924 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).node) ); };
+/* Line 453 of lalr1.cc  */
+#line 2193 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 639: /* JSONInsertExpr */
+/* Line 453 of lalr1.cc  */
+#line 924 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2200 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 640: /* JSONAppendExpr */
+/* Line 453 of lalr1.cc  */
+#line 924 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2207 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 641: /* JSONDeleteExpr */
+/* Line 453 of lalr1.cc  */
+#line 924 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2214 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 642: /* JSONRenameExpr */
+/* Line 453 of lalr1.cc  */
+#line 924 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2221 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 643: /* JSONReplaceExpr */
+/* Line 453 of lalr1.cc  */
+#line 924 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2228 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 650: /* QNAME */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2235 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 651: /* FUNCTION_NAME */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2242 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 652: /* EQNAME */
+/* Line 453 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+	{ release_hack( ((*yyvaluep).expr) ); };
+/* Line 453 of lalr1.cc  */
+#line 2249 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
 
 	default:
@@ -2826,6 +2288,18 @@
   }
 #endif
 
+  inline bool
+  xquery_parser::yy_pact_value_is_default_ (int yyvalue)
+  {
+    return yyvalue == yypact_ninf_;
+  }
+
+  inline bool
+  xquery_parser::yy_table_value_is_error_ (int yyvalue)
+  {
+    return yyvalue == yytable_ninf_;
+  }
+
   int
   xquery_parser::parse ()
   {
@@ -2847,7 +2321,7 @@
     /// Location of the lookahead.
     location_type yylloc;
     /// The locations where the error started and ended.
-    location_type yyerror_range[2];
+    location_type yyerror_range[3];
 
     /// $$.
     semantic_type yyval;
@@ -2859,16 +2333,14 @@
     YYCDEBUG << "Starting parse" << std::endl;
 
 
-    /* User initialization code.  */
-    
-/* Line 553 of lalr1.cc  */
-#line 140 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* User initialization code.  */
+/* Line 538 of lalr1.cc  */
+#line 140 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 {
     yylloc.begin.filename = yylloc.end.filename = &(driver.theFilename2);
 }
-
-/* Line 553 of lalr1.cc  */
-#line 2872 "/home/markos/zorba/repo/expr-memman2/build/src/compiler/parser/xquery_parser.cpp"
+/* Line 538 of lalr1.cc  */
+#line 2344 "/home/colea/xquery_bzr/error-messages/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
@@ -2896,7 +2368,7 @@
 
     /* Try to take a decision without lookahead.  */
     yyn = yypact_[yystate];
-    if (yyn == yypact_ninf_)
+    if (yy_pact_value_is_default_ (yyn))
       goto yydefault;
 
     /* Read a lookahead token.  */
@@ -2929,8 +2401,8 @@
     yyn = yytable_[yyn];
     if (yyn <= 0)
       {
-	if (yyn == 0 || yyn == yytable_ninf_)
-	goto yyerrlab;
+	if (yy_table_value_is_error_ (yyn))
+	  goto yyerrlab;
 	yyn = -yyn;
 	goto yyreduce;
       }
@@ -2985,45 +2457,40 @@
     switch (yyn)
       {
 	  case 3:
-
-/* Line 678 of lalr1.cc  */
-#line 1040 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1040 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       }
     break;
 
   case 4:
-
-/* Line 678 of lalr1.cc  */
-#line 1044 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1044 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       }
     break;
 
   case 5:
-
-/* Line 678 of lalr1.cc  */
-#line 1048 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1048 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       }
     break;
 
   case 6:
-
-/* Line 678 of lalr1.cc  */
-#line 1059 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1059 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
         (yyval.node) = NULL; YYABORT;
       }
     break;
 
   case 7:
-
-/* Line 678 of lalr1.cc  */
-#line 1068 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1068 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
       driver.set_expr( (yyval.node) );
@@ -3031,9 +2498,8 @@
     break;
 
   case 8:
-
-/* Line 678 of lalr1.cc  */
-#line 1074 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1074 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       MainModule* mm = dynamic_cast<MainModule*>((yysemantic_stack_[(2) - (2)].node));
       mm->set_version_decl( static_cast<VersionDecl*>((yysemantic_stack_[(2) - (1)].node)) );
@@ -3043,9 +2509,8 @@
     break;
 
   case 9:
-
-/* Line 678 of lalr1.cc  */
-#line 1082 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1082 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
       driver.set_expr( (yyval.node) );
@@ -3053,9 +2518,8 @@
     break;
 
   case 10:
-
-/* Line 678 of lalr1.cc  */
-#line 1088 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1088 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       LibraryModule* lm = dynamic_cast<LibraryModule*>((yysemantic_stack_[(2) - (2)].node));
       lm->set_version_decl( static_cast<VersionDecl*>((yysemantic_stack_[(2) - (1)].node)) );
@@ -3065,27 +2529,24 @@
     break;
 
   case 11:
-
-/* Line 678 of lalr1.cc  */
-#line 1099 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1099 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)), "utf-8" );
     }
     break;
 
   case 12:
-
-/* Line 678 of lalr1.cc  */
-#line 1104 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1104 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)) );
     }
     break;
 
   case 13:
-
-/* Line 678 of lalr1.cc  */
-#line 1112 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1112 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (1)].node)), NULL);
 
@@ -3094,9 +2555,8 @@
     break;
 
   case 14:
-
-/* Line 678 of lalr1.cc  */
-#line 1119 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1119 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (1)].node)));
 
@@ -3105,9 +2565,8 @@
     break;
 
   case 15:
-
-/* Line 678 of lalr1.cc  */
-#line 1126 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1126 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)),
                                   static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (1)].node)),
@@ -3118,18 +2577,16 @@
     break;
 
   case 16:
-
-/* Line 678 of lalr1.cc  */
-#line 1135 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1135 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new MainModule( LOC((yyloc)), static_cast<QueryBody*>((yysemantic_stack_[(1) - (1)].expr)), NULL );
     }
     break;
 
   case 17:
-
-/* Line 678 of lalr1.cc  */
-#line 1142 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1142 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
       (yylocation_stack_[(3) - (1)]).step();
@@ -3139,9 +2596,8 @@
     break;
 
   case 18:
-
-/* Line 678 of lalr1.cc  */
-#line 1150 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1150 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
       (yylocation_stack_[(3) - (1)]).step();
@@ -3151,9 +2607,8 @@
     break;
 
   case 19:
-
-/* Line 678 of lalr1.cc  */
-#line 1158 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1158 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(5) - (1)].node); (yyval.node) = (yysemantic_stack_[(5) - (3)].node); (yyval.node) = (yysemantic_stack_[(5) - (5)].expr); // to prevent the Bison warning
       (yylocation_stack_[(5) - (3)]).step();
@@ -3163,9 +2618,8 @@
     break;
 
   case 20:
-
-/* Line 678 of lalr1.cc  */
-#line 1166 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1166 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(5) - (1)].node); (yyval.node) = (yysemantic_stack_[(5) - (3)].node); (yyval.node) = (yysemantic_stack_[(5) - (5)].expr); // to prevent the Bison warning
       (yylocation_stack_[(5) - (1)]).step();
@@ -3175,18 +2629,16 @@
     break;
 
   case 21:
-
-/* Line 678 of lalr1.cc  */
-#line 1177 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1177 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new LibraryModule(LOC((yyloc)), static_cast<ModuleDecl*>((yysemantic_stack_[(1) - (1)].node)), NULL);
     }
     break;
 
   case 22:
-
-/* Line 678 of lalr1.cc  */
-#line 1182 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1182 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (2)].node)), NULL);
 
@@ -3195,9 +2647,8 @@
     break;
 
   case 23:
-
-/* Line 678 of lalr1.cc  */
-#line 1189 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1189 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (2)].node)));
 
@@ -3206,9 +2657,8 @@
     break;
 
   case 24:
-
-/* Line 678 of lalr1.cc  */
-#line 1196 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1196 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)),
                                   static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (2)].node)),
@@ -3219,9 +2669,8 @@
     break;
 
   case 25:
-
-/* Line 678 of lalr1.cc  */
-#line 1208 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1208 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ModuleDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)) );
 
@@ -3230,9 +2679,8 @@
     break;
 
   case 26:
-
-/* Line 678 of lalr1.cc  */
-#line 1218 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1218 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       SIND_DeclList *sdl = new SIND_DeclList( LOC((yyloc)) );
       sdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -3241,9 +2689,8 @@
     break;
 
   case 27:
-
-/* Line 678 of lalr1.cc  */
-#line 1225 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1225 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       ((SIND_DeclList*)(yysemantic_stack_[(3) - (1)].node))->push_back( (yysemantic_stack_[(3) - (3)].node) );
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -3251,9 +2698,8 @@
     break;
 
   case 28:
-
-/* Line 678 of lalr1.cc  */
-#line 1232 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1232 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       // error
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
@@ -3264,99 +2710,88 @@
     break;
 
   case 42:
-
-/* Line 678 of lalr1.cc  */
-#line 1267 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1267 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::preserve_space);
     }
     break;
 
   case 43:
-
-/* Line 678 of lalr1.cc  */
-#line 1272 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1272 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::strip_space);
     }
     break;
 
   case 44:
-
-/* Line 678 of lalr1.cc  */
-#line 1280 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1280 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new DefaultCollationDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)) );
     }
     break;
 
   case 45:
-
-/* Line 678 of lalr1.cc  */
-#line 1288 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1288 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new BaseURIDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
     }
     break;
 
   case 46:
-
-/* Line 678 of lalr1.cc  */
-#line 1296 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1296 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_preserve);
     }
     break;
 
   case 47:
-
-/* Line 678 of lalr1.cc  */
-#line 1301 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1301 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_strip);
     }
     break;
 
   case 48:
-
-/* Line 678 of lalr1.cc  */
-#line 1309 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1309 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::ordered);
     }
     break;
 
   case 49:
-
-/* Line 678 of lalr1.cc  */
-#line 1314 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1314 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::unordered);
     }
     break;
 
   case 50:
-
-/* Line 678 of lalr1.cc  */
-#line 1322 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1322 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_greatest);
     }
     break;
 
   case 51:
-
-/* Line 678 of lalr1.cc  */
-#line 1327 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1327 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_least);
     }
     break;
 
   case 52:
-
-/* Line 678 of lalr1.cc  */
-#line 1335 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1335 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)),
                                   StaticContextConsts::preserve_ns,
@@ -3365,9 +2800,8 @@
     break;
 
   case 53:
-
-/* Line 678 of lalr1.cc  */
-#line 1342 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1342 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)),
                                   StaticContextConsts::preserve_ns,
@@ -3376,9 +2810,8 @@
     break;
 
   case 54:
-
-/* Line 678 of lalr1.cc  */
-#line 1349 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1349 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)),
                                   StaticContextConsts::no_preserve_ns,
@@ -3387,9 +2820,8 @@
     break;
 
   case 55:
-
-/* Line 678 of lalr1.cc  */
-#line 1356 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1356 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)),
                                   StaticContextConsts::no_preserve_ns,
@@ -3398,9 +2830,8 @@
     break;
 
   case 58:
-
-/* Line 678 of lalr1.cc  */
-#line 1371 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1371 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yyval.node); // to prevent the Bison warning
       error((yylocation_stack_[(3) - (2)]), "syntax error, \"import\" should be followed by either \"schema\" or \"module\".");
@@ -3409,18 +2840,16 @@
     break;
 
   case 59:
-
-/* Line 678 of lalr1.cc  */
-#line 1381 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1381 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new SchemaImport( LOC((yyloc)), NULL, SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL );
     }
     break;
 
   case 60:
-
-/* Line 678 of lalr1.cc  */
-#line 1386 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1386 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(4) - (3)].node)),
@@ -3430,9 +2859,8 @@
     break;
 
   case 61:
-
-/* Line 678 of lalr1.cc  */
-#line 1394 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1394 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             NULL,
@@ -3442,9 +2870,8 @@
     break;
 
   case 62:
-
-/* Line 678 of lalr1.cc  */
-#line 1402 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1402 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(6) - (3)].node)),
@@ -3454,9 +2881,8 @@
     break;
 
   case 63:
-
-/* Line 678 of lalr1.cc  */
-#line 1413 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1413 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       URILiteralList *ull = new URILiteralList( LOC((yyloc)));
       ull->push_back( SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
@@ -3465,9 +2891,8 @@
     break;
 
   case 64:
-
-/* Line 678 of lalr1.cc  */
-#line 1420 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1420 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       if ( URILiteralList *ull = dynamic_cast<URILiteralList*>((yysemantic_stack_[(3) - (1)].node)) )
         ull->push_back( SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
@@ -3477,27 +2902,24 @@
     break;
 
   case 65:
-
-/* Line 678 of lalr1.cc  */
-#line 1431 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1431 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new SchemaPrefix( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
     break;
 
   case 66:
-
-/* Line 678 of lalr1.cc  */
-#line 1436 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1436 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new SchemaPrefix( LOC((yyloc)), true );
     }
     break;
 
   case 67:
-
-/* Line 678 of lalr1.cc  */
-#line 1444 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1444 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL);
 
@@ -3506,9 +2928,8 @@
     break;
 
   case 68:
-
-/* Line 678 of lalr1.cc  */
-#line 1451 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1451 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (4)].sval)), SYMTAB((yysemantic_stack_[(6) - (6)].sval)), NULL);
 
@@ -3517,9 +2938,8 @@
     break;
 
   case 69:
-
-/* Line 678 of lalr1.cc  */
-#line 1458 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1458 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)),
                             SYMTAB((yysemantic_stack_[(5) - (3)].sval)),
@@ -3530,9 +2950,8 @@
     break;
 
   case 70:
-
-/* Line 678 of lalr1.cc  */
-#line 1467 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1467 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)),
                             SYMTAB((yysemantic_stack_[(8) - (4)].sval)),
@@ -3544,18 +2963,16 @@
     break;
 
   case 71:
-
-/* Line 678 of lalr1.cc  */
-#line 1480 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1480 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new NamespaceDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(5) - (3)].sval)), SYMTAB((yysemantic_stack_[(5) - (5)].sval)) );
     }
     break;
 
   case 72:
-
-/* Line 678 of lalr1.cc  */
-#line 1488 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1488 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_element_default,
@@ -3564,9 +2981,8 @@
     break;
 
   case 73:
-
-/* Line 678 of lalr1.cc  */
-#line 1495 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1495 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_function_default,
@@ -3575,9 +2991,8 @@
     break;
 
   case 74:
-
-/* Line 678 of lalr1.cc  */
-#line 1505 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1505 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       VFO_DeclList *vdl = new VFO_DeclList( LOC((yyloc)));
       vdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -3586,9 +3001,8 @@
     break;
 
   case 75:
-
-/* Line 678 of lalr1.cc  */
-#line 1512 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1512 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       ((VFO_DeclList*)(yysemantic_stack_[(3) - (1)].node))->push_back( (yysemantic_stack_[(3) - (3)].node) );
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -3596,9 +3010,8 @@
     break;
 
   case 76:
-
-/* Line 678 of lalr1.cc  */
-#line 1519 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1519 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
       (yylocation_stack_[(3) - (1)]).step();
@@ -3608,9 +3021,8 @@
     break;
 
   case 85:
-
-/* Line 678 of lalr1.cc  */
-#line 1542 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1542 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new DecimalFormatNode(LOC((yyloc)), (yysemantic_stack_[(4) - (4)].vstrpair));
       delete (yysemantic_stack_[(4) - (4)].vstrpair);
@@ -3618,9 +3030,8 @@
     break;
 
   case 86:
-
-/* Line 678 of lalr1.cc  */
-#line 1548 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1548 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new DecimalFormatNode(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), (yysemantic_stack_[(4) - (4)].vstrpair));
       delete (yysemantic_stack_[(4) - (4)].vstrpair);
@@ -3628,9 +3039,8 @@
     break;
 
   case 87:
-
-/* Line 678 of lalr1.cc  */
-#line 1557 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1557 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.vstrpair) = new vector<string_pair_t>();
       (yyval.vstrpair)->push_back( *(yysemantic_stack_[(1) - (1)].strpair) );
@@ -3639,9 +3049,8 @@
     break;
 
   case 88:
-
-/* Line 678 of lalr1.cc  */
-#line 1564 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1564 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yysemantic_stack_[(2) - (1)].vstrpair)->push_back( *(yysemantic_stack_[(2) - (2)].strpair) );
       delete (yysemantic_stack_[(2) - (2)].strpair);
@@ -3650,9 +3059,8 @@
     break;
 
   case 89:
-
-/* Line 678 of lalr1.cc  */
-#line 1574 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1574 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       StringLiteral *sl = static_cast<StringLiteral*>((yysemantic_stack_[(3) - (3)].expr));
       (yyval.strpair) = new string_pair_t( (yysemantic_stack_[(3) - (1)].strval), sl->get_strval().str() );
@@ -3661,106 +3069,92 @@
     break;
 
   case 90:
-
-/* Line 678 of lalr1.cc  */
-#line 1583 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1583 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "decimal-separator"; }
     break;
 
   case 91:
-
-/* Line 678 of lalr1.cc  */
-#line 1584 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1584 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "digit"; }
     break;
 
   case 92:
-
-/* Line 678 of lalr1.cc  */
-#line 1585 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1585 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "grouping-separator"; }
     break;
 
   case 93:
-
-/* Line 678 of lalr1.cc  */
-#line 1586 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1586 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "infinty"; }
     break;
 
   case 94:
-
-/* Line 678 of lalr1.cc  */
-#line 1587 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1587 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "minus-sign"; }
     break;
 
   case 95:
-
-/* Line 678 of lalr1.cc  */
-#line 1588 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1588 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "NaN"; }
     break;
 
   case 96:
-
-/* Line 678 of lalr1.cc  */
-#line 1589 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1589 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "pattern-separator"; }
     break;
 
   case 97:
-
-/* Line 678 of lalr1.cc  */
-#line 1590 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1590 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "percent"; }
     break;
 
   case 98:
-
-/* Line 678 of lalr1.cc  */
-#line 1591 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1591 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "per-mille"; }
     break;
 
   case 99:
-
-/* Line 678 of lalr1.cc  */
-#line 1592 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1592 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "zero-digit"; }
     break;
 
   case 100:
-
-/* Line 678 of lalr1.cc  */
-#line 1598 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1598 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new OptionDecl(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)));
     }
     break;
 
   case 101:
-
-/* Line 678 of lalr1.cc  */
-#line 1606 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1606 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new FTOptionDecl( LOC((yyloc)), dynamic_cast<FTMatchOptions*>((yysemantic_stack_[(3) - (3)].node)) );
     }
     break;
 
   case 102:
-
-/* Line 678 of lalr1.cc  */
-#line 1614 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1614 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(4) - (4)].node);
     }
     break;
 
   case 103:
-
-/* Line 678 of lalr1.cc  */
-#line 1622 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1622 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(3) - (3)].node));
       d->theType = (yysemantic_stack_[(3) - (2)].node);
@@ -3769,18 +3163,16 @@
     break;
 
   case 104:
-
-/* Line 678 of lalr1.cc  */
-#line 1629 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1629 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
     break;
 
   case 105:
-
-/* Line 678 of lalr1.cc  */
-#line 1637 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1637 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(1) - (1)].node));
       d->theIsExternal = false;
@@ -3789,36 +3181,32 @@
     break;
 
   case 106:
-
-/* Line 678 of lalr1.cc  */
-#line 1644 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1644 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CtxItemDecl(LOC((yyloc)), NULL);
     }
     break;
 
   case 107:
-
-/* Line 678 of lalr1.cc  */
-#line 1649 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1649 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
     }
     break;
 
   case 108:
-
-/* Line 678 of lalr1.cc  */
-#line 1657 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1657 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CtxItemDecl(LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
     }
     break;
 
   case 109:
-
-/* Line 678 of lalr1.cc  */
-#line 1665 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1665 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(4) - (2)].varnametype)));
 
@@ -3834,9 +3222,8 @@
     break;
 
   case 110:
-
-/* Line 678 of lalr1.cc  */
-#line 1679 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1679 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(3) - (2)].varnametype)));
 
@@ -3852,9 +3239,8 @@
     break;
 
   case 111:
-
-/* Line 678 of lalr1.cc  */
-#line 1693 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1693 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(5) - (2)].varnametype)));
 
@@ -3870,18 +3256,16 @@
     break;
 
   case 112:
-
-/* Line 678 of lalr1.cc  */
-#line 1710 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1710 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL, NULL);
     }
     break;
 
   case 113:
-
-/* Line 678 of lalr1.cc  */
-#line 1715 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1715 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)),
@@ -3891,9 +3275,8 @@
     break;
 
   case 114:
-
-/* Line 678 of lalr1.cc  */
-#line 1723 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1723 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
@@ -3903,9 +3286,8 @@
     break;
 
   case 115:
-
-/* Line 678 of lalr1.cc  */
-#line 1731 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1731 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(5) - (4)].expr)),
@@ -3915,18 +3297,16 @@
     break;
 
   case 116:
-
-/* Line 678 of lalr1.cc  */
-#line 1742 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1742 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new AnnotationListParsenode(LOC((yyloc)), static_cast<AnnotationParsenode*>((yysemantic_stack_[(1) - (1)].node)));
     }
     break;
 
   case 117:
-
-/* Line 678 of lalr1.cc  */
-#line 1747 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1747 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       static_cast<AnnotationListParsenode*>((yysemantic_stack_[(2) - (1)].node))->push_back(static_cast<AnnotationParsenode*>((yysemantic_stack_[(2) - (2)].node)));
       (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
@@ -3934,18 +3314,16 @@
     break;
 
   case 118:
-
-/* Line 678 of lalr1.cc  */
-#line 1756 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1756 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))), NULL);
     }
     break;
 
   case 119:
-
-/* Line 678 of lalr1.cc  */
-#line 1761 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1761 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
                                    new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval))),
@@ -3954,18 +3332,16 @@
     break;
 
   case 120:
-
-/* Line 678 of lalr1.cc  */
-#line 1768 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1768 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), true), NULL);
     }
     break;
 
   case 121:
-
-/* Line 678 of lalr1.cc  */
-#line 1773 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1773 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
                                    new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval)), true),
@@ -3974,18 +3350,16 @@
     break;
 
   case 122:
-
-/* Line 678 of lalr1.cc  */
-#line 1783 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1783 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new AnnotationLiteralListParsenode(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr));
     }
     break;
 
   case 123:
-
-/* Line 678 of lalr1.cc  */
-#line 1788 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1788 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       static_cast<AnnotationLiteralListParsenode*>((yysemantic_stack_[(3) - (1)].node))->push_back((yysemantic_stack_[(3) - (3)].expr));
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -3993,9 +3367,8 @@
     break;
 
   case 124:
-
-/* Line 678 of lalr1.cc  */
-#line 1797 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1797 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       static_cast<FunctionDecl*>((yysemantic_stack_[(2) - (2)].node))->setComment( SYMTAB((yysemantic_stack_[(2) - (1)].sval)) );
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
@@ -4003,9 +3376,8 @@
     break;
 
   case 125:
-
-/* Line 678 of lalr1.cc  */
-#line 1803 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1803 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       FunctionDecl* fdecl = static_cast<FunctionDecl*>((yysemantic_stack_[(3) - (3)].node));
 
@@ -4017,27 +3389,24 @@
     break;
 
   case 126:
-
-/* Line 678 of lalr1.cc  */
-#line 1816 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1816 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
     break;
 
   case 127:
-
-/* Line 678 of lalr1.cc  */
-#line 1821 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1821 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
     break;
 
   case 128:
-
-/* Line 678 of lalr1.cc  */
-#line 1829 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1829 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4051,9 +3420,8 @@
     break;
 
   case 129:
-
-/* Line 678 of lalr1.cc  */
-#line 1840 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1840 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC ((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4067,9 +3435,8 @@
     break;
 
   case 130:
-
-/* Line 678 of lalr1.cc  */
-#line 1855 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1855 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC ((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4083,9 +3450,8 @@
     break;
 
   case 131:
-
-/* Line 678 of lalr1.cc  */
-#line 1867 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1867 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4099,45 +3465,40 @@
     break;
 
   case 132:
-
-/* Line 678 of lalr1.cc  */
-#line 1882 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1882 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(NULL);
     }
     break;
 
   case 133:
-
-/* Line 678 of lalr1.cc  */
-#line 1887 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1887 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(3) - (2)].node)));
     }
     break;
 
   case 134:
-
-/* Line 678 of lalr1.cc  */
-#line 1892 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1892 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(NULL, dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node)));
     }
     break;
 
   case 135:
-
-/* Line 678 of lalr1.cc  */
-#line 1897 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1897 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(5) - (2)].node)), dynamic_cast<SequenceType*>((yysemantic_stack_[(5) - (5)].node)));
     }
     break;
 
   case 136:
-
-/* Line 678 of lalr1.cc  */
-#line 1905 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1905 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       ParamList *pl = new ParamList( LOC((yyloc)) );
       pl->push_back( dynamic_cast<Param*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -4146,9 +3507,8 @@
     break;
 
   case 137:
-
-/* Line 678 of lalr1.cc  */
-#line 1912 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1912 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       if ( ParamList *pl = dynamic_cast<ParamList*>((yysemantic_stack_[(3) - (1)].node)) )
         pl->push_back( dynamic_cast<Param*>((yysemantic_stack_[(3) - (3)].node)) );
@@ -4158,18 +3518,16 @@
     break;
 
   case 138:
-
-/* Line 678 of lalr1.cc  */
-#line 1923 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1923 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new Param(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL);
     }
     break;
 
   case 139:
-
-/* Line 678 of lalr1.cc  */
-#line 1928 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1928 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new Param(LOC((yyloc)),
                      static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4178,9 +3536,8 @@
     break;
 
   case 140:
-
-/* Line 678 of lalr1.cc  */
-#line 1938 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1938 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)),
@@ -4190,9 +3547,8 @@
     break;
 
   case 141:
-
-/* Line 678 of lalr1.cc  */
-#line 1945 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1945 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4202,9 +3558,8 @@
     break;
 
   case 142:
-
-/* Line 678 of lalr1.cc  */
-#line 1952 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1952 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                                static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
@@ -4214,9 +3569,8 @@
     break;
 
   case 143:
-
-/* Line 678 of lalr1.cc  */
-#line 1959 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1959 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                                static_cast<QName*>((yysemantic_stack_[(6) - (4)].expr)),
@@ -4226,18 +3580,16 @@
     break;
 
   case 144:
-
-/* Line 678 of lalr1.cc  */
-#line 1969 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1969 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
     }
     break;
 
   case 145:
-
-/* Line 678 of lalr1.cc  */
-#line 1973 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1973 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
                                                     (yysemantic_stack_[(2) - (1)].node),
@@ -4246,18 +3598,16 @@
     break;
 
   case 146:
-
-/* Line 678 of lalr1.cc  */
-#line 1979 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1979 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
     }
     break;
 
   case 147:
-
-/* Line 678 of lalr1.cc  */
-#line 1983 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1983 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
                                                     (yysemantic_stack_[(2) - (1)].node),
@@ -4267,9 +3617,8 @@
     break;
 
   case 148:
-
-/* Line 678 of lalr1.cc  */
-#line 1993 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 1993 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new AST_IndexDecl(LOC((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(8) - (3)].expr)),
@@ -4280,9 +3629,8 @@
     break;
 
   case 149:
-
-/* Line 678 of lalr1.cc  */
-#line 2001 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2001 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new AST_IndexDecl(LOC((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(9) - (4)].expr)),
@@ -4293,9 +3641,8 @@
     break;
 
   case 150:
-
-/* Line 678 of lalr1.cc  */
-#line 2012 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2012 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       IndexKeyList* keyList = new IndexKeyList(LOC((yyloc)));
       keyList->addKeySpec(dynamic_cast<IndexKeySpec*>((yysemantic_stack_[(1) - (1)].node)));
@@ -4304,9 +3651,8 @@
     break;
 
   case 151:
-
-/* Line 678 of lalr1.cc  */
-#line 2018 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2018 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       dynamic_cast<IndexKeyList*>((yysemantic_stack_[(3) - (1)].node))->addKeySpec(dynamic_cast<IndexKeySpec*>((yysemantic_stack_[(3) - (3)].node)));
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -4314,18 +3660,16 @@
     break;
 
   case 152:
-
-/* Line 678 of lalr1.cc  */
-#line 2027 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2027 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL, NULL);
     }
     break;
 
   case 153:
-
-/* Line 678 of lalr1.cc  */
-#line 2032 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2032 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -4335,9 +3679,8 @@
     break;
 
   case 154:
-
-/* Line 678 of lalr1.cc  */
-#line 2039 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2039 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -4347,9 +3690,8 @@
     break;
 
   case 155:
-
-/* Line 678 of lalr1.cc  */
-#line 2046 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2046 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(3) - (1)].expr),
@@ -4359,9 +3701,8 @@
     break;
 
   case 156:
-
-/* Line 678 of lalr1.cc  */
-#line 2058 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2058 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ICCollSimpleCheck(LOC((yyloc)),
                                  static_cast<QName*>((yysemantic_stack_[(11) - (4)].expr)),
@@ -4372,9 +3713,8 @@
     break;
 
   case 157:
-
-/* Line 678 of lalr1.cc  */
-#line 2068 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2068 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ICCollUniqueKeyCheck(LOC((yyloc)),
                                     static_cast<QName*>((yysemantic_stack_[(14) - (4)].expr)),
@@ -4385,9 +3725,8 @@
     break;
 
   case 158:
-
-/* Line 678 of lalr1.cc  */
-#line 2078 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2078 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ICCollForeachNode(LOC((yyloc)),
                                  static_cast<QName*>((yysemantic_stack_[(13) - (4)].expr)),
@@ -4398,9 +3737,8 @@
     break;
 
   case 159:
-
-/* Line 678 of lalr1.cc  */
-#line 2089 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2089 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ICForeignKey( LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(22) - (4)].expr)),
@@ -4414,9 +3752,8 @@
     break;
 
   case 160:
-
-/* Line 678 of lalr1.cc  */
-#line 2105 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2105 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       if ((yysemantic_stack_[(1) - (1)].expr) == NULL)
       {
@@ -4435,72 +3772,64 @@
     break;
 
   case 161:
-
-/* Line 678 of lalr1.cc  */
-#line 2125 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2125 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 162:
-
-/* Line 678 of lalr1.cc  */
-#line 2129 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2129 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 163:
-
-/* Line 678 of lalr1.cc  */
-#line 2133 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2133 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) =  NULL;
     }
     break;
 
   case 164:
-
-/* Line 678 of lalr1.cc  */
-#line 2141 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2141 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 165:
-
-/* Line 678 of lalr1.cc  */
-#line 2145 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2145 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 166:
-
-/* Line 678 of lalr1.cc  */
-#line 2149 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2149 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) =  new BlockBody(LOC((yyloc)));
     }
     break;
 
   case 167:
-
-/* Line 678 of lalr1.cc  */
-#line 2157 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2157 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 168:
-
-/* Line 678 of lalr1.cc  */
-#line 2162 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2162 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
 
@@ -4511,9 +3840,8 @@
     break;
 
   case 169:
-
-/* Line 678 of lalr1.cc  */
-#line 2174 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2174 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       BlockBody* blk = new BlockBody(LOC((yyloc)));
       blk->add((yysemantic_stack_[(1) - (1)].expr));
@@ -4522,9 +3850,8 @@
     break;
 
   case 170:
-
-/* Line 678 of lalr1.cc  */
-#line 2181 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2181 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
 
@@ -4535,27 +3862,24 @@
     break;
 
   case 183:
-
-/* Line 678 of lalr1.cc  */
-#line 2210 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2210 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
     break;
 
   case 184:
-
-/* Line 678 of lalr1.cc  */
-#line 2215 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2215 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new BlockBody(LOC((yyloc)));
     }
     break;
 
   case 185:
-
-/* Line 678 of lalr1.cc  */
-#line 2223 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2223 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       if (dynamic_cast<BlockBody*>((yysemantic_stack_[(3) - (2)].expr)) == NULL)
       {
@@ -4571,27 +3895,24 @@
     break;
 
   case 186:
-
-/* Line 678 of lalr1.cc  */
-#line 2240 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2240 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
     break;
 
   case 187:
-
-/* Line 678 of lalr1.cc  */
-#line 2248 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2248 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(2) - (1)].expr);
     }
     break;
 
   case 188:
-
-/* Line 678 of lalr1.cc  */
-#line 2256 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2256 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       VarDeclStmt* vdecl = static_cast<VarDeclStmt*>((yysemantic_stack_[(3) - (1)].expr));
       vdecl->add((yysemantic_stack_[(3) - (3)].node));
@@ -4600,9 +3921,8 @@
     break;
 
   case 189:
-
-/* Line 678 of lalr1.cc  */
-#line 2263 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2263 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)), NULL);
       vdecl->add((yysemantic_stack_[(2) - (2)].node));
@@ -4611,9 +3931,8 @@
     break;
 
   case 190:
-
-/* Line 678 of lalr1.cc  */
-#line 2270 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2270 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)),
                                            static_cast<AnnotationListParsenode*>((yysemantic_stack_[(3) - (1)].node)));
@@ -4623,9 +3942,8 @@
     break;
 
   case 191:
-
-/* Line 678 of lalr1.cc  */
-#line 2281 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2281 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)),
@@ -4637,9 +3955,8 @@
     break;
 
   case 192:
-
-/* Line 678 of lalr1.cc  */
-#line 2290 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2290 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4651,9 +3968,8 @@
     break;
 
   case 193:
-
-/* Line 678 of lalr1.cc  */
-#line 2299 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2299 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4665,9 +3981,8 @@
     break;
 
   case 194:
-
-/* Line 678 of lalr1.cc  */
-#line 2308 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2308 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -4679,36 +3994,32 @@
     break;
 
   case 195:
-
-/* Line 678 of lalr1.cc  */
-#line 2321 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2321 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new AssignExpr(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)), (yysemantic_stack_[(5) - (4)].expr));
     }
     break;
 
   case 196:
-
-/* Line 678 of lalr1.cc  */
-#line 2329 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2329 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new ApplyExpr(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr));
     }
     break;
 
   case 197:
-
-/* Line 678 of lalr1.cc  */
-#line 2337 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2337 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new ExitExpr(LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr));
     }
     break;
 
   case 198:
-
-/* Line 678 of lalr1.cc  */
-#line 2345 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2345 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       BlockBody* bb = dynamic_cast<BlockBody *>((yysemantic_stack_[(5) - (5)].expr));
       if (bb == NULL)
@@ -4722,27 +4033,24 @@
     break;
 
   case 199:
-
-/* Line 678 of lalr1.cc  */
-#line 2360 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2360 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new FlowCtlStatement(LOC((yyloc)), FlowCtlStatement::BREAK);
     }
     break;
 
   case 200:
-
-/* Line 678 of lalr1.cc  */
-#line 2365 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2365 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new FlowCtlStatement( LOC((yyloc)), FlowCtlStatement::CONTINUE );
     }
     break;
 
   case 201:
-
-/* Line 678 of lalr1.cc  */
-#line 2373 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2373 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       ReturnExpr* re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
       (yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4755,9 +4063,8 @@
     break;
 
   case 202:
-
-/* Line 678 of lalr1.cc  */
-#line 2387 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2387 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       exprnode* retExpr = (yysemantic_stack_[(2) - (2)].expr);
 
@@ -4773,9 +4080,8 @@
     break;
 
   case 203:
-
-/* Line 678 of lalr1.cc  */
-#line 2404 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2404 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       exprnode* thenExpr = (yysemantic_stack_[(8) - (6)].expr);
       exprnode* elseExpr = (yysemantic_stack_[(8) - (8)].expr);
@@ -4799,18 +4105,16 @@
     break;
 
   case 204:
-
-/* Line 678 of lalr1.cc  */
-#line 2429 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2429 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new TryExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), (yysemantic_stack_[(3) - (3)].expr));
     }
     break;
 
   case 205:
-
-/* Line 678 of lalr1.cc  */
-#line 2437 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2437 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       CatchListExpr* cle = new CatchListExpr( LOC((yyloc)) );
       cle->push_back( static_cast<CatchExpr*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -4819,9 +4123,8 @@
     break;
 
   case 206:
-
-/* Line 678 of lalr1.cc  */
-#line 2444 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2444 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
       if ( cle )
@@ -4831,9 +4134,8 @@
     break;
 
   case 207:
-
-/* Line 678 of lalr1.cc  */
-#line 2455 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2455 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
        (yyval.expr) = new CatchExpr(LOC((yyloc)), *(yysemantic_stack_[(3) - (2)].name_test_list), (yysemantic_stack_[(3) - (3)].expr));
        delete (yysemantic_stack_[(3) - (2)].name_test_list);
@@ -4841,18 +4143,16 @@
     break;
 
   case 208:
-
-/* Line 678 of lalr1.cc  */
-#line 2465 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2465 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 209:
-
-/* Line 678 of lalr1.cc  */
-#line 2470 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2470 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       Expr* expr = dynamic_cast<Expr*>((yysemantic_stack_[(3) - (1)].expr));
       if ( !expr )
@@ -4865,10 +4165,33 @@
     }
     break;
 
-  case 228:
-
-/* Line 678 of lalr1.cc  */
-#line 2515 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 210:
+/* Line 661 of lalr1.cc  */
+#line 2482 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.expr) = (yysemantic_stack_[(4) - (1)].expr); // to prevent the Bison warning
+      (yyval.expr) = (yysemantic_stack_[(4) - (3)].expr); // to prevent the Bison warning
+      error((yylocation_stack_[(4) - (2)]), "syntax error, unexpected ExprSingle (missing comma \",\" between expressions?)");
+      YYERROR;
+    }
+    break;
+
+  case 211:
+/* Line 661 of lalr1.cc  */
+#line 2489 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      // This rule will never be reached, as the ERROR rule will stop the parser,
+      // but it is nevertheless needed to fix a testcase with an unterminated comment which
+      // would otherwise cycle indefinitely
+      (yyval.expr) = (yysemantic_stack_[(3) - (1)].expr); // to prevent the Bison warning
+      (yyval.expr) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
+      YYERROR;
+    }
+    break;
+
+  case 230:
+/* Line 661 of lalr1.cc  */
+#line 2532 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       ReturnExpr *re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
       (yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4880,64 +4203,57 @@
     }
     break;
 
-  case 229:
-
-/* Line 678 of lalr1.cc  */
-#line 2529 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 231:
+/* Line 661 of lalr1.cc  */
+#line 2546 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new ReturnExpr( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr) );
     }
     break;
 
-  case 230:
-
-/* Line 678 of lalr1.cc  */
-#line 2537 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 232:
+/* Line 661 of lalr1.cc  */
+#line 2554 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.strval) = parser::the_sliding;
     }
     break;
 
-  case 231:
-
-/* Line 678 of lalr1.cc  */
-#line 2542 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 233:
+/* Line 661 of lalr1.cc  */
+#line 2559 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.strval) = parser::the_tumbling;
     }
     break;
 
-  case 232:
-
-/* Line 678 of lalr1.cc  */
-#line 2550 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 234:
+/* Line 661 of lalr1.cc  */
+#line 2567 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.strval) = parser::the_start;
     }
     break;
 
-  case 233:
-
-/* Line 678 of lalr1.cc  */
-#line 2555 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 235:
+/* Line 661 of lalr1.cc  */
+#line 2572 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.strval) = parser::the_end;
     }
     break;
 
-  case 234:
-
-/* Line 678 of lalr1.cc  */
-#line 2560 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 236:
+/* Line 661 of lalr1.cc  */
+#line 2577 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
     (yyval.strval) = parser::the_only_end;
   }
     break;
 
-  case 235:
-
-/* Line 678 of lalr1.cc  */
-#line 2568 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 237:
+/* Line 661 of lalr1.cc  */
+#line 2585 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new FLWORWinCond(LOC((yyloc)),
                             dynamic_cast<WindowVars*>((yysemantic_stack_[(4) - (2)].node)),
@@ -4947,10 +4263,9 @@
     }
     break;
 
-  case 236:
-
-/* Line 678 of lalr1.cc  */
-#line 2577 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 238:
+/* Line 661 of lalr1.cc  */
+#line 2594 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new FLWORWinCond(LOC((yyloc)),
                             NULL,
@@ -4960,10 +4275,9 @@
     }
     break;
 
-  case 237:
-
-/* Line 678 of lalr1.cc  */
-#line 2589 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 239:
+/* Line 661 of lalr1.cc  */
+#line 2606 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new WindowClause (LOC ((yyloc)),
                              ((yysemantic_stack_[(5) - (2)].strval) == parser::the_tumbling ?
@@ -4975,10 +4289,9 @@
     }
     break;
 
-  case 238:
-
-/* Line 678 of lalr1.cc  */
-#line 2599 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 240:
+/* Line 661 of lalr1.cc  */
+#line 2616 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new WindowClause (LOC ((yyloc)),
                              ((yysemantic_stack_[(4) - (2)].strval) == parser::the_tumbling ?
@@ -4989,19 +4302,17 @@
     }
     break;
 
-  case 239:
-
-/* Line 678 of lalr1.cc  */
-#line 2612 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 241:
+/* Line 661 of lalr1.cc  */
+#line 2629 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CountClause(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
     break;
 
-  case 248:
-
-/* Line 678 of lalr1.cc  */
-#line 2636 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 250:
+/* Line 661 of lalr1.cc  */
+#line 2653 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       FLWORClauseList *fcl = new FLWORClauseList( LOC((yyloc)) );
       fcl->push_back( dynamic_cast<FLWORClause*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5009,10 +4320,9 @@
     }
     break;
 
-  case 249:
-
-/* Line 678 of lalr1.cc  */
-#line 2643 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 251:
+/* Line 661 of lalr1.cc  */
+#line 2660 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       FLWORClauseList *fcl = dynamic_cast<FLWORClauseList*>((yysemantic_stack_[(2) - (1)].node));
       fcl->push_back( dynamic_cast<FLWORClause*>((yysemantic_stack_[(2) - (2)].node)) );
@@ -5020,19 +4330,17 @@
     }
     break;
 
-  case 250:
-
-/* Line 678 of lalr1.cc  */
-#line 2653 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 252:
+/* Line 661 of lalr1.cc  */
+#line 2670 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ForClause(LOC((yyloc)), dynamic_cast<VarInDeclList*>((yysemantic_stack_[(3) - (3)].node)));
     }
     break;
 
-  case 251:
-
-/* Line 678 of lalr1.cc  */
-#line 2659 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 253:
+/* Line 661 of lalr1.cc  */
+#line 2676 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
       error((yylocation_stack_[(3) - (2)]), "syntax error, unexpected QName \""
@@ -5042,10 +4350,9 @@
     }
     break;
 
-  case 252:
-
-/* Line 678 of lalr1.cc  */
-#line 2668 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 254:
+/* Line 661 of lalr1.cc  */
+#line 2685 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = NULL; // to prevent the Bison warning
       error((yylocation_stack_[(2) - (2)]), ""); // the error message is already set in the driver's parseError member
@@ -5053,10 +4360,9 @@
     }
     break;
 
-  case 253:
-
-/* Line 678 of lalr1.cc  */
-#line 2678 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 255:
+/* Line 661 of lalr1.cc  */
+#line 2695 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       VarInDeclList* vdl = new VarInDeclList( LOC((yyloc)) );
       vdl->push_back( dynamic_cast<VarInDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5064,10 +4370,9 @@
     }
     break;
 
-  case 254:
-
-/* Line 678 of lalr1.cc  */
-#line 2685 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 256:
+/* Line 661 of lalr1.cc  */
+#line 2702 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       if ( VarInDeclList* vdl = dynamic_cast<VarInDeclList*>((yysemantic_stack_[(4) - (1)].node)) )
         vdl->push_back( dynamic_cast<VarInDecl*>((yysemantic_stack_[(4) - (4)].node)) );
@@ -5075,10 +4380,9 @@
     }
     break;
 
-  case 255:
-
-/* Line 678 of lalr1.cc  */
-#line 2693 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 257:
+/* Line 661 of lalr1.cc  */
+#line 2710 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); // to prevent the Bison warning
       error((yylocation_stack_[(3) - (3)]), "syntax error, unexpected QName \""
@@ -5088,10 +4392,9 @@
     }
     break;
 
-  case 256:
-
-/* Line 678 of lalr1.cc  */
-#line 2705 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 258:
+/* Line 661 of lalr1.cc  */
+#line 2722 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)),
@@ -5103,55 +4406,51 @@
     }
     break;
 
-  case 257:
-
-/* Line 678 of lalr1.cc  */
-#line 2715 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.node) = new VarInDecl(LOC((yyloc)),
-                         static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
-                         NULL,
-                         NULL,
-                         NULL,
-                         (yysemantic_stack_[(5) - (5)].expr),
-                         true);
-    }
-    break;
-
-  case 258:
-
-/* Line 678 of lalr1.cc  */
-#line 2725 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.node) = new VarInDecl(LOC((yyloc)),
-                         static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
-                         dynamic_cast<SequenceType *>((yysemantic_stack_[(4) - (2)].node)),
-                         NULL,
-                         NULL,
-                         (yysemantic_stack_[(4) - (4)].expr),
-                         false);
-    }
-    break;
-
   case 259:
-
-/* Line 678 of lalr1.cc  */
-#line 2735 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2732 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
-                         static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
-                         dynamic_cast<SequenceType *>((yysemantic_stack_[(6) - (2)].node)),
-                         NULL,
-                         NULL,
-                         (yysemantic_stack_[(6) - (6)].expr),
+                         static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
+                         NULL,
+                         NULL,
+                         NULL,
+                         (yysemantic_stack_[(5) - (5)].expr),
                          true);
     }
     break;
 
   case 260:
-
-/* Line 678 of lalr1.cc  */
-#line 2745 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 2742 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.node) = new VarInDecl(LOC((yyloc)),
+                         static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
+                         dynamic_cast<SequenceType *>((yysemantic_stack_[(4) - (2)].node)),
+                         NULL,
+                         NULL,
+                         (yysemantic_stack_[(4) - (4)].expr),
+                         false);
+    }
+    break;
+
+  case 261:
+/* Line 661 of lalr1.cc  */
+#line 2752 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.node) = new VarInDecl(LOC((yyloc)),
+                         static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
+                         dynamic_cast<SequenceType *>((yysemantic_stack_[(6) - (2)].node)),
+                         NULL,
+                         NULL,
+                         (yysemantic_stack_[(6) - (6)].expr),
+                         true);
+    }
+    break;
+
+  case 262:
+/* Line 661 of lalr1.cc  */
+#line 2762 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5163,10 +4462,9 @@
     }
     break;
 
-  case 261:
-
-/* Line 678 of lalr1.cc  */
-#line 2755 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 263:
+/* Line 661 of lalr1.cc  */
+#line 2772 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5178,10 +4476,9 @@
     }
     break;
 
-  case 262:
-
-/* Line 678 of lalr1.cc  */
-#line 2765 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 264:
+/* Line 661 of lalr1.cc  */
+#line 2782 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5193,10 +4490,9 @@
     }
     break;
 
-  case 263:
-
-/* Line 678 of lalr1.cc  */
-#line 2775 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 265:
+/* Line 661 of lalr1.cc  */
+#line 2792 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(7) - (1)].expr)),
@@ -5208,10 +4504,9 @@
     }
     break;
 
-  case 264:
-
-/* Line 678 of lalr1.cc  */
-#line 2786 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 266:
+/* Line 661 of lalr1.cc  */
+#line 2803 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5222,10 +4517,9 @@
     }
     break;
 
-  case 265:
-
-/* Line 678 of lalr1.cc  */
-#line 2795 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 267:
+/* Line 661 of lalr1.cc  */
+#line 2812 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5237,10 +4531,9 @@
     }
     break;
 
-  case 266:
-
-/* Line 678 of lalr1.cc  */
-#line 2805 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 268:
+/* Line 661 of lalr1.cc  */
+#line 2822 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC ((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5252,10 +4545,9 @@
     }
     break;
 
-  case 267:
-
-/* Line 678 of lalr1.cc  */
-#line 2815 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 269:
+/* Line 661 of lalr1.cc  */
+#line 2832 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new VarInDecl(LOC ((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5267,37 +4559,33 @@
     }
     break;
 
-  case 268:
-
-/* Line 678 of lalr1.cc  */
-#line 2831 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 270:
+/* Line 661 of lalr1.cc  */
+#line 2848 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new PositionalVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
     break;
 
-  case 269:
-
-/* Line 678 of lalr1.cc  */
-#line 2840 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 271:
+/* Line 661 of lalr1.cc  */
+#line 2857 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new FTScoreVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
     break;
 
-  case 270:
-
-/* Line 678 of lalr1.cc  */
-#line 2849 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 272:
+/* Line 661 of lalr1.cc  */
+#line 2866 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new LetClause( LOC((yyloc)), dynamic_cast<VarGetsDeclList*>((yysemantic_stack_[(2) - (2)].node)) );
         }
     break;
 
-  case 271:
-
-/* Line 678 of lalr1.cc  */
-#line 2857 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 273:
+/* Line 661 of lalr1.cc  */
+#line 2874 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             VarGetsDeclList *vgdl = new VarGetsDeclList( LOC((yyloc)) );
             vgdl->push_back( dynamic_cast<VarGetsDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5305,10 +4593,9 @@
         }
     break;
 
-  case 272:
-
-/* Line 678 of lalr1.cc  */
-#line 2863 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 274:
+/* Line 661 of lalr1.cc  */
+#line 2880 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             if( VarGetsDeclList *vgdl = dynamic_cast<VarGetsDeclList*>((yysemantic_stack_[(3) - (1)].node)) )
                 vgdl->push_back( dynamic_cast<VarGetsDecl*>((yysemantic_stack_[(3) - (3)].node)) );
@@ -5316,10 +4603,9 @@
         }
     break;
 
-  case 273:
-
-/* Line 678 of lalr1.cc  */
-#line 2875 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 275:
+/* Line 661 of lalr1.cc  */
+#line 2892 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -5329,10 +4615,9 @@
     }
     break;
 
-  case 274:
-
-/* Line 678 of lalr1.cc  */
-#line 2883 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 276:
+/* Line 661 of lalr1.cc  */
+#line 2900 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5342,10 +4627,9 @@
     }
     break;
 
-  case 275:
-
-/* Line 678 of lalr1.cc  */
-#line 2893 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 277:
+/* Line 661 of lalr1.cc  */
+#line 2910 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            dynamic_cast<FTScoreVar*>((yysemantic_stack_[(3) - (1)].node))->get_var_name(),
@@ -5355,10 +4639,9 @@
      }
     break;
 
-  case 276:
-
-/* Line 678 of lalr1.cc  */
-#line 2901 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 278:
+/* Line 661 of lalr1.cc  */
+#line 2918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new VarGetsDecl(LOC ((yyloc)),
                            static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -5368,10 +4651,9 @@
     }
     break;
 
-  case 277:
-
-/* Line 678 of lalr1.cc  */
-#line 2913 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 279:
+/* Line 661 of lalr1.cc  */
+#line 2930 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new WindowVarDecl(LOC ((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -5379,10 +4661,9 @@
     }
     break;
 
-  case 278:
-
-/* Line 678 of lalr1.cc  */
-#line 2919 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 280:
+/* Line 661 of lalr1.cc  */
+#line 2936 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new WindowVarDecl(LOC ((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5391,93 +4672,83 @@
     }
     break;
 
-  case 280:
-
-/* Line 678 of lalr1.cc  */
-#line 2932 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 282:
+/* Line 661 of lalr1.cc  */
+#line 2949 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL, NULL);
     }
     break;
 
-  case 281:
-
-/* Line 678 of lalr1.cc  */
-#line 2936 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 283:
+/* Line 661 of lalr1.cc  */
+#line 2953 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       dynamic_cast<WindowVars *>((yyval.node))->set_curr(static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)));
     }
     break;
 
-  case 282:
-
-/* Line 678 of lalr1.cc  */
-#line 2944 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 284:
+/* Line 661 of lalr1.cc  */
+#line 2961 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), dynamic_cast<PositionalVar*>((yysemantic_stack_[(1) - (1)].node)), NULL, NULL, NULL);
     }
     break;
 
-  case 283:
-
-/* Line 678 of lalr1.cc  */
-#line 2948 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 285:
+/* Line 661 of lalr1.cc  */
+#line 2965 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       dynamic_cast<WindowVars *>((yyval.node))->set_posvar(dynamic_cast<PositionalVar*>((yysemantic_stack_[(2) - (1)].node)));
     }
     break;
 
-  case 285:
-
-/* Line 678 of lalr1.cc  */
-#line 2957 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 287:
+/* Line 661 of lalr1.cc  */
+#line 2974 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)), static_cast<QName*>((yysemantic_stack_[(6) - (6)].expr)));
     }
     break;
 
-  case 286:
-
-/* Line 678 of lalr1.cc  */
-#line 2961 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 288:
+/* Line 661 of lalr1.cc  */
+#line 2978 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, NULL, static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
     }
     break;
 
-  case 287:
-
-/* Line 678 of lalr1.cc  */
-#line 2965 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 289:
+/* Line 661 of lalr1.cc  */
+#line 2982 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL);
     }
     break;
 
-  case 288:
-
-/* Line 678 of lalr1.cc  */
-#line 2975 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 290:
+/* Line 661 of lalr1.cc  */
+#line 2992 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new WhereClause(LOC ((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
     }
     break;
 
-  case 289:
-
-/* Line 678 of lalr1.cc  */
-#line 2983 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 291:
+/* Line 661 of lalr1.cc  */
+#line 3000 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new GroupByClause(LOC((yyloc)), dynamic_cast<GroupSpecList*>((yysemantic_stack_[(3) - (3)].node)));
     }
     break;
 
-  case 290:
-
-/* Line 678 of lalr1.cc  */
-#line 2990 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 292:
+/* Line 661 of lalr1.cc  */
+#line 3007 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       GroupSpecList* gsl = new GroupSpecList(LOC((yyloc)));
       gsl->push_back(static_cast<GroupSpec*>((yysemantic_stack_[(1) - (1)].node)));
@@ -5485,10 +4756,9 @@
     }
     break;
 
-  case 291:
-
-/* Line 678 of lalr1.cc  */
-#line 2996 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 293:
+/* Line 661 of lalr1.cc  */
+#line 3013 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       GroupSpecList* gsl = static_cast<GroupSpecList*>((yysemantic_stack_[(3) - (1)].node));
       gsl->push_back(static_cast<GroupSpec*>((yysemantic_stack_[(3) - (3)].node)));
@@ -5496,28 +4766,25 @@
     }
     break;
 
-  case 292:
-
-/* Line 678 of lalr1.cc  */
-#line 3006 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 294:
+/* Line 661 of lalr1.cc  */
+#line 3023 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL, NULL, NULL);
     }
     break;
 
-  case 293:
-
-/* Line 678 of lalr1.cc  */
-#line 3010 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 295:
+/* Line 661 of lalr1.cc  */
+#line 3027 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)), NULL, (yysemantic_stack_[(4) - (4)].expr), NULL);
     }
     break;
 
-  case 294:
-
-/* Line 678 of lalr1.cc  */
-#line 3014 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 296:
+/* Line 661 of lalr1.cc  */
+#line 3031 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5527,10 +4794,9 @@
     }
     break;
 
-  case 295:
-
-/* Line 678 of lalr1.cc  */
-#line 3022 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 297:
+/* Line 661 of lalr1.cc  */
+#line 3039 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -5540,10 +4806,9 @@
     }
     break;
 
-  case 296:
-
-/* Line 678 of lalr1.cc  */
-#line 3030 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 298:
+/* Line 661 of lalr1.cc  */
+#line 3047 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5553,10 +4818,9 @@
     }
     break;
 
-  case 297:
-
-/* Line 678 of lalr1.cc  */
-#line 3038 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 299:
+/* Line 661 of lalr1.cc  */
+#line 3055 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new GroupSpec(LOC((yyloc)),
                          static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -5566,19 +4830,17 @@
     }
     break;
 
-  case 298:
-
-/* Line 678 of lalr1.cc  */
-#line 3050 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 300:
+/* Line 661 of lalr1.cc  */
+#line 3067 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new GroupCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
     }
     break;
 
-  case 299:
-
-/* Line 678 of lalr1.cc  */
-#line 3058 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 301:
+/* Line 661 of lalr1.cc  */
+#line 3075 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderByClause(
                 LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(3) - (3)].node))
@@ -5586,10 +4848,9 @@
         }
     break;
 
-  case 300:
-
-/* Line 678 of lalr1.cc  */
-#line 3064 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 302:
+/* Line 661 of lalr1.cc  */
+#line 3081 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderByClause(
                 LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(4) - (4)].node)), true
@@ -5597,10 +4858,9 @@
         }
     break;
 
-  case 301:
-
-/* Line 678 of lalr1.cc  */
-#line 3074 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 303:
+/* Line 661 of lalr1.cc  */
+#line 3091 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             OrderSpecList *osl = new OrderSpecList( LOC((yyloc)) );
             osl->push_back( dynamic_cast<OrderSpec*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5608,10 +4868,9 @@
         }
     break;
 
-  case 302:
-
-/* Line 678 of lalr1.cc  */
-#line 3080 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 304:
+/* Line 661 of lalr1.cc  */
+#line 3097 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             if ( OrderSpecList* osl = dynamic_cast<OrderSpecList*>((yysemantic_stack_[(3) - (1)].node)) )
                 osl->push_back( dynamic_cast<OrderSpec*>((yysemantic_stack_[(3) - (3)].node)) );
@@ -5619,19 +4878,17 @@
         }
     break;
 
-  case 303:
-
-/* Line 678 of lalr1.cc  */
-#line 3090 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 305:
+/* Line 661 of lalr1.cc  */
+#line 3107 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderSpec( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL );
         }
     break;
 
-  case 304:
-
-/* Line 678 of lalr1.cc  */
-#line 3094 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 306:
+/* Line 661 of lalr1.cc  */
+#line 3111 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderSpec(
                 LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr), dynamic_cast<OrderModifierPN*>((yysemantic_stack_[(2) - (2)].node))
@@ -5639,10 +4896,9 @@
         }
     break;
 
-  case 305:
-
-/* Line 678 of lalr1.cc  */
-#line 3104 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 307:
+/* Line 661 of lalr1.cc  */
+#line 3121 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), dynamic_cast<OrderDirSpec*>((yysemantic_stack_[(1) - (1)].node)), NULL, NULL
@@ -5650,10 +4906,9 @@
         }
     break;
 
-  case 306:
-
-/* Line 678 of lalr1.cc  */
-#line 3110 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 308:
+/* Line 661 of lalr1.cc  */
+#line 3127 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), NULL, dynamic_cast<OrderEmptySpec*>((yysemantic_stack_[(1) - (1)].node)), NULL
@@ -5661,10 +4916,9 @@
         }
     break;
 
-  case 307:
-
-/* Line 678 of lalr1.cc  */
-#line 3116 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 309:
+/* Line 661 of lalr1.cc  */
+#line 3133 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)), NULL, NULL, dynamic_cast<OrderCollationSpec*>((yysemantic_stack_[(1) - (1)].node))
@@ -5672,10 +4926,9 @@
         }
     break;
 
-  case 308:
-
-/* Line 678 of lalr1.cc  */
-#line 3122 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 310:
+/* Line 661 of lalr1.cc  */
+#line 3139 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5686,10 +4939,9 @@
         }
     break;
 
-  case 309:
-
-/* Line 678 of lalr1.cc  */
-#line 3131 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 311:
+/* Line 661 of lalr1.cc  */
+#line 3148 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5700,10 +4952,9 @@
         }
     break;
 
-  case 310:
-
-/* Line 678 of lalr1.cc  */
-#line 3140 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 312:
+/* Line 661 of lalr1.cc  */
+#line 3157 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5714,10 +4965,9 @@
         }
     break;
 
-  case 311:
-
-/* Line 678 of lalr1.cc  */
-#line 3149 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 313:
+/* Line 661 of lalr1.cc  */
+#line 3166 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5728,28 +4978,25 @@
         }
     break;
 
-  case 312:
-
-/* Line 678 of lalr1.cc  */
-#line 3162 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 314:
+/* Line 661 of lalr1.cc  */
+#line 3179 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_ascending );
         }
     break;
 
-  case 313:
-
-/* Line 678 of lalr1.cc  */
-#line 3166 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 315:
+/* Line 661 of lalr1.cc  */
+#line 3183 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_descending );
         }
     break;
 
-  case 314:
-
-/* Line 678 of lalr1.cc  */
-#line 3174 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 316:
+/* Line 661 of lalr1.cc  */
+#line 3191 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderEmptySpec(
                 LOC((yyloc)), StaticContextConsts::empty_greatest
@@ -5757,10 +5004,9 @@
         }
     break;
 
-  case 315:
-
-/* Line 678 of lalr1.cc  */
-#line 3180 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 317:
+/* Line 661 of lalr1.cc  */
+#line 3197 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderEmptySpec(
                 LOC((yyloc)), StaticContextConsts::empty_least
@@ -5768,19 +5014,17 @@
         }
     break;
 
-  case 316:
-
-/* Line 678 of lalr1.cc  */
-#line 3190 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 318:
+/* Line 661 of lalr1.cc  */
+#line 3207 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
         }
     break;
 
-  case 317:
-
-/* Line 678 of lalr1.cc  */
-#line 3198 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 319:
+/* Line 661 of lalr1.cc  */
+#line 3215 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new QuantifiedExpr(
                 LOC((yyloc)),
@@ -5791,10 +5035,9 @@
         }
     break;
 
-  case 318:
-
-/* Line 678 of lalr1.cc  */
-#line 3207 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 320:
+/* Line 661 of lalr1.cc  */
+#line 3224 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new QuantifiedExpr(
                 LOC((yyloc)),
@@ -5805,10 +5048,9 @@
         }
     break;
 
-  case 319:
-
-/* Line 678 of lalr1.cc  */
-#line 3220 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 321:
+/* Line 661 of lalr1.cc  */
+#line 3237 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       QVarInDeclList *qvidl = new QVarInDeclList( LOC((yyloc)) );
       qvidl->push_back( dynamic_cast<QVarInDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5817,10 +5059,9 @@
     }
     break;
 
-  case 320:
-
-/* Line 678 of lalr1.cc  */
-#line 3227 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 322:
+/* Line 661 of lalr1.cc  */
+#line 3244 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       QVarInDeclList *qvidl = dynamic_cast<QVarInDeclList*>((yysemantic_stack_[(4) - (1)].node));
       qvidl->push_back( dynamic_cast<QVarInDecl*>((yysemantic_stack_[(4) - (4)].node)) );
@@ -5828,19 +5069,17 @@
     }
     break;
 
-  case 321:
-
-/* Line 678 of lalr1.cc  */
-#line 3239 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 323:
+/* Line 661 of lalr1.cc  */
+#line 3256 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new QVarInDecl(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), (yysemantic_stack_[(3) - (3)].expr));
     }
     break;
 
-  case 322:
-
-/* Line 678 of lalr1.cc  */
-#line 3243 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 324:
+/* Line 661 of lalr1.cc  */
+#line 3260 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new QVarInDecl(LOC((yyloc)),
                           static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5849,50 +5088,45 @@
     }
     break;
 
-  case 323:
-
-/* Line 678 of lalr1.cc  */
-#line 3255 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.expr) = new SwitchExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(8) - (5)].node)), (yysemantic_stack_[(8) - (8)].expr));
-    }
-    break;
-
-  case 324:
-
-/* Line 678 of lalr1.cc  */
-#line 3262 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-      SwitchCaseClauseList* scc_list_p = new SwitchCaseClauseList(LOC((yyloc)));
-      scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(1) - (1)].node)));
-      (yyval.node) = scc_list_p;
-    }
-    break;
-
   case 325:
-
-/* Line 678 of lalr1.cc  */
-#line 3268 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3272 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      SwitchCaseClauseList* scc_list_p = static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
-      scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(2) - (2)].node)));
-      (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+      (yyval.expr) = new SwitchExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(8) - (5)].node)), (yysemantic_stack_[(8) - (8)].expr));
     }
     break;
 
   case 326:
-
-/* Line 678 of lalr1.cc  */
-#line 3277 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3279 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      (yyval.node) = new SwitchCaseClause(LOC((yyloc)), dynamic_cast<SwitchCaseOperandList*>((yysemantic_stack_[(3) - (1)].node)), (yysemantic_stack_[(3) - (3)].expr));
+      SwitchCaseClauseList* scc_list_p = new SwitchCaseClauseList(LOC((yyloc)));
+      scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(1) - (1)].node)));
+      (yyval.node) = scc_list_p;
     }
     break;
 
   case 327:
-
-/* Line 678 of lalr1.cc  */
-#line 3284 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3285 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      SwitchCaseClauseList* scc_list_p = static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
+      scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(2) - (2)].node)));
+      (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+    }
+    break;
+
+  case 328:
+/* Line 661 of lalr1.cc  */
+#line 3294 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.node) = new SwitchCaseClause(LOC((yyloc)), dynamic_cast<SwitchCaseOperandList*>((yysemantic_stack_[(3) - (1)].node)), (yysemantic_stack_[(3) - (3)].expr));
+    }
+    break;
+
+  case 329:
+/* Line 661 of lalr1.cc  */
+#line 3301 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       SwitchCaseOperandList* sco_list_p = new SwitchCaseOperandList(LOC((yyloc)));
       sco_list_p->push_back((yysemantic_stack_[(2) - (2)].expr));
@@ -5900,10 +5134,9 @@
     }
     break;
 
-  case 328:
-
-/* Line 678 of lalr1.cc  */
-#line 3290 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 330:
+/* Line 661 of lalr1.cc  */
+#line 3307 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       SwitchCaseOperandList* sco_list_p = static_cast<SwitchCaseOperandList*>((yysemantic_stack_[(3) - (1)].node));
       sco_list_p->push_back((yysemantic_stack_[(3) - (3)].expr));
@@ -5911,75 +5144,45 @@
     }
     break;
 
-  case 329:
-
-/* Line 678 of lalr1.cc  */
-#line 3301 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.expr) = new SwitchExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(8) - (5)].node)), (yysemantic_stack_[(8) - (8)].expr));
-    }
-    break;
-
-  case 330:
-
-/* Line 678 of lalr1.cc  */
-#line 3308 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-      SwitchCaseClauseList* scc_list_p = new SwitchCaseClauseList(LOC((yyloc)));
-      scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(1) - (1)].node)));
-      (yyval.node) = scc_list_p;
-    }
-    break;
-
   case 331:
-
-/* Line 678 of lalr1.cc  */
-#line 3314 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3318 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      SwitchCaseClauseList* scc_list_p = static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
-      scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(2) - (2)].node)));
-      (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+      (yyval.expr) = new SwitchExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(8) - (5)].node)), (yysemantic_stack_[(8) - (8)].expr));
     }
     break;
 
   case 332:
-
-/* Line 678 of lalr1.cc  */
-#line 3323 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3325 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      (yyval.node) = new SwitchCaseClause(LOC((yyloc)), dynamic_cast<SwitchCaseOperandList*>((yysemantic_stack_[(3) - (1)].node)), (yysemantic_stack_[(3) - (3)].expr));
+      SwitchCaseClauseList* scc_list_p = new SwitchCaseClauseList(LOC((yyloc)));
+      scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(1) - (1)].node)));
+      (yyval.node) = scc_list_p;
     }
     break;
 
   case 333:
-
-/* Line 678 of lalr1.cc  */
-#line 3332 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3331 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
-                              (yysemantic_stack_[(8) - (3)].expr),
-                              dynamic_cast<CaseClauseList*>((yysemantic_stack_[(8) - (5)].node)),
-                              (yysemantic_stack_[(8) - (8)].expr));
+      SwitchCaseClauseList* scc_list_p = static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
+      scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(2) - (2)].node)));
+      (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
     }
     break;
 
   case 334:
-
-/* Line 678 of lalr1.cc  */
-#line 3339 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3340 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
-                              (yysemantic_stack_[(10) - (3)].expr),
-                              dynamic_cast<CaseClauseList*>((yysemantic_stack_[(10) - (5)].node)),
-                              static_cast<QName*>((yysemantic_stack_[(10) - (8)].expr)),
-                              (yysemantic_stack_[(10) - (10)].expr));
+      (yyval.node) = new SwitchCaseClause(LOC((yyloc)), dynamic_cast<SwitchCaseOperandList*>((yysemantic_stack_[(3) - (1)].node)), (yysemantic_stack_[(3) - (3)].expr));
     }
     break;
 
   case 335:
-
-/* Line 678 of lalr1.cc  */
-#line 3350 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3349 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
                               (yysemantic_stack_[(8) - (3)].expr),
@@ -5989,9 +5192,8 @@
     break;
 
   case 336:
-
-/* Line 678 of lalr1.cc  */
-#line 3357 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3356 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
                               (yysemantic_stack_[(10) - (3)].expr),
@@ -6002,153 +5204,161 @@
     break;
 
   case 337:
-
-/* Line 678 of lalr1.cc  */
-#line 3369 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3367 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      CaseClauseList* cc_list_p = new CaseClauseList(LOC ((yyloc)));
-      cc_list_p->push_back(dynamic_cast<CaseClause*>((yysemantic_stack_[(1) - (1)].node)));
-      (yyval.node) = cc_list_p;
+      (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
+                              (yysemantic_stack_[(8) - (3)].expr),
+                              dynamic_cast<CaseClauseList*>((yysemantic_stack_[(8) - (5)].node)),
+                              (yysemantic_stack_[(8) - (8)].expr));
     }
     break;
 
   case 338:
-
-/* Line 678 of lalr1.cc  */
-#line 3375 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3374 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      CaseClauseList* cc_list_p = dynamic_cast<CaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
-      cc_list_p->push_back(dynamic_cast<CaseClause*>((yysemantic_stack_[(2) - (2)].node)));
-      (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+      (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
+                              (yysemantic_stack_[(10) - (3)].expr),
+                              dynamic_cast<CaseClauseList*>((yysemantic_stack_[(10) - (5)].node)),
+                              static_cast<QName*>((yysemantic_stack_[(10) - (8)].expr)),
+                              (yysemantic_stack_[(10) - (10)].expr));
     }
     break;
 
   case 339:
-
-/* Line 678 of lalr1.cc  */
-#line 3387 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3386 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      (yyval.node) = new CaseClause(LOC ((yyloc)),
-                          dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (2)].node)),
-                          (yysemantic_stack_[(4) - (4)].expr));
+      CaseClauseList* cc_list_p = new CaseClauseList(LOC ((yyloc)));
+      cc_list_p->push_back(dynamic_cast<CaseClause*>((yysemantic_stack_[(1) - (1)].node)));
+      (yyval.node) = cc_list_p;
     }
     break;
 
   case 340:
-
-/* Line 678 of lalr1.cc  */
-#line 3393 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3392 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      (yyval.node) = new CaseClause(LOC ((yyloc)),
-                          static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
-                          dynamic_cast<SequenceType*>((yysemantic_stack_[(7) - (5)].node)),
-                          (yysemantic_stack_[(7) - (7)].expr));
-     }
+      CaseClauseList* cc_list_p = dynamic_cast<CaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
+      cc_list_p->push_back(dynamic_cast<CaseClause*>((yysemantic_stack_[(2) - (2)].node)));
+      (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+    }
     break;
 
   case 341:
-
-/* Line 678 of lalr1.cc  */
-#line 3404 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3404 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      CaseClauseList* cc_list_p = new CaseClauseList(LOC ((yyloc)));
-      cc_list_p->push_back(dynamic_cast<CaseClause*>((yysemantic_stack_[(1) - (1)].node)));
-      (yyval.node) = cc_list_p;
+      (yyval.node) = new CaseClause(LOC ((yyloc)),
+                          dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (2)].node)),
+                          (yysemantic_stack_[(4) - (4)].expr));
     }
     break;
 
   case 342:
-
-/* Line 678 of lalr1.cc  */
-#line 3410 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3410 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      CaseClauseList* cc_list_p = dynamic_cast<CaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
-      cc_list_p->push_back(dynamic_cast<CaseClause*>((yysemantic_stack_[(2) - (2)].node)));
-      (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
-    }
+      (yyval.node) = new CaseClause(LOC ((yyloc)),
+                          static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
+                          dynamic_cast<SequenceType*>((yysemantic_stack_[(7) - (5)].node)),
+                          (yysemantic_stack_[(7) - (7)].expr));
+     }
     break;
 
   case 343:
-
-/* Line 678 of lalr1.cc  */
-#line 3421 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3421 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      (yyval.node) = new CaseClause(LOC ((yyloc)),
-                          dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (2)].node)),
-                          (yysemantic_stack_[(4) - (4)].expr));
+      CaseClauseList* cc_list_p = new CaseClauseList(LOC ((yyloc)));
+      cc_list_p->push_back(dynamic_cast<CaseClause*>((yysemantic_stack_[(1) - (1)].node)));
+      (yyval.node) = cc_list_p;
     }
     break;
 
   case 344:
-
-/* Line 678 of lalr1.cc  */
-#line 3427 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3427 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      (yyval.node) = new CaseClause(LOC ((yyloc)),
-                          static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
-                          dynamic_cast<SequenceType*>((yysemantic_stack_[(7) - (5)].node)),
-                          (yysemantic_stack_[(7) - (7)].expr));
-     }
+      CaseClauseList* cc_list_p = dynamic_cast<CaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
+      cc_list_p->push_back(dynamic_cast<CaseClause*>((yysemantic_stack_[(2) - (2)].node)));
+      (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+    }
     break;
 
   case 345:
-
-/* Line 678 of lalr1.cc  */
-#line 3438 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3438 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      (yyval.expr) = new IfExpr(LOC ((yyloc)), (yysemantic_stack_[(8) - (3)].expr), (yysemantic_stack_[(8) - (6)].expr), (yysemantic_stack_[(8) - (8)].expr));
+      (yyval.node) = new CaseClause(LOC ((yyloc)),
+                          dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (2)].node)),
+                          (yysemantic_stack_[(4) - (4)].expr));
     }
     break;
 
   case 346:
-
-/* Line 678 of lalr1.cc  */
-#line 3447 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3444 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-    }
+      (yyval.node) = new CaseClause(LOC ((yyloc)),
+                          static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
+                          dynamic_cast<SequenceType*>((yysemantic_stack_[(7) - (5)].node)),
+                          (yysemantic_stack_[(7) - (7)].expr));
+     }
     break;
 
   case 347:
-
-/* Line 678 of lalr1.cc  */
-#line 3451 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3455 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      (yyval.expr) = new OrExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
+      (yyval.expr) = new IfExpr(LOC ((yyloc)), (yysemantic_stack_[(8) - (3)].expr), (yysemantic_stack_[(8) - (6)].expr), (yysemantic_stack_[(8) - (8)].expr));
     }
     break;
 
   case 348:
-
-/* Line 678 of lalr1.cc  */
-#line 3460 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3464 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-        }
+      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+    }
     break;
 
   case 349:
-
-/* Line 678 of lalr1.cc  */
-#line 3464 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3468 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new AndExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
-        }
+      (yyval.expr) = new OrExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
+    }
     break;
 
   case 350:
-
-/* Line 678 of lalr1.cc  */
-#line 3472 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3477 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 351:
-
-/* Line 678 of lalr1.cc  */
-#line 3476 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3481 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = new AndExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
+        }
+    break;
+
+  case 352:
+/* Line 661 of lalr1.cc  */
+#line 3489 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+        }
+    break;
+
+  case 353:
+/* Line 661 of lalr1.cc  */
+#line 3493 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             /*  ::=  "eq" | "ne" | "lt" | "le" | "gt" | "ge" */
             (yyval.expr) = new ComparisonExpr(
@@ -6160,10 +5370,9 @@
         }
     break;
 
-  case 352:
-
-/* Line 678 of lalr1.cc  */
-#line 3486 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 354:
+/* Line 661 of lalr1.cc  */
+#line 3503 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             /*  ::=  "is" | "<<" | ">>" */
             (yyval.expr) = new ComparisonExpr(
@@ -6172,10 +5381,9 @@
         }
     break;
 
-  case 353:
-
-/* Line 678 of lalr1.cc  */
-#line 3493 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 355:
+/* Line 661 of lalr1.cc  */
+#line 3510 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6186,10 +5394,9 @@
         }
     break;
 
-  case 354:
-
-/* Line 678 of lalr1.cc  */
-#line 3502 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 356:
+/* Line 661 of lalr1.cc  */
+#line 3519 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6200,20 +5407,18 @@
         }
     break;
 
-  case 355:
-
-/* Line 678 of lalr1.cc  */
-#line 3511 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 357:
+/* Line 661 of lalr1.cc  */
+#line 3528 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             /* this call is needed */
             driver.lexer->interpretAsLessThan();
         }
     break;
 
-  case 356:
-
-/* Line 678 of lalr1.cc  */
-#line 3516 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 358:
+/* Line 661 of lalr1.cc  */
+#line 3533 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6224,10 +5429,9 @@
         }
     break;
 
-  case 357:
-
-/* Line 678 of lalr1.cc  */
-#line 3525 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 359:
+/* Line 661 of lalr1.cc  */
+#line 3542 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6238,10 +5442,9 @@
         }
     break;
 
-  case 358:
-
-/* Line 678 of lalr1.cc  */
-#line 3534 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 360:
+/* Line 661 of lalr1.cc  */
+#line 3551 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6252,10 +5455,9 @@
         }
     break;
 
-  case 359:
-
-/* Line 678 of lalr1.cc  */
-#line 3543 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 361:
+/* Line 661 of lalr1.cc  */
+#line 3560 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6266,19 +5468,17 @@
         }
     break;
 
-  case 360:
-
-/* Line 678 of lalr1.cc  */
-#line 3556 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 362:
+/* Line 661 of lalr1.cc  */
+#line 3573 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
-  case 361:
-
-/* Line 678 of lalr1.cc  */
-#line 3560 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 363:
+/* Line 661 of lalr1.cc  */
+#line 3577 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new FTContainsExpr(
                 LOC((yyloc)),
@@ -6289,327 +5489,293 @@
         }
     break;
 
-  case 362:
-
-/* Line 678 of lalr1.cc  */
-#line 3572 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-          (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-        }
-    break;
-
-  case 363:
-
-/* Line 678 of lalr1.cc  */
-#line 3576 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-          (yyval.expr) = new StringConcatExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
-        }
-    break;
-
   case 364:
-
-/* Line 678 of lalr1.cc  */
-#line 3583 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3589 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = NULL;
+          (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 365:
-
-/* Line 678 of lalr1.cc  */
-#line 3587 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3593 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+          (yyval.expr) = new StringConcatExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
         }
     break;
 
   case 366:
-
-/* Line 678 of lalr1.cc  */
-#line 3594 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3600 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+            (yyval.node) = NULL;
         }
     break;
 
   case 367:
-
-/* Line 678 of lalr1.cc  */
-#line 3598 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3604 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new RangeExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 368:
-
-/* Line 678 of lalr1.cc  */
-#line 3607 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3611 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 369:
-
-/* Line 678 of lalr1.cc  */
-#line 3611 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3615 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new AdditiveExpr( LOC((yyloc)), ParseConstants::op_plus, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
+            (yyval.expr) = new RangeExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
     break;
 
   case 370:
-
-/* Line 678 of lalr1.cc  */
-#line 3615 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3624 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new AdditiveExpr( LOC((yyloc)), ParseConstants::op_minus, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
+            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 371:
-
-/* Line 678 of lalr1.cc  */
-#line 3623 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3628 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+            (yyval.expr) = new AdditiveExpr( LOC((yyloc)), ParseConstants::op_plus, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
     break;
 
   case 372:
-
-/* Line 678 of lalr1.cc  */
-#line 3627 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3632 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new MultiplicativeExpr(
-                LOC((yyloc)), ParseConstants::op_mul, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
-            );
+            (yyval.expr) = new AdditiveExpr( LOC((yyloc)), ParseConstants::op_minus, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
     break;
 
   case 373:
-
-/* Line 678 of lalr1.cc  */
-#line 3633 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3640 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new MultiplicativeExpr(
-                LOC((yyloc)), ParseConstants::op_div, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
-            );
+            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 374:
-
-/* Line 678 of lalr1.cc  */
-#line 3639 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3644 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new MultiplicativeExpr(
-                LOC((yyloc)), ParseConstants::op_idiv, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
+                LOC((yyloc)), ParseConstants::op_mul, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
             );
         }
     break;
 
   case 375:
-
-/* Line 678 of lalr1.cc  */
-#line 3645 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3650 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new MultiplicativeExpr(
-                LOC((yyloc)), ParseConstants::op_mod, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
+                LOC((yyloc)), ParseConstants::op_div, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
             );
         }
     break;
 
   case 376:
-
-/* Line 678 of lalr1.cc  */
-#line 3655 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3656 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+            (yyval.expr) = new MultiplicativeExpr(
+                LOC((yyloc)), ParseConstants::op_idiv, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
+            );
         }
     break;
 
   case 377:
-
-/* Line 678 of lalr1.cc  */
-#line 3659 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3662 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
+            (yyval.expr) = new MultiplicativeExpr(
+                LOC((yyloc)), ParseConstants::op_mod, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
+            );
         }
     break;
 
   case 378:
-
-/* Line 678 of lalr1.cc  */
-#line 3663 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3672 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
+            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 379:
-
-/* Line 678 of lalr1.cc  */
-#line 3671 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3676 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+            (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
     break;
 
   case 380:
-
-/* Line 678 of lalr1.cc  */
-#line 3675 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3680 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new IntersectExceptExpr(
-                LOC((yyloc)), ParseConstants::op_intersect, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
-            );
+            (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
         }
     break;
 
   case 381:
-
-/* Line 678 of lalr1.cc  */
-#line 3681 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3688 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new IntersectExceptExpr(
-                LOC((yyloc)), ParseConstants::op_except, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
-            );
+            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 382:
-
-/* Line 678 of lalr1.cc  */
-#line 3691 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3692 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+            (yyval.expr) = new IntersectExceptExpr(
+                LOC((yyloc)), ParseConstants::op_intersect, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
+            );
         }
     break;
 
   case 383:
-
-/* Line 678 of lalr1.cc  */
-#line 3695 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3698 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new InstanceofExpr(
-                LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node))
+            (yyval.expr) = new IntersectExceptExpr(
+                LOC((yyloc)), ParseConstants::op_except, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
             );
         }
     break;
 
   case 384:
-
-/* Line 678 of lalr1.cc  */
-#line 3705 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3708 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 385:
-
-/* Line 678 of lalr1.cc  */
-#line 3709 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3712 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new TreatExpr(
+            (yyval.expr) = new InstanceofExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node))
             );
         }
     break;
 
   case 386:
-
-/* Line 678 of lalr1.cc  */
-#line 3719 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3722 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 387:
-
-/* Line 678 of lalr1.cc  */
-#line 3723 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3726 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new CastableExpr(
-                LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SingleType*>((yysemantic_stack_[(4) - (4)].node))
+            (yyval.expr) = new TreatExpr(
+                LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node))
             );
         }
     break;
 
   case 388:
-
-/* Line 678 of lalr1.cc  */
-#line 3733 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3736 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 389:
-
-/* Line 678 of lalr1.cc  */
-#line 3737 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3740 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new CastExpr(
+            (yyval.expr) = new CastableExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SingleType*>((yysemantic_stack_[(4) - (4)].node))
             );
         }
     break;
 
   case 390:
-
-/* Line 678 of lalr1.cc  */
-#line 3747 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3750 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 391:
-
-/* Line 678 of lalr1.cc  */
-#line 3751 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3754 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new UnaryExpr( LOC((yyloc)), dynamic_cast<SignList*>((yysemantic_stack_[(2) - (1)].node)), (yysemantic_stack_[(2) - (2)].expr) );
+            (yyval.expr) = new CastExpr(
+                LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SingleType*>((yysemantic_stack_[(4) - (4)].node))
+            );
         }
     break;
 
   case 392:
-
-/* Line 678 of lalr1.cc  */
-#line 3759 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3764 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new SignList( LOC((yyloc)), true );
+            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 393:
-
-/* Line 678 of lalr1.cc  */
-#line 3763 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3768 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new SignList( LOC((yyloc)), false );
+            (yyval.expr) = new UnaryExpr( LOC((yyloc)), dynamic_cast<SignList*>((yysemantic_stack_[(2) - (1)].node)), (yysemantic_stack_[(2) - (2)].expr) );
         }
     break;
 
   case 394:
-
-/* Line 678 of lalr1.cc  */
-#line 3767 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3776 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+            (yyval.node) = new SignList( LOC((yyloc)), true );
         }
     break;
 
   case 395:
-
-/* Line 678 of lalr1.cc  */
-#line 3771 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3780 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = new SignList( LOC((yyloc)), false );
+        }
+    break;
+
+  case 396:
+/* Line 661 of lalr1.cc  */
+#line 3784 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+        }
+    break;
+
+  case 397:
+/* Line 661 of lalr1.cc  */
+#line 3788 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             if ( SignList *sl = dynamic_cast<SignList*>((yysemantic_stack_[(2) - (1)].node)) )
                 sl->negate();
@@ -6617,145 +5783,129 @@
         }
     break;
 
-  case 396:
-
-/* Line 678 of lalr1.cc  */
-#line 3781 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-        }
-    break;
-
-  case 397:
-
-/* Line 678 of lalr1.cc  */
-#line 3785 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-        }
-    break;
-
   case 398:
-
-/* Line 678 of lalr1.cc  */
-#line 3789 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3798 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 399:
-
-/* Line 678 of lalr1.cc  */
-#line 3797 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 3802 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+        }
+    break;
+
+  case 400:
+/* Line 661 of lalr1.cc  */
+#line 3806 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+        }
+    break;
+
+  case 401:
+/* Line 661 of lalr1.cc  */
+#line 3814 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_eq );
         }
     break;
 
-  case 400:
-
-/* Line 678 of lalr1.cc  */
-#line 3801 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 402:
+/* Line 661 of lalr1.cc  */
+#line 3818 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ne );
         }
     break;
 
-  case 401:
-
-/* Line 678 of lalr1.cc  */
-#line 3805 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 403:
+/* Line 661 of lalr1.cc  */
+#line 3822 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_lt );
         }
     break;
 
-  case 402:
-
-/* Line 678 of lalr1.cc  */
-#line 3809 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 404:
+/* Line 661 of lalr1.cc  */
+#line 3826 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_le );
         }
     break;
 
-  case 403:
-
-/* Line 678 of lalr1.cc  */
-#line 3813 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 405:
+/* Line 661 of lalr1.cc  */
+#line 3830 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_gt );
         }
     break;
 
-  case 404:
-
-/* Line 678 of lalr1.cc  */
-#line 3817 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 406:
+/* Line 661 of lalr1.cc  */
+#line 3834 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ge );
         }
     break;
 
-  case 405:
-
-/* Line 678 of lalr1.cc  */
-#line 3825 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 407:
+/* Line 661 of lalr1.cc  */
+#line 3842 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new NodeComp( LOC((yyloc)), ParseConstants::op_is );
         }
     break;
 
-  case 406:
-
-/* Line 678 of lalr1.cc  */
-#line 3829 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 408:
+/* Line 661 of lalr1.cc  */
+#line 3846 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new NodeComp( LOC((yyloc)), ParseConstants::op_precedes );
         }
     break;
 
-  case 407:
-
-/* Line 678 of lalr1.cc  */
-#line 3833 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 409:
+/* Line 661 of lalr1.cc  */
+#line 3850 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new NodeComp( LOC((yyloc)), ParseConstants::op_follows );
         }
     break;
 
-  case 408:
-
-/* Line 678 of lalr1.cc  */
-#line 3841 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 410:
+/* Line 661 of lalr1.cc  */
+#line 3858 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(4) - (3)].expr) );
         }
     break;
 
-  case 409:
-
-/* Line 678 of lalr1.cc  */
-#line 3845 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 411:
+/* Line 661 of lalr1.cc  */
+#line 3862 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "lax", (yysemantic_stack_[(5) - (4)].expr) );
         }
     break;
 
-  case 410:
-
-/* Line 678 of lalr1.cc  */
-#line 3849 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 412:
+/* Line 661 of lalr1.cc  */
+#line 3866 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(5) - (4)].expr) );
         }
     break;
 
-  case 411:
-
-/* Line 678 of lalr1.cc  */
-#line 3853 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 413:
+/* Line 661 of lalr1.cc  */
+#line 3870 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ValidateExpr(
                 LOC((yyloc)), dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (3)].node))->get_name(), (yysemantic_stack_[(6) - (5)].expr)
@@ -6764,10 +5914,9 @@
         }
     break;
 
-  case 412:
-
-/* Line 678 of lalr1.cc  */
-#line 3864 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 414:
+/* Line 661 of lalr1.cc  */
+#line 3881 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ExtensionExpr(
                 LOC((yyloc)), dynamic_cast<PragmaList*>((yysemantic_stack_[(3) - (1)].node)), NULL
@@ -6775,10 +5924,9 @@
         }
     break;
 
-  case 413:
-
-/* Line 678 of lalr1.cc  */
-#line 3870 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 415:
+/* Line 661 of lalr1.cc  */
+#line 3887 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ExtensionExpr(
                 LOC((yyloc)), dynamic_cast<PragmaList*>((yysemantic_stack_[(4) - (1)].node)), (yysemantic_stack_[(4) - (3)].expr)
@@ -6786,10 +5934,9 @@
         }
     break;
 
-  case 414:
-
-/* Line 678 of lalr1.cc  */
-#line 3880 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 416:
+/* Line 661 of lalr1.cc  */
+#line 3897 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             PragmaList *pl = new PragmaList( LOC((yyloc)) );
             pl->push_back( dynamic_cast<Pragma*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -6797,10 +5944,9 @@
         }
     break;
 
-  case 415:
-
-/* Line 678 of lalr1.cc  */
-#line 3886 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 417:
+/* Line 661 of lalr1.cc  */
+#line 3903 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             if ( PragmaList *pl = dynamic_cast<PragmaList*>((yysemantic_stack_[(2) - (1)].node)) )
                 pl->push_back( dynamic_cast<Pragma*>((yysemantic_stack_[(2) - (2)].node)) );
@@ -6808,46 +5954,41 @@
         }
     break;
 
-  case 416:
-
-/* Line 678 of lalr1.cc  */
-#line 3896 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 418:
+/* Line 661 of lalr1.cc  */
+#line 3913 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new Pragma( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
         }
     break;
 
-  case 417:
-
-/* Line 678 of lalr1.cc  */
-#line 3900 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 419:
+/* Line 661 of lalr1.cc  */
+#line 3917 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new Pragma( LOC((yyloc)), new QName( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) ), "" );
         }
     break;
 
-  case 418:
-
-/* Line 678 of lalr1.cc  */
-#line 3904 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 420:
+/* Line 661 of lalr1.cc  */
+#line 3921 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new Pragma( LOC((yyloc)), new QName( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)), true ), "" );
         }
     break;
 
-  case 419:
-
-/* Line 678 of lalr1.cc  */
-#line 3942 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 421:
+/* Line 661 of lalr1.cc  */
+#line 3959 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new PathExpr(LOC((yyloc)), ParseConstants::path_leading_lone_slash, NULL);
     }
     break;
 
-  case 420:
-
-/* Line 678 of lalr1.cc  */
-#line 3946 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 422:
+/* Line 661 of lalr1.cc  */
+#line 3963 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       RelativePathExpr* rpe;
 
@@ -6859,10 +6000,9 @@
     }
     break;
 
-  case 421:
-
-/* Line 678 of lalr1.cc  */
-#line 3956 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 423:
+/* Line 661 of lalr1.cc  */
+#line 3973 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       RelativePathExpr* rpe;
 
@@ -6874,10 +6014,9 @@
     }
     break;
 
-  case 422:
-
-/* Line 678 of lalr1.cc  */
-#line 3966 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 424:
+/* Line 661 of lalr1.cc  */
+#line 3983 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       RelativePathExpr* rpe = dynamic_cast<RelativePathExpr*>((yysemantic_stack_[(1) - (1)].expr));
       (yyval.expr) = (!rpe ?
@@ -6886,19 +6025,17 @@
     }
     break;
 
-  case 423:
-
-/* Line 678 of lalr1.cc  */
-#line 3979 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 425:
+/* Line 661 of lalr1.cc  */
+#line 3996 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = NULL;
     }
     break;
 
-  case 424:
-
-/* Line 678 of lalr1.cc  */
-#line 3988 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 426:
+/* Line 661 of lalr1.cc  */
+#line 4005 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       AxisStep* as = dynamic_cast<AxisStep*>((yysemantic_stack_[(1) - (1)].expr));
       (yyval.expr) = (as ?
@@ -6910,46 +6047,41 @@
     }
     break;
 
-  case 425:
-
-/* Line 678 of lalr1.cc  */
-#line 3998 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 427:
+/* Line 661 of lalr1.cc  */
+#line 4015 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new RelativePathExpr(LOC((yyloc)), ParseConstants::st_slash, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr), false);
     }
     break;
 
-  case 426:
-
-/* Line 678 of lalr1.cc  */
-#line 4002 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 428:
+/* Line 661 of lalr1.cc  */
+#line 4019 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new RelativePathExpr(LOC((yyloc)), ParseConstants::st_slashslash, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr), false);
     }
     break;
 
-  case 427:
-
-/* Line 678 of lalr1.cc  */
-#line 4011 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-    }
-    break;
-
-  case 428:
-
-/* Line 678 of lalr1.cc  */
-#line 4015 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-    }
-    break;
-
   case 429:
-
-/* Line 678 of lalr1.cc  */
-#line 4024 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4028 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+    }
+    break;
+
+  case 430:
+/* Line 661 of lalr1.cc  */
+#line 4032 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+    }
+    break;
+
+  case 431:
+/* Line 661 of lalr1.cc  */
+#line 4041 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new AxisStep(
                 LOC((yyloc)), dynamic_cast<ForwardStep*>((yysemantic_stack_[(1) - (1)].node)), NULL
@@ -6957,10 +6089,9 @@
         }
     break;
 
-  case 430:
-
-/* Line 678 of lalr1.cc  */
-#line 4030 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 432:
+/* Line 661 of lalr1.cc  */
+#line 4047 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new AxisStep(
                 LOC((yyloc)),
@@ -6970,10 +6101,9 @@
         }
     break;
 
-  case 431:
-
-/* Line 678 of lalr1.cc  */
-#line 4038 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 433:
+/* Line 661 of lalr1.cc  */
+#line 4055 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new AxisStep(
                 LOC((yyloc)), dynamic_cast<ReverseStep*>((yysemantic_stack_[(1) - (1)].node)), NULL
@@ -6981,10 +6111,9 @@
         }
     break;
 
-  case 432:
-
-/* Line 678 of lalr1.cc  */
-#line 4044 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 434:
+/* Line 661 of lalr1.cc  */
+#line 4061 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new AxisStep(
                 LOC((yyloc)),
@@ -6994,10 +6123,9 @@
         }
     break;
 
-  case 433:
-
-/* Line 678 of lalr1.cc  */
-#line 4056 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 435:
+/* Line 661 of lalr1.cc  */
+#line 4073 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ForwardStep(
                 LOC((yyloc)), dynamic_cast<ForwardAxis*>((yysemantic_stack_[(2) - (1)].node)), (yysemantic_stack_[(2) - (2)].node)
@@ -7005,10 +6133,9 @@
         }
     break;
 
-  case 434:
-
-/* Line 678 of lalr1.cc  */
-#line 4062 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 436:
+/* Line 661 of lalr1.cc  */
+#line 4079 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ForwardStep(
                 LOC((yyloc)), dynamic_cast<AbbrevForwardStep*>((yysemantic_stack_[(1) - (1)].node))
@@ -7016,46 +6143,41 @@
         }
     break;
 
-  case 435:
-
-/* Line 678 of lalr1.cc  */
-#line 4072 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 437:
+/* Line 661 of lalr1.cc  */
+#line 4089 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_child );
         }
     break;
 
-  case 436:
-
-/* Line 678 of lalr1.cc  */
-#line 4076 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 438:
+/* Line 661 of lalr1.cc  */
+#line 4093 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_descendant);
         }
     break;
 
-  case 437:
-
-/* Line 678 of lalr1.cc  */
-#line 4080 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 439:
+/* Line 661 of lalr1.cc  */
+#line 4097 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_attribute );
         }
     break;
 
-  case 438:
-
-/* Line 678 of lalr1.cc  */
-#line 4084 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 440:
+/* Line 661 of lalr1.cc  */
+#line 4101 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_self );
         }
     break;
 
-  case 439:
-
-/* Line 678 of lalr1.cc  */
-#line 4088 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 441:
+/* Line 661 of lalr1.cc  */
+#line 4105 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ForwardAxis(
                 LOC((yyloc)), ParseConstants::axis_descendant_or_self
@@ -7063,10 +6185,9 @@
         }
     break;
 
-  case 440:
-
-/* Line 678 of lalr1.cc  */
-#line 4094 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 442:
+/* Line 661 of lalr1.cc  */
+#line 4111 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ForwardAxis(
                 LOC((yyloc)), ParseConstants::axis_following_sibling
@@ -7074,46 +6195,41 @@
         }
     break;
 
-  case 441:
-
-/* Line 678 of lalr1.cc  */
-#line 4100 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 443:
+/* Line 661 of lalr1.cc  */
+#line 4117 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_following );
         }
     break;
 
-  case 442:
-
-/* Line 678 of lalr1.cc  */
-#line 4108 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 444:
+/* Line 661 of lalr1.cc  */
+#line 4125 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new AbbrevForwardStep( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), false );
         }
     break;
 
-  case 443:
-
-/* Line 678 of lalr1.cc  */
-#line 4112 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 445:
+/* Line 661 of lalr1.cc  */
+#line 4129 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new AbbrevForwardStep( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].node), true );
         }
     break;
 
-  case 444:
-
-/* Line 678 of lalr1.cc  */
-#line 4120 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 446:
+/* Line 661 of lalr1.cc  */
+#line 4137 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ReverseStep( LOC((yyloc)), dynamic_cast<ReverseAxis*>((yysemantic_stack_[(2) - (1)].node)), (yysemantic_stack_[(2) - (2)].node) );
         }
     break;
 
-  case 445:
-
-/* Line 678 of lalr1.cc  */
-#line 4124 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 447:
+/* Line 661 of lalr1.cc  */
+#line 4141 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             ReverseAxis *ra = new ReverseAxis(
                 LOC((yyloc)), ParseConstants::axis_parent
@@ -7122,28 +6238,25 @@
         }
     break;
 
-  case 446:
-
-/* Line 678 of lalr1.cc  */
-#line 4135 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 448:
+/* Line 661 of lalr1.cc  */
+#line 4152 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ReverseAxis( LOC((yyloc)), ParseConstants::axis_parent );
         }
     break;
 
-  case 447:
-
-/* Line 678 of lalr1.cc  */
-#line 4139 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 449:
+/* Line 661 of lalr1.cc  */
+#line 4156 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ReverseAxis( LOC((yyloc)), ParseConstants::axis_ancestor );
         }
     break;
 
-  case 448:
-
-/* Line 678 of lalr1.cc  */
-#line 4143 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 450:
+/* Line 661 of lalr1.cc  */
+#line 4160 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ReverseAxis(
                 LOC((yyloc)), ParseConstants::axis_preceding_sibling
@@ -7151,19 +6264,17 @@
         }
     break;
 
-  case 449:
-
-/* Line 678 of lalr1.cc  */
-#line 4149 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 451:
+/* Line 661 of lalr1.cc  */
+#line 4166 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ReverseAxis( LOC((yyloc)), ParseConstants::axis_preceding );
         }
     break;
 
-  case 450:
-
-/* Line 678 of lalr1.cc  */
-#line 4153 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 452:
+/* Line 661 of lalr1.cc  */
+#line 4170 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ReverseAxis(
                 LOC((yyloc)), ParseConstants::axis_ancestor_or_self
@@ -7171,118 +6282,105 @@
         }
     break;
 
-  case 451:
-
-/* Line 678 of lalr1.cc  */
-#line 4167 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-        }
-    break;
-
-  case 452:
-
-/* Line 678 of lalr1.cc  */
-#line 4171 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-        }
-    break;
-
   case 453:
-
-/* Line 678 of lalr1.cc  */
-#line 4179 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4184 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 454:
+/* Line 661 of lalr1.cc  */
+#line 4188 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 455:
+/* Line 661 of lalr1.cc  */
+#line 4196 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new NameTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
         }
     break;
 
-  case 454:
-
-/* Line 678 of lalr1.cc  */
-#line 4183 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 456:
+/* Line 661 of lalr1.cc  */
+#line 4200 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new NameTest( LOC((yyloc)), dynamic_cast<Wildcard*>((yysemantic_stack_[(1) - (1)].node)) );
         }
     break;
 
-  case 455:
-
-/* Line 678 of lalr1.cc  */
-#line 4193 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 457:
+/* Line 661 of lalr1.cc  */
+#line 4210 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), "", "", ParseConstants::wild_all, false);
     }
     break;
 
-  case 456:
-
-/* Line 678 of lalr1.cc  */
-#line 4197 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 458:
+/* Line 661 of lalr1.cc  */
+#line 4214 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, false);
     }
     break;
 
-  case 457:
-
-/* Line 678 of lalr1.cc  */
-#line 4201 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 459:
+/* Line 661 of lalr1.cc  */
+#line 4218 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, true);
     }
     break;
 
-  case 458:
-
-/* Line 678 of lalr1.cc  */
-#line 4205 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 460:
+/* Line 661 of lalr1.cc  */
+#line 4222 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), "", SYMTAB((yysemantic_stack_[(1) - (1)].sval)), ParseConstants::wild_prefix, false);
     }
     break;
 
-  case 459:
-
-/* Line 678 of lalr1.cc  */
-#line 4214 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 461:
+/* Line 661 of lalr1.cc  */
+#line 4231 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
        (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
      }
     break;
 
-  case 460:
-
-/* Line 678 of lalr1.cc  */
-#line 4218 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 462:
+/* Line 661 of lalr1.cc  */
+#line 4235 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
        (yyval.expr) = new FilterExpr(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr), dynamic_cast<PredicateList*>((yysemantic_stack_[(2) - (2)].node)));
      }
     break;
 
-  case 461:
-
-/* Line 678 of lalr1.cc  */
-#line 4222 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 463:
+/* Line 661 of lalr1.cc  */
+#line 4239 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
        (yyval.expr) = new DynamicFunctionInvocation(LOC ((yyloc)), (yysemantic_stack_[(3) - (1)].expr));
      }
     break;
 
-  case 462:
-
-/* Line 678 of lalr1.cc  */
-#line 4226 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 464:
+/* Line 661 of lalr1.cc  */
+#line 4243 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
        (yyval.expr) = new DynamicFunctionInvocation(LOC ((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<ArgList*>((yysemantic_stack_[(4) - (3)].node)));
      }
     break;
 
-  case 463:
-
-/* Line 678 of lalr1.cc  */
-#line 4234 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 465:
+/* Line 661 of lalr1.cc  */
+#line 4251 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             PredicateList *pl = new PredicateList( LOC((yyloc)) );
             pl->push_back( dynamic_cast<exprnode*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -7290,10 +6388,9 @@
         }
     break;
 
-  case 464:
-
-/* Line 678 of lalr1.cc  */
-#line 4240 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 466:
+/* Line 661 of lalr1.cc  */
+#line 4257 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             if ( PredicateList *pl = dynamic_cast<PredicateList*>((yysemantic_stack_[(2) - (1)].node)) )
                 pl->push_back( dynamic_cast<exprnode*>((yysemantic_stack_[(2) - (2)].expr)) );
@@ -7301,163 +6398,145 @@
         }
     break;
 
-  case 465:
-
-/* Line 678 of lalr1.cc  */
-#line 4250 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 467:
+/* Line 661 of lalr1.cc  */
+#line 4267 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
         }
     break;
 
-  case 466:
-
-/* Line 678 of lalr1.cc  */
-#line 4258 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-          (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-        }
-    break;
-
-  case 467:
-
-/* Line 678 of lalr1.cc  */
-#line 4262 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-          (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-        }
-    break;
-
   case 468:
-
-/* Line 678 of lalr1.cc  */
-#line 4266 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4275 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 469:
-
-/* Line 678 of lalr1.cc  */
-#line 4270 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4279 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 470:
-
-/* Line 678 of lalr1.cc  */
-#line 4274 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4283 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 471:
-
-/* Line 678 of lalr1.cc  */
-#line 4278 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4287 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 472:
-
-/* Line 678 of lalr1.cc  */
-#line 4282 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4291 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 473:
-
-/* Line 678 of lalr1.cc  */
-#line 4286 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4295 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 474:
-
-/* Line 678 of lalr1.cc  */
-#line 4290 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4299 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 475:
-
-/* Line 678 of lalr1.cc  */
-#line 4294 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4303 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 476:
-
-/* Line 678 of lalr1.cc  */
-#line 4299 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4307 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 477:
-
-/* Line 678 of lalr1.cc  */
-#line 4303 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4311 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 478:
-
-/* Line 678 of lalr1.cc  */
-#line 4307 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4316 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 479:
-
-/* Line 678 of lalr1.cc  */
-#line 4311 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4320 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 480:
-
-/* Line 678 of lalr1.cc  */
-#line 4319 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4324 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+          (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 481:
-
-/* Line 678 of lalr1.cc  */
-#line 4323 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4328 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+          (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 482:
-
-/* Line 678 of lalr1.cc  */
-#line 4331 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4336 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+        }
+    break;
+
+  case 483:
+/* Line 661 of lalr1.cc  */
+#line 4340 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+        }
+    break;
+
+  case 484:
+/* Line 661 of lalr1.cc  */
+#line 4348 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_decimal, *(yysemantic_stack_[(1) - (1)].decval)
@@ -7466,10 +6545,9 @@
         }
     break;
 
-  case 483:
-
-/* Line 678 of lalr1.cc  */
-#line 4338 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 485:
+/* Line 661 of lalr1.cc  */
+#line 4355 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_integer, *(yysemantic_stack_[(1) - (1)].ival)
@@ -7478,10 +6556,9 @@
         }
     break;
 
-  case 484:
-
-/* Line 678 of lalr1.cc  */
-#line 4345 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 486:
+/* Line 661 of lalr1.cc  */
+#line 4362 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = NumericLiteral::new_literal(
                 LOC((yyloc)), ParseConstants::num_double, *(yysemantic_stack_[(1) - (1)].dval)
@@ -7490,73 +6567,65 @@
         }
     break;
 
-  case 485:
-
-/* Line 678 of lalr1.cc  */
-#line 4356 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 487:
+/* Line 661 of lalr1.cc  */
+#line 4373 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new VarRef(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)));
         }
     break;
 
-  case 486:
-
-/* Line 678 of lalr1.cc  */
-#line 4364 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 488:
+/* Line 661 of lalr1.cc  */
+#line 4381 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), NULL);
         }
     break;
 
-  case 487:
-
-/* Line 678 of lalr1.cc  */
-#line 4368 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 489:
+/* Line 661 of lalr1.cc  */
+#line 4385 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
         }
     break;
 
-  case 488:
-
-/* Line 678 of lalr1.cc  */
-#line 4376 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 490:
+/* Line 661 of lalr1.cc  */
+#line 4393 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ContextItemExpr( LOC((yyloc)) );
         }
     break;
 
-  case 489:
-
-/* Line 678 of lalr1.cc  */
-#line 4384 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 491:
+/* Line 661 of lalr1.cc  */
+#line 4401 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new OrderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
     break;
 
-  case 490:
-
-/* Line 678 of lalr1.cc  */
-#line 4392 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 492:
+/* Line 661 of lalr1.cc  */
+#line 4409 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new UnorderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
     break;
 
-  case 491:
-
-/* Line 678 of lalr1.cc  */
-#line 4446 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 493:
+/* Line 661 of lalr1.cc  */
+#line 4463 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new FunctionCall( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), NULL );
         }
     break;
 
-  case 492:
-
-/* Line 678 of lalr1.cc  */
-#line 4450 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 494:
+/* Line 661 of lalr1.cc  */
+#line 4467 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new FunctionCall(
                 LOC((yyloc)),
@@ -7566,10 +6635,9 @@
         }
     break;
 
-  case 493:
-
-/* Line 678 of lalr1.cc  */
-#line 4463 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 495:
+/* Line 661 of lalr1.cc  */
+#line 4480 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             ArgList *al = new ArgList( LOC((yyloc)) );
             al->push_back( (yysemantic_stack_[(1) - (1)].expr) );
@@ -7577,10 +6645,9 @@
         }
     break;
 
-  case 494:
-
-/* Line 678 of lalr1.cc  */
-#line 4469 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 496:
+/* Line 661 of lalr1.cc  */
+#line 4486 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             if ( ArgList *al = dynamic_cast<ArgList*>((yysemantic_stack_[(3) - (1)].node)) )
                 al->push_back( (yysemantic_stack_[(3) - (3)].expr) );
@@ -7588,55 +6655,49 @@
         }
     break;
 
-  case 495:
-
-/* Line 678 of lalr1.cc  */
-#line 4479 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-        }
-    break;
-
-  case 496:
-
-/* Line 678 of lalr1.cc  */
-#line 4483 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-        }
-    break;
-
   case 497:
-
-/* Line 678 of lalr1.cc  */
-#line 4491 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4496 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 498:
-
-/* Line 678 of lalr1.cc  */
-#line 4495 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4500 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 499:
-
-/* Line 678 of lalr1.cc  */
-#line 4499 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4508 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
     break;
 
   case 500:
-
-/* Line 678 of lalr1.cc  */
-#line 4507 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4512 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+        }
+    break;
+
+  case 501:
+/* Line 661 of lalr1.cc  */
+#line 4516 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+        }
+    break;
+
+  case 502:
+/* Line 661 of lalr1.cc  */
+#line 4524 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new DirElemConstructor(
                 LOC((yyloc)),
@@ -7648,10 +6709,9 @@
         }
     break;
 
-  case 501:
-
-/* Line 678 of lalr1.cc  */
-#line 4517 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 503:
+/* Line 661 of lalr1.cc  */
+#line 4534 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new DirElemConstructor(
                 LOC((yyloc)),
@@ -7663,10 +6723,9 @@
         }
     break;
 
-  case 502:
-
-/* Line 678 of lalr1.cc  */
-#line 4527 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 504:
+/* Line 661 of lalr1.cc  */
+#line 4544 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             if (static_cast<QName*>((yysemantic_stack_[(8) - (2)].expr))->get_qname() != static_cast<QName*>((yysemantic_stack_[(8) - (6)].expr))->get_qname())
             {
@@ -7685,10 +6744,9 @@
         }
     break;
 
-  case 503:
-
-/* Line 678 of lalr1.cc  */
-#line 4544 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 505:
+/* Line 661 of lalr1.cc  */
+#line 4561 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             if (static_cast<QName*>((yysemantic_stack_[(9) - (2)].expr))->get_qname() != static_cast<QName*>((yysemantic_stack_[(9) - (7)].expr))->get_qname())
             {
@@ -7707,10 +6765,9 @@
         }
     break;
 
-  case 504:
-
-/* Line 678 of lalr1.cc  */
-#line 4561 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 506:
+/* Line 661 of lalr1.cc  */
+#line 4578 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             if (static_cast<QName*>((yysemantic_stack_[(9) - (2)].expr))->get_qname() != static_cast<QName*>((yysemantic_stack_[(9) - (7)].expr))->get_qname())
             {
@@ -7729,10 +6786,9 @@
         }
     break;
 
-  case 505:
-
-/* Line 678 of lalr1.cc  */
-#line 4578 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 507:
+/* Line 661 of lalr1.cc  */
+#line 4595 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             if (static_cast<QName*>((yysemantic_stack_[(10) - (2)].expr))->get_qname() != static_cast<QName*>((yysemantic_stack_[(10) - (8)].expr))->get_qname())
             {
@@ -7751,10 +6807,9 @@
         }
     break;
 
-  case 506:
-
-/* Line 678 of lalr1.cc  */
-#line 4600 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 508:
+/* Line 661 of lalr1.cc  */
+#line 4617 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             DirElemContentList *decl = new DirElemContentList( LOC((yyloc)) );
             decl->push_back( dynamic_cast<DirElemContent*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -7762,10 +6817,9 @@
         }
     break;
 
-  case 507:
-
-/* Line 678 of lalr1.cc  */
-#line 4606 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 509:
+/* Line 661 of lalr1.cc  */
+#line 4623 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             DirElemContentList *decl = dynamic_cast<DirElemContentList*>((yysemantic_stack_[(2) - (1)].node));
             if ( decl )
@@ -7774,10 +6828,9 @@
         }
     break;
 
-  case 508:
-
-/* Line 678 of lalr1.cc  */
-#line 4617 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 510:
+/* Line 661 of lalr1.cc  */
+#line 4634 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             DirAttributeList *dal = new DirAttributeList( LOC((yyloc)) );
             dal->push_back( dynamic_cast<DirAttr*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7785,10 +6838,9 @@
         }
     break;
 
-  case 509:
-
-/* Line 678 of lalr1.cc  */
-#line 4623 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 511:
+/* Line 661 of lalr1.cc  */
+#line 4640 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             DirAttributeList *dal = dynamic_cast<DirAttributeList*>((yysemantic_stack_[(2) - (1)].node));
             if ( dal )
@@ -7797,10 +6849,9 @@
         }
     break;
 
-  case 510:
-
-/* Line 678 of lalr1.cc  */
-#line 4634 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 512:
+/* Line 661 of lalr1.cc  */
+#line 4651 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new DirAttr(
                 LOC((yyloc)),
@@ -7810,114 +6861,103 @@
         }
     break;
 
-  case 513:
-
-/* Line 678 of lalr1.cc  */
-#line 4651 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 515:
+/* Line 661 of lalr1.cc  */
+#line 4668 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new DirAttributeValue( LOC((yyloc)),
                                 dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(3) - (2)].node)));
         }
     break;
 
-  case 514:
-
-/* Line 678 of lalr1.cc  */
-#line 4656 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 516:
+/* Line 661 of lalr1.cc  */
+#line 4673 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new DirAttributeValue( LOC((yyloc)),
                                 dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(3) - (2)].node)));
         }
     break;
 
-  case 515:
-
-/* Line 678 of lalr1.cc  */
-#line 4665 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 517:
+/* Line 661 of lalr1.cc  */
+#line 4682 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new QuoteAttrContentList( LOC((yyloc)) );
         }
     break;
 
-  case 516:
-
-/* Line 678 of lalr1.cc  */
-#line 4669 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-        }
-    break;
-
-  case 517:
-
-/* Line 678 of lalr1.cc  */
-#line 4676 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
-            qacl->push_back( new QuoteAttrValueContent( LOC((yyloc)), "\"" ) );
-            (yyval.node) = qacl;
-        }
-    break;
-
   case 518:
-
-/* Line 678 of lalr1.cc  */
-#line 4682 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4686 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
-            qacl->push_back( dynamic_cast<QuoteAttrValueContent*>((yysemantic_stack_[(1) - (1)].node)) );
-            (yyval.node) = qacl;
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 519:
-
-/* Line 678 of lalr1.cc  */
-#line 4688 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4693 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            QuoteAttrContentList *qacl =
-                dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
-            if ( qacl )
-                qacl->push_back( new QuoteAttrValueContent( LOC((yyloc)), "\"" ) );
-            (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+            QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
+            qacl->push_back( new QuoteAttrValueContent( LOC((yyloc)), "\"" ) );
+            (yyval.node) = qacl;
         }
     break;
 
   case 520:
-
-/* Line 678 of lalr1.cc  */
-#line 4696 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4699 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            QuoteAttrContentList *qacl =
-                dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
-            if ( qacl )
-                qacl->push_back( dynamic_cast<QuoteAttrValueContent*>((yysemantic_stack_[(2) - (2)].node)) );
-            (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+            QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
+            qacl->push_back( dynamic_cast<QuoteAttrValueContent*>((yysemantic_stack_[(1) - (1)].node)) );
+            (yyval.node) = qacl;
         }
     break;
 
   case 521:
-
-/* Line 678 of lalr1.cc  */
-#line 4708 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4705 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new AposAttrContentList( LOC((yyloc)) );
+            QuoteAttrContentList *qacl =
+                dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
+            if ( qacl )
+                qacl->push_back( new QuoteAttrValueContent( LOC((yyloc)), "\"" ) );
+            (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
         }
     break;
 
   case 522:
-
-/* Line 678 of lalr1.cc  */
-#line 4712 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4713 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+            QuoteAttrContentList *qacl =
+                dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
+            if ( qacl )
+                qacl->push_back( dynamic_cast<QuoteAttrValueContent*>((yysemantic_stack_[(2) - (2)].node)) );
+            (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
         }
     break;
 
   case 523:
-
-/* Line 678 of lalr1.cc  */
-#line 4719 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4725 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = new AposAttrContentList( LOC((yyloc)) );
+        }
+    break;
+
+  case 524:
+/* Line 661 of lalr1.cc  */
+#line 4729 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 525:
+/* Line 661 of lalr1.cc  */
+#line 4736 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             AposAttrContentList *aacl = new AposAttrContentList( LOC((yyloc)) );
             aacl->push_back( new AposAttrValueContent( LOC((yyloc)),"'") );
@@ -7925,10 +6965,9 @@
         }
     break;
 
-  case 524:
-
-/* Line 678 of lalr1.cc  */
-#line 4725 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 526:
+/* Line 661 of lalr1.cc  */
+#line 4742 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             AposAttrContentList *aacl = new AposAttrContentList( LOC((yyloc)) );
             aacl->push_back( dynamic_cast<AposAttrValueContent*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7936,10 +6975,9 @@
         }
     break;
 
-  case 525:
-
-/* Line 678 of lalr1.cc  */
-#line 4731 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 527:
+/* Line 661 of lalr1.cc  */
+#line 4748 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
             if (aacl)
@@ -7948,10 +6986,9 @@
         }
     break;
 
-  case 526:
-
-/* Line 678 of lalr1.cc  */
-#line 4738 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 528:
+/* Line 661 of lalr1.cc  */
+#line 4755 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
             if ( aacl )
@@ -7960,19 +6997,17 @@
         }
     break;
 
-  case 527:
-
-/* Line 678 of lalr1.cc  */
-#line 4749 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 529:
+/* Line 661 of lalr1.cc  */
+#line 4766 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new QuoteAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
         }
     break;
 
-  case 528:
-
-/* Line 678 of lalr1.cc  */
-#line 4753 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 530:
+/* Line 661 of lalr1.cc  */
+#line 4770 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new QuoteAttrValueContent(
                 LOC((yyloc)), dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr))
@@ -7980,19 +7015,17 @@
         }
     break;
 
-  case 529:
-
-/* Line 678 of lalr1.cc  */
-#line 4763 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 531:
+/* Line 661 of lalr1.cc  */
+#line 4780 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new AposAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
         }
     break;
 
-  case 530:
-
-/* Line 678 of lalr1.cc  */
-#line 4767 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 532:
+/* Line 661 of lalr1.cc  */
+#line 4784 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new AposAttrValueContent(
                 LOC((yyloc)), dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr))
@@ -8000,48 +7033,43 @@
         }
     break;
 
-  case 531:
-
-/* Line 678 of lalr1.cc  */
-#line 4777 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 533:
+/* Line 661 of lalr1.cc  */
+#line 4794 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new DirElemContent( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr) );
         }
     break;
 
-  case 532:
-
-/* Line 678 of lalr1.cc  */
-#line 4781 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 534:
+/* Line 661 of lalr1.cc  */
+#line 4798 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new DirElemContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
         }
     break;
 
-  case 533:
-
-/* Line 678 of lalr1.cc  */
-#line 4785 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 535:
+/* Line 661 of lalr1.cc  */
+#line 4802 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             rchandle<CDataSection> cdata_h = dynamic_cast<CDataSection*>((yysemantic_stack_[(1) - (1)].expr));
             (yyval.expr) = new DirElemContent( LOC((yyloc)), cdata_h );
         }
     break;
 
-  case 534:
-
-/* Line 678 of lalr1.cc  */
-#line 4790 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 536:
+/* Line 661 of lalr1.cc  */
+#line 4807 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             rchandle<CommonContent> cont_h = dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr));
             (yyval.expr) = new DirElemContent( LOC((yyloc)), cont_h );
         }
     break;
 
-  case 535:
-
-/* Line 678 of lalr1.cc  */
-#line 4799 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 537:
+/* Line 661 of lalr1.cc  */
+#line 4816 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new CommonContent(
                 LOC((yyloc)), ParseConstants::cont_charref, SYMTAB((yysemantic_stack_[(1) - (1)].sval))
@@ -8049,10 +7077,9 @@
         }
     break;
 
-  case 536:
-
-/* Line 678 of lalr1.cc  */
-#line 4805 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 538:
+/* Line 661 of lalr1.cc  */
+#line 4822 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new CommonContent(
                 LOC((yyloc)), ParseConstants::cont_escape_lbrace
@@ -8060,10 +7087,9 @@
         }
     break;
 
-  case 537:
-
-/* Line 678 of lalr1.cc  */
-#line 4811 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 539:
+/* Line 661 of lalr1.cc  */
+#line 4828 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new CommonContent(
                 LOC((yyloc)), ParseConstants::cont_escape_rbrace
@@ -8071,353 +7097,315 @@
         }
     break;
 
-  case 538:
-
-/* Line 678 of lalr1.cc  */
-#line 4817 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 540:
+/* Line 661 of lalr1.cc  */
+#line 4834 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new CommonContent(LOC((yyloc)), new EnclosedExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr)));
         }
     break;
 
-  case 539:
-
-/* Line 678 of lalr1.cc  */
-#line 4825 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 541:
+/* Line 661 of lalr1.cc  */
+#line 4842 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new DirCommentConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
     break;
 
-  case 540:
-
-/* Line 678 of lalr1.cc  */
-#line 4830 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 542:
+/* Line 661 of lalr1.cc  */
+#line 4847 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new DirCommentConstructor( LOC((yyloc)), "" );
     }
     break;
 
-  case 541:
-
-/* Line 678 of lalr1.cc  */
-#line 4838 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 543:
+/* Line 661 of lalr1.cc  */
+#line 4855 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new DirPIConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
     break;
 
-  case 542:
-
-/* Line 678 of lalr1.cc  */
-#line 4843 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 544:
+/* Line 661 of lalr1.cc  */
+#line 4860 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new DirPIConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
     }
     break;
 
-  case 543:
-
-/* Line 678 of lalr1.cc  */
-#line 4851 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 545:
+/* Line 661 of lalr1.cc  */
+#line 4868 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new CDataSection( LOC((yyloc)),SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
     }
     break;
 
-  case 544:
-
-/* Line 678 of lalr1.cc  */
-#line 4859 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-    }
-    break;
-
-  case 545:
-
-/* Line 678 of lalr1.cc  */
-#line 4864 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-    }
-    break;
-
   case 546:
-
-/* Line 678 of lalr1.cc  */
-#line 4869 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4876 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 547:
-
-/* Line 678 of lalr1.cc  */
-#line 4874 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4881 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 548:
-
-/* Line 678 of lalr1.cc  */
-#line 4879 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4886 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 549:
-
-/* Line 678 of lalr1.cc  */
-#line 4884 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4891 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 550:
-
-/* Line 678 of lalr1.cc  */
-#line 4893 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4896 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new CompDocConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
-        }
+      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+    }
     break;
 
   case 551:
-
-/* Line 678 of lalr1.cc  */
-#line 4901 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4901 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new CompElemConstructor(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval))), (yysemantic_stack_[(3) - (2)].expr));
-        }
+      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+    }
     break;
 
   case 552:
-
-/* Line 678 of lalr1.cc  */
-#line 4905 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4910 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new CompElemConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
+            (yyval.expr) = new CompDocConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
     break;
 
   case 553:
-
-/* Line 678 of lalr1.cc  */
-#line 4922 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4918 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-          (yyval.expr) = new CompAttrConstructor( LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval))), (yysemantic_stack_[(3) - (2)].expr) );
+            (yyval.expr) = new CompElemConstructor(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval))), (yysemantic_stack_[(3) - (2)].expr));
         }
     break;
 
   case 554:
-
-/* Line 678 of lalr1.cc  */
-#line 4926 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new CompAttrConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
+            (yyval.expr) = new CompElemConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
         }
     break;
 
   case 555:
-
-/* Line 678 of lalr1.cc  */
-#line 4934 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4939 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new CompTextConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
+          (yyval.expr) = new CompAttrConstructor( LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval))), (yysemantic_stack_[(3) - (2)].expr) );
         }
     break;
 
   case 556:
-
-/* Line 678 of lalr1.cc  */
-#line 4942 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4943 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new CompCommentConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
+            (yyval.expr) = new CompAttrConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
         }
     break;
 
   case 557:
-
-/* Line 678 of lalr1.cc  */
-#line 4950 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4951 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new CompPIConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)), (yysemantic_stack_[(3) - (2)].expr) );
+            (yyval.expr) = new CompTextConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
     break;
 
   case 558:
-
-/* Line 678 of lalr1.cc  */
-#line 4954 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4959 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new CompPIConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
+            (yyval.expr) = new CompCommentConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
     break;
 
   case 559:
-
-/* Line 678 of lalr1.cc  */
-#line 4962 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4967 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new SingleType(
-                LOC((yyloc)), dynamic_cast<AtomicType*>((yysemantic_stack_[(1) - (1)].node)), false
-            );
+            (yyval.expr) = new CompPIConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)), (yysemantic_stack_[(3) - (2)].expr) );
         }
     break;
 
   case 560:
-
-/* Line 678 of lalr1.cc  */
-#line 4968 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4971 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new SingleType(
-                LOC((yyloc)), dynamic_cast<AtomicType*>((yysemantic_stack_[(2) - (1)].node)), true
-            );
+            (yyval.expr) = new CompPIConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
         }
     break;
 
   case 561:
-
-/* Line 678 of lalr1.cc  */
-#line 4978 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4979 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
+            (yyval.node) = new SingleType(
+                LOC((yyloc)), dynamic_cast<AtomicType*>((yysemantic_stack_[(1) - (1)].node)), false
+            );
         }
     break;
 
   case 562:
-
-/* Line 678 of lalr1.cc  */
-#line 4986 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4985 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new SequenceType( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL );
+            (yyval.node) = new SingleType(
+                LOC((yyloc)), dynamic_cast<AtomicType*>((yysemantic_stack_[(2) - (1)].node)), true
+            );
         }
     break;
 
   case 563:
-
-/* Line 678 of lalr1.cc  */
-#line 4990 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 4995 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new SequenceType(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].node), dynamic_cast<OccurrenceIndicator*>((yysemantic_stack_[(2) - (2)].node)));
+            (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
         }
     break;
 
   case 564:
-
-/* Line 678 of lalr1.cc  */
-#line 4994 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5003 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new SequenceType( LOC((yyloc)), NULL, NULL );
+            (yyval.node) = new SequenceType( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL );
         }
     break;
 
   case 565:
-
-/* Line 678 of lalr1.cc  */
-#line 5029 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5007 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new OccurrenceIndicator(
-                LOC((yyloc)), ParseConstants::occurs_optionally
-            );
+            (yyval.node) = new SequenceType(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].node), dynamic_cast<OccurrenceIndicator*>((yysemantic_stack_[(2) - (2)].node)));
         }
     break;
 
   case 566:
-
-/* Line 678 of lalr1.cc  */
-#line 5035 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5011 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new OccurrenceIndicator(
-                LOC((yyloc)), ParseConstants::occurs_zero_or_more
-            );
+            (yyval.node) = new SequenceType( LOC((yyloc)), NULL, NULL );
         }
     break;
 
   case 567:
-
-/* Line 678 of lalr1.cc  */
-#line 5041 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5046 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OccurrenceIndicator(
-                LOC((yyloc)), ParseConstants::occurs_one_or_more
+                LOC((yyloc)), ParseConstants::occurs_optionally
             );
         }
     break;
 
   case 568:
-
-/* Line 678 of lalr1.cc  */
-#line 5051 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5052 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+            (yyval.node) = new OccurrenceIndicator(
+                LOC((yyloc)), ParseConstants::occurs_zero_or_more
+            );
         }
     break;
 
   case 569:
-
-/* Line 678 of lalr1.cc  */
-#line 5055 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5058 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+            (yyval.node) = new OccurrenceIndicator(
+                LOC((yyloc)), ParseConstants::occurs_one_or_more
+            );
         }
     break;
 
   case 570:
-
-/* Line 678 of lalr1.cc  */
-#line 5059 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5068 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new ItemType( LOC((yyloc)), true );
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 571:
-
-/* Line 678 of lalr1.cc  */
-#line 5063 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5072 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new StructuredItemType(LOC((yyloc)));
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 572:
-
-/* Line 678 of lalr1.cc  */
-#line 5067 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5076 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+            (yyval.node) = new ItemType( LOC((yyloc)), true );
         }
     break;
 
   case 573:
-
-/* Line 678 of lalr1.cc  */
-#line 5071 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5080 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+            (yyval.node) = new StructuredItemType(LOC((yyloc)));
         }
     break;
 
   case 574:
-
-/* Line 678 of lalr1.cc  */
-#line 5075 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5084 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 575:
-
-/* Line 678 of lalr1.cc  */
-#line 5082 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5088 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 576:
+/* Line 661 of lalr1.cc  */
+#line 5092 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 577:
+/* Line 661 of lalr1.cc  */
+#line 5099 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           TypeList* aTypeList = new TypeList(LOC ((yyloc)));
           aTypeList->push_back(dynamic_cast<SequenceType *>((yysemantic_stack_[(1) - (1)].node)));
@@ -8425,10 +7413,9 @@
         }
     break;
 
-  case 576:
-
-/* Line 678 of lalr1.cc  */
-#line 5088 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 578:
+/* Line 661 of lalr1.cc  */
+#line 5105 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           TypeList* aTypeList = dynamic_cast<TypeList *>((yysemantic_stack_[(3) - (1)].node));
           aTypeList->push_back(dynamic_cast<SequenceType *>((yysemantic_stack_[(3) - (3)].node)));
@@ -8436,127 +7423,113 @@
         }
     break;
 
-  case 577:
-
-/* Line 678 of lalr1.cc  */
-#line 5098 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 579:
+/* Line 661 of lalr1.cc  */
+#line 5115 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new AtomicType( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
         }
     break;
 
-  case 578:
-
-/* Line 678 of lalr1.cc  */
-#line 5106 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-        }
-    break;
-
-  case 579:
-
-/* Line 678 of lalr1.cc  */
-#line 5110 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-        }
-    break;
-
   case 580:
-
-/* Line 678 of lalr1.cc  */
-#line 5114 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5123 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 581:
-
-/* Line 678 of lalr1.cc  */
-#line 5118 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5127 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 582:
-
-/* Line 678 of lalr1.cc  */
-#line 5122 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5131 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 583:
-
-/* Line 678 of lalr1.cc  */
-#line 5126 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5135 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 584:
-
-/* Line 678 of lalr1.cc  */
-#line 5130 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5139 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 585:
-
-/* Line 678 of lalr1.cc  */
-#line 5134 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5143 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 586:
-
-/* Line 678 of lalr1.cc  */
-#line 5138 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5147 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 587:
-
-/* Line 678 of lalr1.cc  */
-#line 5146 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5151 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 588:
+/* Line 661 of lalr1.cc  */
+#line 5155 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 589:
+/* Line 661 of lalr1.cc  */
+#line 5163 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new AnyKindTest( LOC((yyloc)) );
         }
     break;
 
-  case 588:
-
-/* Line 678 of lalr1.cc  */
-#line 5154 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 590:
+/* Line 661 of lalr1.cc  */
+#line 5171 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new DocumentTest( LOC((yyloc)) );
         }
     break;
 
-  case 589:
-
-/* Line 678 of lalr1.cc  */
-#line 5158 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 591:
+/* Line 661 of lalr1.cc  */
+#line 5175 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new DocumentTest( LOC((yyloc)), dynamic_cast<ElementTest*>((yysemantic_stack_[(4) - (3)].node)) );
         }
     break;
 
-  case 590:
-
-/* Line 678 of lalr1.cc  */
-#line 5162 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 592:
+/* Line 661 of lalr1.cc  */
+#line 5179 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new DocumentTest(
                 LOC((yyloc)), dynamic_cast<SchemaElementTest*>((yysemantic_stack_[(4) - (3)].node))
@@ -8564,259 +7537,233 @@
         }
     break;
 
-  case 591:
-
-/* Line 678 of lalr1.cc  */
-#line 5172 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 593:
+/* Line 661 of lalr1.cc  */
+#line 5189 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new TextTest( LOC((yyloc)) );
         }
     break;
 
-  case 592:
-
-/* Line 678 of lalr1.cc  */
-#line 5180 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 594:
+/* Line 661 of lalr1.cc  */
+#line 5197 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new CommentTest( LOC((yyloc)));
         }
     break;
 
-  case 593:
-
-/* Line 678 of lalr1.cc  */
-#line 5188 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 595:
+/* Line 661 of lalr1.cc  */
+#line 5205 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new PITest( LOC((yyloc)), "" );
         }
     break;
 
-  case 594:
-
-/* Line 678 of lalr1.cc  */
-#line 5192 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
-        }
-    break;
-
-  case 595:
-
-/* Line 678 of lalr1.cc  */
-#line 5196 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
-        }
-    break;
-
   case 596:
-
-/* Line 678 of lalr1.cc  */
-#line 5204 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5209 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
+            (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
         }
     break;
 
   case 597:
-
-/* Line 678 of lalr1.cc  */
-#line 5208 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5213 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new AttributeTest(
-                LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL
-            );
+            (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
         }
     break;
 
   case 598:
-
-/* Line 678 of lalr1.cc  */
-#line 5214 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5221 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new AttributeTest(
-                LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)), dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node))
-            );
+            (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
         }
     break;
 
   case 599:
-
-/* Line 678 of lalr1.cc  */
-#line 5220 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5225 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
+            (yyval.node) = new AttributeTest(
+                LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL
+            );
         }
     break;
 
   case 600:
-
-/* Line 678 of lalr1.cc  */
-#line 5224 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5231 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new AttributeTest(
-                LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node))
+                LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)), dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node))
             );
         }
     break;
 
   case 601:
-
-/* Line 678 of lalr1.cc  */
-#line 5234 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5237 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new SchemaAttributeTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
+            (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
         }
     break;
 
   case 602:
-
-/* Line 678 of lalr1.cc  */
-#line 5242 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5241 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new ElementTest( LOC((yyloc)), NULL, NULL, true );
+            (yyval.node) = new AttributeTest(
+                LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node))
+            );
         }
     break;
 
   case 603:
-
-/* Line 678 of lalr1.cc  */
-#line 5246 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5251 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new ElementTest(
-                LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL, true
-            );
+            (yyval.node) = new SchemaAttributeTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
     break;
 
   case 604:
-
-/* Line 678 of lalr1.cc  */
-#line 5252 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5259 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new ElementTest(
-                LOC((yyloc)),
-                static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)),
-                dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)),
-                false
-            );
+            (yyval.node) = new ElementTest( LOC((yyloc)), NULL, NULL, true );
         }
     break;
 
   case 605:
-
-/* Line 678 of lalr1.cc  */
-#line 5261 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5263 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ElementTest(
-                LOC((yyloc)),
-                static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)),
-                dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)),
-                true
+                LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL, true
             );
         }
     break;
 
   case 606:
-
-/* Line 678 of lalr1.cc  */
-#line 5270 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5269 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ElementTest(
-                LOC((yyloc)), NULL, NULL, true
+                LOC((yyloc)),
+                static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)),
+                dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)),
+                false
             );
         }
     break;
 
   case 607:
-
-/* Line 678 of lalr1.cc  */
-#line 5276 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5278 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ElementTest(
-                LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), false
+                LOC((yyloc)),
+                static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)),
+                dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)),
+                true
             );
         }
     break;
 
   case 608:
-
-/* Line 678 of lalr1.cc  */
-#line 5282 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5287 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ElementTest(
-                LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), true
+                LOC((yyloc)), NULL, NULL, true
             );
         }
     break;
 
   case 609:
-
-/* Line 678 of lalr1.cc  */
-#line 5292 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5293 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new SchemaElementTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
+            (yyval.node) = new ElementTest(
+                LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), false
+            );
         }
     break;
 
   case 610:
-
-/* Line 678 of lalr1.cc  */
-#line 5309 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5299 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
+            (yyval.node) = new ElementTest(
+                LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), true
+            );
         }
     break;
 
   case 611:
-
-/* Line 678 of lalr1.cc  */
-#line 5316 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5309 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (1)].expr)), true );
+            (yyval.node) = new SchemaElementTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
     break;
 
   case 612:
-
-/* Line 678 of lalr1.cc  */
-#line 5331 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5326 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
+            (yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
         }
     break;
 
   case 613:
-
-/* Line 678 of lalr1.cc  */
-#line 5367 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5333 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-    }
+            (yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (1)].expr)), true );
+        }
     break;
 
   case 614:
-
-/* Line 678 of lalr1.cc  */
-#line 5371 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5348 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-    }
+            (yyval.expr) = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
+        }
     break;
 
   case 615:
-
-/* Line 678 of lalr1.cc  */
-#line 5379 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5384 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+    }
+    break;
+
+  case 616:
+/* Line 661 of lalr1.cc  */
+#line 5388 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+    }
+    break;
+
+  case 617:
+/* Line 661 of lalr1.cc  */
+#line 5396 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new LiteralFunctionItem(LOC ((yyloc)), dynamic_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), (yysemantic_stack_[(3) - (3)].ival));
     }
     break;
 
-  case 616:
-
-/* Line 678 of lalr1.cc  */
-#line 5387 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 618:
+/* Line 661 of lalr1.cc  */
+#line 5404 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new InlineFunction(LOC((yyloc)),
                               &*(yysemantic_stack_[(3) - (2)].fnsig)->theParams,
@@ -8826,46 +7773,41 @@
     }
     break;
 
-  case 617:
-
-/* Line 678 of lalr1.cc  */
-#line 5399 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-    }
-    break;
-
-  case 618:
-
-/* Line 678 of lalr1.cc  */
-#line 5403 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-    }
-    break;
-
   case 619:
-
-/* Line 678 of lalr1.cc  */
-#line 5411 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5416 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+    }
+    break;
+
+  case 620:
+/* Line 661 of lalr1.cc  */
+#line 5420 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+    }
+    break;
+
+  case 621:
+/* Line 661 of lalr1.cc  */
+#line 5428 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new AnyFunctionTest(LOC((yyloc)));
     }
     break;
 
-  case 620:
-
-/* Line 678 of lalr1.cc  */
-#line 5419 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 622:
+/* Line 661 of lalr1.cc  */
+#line 5436 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.node) = new TypedFunctionTest(LOC ((yyloc)), dynamic_cast<SequenceType *>((yysemantic_stack_[(5) - (5)].node)));
         }
     break;
 
-  case 621:
-
-/* Line 678 of lalr1.cc  */
-#line 5423 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 623:
+/* Line 661 of lalr1.cc  */
+#line 5440 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.node) = new TypedFunctionTest(LOC ((yyloc)),
               dynamic_cast<TypeList *>((yysemantic_stack_[(6) - (3)].node)),
@@ -8873,19 +7815,17 @@
         }
     break;
 
-  case 622:
-
-/* Line 678 of lalr1.cc  */
-#line 5434 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 624:
+/* Line 661 of lalr1.cc  */
+#line 5451 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
            (yyval.node) = (yysemantic_stack_[(3) - (2)].node);
         }
     break;
 
-  case 623:
-
-/* Line 678 of lalr1.cc  */
-#line 5451 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 625:
+/* Line 661 of lalr1.cc  */
+#line 5468 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::strict_validation
@@ -8893,10 +7833,9 @@
         }
     break;
 
-  case 624:
-
-/* Line 678 of lalr1.cc  */
-#line 5457 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 626:
+/* Line 661 of lalr1.cc  */
+#line 5474 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::lax_validation
@@ -8904,10 +7843,9 @@
         }
     break;
 
-  case 625:
-
-/* Line 678 of lalr1.cc  */
-#line 5463 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 627:
+/* Line 661 of lalr1.cc  */
+#line 5480 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::skip_validation
@@ -8915,81 +7853,73 @@
         }
     break;
 
-  case 626:
-
-/* Line 678 of lalr1.cc  */
-#line 5473 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::INTO, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
-        }
-    break;
-
-  case 627:
-
-/* Line 678 of lalr1.cc  */
-#line 5477 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.expr) = new InsertExpr(
-                LOC((yyloc)), store::UpdateConsts::AS_FIRST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
-            );
-        }
-    break;
-
   case 628:
-
-/* Line 678 of lalr1.cc  */
-#line 5483 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5490 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new InsertExpr(
-                LOC((yyloc)), store::UpdateConsts::AS_LAST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
-            );
+            (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::INTO, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
     break;
 
   case 629:
-
-/* Line 678 of lalr1.cc  */
-#line 5489 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5494 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::AFTER, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
+            (yyval.expr) = new InsertExpr(
+                LOC((yyloc)), store::UpdateConsts::AS_FIRST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
+            );
         }
     break;
 
   case 630:
-
-/* Line 678 of lalr1.cc  */
-#line 5493 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5500 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new InsertExpr(
-                LOC ((yyloc)), store::UpdateConsts::BEFORE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
+                LOC((yyloc)), store::UpdateConsts::AS_LAST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
             );
         }
     break;
 
   case 631:
-
-/* Line 678 of lalr1.cc  */
-#line 5499 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5506 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::INTO, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
+            (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::AFTER, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
     break;
 
   case 632:
-
-/* Line 678 of lalr1.cc  */
-#line 5503 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5510 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new InsertExpr(
-                LOC((yyloc)), store::UpdateConsts::AS_FIRST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
+                LOC ((yyloc)), store::UpdateConsts::BEFORE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
             );
         }
     break;
 
   case 633:
-
-/* Line 678 of lalr1.cc  */
-#line 5509 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5516 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::INTO, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
+        }
+    break;
+
+  case 634:
+/* Line 661 of lalr1.cc  */
+#line 5520 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = new InsertExpr(
+                LOC((yyloc)), store::UpdateConsts::AS_FIRST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
+            );
+        }
+    break;
+
+  case 635:
+/* Line 661 of lalr1.cc  */
+#line 5526 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new InsertExpr(
                   LOC((yyloc)), store::UpdateConsts::AS_LAST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
@@ -8997,10 +7927,9 @@
         }
     break;
 
-  case 634:
-
-/* Line 678 of lalr1.cc  */
-#line 5515 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 636:
+/* Line 661 of lalr1.cc  */
+#line 5532 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new InsertExpr(
                 LOC ((yyloc)),
@@ -9009,39 +7938,35 @@
         }
     break;
 
-  case 635:
-
-/* Line 678 of lalr1.cc  */
-#line 5522 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.expr) = new InsertExpr(
-                LOC ((yyloc)), store::UpdateConsts::BEFORE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
-            );
-        }
-    break;
-
-  case 636:
-
-/* Line 678 of lalr1.cc  */
-#line 5532 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
-        }
-    break;
-
   case 637:
-
-/* Line 678 of lalr1.cc  */
-#line 5537 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5539 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
+            (yyval.expr) = new InsertExpr(
+                LOC ((yyloc)), store::UpdateConsts::BEFORE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
+            );
         }
     break;
 
   case 638:
-
-/* Line 678 of lalr1.cc  */
-#line 5545 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5549 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
+        }
+    break;
+
+  case 639:
+/* Line 661 of lalr1.cc  */
+#line 5554 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
+        }
+    break;
+
+  case 640:
+/* Line 661 of lalr1.cc  */
+#line 5562 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ReplaceExpr(
                 LOC((yyloc)), store::UpdateConsts::NODE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
@@ -9049,10 +7974,9 @@
         }
     break;
 
-  case 639:
-
-/* Line 678 of lalr1.cc  */
-#line 5551 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 641:
+/* Line 661 of lalr1.cc  */
+#line 5568 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ReplaceExpr(
                 LOC((yyloc)), store::UpdateConsts::VALUE_OF_NODE, (yysemantic_stack_[(7) - (5)].expr), (yysemantic_stack_[(7) - (7)].expr)
@@ -9060,29 +7984,26 @@
         }
     break;
 
-  case 640:
-
-/* Line 678 of lalr1.cc  */
-#line 5561 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 642:
+/* Line 661 of lalr1.cc  */
+#line 5578 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new RenameExpr( LOC ((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
     break;
 
-  case 641:
-
-/* Line 678 of lalr1.cc  */
-#line 5583 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 643:
+/* Line 661 of lalr1.cc  */
+#line 5600 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       CopyVarList *cvl = dynamic_cast<CopyVarList*>((yysemantic_stack_[(7) - (3)].expr));
       (yyval.expr) = new TransformExpr( LOC((yyloc)), cvl, (yysemantic_stack_[(7) - (5)].expr), (yysemantic_stack_[(7) - (7)].expr) );
     }
     break;
 
-  case 642:
-
-/* Line 678 of lalr1.cc  */
-#line 5592 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 644:
+/* Line 661 of lalr1.cc  */
+#line 5609 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       CopyVarList* lList = new CopyVarList(LOC((yyloc)));
       lList->push_back (dynamic_cast<VarBinding*> ((yysemantic_stack_[(1) - (1)].expr)));
@@ -9090,10 +8011,9 @@
     }
     break;
 
-  case 643:
-
-/* Line 678 of lalr1.cc  */
-#line 5598 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 645:
+/* Line 661 of lalr1.cc  */
+#line 5615 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       CopyVarList* lList = dynamic_cast<CopyVarList*>((yysemantic_stack_[(4) - (1)].expr));
       VarBinding* lBinding = dynamic_cast<VarBinding*>((yysemantic_stack_[(4) - (4)].expr));
@@ -9102,28 +8022,25 @@
     }
     break;
 
-  case 644:
-
-/* Line 678 of lalr1.cc  */
-#line 5611 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 646:
+/* Line 661 of lalr1.cc  */
+#line 5628 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
        (yyval.expr) = new VarBinding(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), (yysemantic_stack_[(3) - (3)].expr));
     }
     break;
 
-  case 645:
-
-/* Line 678 of lalr1.cc  */
-#line 5625 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 647:
+/* Line 661 of lalr1.cc  */
+#line 5642 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new TryExpr( LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
         }
     break;
 
-  case 646:
-
-/* Line 678 of lalr1.cc  */
-#line 5632 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 648:
+/* Line 661 of lalr1.cc  */
+#line 5649 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             CatchListExpr *cle = new CatchListExpr( LOC((yyloc)) );
             cle->push_back( static_cast<CatchExpr*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -9131,10 +8048,9 @@
         }
     break;
 
-  case 647:
-
-/* Line 678 of lalr1.cc  */
-#line 5638 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 649:
+/* Line 661 of lalr1.cc  */
+#line 5655 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
             if ( cle )
@@ -9143,29 +8059,26 @@
         }
     break;
 
-  case 648:
-
-/* Line 678 of lalr1.cc  */
-#line 5648 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-       (yyval.expr) = new CatchExpr(LOC((yyloc)), *(yysemantic_stack_[(3) - (2)].name_test_list), (yysemantic_stack_[(3) - (3)].expr));
-       delete (yysemantic_stack_[(3) - (2)].name_test_list);
-    }
-    break;
-
-  case 649:
-
-/* Line 678 of lalr1.cc  */
-#line 5657 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
-    }
-    break;
-
   case 650:
-
-/* Line 678 of lalr1.cc  */
-#line 5665 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5665 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+       (yyval.expr) = new CatchExpr(LOC((yyloc)), *(yysemantic_stack_[(3) - (2)].name_test_list), (yysemantic_stack_[(3) - (3)].expr));
+       delete (yysemantic_stack_[(3) - (2)].name_test_list);
+    }
+    break;
+
+  case 651:
+/* Line 661 of lalr1.cc  */
+#line 5674 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
+    }
+    break;
+
+  case 652:
+/* Line 661 of lalr1.cc  */
+#line 5682 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             CatchExpr::NameTestList *ntl = new CatchExpr::NameTestList;
             ntl->push_back( static_cast<NameTest*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -9173,10 +8086,9 @@
         }
     break;
 
-  case 651:
-
-/* Line 678 of lalr1.cc  */
-#line 5671 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 653:
+/* Line 661 of lalr1.cc  */
+#line 5688 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             CatchExpr::NameTestList *ntl =
                 static_cast<CatchExpr::NameTestList*>((yysemantic_stack_[(3) - (1)].name_test_list));
@@ -9185,121 +8097,108 @@
         }
     break;
 
-  case 652:
-
-/* Line 678 of lalr1.cc  */
-#line 5689 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 654:
+/* Line 661 of lalr1.cc  */
+#line 5706 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTSelection( LOC((yyloc)), (yysemantic_stack_[(2) - (1)].node), (yysemantic_stack_[(2) - (2)].pos_filter_list) );
             delete (yysemantic_stack_[(2) - (2)].pos_filter_list);
         }
     break;
 
-  case 653:
-
-/* Line 678 of lalr1.cc  */
-#line 5697 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 655:
+/* Line 661 of lalr1.cc  */
+#line 5714 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.pos_filter_list) = NULL;
         }
     break;
 
-  case 654:
-
-/* Line 678 of lalr1.cc  */
-#line 5701 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 656:
+/* Line 661 of lalr1.cc  */
+#line 5718 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.pos_filter_list) = (yysemantic_stack_[(1) - (1)].pos_filter_list);
         }
     break;
 
-  case 655:
-
-/* Line 678 of lalr1.cc  */
-#line 5708 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 657:
+/* Line 661 of lalr1.cc  */
+#line 5725 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.pos_filter_list) = new FTSelection::pos_filter_list_t;
             (yyval.pos_filter_list)->push_back( dynamic_cast<FTPosFilter*>((yysemantic_stack_[(1) - (1)].node)) );
         }
     break;
 
-  case 656:
-
-/* Line 678 of lalr1.cc  */
-#line 5713 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 658:
+/* Line 661 of lalr1.cc  */
+#line 5730 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yysemantic_stack_[(2) - (1)].pos_filter_list)->push_back( dynamic_cast<FTPosFilter*>((yysemantic_stack_[(2) - (2)].node)) );
             (yyval.pos_filter_list) = (yysemantic_stack_[(2) - (1)].pos_filter_list);
         }
     break;
 
-  case 657:
-
-/* Line 678 of lalr1.cc  */
-#line 5721 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-        }
-    break;
-
-  case 658:
-
-/* Line 678 of lalr1.cc  */
-#line 5725 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = new FTOr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
-        }
-    break;
-
   case 659:
-
-/* Line 678 of lalr1.cc  */
-#line 5732 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5738 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 660:
-
-/* Line 678 of lalr1.cc  */
-#line 5736 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5742 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new FTAnd( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
+            (yyval.node) = new FTOr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
         }
     break;
 
   case 661:
-
-/* Line 678 of lalr1.cc  */
-#line 5743 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5749 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 662:
-
-/* Line 678 of lalr1.cc  */
-#line 5747 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5753 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new FTMildNot( LOC((yyloc)), (yysemantic_stack_[(4) - (1)].node), (yysemantic_stack_[(4) - (4)].node) );
+            (yyval.node) = new FTAnd( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
         }
     break;
 
   case 663:
-
-/* Line 678 of lalr1.cc  */
-#line 5754 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5760 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 664:
-
-/* Line 678 of lalr1.cc  */
-#line 5758 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5764 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = new FTMildNot( LOC((yyloc)), (yysemantic_stack_[(4) - (1)].node), (yysemantic_stack_[(4) - (4)].node) );
+        }
+    break;
+
+  case 665:
+/* Line 661 of lalr1.cc  */
+#line 5771 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 666:
+/* Line 661 of lalr1.cc  */
+#line 5775 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTUnaryNot(
                 LOC((yyloc)), dynamic_cast<FTPrimaryWithOptions*>((yysemantic_stack_[(2) - (2)].node))
@@ -9307,10 +8206,9 @@
         }
     break;
 
-  case 665:
-
-/* Line 678 of lalr1.cc  */
-#line 5767 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 667:
+/* Line 661 of lalr1.cc  */
+#line 5784 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTPrimaryWithOptions(
                 LOC((yyloc)),
@@ -9321,55 +8219,49 @@
         }
     break;
 
-  case 666:
-
-/* Line 678 of lalr1.cc  */
-#line 5779 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = NULL;
-        }
-    break;
-
-  case 667:
-
-/* Line 678 of lalr1.cc  */
-#line 5783 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-        }
-    break;
-
   case 668:
-
-/* Line 678 of lalr1.cc  */
-#line 5790 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5796 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = NULL;
         }
     break;
 
   case 669:
-
-/* Line 678 of lalr1.cc  */
-#line 5794 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5800 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 670:
-
-/* Line 678 of lalr1.cc  */
-#line 5802 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5807 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = NULL;
+        }
+    break;
+
+  case 671:
+/* Line 661 of lalr1.cc  */
+#line 5811 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 672:
+/* Line 661 of lalr1.cc  */
+#line 5819 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTWeight( LOC((yyloc)), dynamic_cast<exprnode*>((yysemantic_stack_[(4) - (3)].expr)) );
         }
     break;
 
-  case 671:
-
-/* Line 678 of lalr1.cc  */
-#line 5810 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 673:
+/* Line 661 of lalr1.cc  */
+#line 5827 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTWordsTimes(
                 LOC((yyloc)),
@@ -9379,46 +8271,41 @@
         }
     break;
 
-  case 672:
-
-/* Line 678 of lalr1.cc  */
-#line 5818 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 674:
+/* Line 661 of lalr1.cc  */
+#line 5835 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(3) - (2)].node);
         }
     break;
 
-  case 673:
-
-/* Line 678 of lalr1.cc  */
-#line 5822 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-        }
-    break;
-
-  case 674:
-
-/* Line 678 of lalr1.cc  */
-#line 5829 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = NULL;
-        }
-    break;
-
   case 675:
-
-/* Line 678 of lalr1.cc  */
-#line 5833 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5839 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 676:
-
-/* Line 678 of lalr1.cc  */
-#line 5841 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5846 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = NULL;
+        }
+    break;
+
+  case 677:
+/* Line 661 of lalr1.cc  */
+#line 5850 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 678:
+/* Line 661 of lalr1.cc  */
+#line 5858 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTExtensionSelection(
                 LOC((yyloc)),
@@ -9428,28 +8315,25 @@
         }
     break;
 
-  case 677:
-
-/* Line 678 of lalr1.cc  */
-#line 5852 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = NULL;
-        }
-    break;
-
-  case 678:
-
-/* Line 678 of lalr1.cc  */
-#line 5856 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-        }
-    break;
-
   case 679:
-
-/* Line 678 of lalr1.cc  */
-#line 5864 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5869 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = NULL;
+        }
+    break;
+
+  case 680:
+/* Line 661 of lalr1.cc  */
+#line 5873 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 681:
+/* Line 661 of lalr1.cc  */
+#line 5881 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTWords(
                 LOC((yyloc)),
@@ -9459,10 +8343,9 @@
         }
     break;
 
-  case 680:
-
-/* Line 678 of lalr1.cc  */
-#line 5876 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 682:
+/* Line 661 of lalr1.cc  */
+#line 5893 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTWordsValue(
                 LOC((yyloc)), static_cast<StringLiteral*>((yysemantic_stack_[(1) - (1)].expr)), NULL
@@ -9470,10 +8353,9 @@
         }
     break;
 
-  case 681:
-
-/* Line 678 of lalr1.cc  */
-#line 5882 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 683:
+/* Line 661 of lalr1.cc  */
+#line 5899 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTWordsValue(
                 LOC((yyloc)), NULL, dynamic_cast<exprnode*>((yysemantic_stack_[(3) - (2)].expr))
@@ -9481,145 +8363,129 @@
         }
     break;
 
-  case 682:
-
-/* Line 678 of lalr1.cc  */
-#line 5891 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 684:
+/* Line 661 of lalr1.cc  */
+#line 5908 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::any );
         }
     break;
 
-  case 683:
-
-/* Line 678 of lalr1.cc  */
-#line 5895 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-        }
-    break;
-
-  case 684:
-
-/* Line 678 of lalr1.cc  */
-#line 5903 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
-        }
-    break;
-
   case 685:
-
-/* Line 678 of lalr1.cc  */
-#line 5907 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5912 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 686:
-
-/* Line 678 of lalr1.cc  */
-#line 5911 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5920 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::phrase );
+            (yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
         }
     break;
 
   case 687:
-
-/* Line 678 of lalr1.cc  */
-#line 5918 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5924 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.ft_anyall_value) = ft_anyall_mode::any;
+            (yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
         }
     break;
 
   case 688:
-
-/* Line 678 of lalr1.cc  */
-#line 5922 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5928 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.ft_anyall_value) = ft_anyall_mode::any_word;
+            (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::phrase );
         }
     break;
 
   case 689:
-
-/* Line 678 of lalr1.cc  */
-#line 5929 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5935 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.ft_anyall_value) = ft_anyall_mode::all;
+            (yyval.ft_anyall_value) = ft_anyall_mode::any;
         }
     break;
 
   case 690:
-
-/* Line 678 of lalr1.cc  */
-#line 5933 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5939 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.ft_anyall_value) = ft_anyall_mode::all_words;
+            (yyval.ft_anyall_value) = ft_anyall_mode::any_word;
         }
     break;
 
   case 691:
-
-/* Line 678 of lalr1.cc  */
-#line 5941 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5946 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+            (yyval.ft_anyall_value) = ft_anyall_mode::all;
         }
     break;
 
   case 692:
-
-/* Line 678 of lalr1.cc  */
-#line 5945 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5950 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+            (yyval.ft_anyall_value) = ft_anyall_mode::all_words;
         }
     break;
 
   case 693:
-
-/* Line 678 of lalr1.cc  */
-#line 5949 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5958 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 694:
-
-/* Line 678 of lalr1.cc  */
-#line 5953 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5962 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 695:
-
-/* Line 678 of lalr1.cc  */
-#line 5957 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5966 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 696:
-
-/* Line 678 of lalr1.cc  */
-#line 5965 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 5970 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 697:
+/* Line 661 of lalr1.cc  */
+#line 5974 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 698:
+/* Line 661 of lalr1.cc  */
+#line 5982 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTOrder( LOC((yyloc)) );
         }
     break;
 
-  case 697:
-
-/* Line 678 of lalr1.cc  */
-#line 5973 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 699:
+/* Line 661 of lalr1.cc  */
+#line 5990 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTWindow(
                 LOC((yyloc)),
@@ -9629,10 +8495,9 @@
         }
     break;
 
-  case 698:
-
-/* Line 678 of lalr1.cc  */
-#line 5985 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 700:
+/* Line 661 of lalr1.cc  */
+#line 6002 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTDistance(
                 LOC((yyloc)),
@@ -9642,37 +8507,33 @@
         }
     break;
 
-  case 699:
-
-/* Line 678 of lalr1.cc  */
-#line 5997 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 701:
+/* Line 661 of lalr1.cc  */
+#line 6014 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::words );
         }
     break;
 
-  case 700:
-
-/* Line 678 of lalr1.cc  */
-#line 6001 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 702:
+/* Line 661 of lalr1.cc  */
+#line 6018 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::sentences );
         }
     break;
 
-  case 701:
-
-/* Line 678 of lalr1.cc  */
-#line 6005 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 703:
+/* Line 661 of lalr1.cc  */
+#line 6022 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::paragraphs );
         }
     break;
 
-  case 702:
-
-/* Line 678 of lalr1.cc  */
-#line 6013 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 704:
+/* Line 661 of lalr1.cc  */
+#line 6030 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             FTMatchOptions *mo = new FTMatchOptions( LOC((yyloc)) );
             mo->push_back( dynamic_cast<FTMatchOption*>((yysemantic_stack_[(2) - (2)].node)) );
@@ -9680,10 +8541,9 @@
         }
     break;
 
-  case 703:
-
-/* Line 678 of lalr1.cc  */
-#line 6019 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 705:
+/* Line 661 of lalr1.cc  */
+#line 6036 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             FTMatchOptions *mo = dynamic_cast<FTMatchOptions*>((yysemantic_stack_[(3) - (1)].node));
             mo->push_back( dynamic_cast<FTMatchOption*>((yysemantic_stack_[(3) - (3)].node)) );
@@ -9691,118 +8551,105 @@
         }
     break;
 
-  case 704:
-
-/* Line 678 of lalr1.cc  */
-#line 6029 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-        }
-    break;
-
-  case 705:
-
-/* Line 678 of lalr1.cc  */
-#line 6033 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-        }
-    break;
-
   case 706:
-
-/* Line 678 of lalr1.cc  */
-#line 6037 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 6046 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 707:
-
-/* Line 678 of lalr1.cc  */
-#line 6041 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 6050 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 708:
-
-/* Line 678 of lalr1.cc  */
-#line 6045 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 6054 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 709:
-
-/* Line 678 of lalr1.cc  */
-#line 6049 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 6058 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 710:
-
-/* Line 678 of lalr1.cc  */
-#line 6053 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 6062 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 711:
-
-/* Line 678 of lalr1.cc  */
-#line 6057 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 6066 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 712:
-
-/* Line 678 of lalr1.cc  */
-#line 6065 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 6070 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 713:
+/* Line 661 of lalr1.cc  */
+#line 6074 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 714:
+/* Line 661 of lalr1.cc  */
+#line 6082 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::sensitive );
         }
     break;
 
-  case 713:
-
-/* Line 678 of lalr1.cc  */
-#line 6069 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 715:
+/* Line 661 of lalr1.cc  */
+#line 6086 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::insensitive );
         }
     break;
 
-  case 714:
-
-/* Line 678 of lalr1.cc  */
-#line 6073 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 716:
+/* Line 661 of lalr1.cc  */
+#line 6090 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::lower );
         }
     break;
 
-  case 715:
-
-/* Line 678 of lalr1.cc  */
-#line 6077 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 717:
+/* Line 661 of lalr1.cc  */
+#line 6094 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::upper );
         }
     break;
 
-  case 716:
-
-/* Line 678 of lalr1.cc  */
-#line 6085 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 718:
+/* Line 661 of lalr1.cc  */
+#line 6102 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTDiacriticsOption(
                 LOC((yyloc)), ft_diacritics_mode::sensitive
@@ -9810,10 +8657,9 @@
         }
     break;
 
-  case 717:
-
-/* Line 678 of lalr1.cc  */
-#line 6091 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 719:
+/* Line 661 of lalr1.cc  */
+#line 6108 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTDiacriticsOption(
                 LOC((yyloc)), ft_diacritics_mode::insensitive
@@ -9821,10 +8667,9 @@
         }
     break;
 
-  case 718:
-
-/* Line 678 of lalr1.cc  */
-#line 6101 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 720:
+/* Line 661 of lalr1.cc  */
+#line 6118 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTExtensionOption(
                 LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)), SYMTAB((yysemantic_stack_[(3) - (3)].sval))
@@ -9832,28 +8677,25 @@
         }
     break;
 
-  case 719:
-
-/* Line 678 of lalr1.cc  */
-#line 6111 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 721:
+/* Line 661 of lalr1.cc  */
+#line 6128 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::stemming );
         }
     break;
 
-  case 720:
-
-/* Line 678 of lalr1.cc  */
-#line 6115 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 722:
+/* Line 661 of lalr1.cc  */
+#line 6132 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::no_stemming );
         }
     break;
 
-  case 721:
-
-/* Line 678 of lalr1.cc  */
-#line 6123 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 723:
+/* Line 661 of lalr1.cc  */
+#line 6140 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             FTThesaurusOption::thesaurus_id_list_t *til = NULL;
             if ( (yysemantic_stack_[(2) - (2)].node) ) {
@@ -9865,10 +8707,9 @@
         }
     break;
 
-  case 722:
-
-/* Line 678 of lalr1.cc  */
-#line 6133 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 724:
+/* Line 661 of lalr1.cc  */
+#line 6150 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             FTThesaurusOption::thesaurus_id_list_t *til = (yysemantic_stack_[(5) - (4)].thesaurus_id_list);
             if ( (yysemantic_stack_[(5) - (3)].node) ) {
@@ -9881,75 +8722,67 @@
         }
     break;
 
-  case 723:
-
-/* Line 678 of lalr1.cc  */
-#line 6144 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 725:
+/* Line 661 of lalr1.cc  */
+#line 6161 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTThesaurusOption( LOC((yyloc)), NULL, false, true );
         }
     break;
 
-  case 724:
-
-/* Line 678 of lalr1.cc  */
-#line 6151 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-        }
-    break;
-
-  case 725:
-
-/* Line 678 of lalr1.cc  */
-#line 6155 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = NULL;
-        }
-    break;
-
   case 726:
-
-/* Line 678 of lalr1.cc  */
-#line 6162 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 6168 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 727:
+/* Line 661 of lalr1.cc  */
+#line 6172 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = NULL;
+        }
+    break;
+
+  case 728:
+/* Line 661 of lalr1.cc  */
+#line 6179 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.thesaurus_id_list) = NULL;
         }
     break;
 
-  case 727:
-
-/* Line 678 of lalr1.cc  */
-#line 6166 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 729:
+/* Line 661 of lalr1.cc  */
+#line 6183 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.thesaurus_id_list) = (yysemantic_stack_[(2) - (2)].thesaurus_id_list);
         }
     break;
 
-  case 728:
-
-/* Line 678 of lalr1.cc  */
-#line 6173 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 730:
+/* Line 661 of lalr1.cc  */
+#line 6190 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.thesaurus_id_list) = new FTThesaurusOption::thesaurus_id_list_t;
             (yyval.thesaurus_id_list)->push_back( dynamic_cast<FTThesaurusID*>((yysemantic_stack_[(1) - (1)].node)) );
         }
     break;
 
-  case 729:
-
-/* Line 678 of lalr1.cc  */
-#line 6178 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 731:
+/* Line 661 of lalr1.cc  */
+#line 6195 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yysemantic_stack_[(3) - (1)].thesaurus_id_list)->push_back( dynamic_cast<FTThesaurusID*>((yysemantic_stack_[(3) - (3)].node)) );
             (yyval.thesaurus_id_list) = (yysemantic_stack_[(3) - (1)].thesaurus_id_list);
         }
     break;
 
-  case 730:
-
-/* Line 678 of lalr1.cc  */
-#line 6187 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 732:
+/* Line 661 of lalr1.cc  */
+#line 6204 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTThesaurusID(
                 LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (2)].sval)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)), dynamic_cast<FTRange*>((yysemantic_stack_[(4) - (4)].node))
@@ -9957,46 +8790,41 @@
         }
     break;
 
-  case 731:
-
-/* Line 678 of lalr1.cc  */
-#line 6196 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 733:
+/* Line 661 of lalr1.cc  */
+#line 6213 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.sval) = 0;
         }
     break;
 
-  case 732:
-
-/* Line 678 of lalr1.cc  */
-#line 6200 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 734:
+/* Line 661 of lalr1.cc  */
+#line 6217 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.sval) = (yysemantic_stack_[(2) - (2)].sval);
         }
     break;
 
-  case 733:
-
-/* Line 678 of lalr1.cc  */
-#line 6207 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = NULL;
-        }
-    break;
-
-  case 734:
-
-/* Line 678 of lalr1.cc  */
-#line 6211 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-            (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
-        }
-    break;
-
   case 735:
-
-/* Line 678 of lalr1.cc  */
-#line 6219 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 6224 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = NULL;
+        }
+    break;
+
+  case 736:
+/* Line 661 of lalr1.cc  */
+#line 6228 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+            (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+        }
+    break;
+
+  case 737:
+/* Line 661 of lalr1.cc  */
+#line 6236 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTStopWordOption(
                 LOC((yyloc)),
@@ -10007,10 +8835,9 @@
         }
     break;
 
-  case 736:
-
-/* Line 678 of lalr1.cc  */
-#line 6228 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 738:
+/* Line 661 of lalr1.cc  */
+#line 6245 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTStopWordOption(
                 LOC((yyloc)), NULL, (yysemantic_stack_[(4) - (4)].incl_excl_list), ft_stop_words_mode::with_default
@@ -10019,10 +8846,9 @@
         }
     break;
 
-  case 737:
-
-/* Line 678 of lalr1.cc  */
-#line 6235 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 739:
+/* Line 661 of lalr1.cc  */
+#line 6252 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTStopWordOption(
                 LOC((yyloc)), NULL, NULL, ft_stop_words_mode::without
@@ -10030,28 +8856,25 @@
         }
     break;
 
-  case 738:
-
-/* Line 678 of lalr1.cc  */
-#line 6245 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 740:
+/* Line 661 of lalr1.cc  */
+#line 6262 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTStopWords( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)), NULL );
         }
     break;
 
-  case 739:
-
-/* Line 678 of lalr1.cc  */
-#line 6249 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 741:
+/* Line 661 of lalr1.cc  */
+#line 6266 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTStopWords( LOC((yyloc)), "", (yysemantic_stack_[(3) - (2)].strlist) );
         }
     break;
 
-  case 740:
-
-/* Line 678 of lalr1.cc  */
-#line 6256 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 742:
+/* Line 661 of lalr1.cc  */
+#line 6273 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             string_list_t *sl = new string_list_t;
             sl->push_back( SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
@@ -10059,10 +8882,9 @@
         }
     break;
 
-  case 741:
-
-/* Line 678 of lalr1.cc  */
-#line 6262 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 743:
+/* Line 661 of lalr1.cc  */
+#line 6279 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             if ( (yysemantic_stack_[(3) - (1)].strlist) )
                 (yysemantic_stack_[(3) - (1)].strlist)->push_back( SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
@@ -10070,38 +8892,34 @@
         }
     break;
 
-  case 742:
-
-/* Line 678 of lalr1.cc  */
-#line 6271 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 744:
+/* Line 661 of lalr1.cc  */
+#line 6288 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.incl_excl_list) = NULL;
         }
     break;
 
-  case 743:
-
-/* Line 678 of lalr1.cc  */
-#line 6275 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 745:
+/* Line 661 of lalr1.cc  */
+#line 6292 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.incl_excl_list) = (yysemantic_stack_[(1) - (1)].incl_excl_list);
         }
     break;
 
-  case 744:
-
-/* Line 678 of lalr1.cc  */
-#line 6282 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 746:
+/* Line 661 of lalr1.cc  */
+#line 6299 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.incl_excl_list) = new FTStopWordOption::incl_excl_list_t;
             (yyval.incl_excl_list)->push_back( dynamic_cast<FTStopWordsInclExcl*>((yysemantic_stack_[(1) - (1)].node)) );
         }
     break;
 
-  case 745:
-
-/* Line 678 of lalr1.cc  */
-#line 6287 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 747:
+/* Line 661 of lalr1.cc  */
+#line 6304 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             FTStopWordOption::incl_excl_list_t *iel = (yysemantic_stack_[(2) - (1)].incl_excl_list);
             if ( !iel )
@@ -10111,10 +8929,9 @@
         }
     break;
 
-  case 746:
-
-/* Line 678 of lalr1.cc  */
-#line 6299 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 748:
+/* Line 661 of lalr1.cc  */
+#line 6316 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTStopWordsInclExcl(
                 LOC((yyloc)),
@@ -10124,10 +8941,9 @@
         }
     break;
 
-  case 747:
-
-/* Line 678 of lalr1.cc  */
-#line 6307 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 749:
+/* Line 661 of lalr1.cc  */
+#line 6324 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTStopWordsInclExcl(
                 LOC((yyloc)),
@@ -10137,109 +8953,97 @@
         }
     break;
 
-  case 748:
-
-/* Line 678 of lalr1.cc  */
-#line 6319 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 750:
+/* Line 661 of lalr1.cc  */
+#line 6336 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTLanguageOption( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
         }
     break;
 
-  case 749:
-
-/* Line 678 of lalr1.cc  */
-#line 6327 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 751:
+/* Line 661 of lalr1.cc  */
+#line 6344 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::with );
         }
     break;
 
-  case 750:
-
-/* Line 678 of lalr1.cc  */
-#line 6331 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 752:
+/* Line 661 of lalr1.cc  */
+#line 6348 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::without );
         }
     break;
 
-  case 751:
-
-/* Line 678 of lalr1.cc  */
-#line 6339 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 753:
+/* Line 661 of lalr1.cc  */
+#line 6356 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_start );
         }
     break;
 
-  case 752:
-
-/* Line 678 of lalr1.cc  */
-#line 6343 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 754:
+/* Line 661 of lalr1.cc  */
+#line 6360 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_end );
         }
     break;
 
-  case 753:
-
-/* Line 678 of lalr1.cc  */
-#line 6347 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 755:
+/* Line 661 of lalr1.cc  */
+#line 6364 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::entire );
         }
     break;
 
-  case 754:
-
-/* Line 678 of lalr1.cc  */
-#line 6355 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 756:
+/* Line 661 of lalr1.cc  */
+#line 6372 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTTimes( LOC((yyloc)), dynamic_cast<FTRange*>((yysemantic_stack_[(3) - (2)].node)) );
         }
     break;
 
-  case 755:
-
-/* Line 678 of lalr1.cc  */
-#line 6363 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 757:
+/* Line 661 of lalr1.cc  */
+#line 6380 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::exactly, (yysemantic_stack_[(2) - (2)].expr) );
         }
     break;
 
-  case 756:
-
-/* Line 678 of lalr1.cc  */
-#line 6367 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 758:
+/* Line 661 of lalr1.cc  */
+#line 6384 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::at_least, (yysemantic_stack_[(3) - (3)].expr) );
         }
     break;
 
-  case 757:
-
-/* Line 678 of lalr1.cc  */
-#line 6371 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 759:
+/* Line 661 of lalr1.cc  */
+#line 6388 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::at_most, (yysemantic_stack_[(3) - (3)].expr) );
         }
     break;
 
-  case 758:
-
-/* Line 678 of lalr1.cc  */
-#line 6375 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 760:
+/* Line 661 of lalr1.cc  */
+#line 6392 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::from_to, (yysemantic_stack_[(4) - (2)].expr), (yysemantic_stack_[(4) - (4)].expr) );
         }
     break;
 
-  case 759:
-
-/* Line 678 of lalr1.cc  */
-#line 6383 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 761:
+/* Line 661 of lalr1.cc  */
+#line 6400 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTScope(
                 LOC((yyloc)),
@@ -10249,10 +9053,9 @@
         }
     break;
 
-  case 760:
-
-/* Line 678 of lalr1.cc  */
-#line 6391 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 762:
+/* Line 661 of lalr1.cc  */
+#line 6408 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTScope(
                 LOC((yyloc)),
@@ -10262,105 +9065,94 @@
         }
     break;
 
-  case 761:
-
-/* Line 678 of lalr1.cc  */
-#line 6403 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 763:
+/* Line 661 of lalr1.cc  */
+#line 6420 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::sentence );
         }
     break;
 
-  case 762:
-
-/* Line 678 of lalr1.cc  */
-#line 6407 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 764:
+/* Line 661 of lalr1.cc  */
+#line 6424 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::paragraph );
         }
     break;
 
-  case 763:
-
-/* Line 678 of lalr1.cc  */
-#line 6415 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 765:
+/* Line 661 of lalr1.cc  */
+#line 6432 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTIgnoreOption( LOC((yyloc)), static_cast<UnionExpr*>((yysemantic_stack_[(3) - (3)].expr)) );
         }
     break;
 
-  case 764:
-
-/* Line 678 of lalr1.cc  */
-#line 6429 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 766:
+/* Line 661 of lalr1.cc  */
+#line 6446 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), NULL );
         }
     break;
 
-  case 765:
-
-/* Line 678 of lalr1.cc  */
-#line 6433 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 767:
+/* Line 661 of lalr1.cc  */
+#line 6450 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
         }
     break;
 
-  case 766:
-
-/* Line 678 of lalr1.cc  */
-#line 6440 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 768:
+/* Line 661 of lalr1.cc  */
+#line 6457 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), NULL, false);
         }
     break;
 
-  case 767:
-
-/* Line 678 of lalr1.cc  */
-#line 6445 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 769:
+/* Line 661 of lalr1.cc  */
+#line 6462 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), false);
         }
     break;
 
-  case 768:
-
-/* Line 678 of lalr1.cc  */
-#line 6453 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 770:
+/* Line 661 of lalr1.cc  */
+#line 6470 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), NULL, true);
         }
     break;
 
-  case 769:
-
-/* Line 678 of lalr1.cc  */
-#line 6458 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 771:
+/* Line 661 of lalr1.cc  */
+#line 6475 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           // TODO: fill in with the correct constructor
           (yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), true);
         }
     break;
 
-  case 770:
-
-/* Line 678 of lalr1.cc  */
-#line 6467 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 772:
+/* Line 661 of lalr1.cc  */
+#line 6484 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = new JSONDirectObjectConstructor(LOC((yyloc)),
                                                dynamic_cast<JSONPairList*>((yysemantic_stack_[(3) - (2)].node)));
         }
     break;
 
-  case 771:
-
-/* Line 678 of lalr1.cc  */
-#line 6475 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 773:
+/* Line 661 of lalr1.cc  */
+#line 6492 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           JSONPairList* jpl = new JSONPairList(LOC((yyloc)));
           jpl->push_back(new JSONPairConstructor(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)));
@@ -10368,10 +9160,9 @@
         }
     break;
 
-  case 772:
-
-/* Line 678 of lalr1.cc  */
-#line 6481 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 774:
+/* Line 661 of lalr1.cc  */
+#line 6498 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (1)].node));
           assert(jpl);
@@ -10380,10 +9171,9 @@
         }
     break;
 
-  case 773:
-
-/* Line 678 of lalr1.cc  */
-#line 6491 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 775:
+/* Line 661 of lalr1.cc  */
+#line 6508 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = new JSONObjectInsertExpr(LOC((yyloc)),
                                         static_cast<JSONPairList*>((yysemantic_stack_[(7) - (4)].node)),
@@ -10391,30 +9181,27 @@
         }
     break;
 
-  case 774:
-
-/* Line 678 of lalr1.cc  */
-#line 6497 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 776:
+/* Line 661 of lalr1.cc  */
+#line 6514 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = new JSONArrayInsertExpr(LOC((yyloc)), (yysemantic_stack_[(10) - (4)].expr), (yysemantic_stack_[(10) - (7)].expr), (yysemantic_stack_[(10) - (10)].expr));
         }
     break;
 
-  case 775:
-
-/* Line 678 of lalr1.cc  */
-#line 6504 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 777:
+/* Line 661 of lalr1.cc  */
+#line 6521 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = new JSONArrayAppendExpr(LOC((yyloc)), (yysemantic_stack_[(7) - (4)].expr), (yysemantic_stack_[(7) - (7)].expr));
         }
     break;
 
-  case 776:
-
-/* Line 678 of lalr1.cc  */
-#line 6511 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 778:
+/* Line 661 of lalr1.cc  */
+#line 6528 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-          rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation = 
+          rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(3) - (3)].expr));
 
           if (lDynamicFunctionInvocation == NULL)
@@ -10440,15 +9227,14 @@
         }
     break;
 
-  case 777:
-
-/* Line 678 of lalr1.cc  */
-#line 6540 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 779:
+/* Line 661 of lalr1.cc  */
+#line 6557 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-          rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation = 
+          rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(5) - (3)].expr));
 
-          if(lDynamicFunctionInvocation == NULL) 
+          if(lDynamicFunctionInvocation == NULL)
           {
             error((yylocation_stack_[(5) - (3)]), "An object invocation is expected. A filter was found instead.");
             YYERROR;
@@ -10471,15 +9257,14 @@
         }
     break;
 
-  case 778:
-
-/* Line 678 of lalr1.cc  */
-#line 6569 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 780:
+/* Line 661 of lalr1.cc  */
+#line 6586 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-          rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation = 
+          rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(7) - (5)].expr));
 
-          if(lDynamicFunctionInvocation == NULL) 
+          if(lDynamicFunctionInvocation == NULL)
           {
             error((yylocation_stack_[(7) - (3)]), "An object invocation is expected. A filter was found instead.");
             YYERROR;
@@ -10502,64 +9287,57 @@
         }
     break;
 
-  case 779:
-
-/* Line 678 of lalr1.cc  */
-#line 6598 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-          (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-        }
-    break;
-
-  case 780:
-
-/* Line 678 of lalr1.cc  */
-#line 6602 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
-    {
-          (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-        }
-    break;
-
   case 781:
-
-/* Line 678 of lalr1.cc  */
-#line 6606 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 6615 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
     break;
 
   case 782:
-
-/* Line 678 of lalr1.cc  */
-#line 6613 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+/* Line 661 of lalr1.cc  */
+#line 6619 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+          (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 783:
+/* Line 661 of lalr1.cc  */
+#line 6623 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+          (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+        }
+    break;
+
+  case 784:
+/* Line 661 of lalr1.cc  */
+#line 6630 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonItem);
         }
     break;
 
-  case 783:
-
-/* Line 678 of lalr1.cc  */
-#line 6620 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 785:
+/* Line 661 of lalr1.cc  */
+#line 6637 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonObject);
         }
     break;
 
-  case 784:
-
-/* Line 678 of lalr1.cc  */
-#line 6627 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 786:
+/* Line 661 of lalr1.cc  */
+#line 6644 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonArray);
         }
     break;
 
-  case 787:
-
-/* Line 678 of lalr1.cc  */
-#line 6644 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 789:
+/* Line 661 of lalr1.cc  */
+#line 6661 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           auto_ptr<QName> lQName( static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
           zstring const &tmp = lQName->get_qname();
@@ -10571,1560 +9349,1349 @@
         }
     break;
 
-  case 789:
-
-/* Line 678 of lalr1.cc  */
-#line 6657 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 791:
+/* Line 661 of lalr1.cc  */
+#line 6674 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("attribute"))); }
     break;
 
-  case 790:
-
-/* Line 678 of lalr1.cc  */
-#line 6658 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 792:
+/* Line 661 of lalr1.cc  */
+#line 6675 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("comment"))); }
     break;
 
-  case 791:
-
-/* Line 678 of lalr1.cc  */
-#line 6659 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 793:
+/* Line 661 of lalr1.cc  */
+#line 6676 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("document-node"))); }
     break;
 
-  case 792:
-
-/* Line 678 of lalr1.cc  */
-#line 6660 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 794:
+/* Line 661 of lalr1.cc  */
+#line 6677 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("element"))); }
     break;
 
-  case 793:
-
-/* Line 678 of lalr1.cc  */
-#line 6661 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 795:
+/* Line 661 of lalr1.cc  */
+#line 6678 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("item"))); }
     break;
 
-  case 794:
-
-/* Line 678 of lalr1.cc  */
-#line 6662 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 796:
+/* Line 661 of lalr1.cc  */
+#line 6679 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("if"))); }
     break;
 
-  case 795:
-
-/* Line 678 of lalr1.cc  */
-#line 6663 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 797:
+/* Line 661 of lalr1.cc  */
+#line 6680 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("node"))); }
     break;
 
-  case 796:
-
-/* Line 678 of lalr1.cc  */
-#line 6664 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 798:
+/* Line 661 of lalr1.cc  */
+#line 6681 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("processing-instruction"))); }
     break;
 
-  case 797:
-
-/* Line 678 of lalr1.cc  */
-#line 6665 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 799:
+/* Line 661 of lalr1.cc  */
+#line 6682 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema-attribute"))); }
     break;
 
-  case 798:
-
-/* Line 678 of lalr1.cc  */
-#line 6666 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 800:
+/* Line 661 of lalr1.cc  */
+#line 6683 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema-element"))); }
     break;
 
-  case 799:
-
-/* Line 678 of lalr1.cc  */
-#line 6667 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 801:
+/* Line 661 of lalr1.cc  */
+#line 6684 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("text"))); }
     break;
 
-  case 800:
-
-/* Line 678 of lalr1.cc  */
-#line 6668 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 802:
+/* Line 661 of lalr1.cc  */
+#line 6685 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("typeswitch"))); }
     break;
 
-  case 801:
-
-/* Line 678 of lalr1.cc  */
-#line 6669 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 803:
+/* Line 661 of lalr1.cc  */
+#line 6686 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("switch"))); }
     break;
 
-  case 802:
-
-/* Line 678 of lalr1.cc  */
-#line 6670 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 804:
+/* Line 661 of lalr1.cc  */
+#line 6687 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("empty-sequence"))); }
     break;
 
-  case 803:
-
-/* Line 678 of lalr1.cc  */
-#line 6671 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 805:
+/* Line 661 of lalr1.cc  */
+#line 6688 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("while"))); }
     break;
 
-  case 805:
-
-/* Line 678 of lalr1.cc  */
-#line 6676 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 807:
+/* Line 661 of lalr1.cc  */
+#line 6693 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))); }
     break;
 
-  case 806:
-
-/* Line 678 of lalr1.cc  */
-#line 6677 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 808:
+/* Line 661 of lalr1.cc  */
+#line 6694 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("xquery"))); }
     break;
 
-  case 807:
-
-/* Line 678 of lalr1.cc  */
-#line 6678 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 809:
+/* Line 661 of lalr1.cc  */
+#line 6695 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("empty"))); }
     break;
 
-  case 808:
-
-/* Line 678 of lalr1.cc  */
-#line 6679 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 810:
+/* Line 661 of lalr1.cc  */
+#line 6696 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("boundary-space"))); }
     break;
 
-  case 809:
-
-/* Line 678 of lalr1.cc  */
-#line 6680 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 811:
+/* Line 661 of lalr1.cc  */
+#line 6697 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ft-option"))); }
     break;
 
-  case 810:
-
-/* Line 678 of lalr1.cc  */
-#line 6681 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 812:
+/* Line 661 of lalr1.cc  */
+#line 6698 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("base-uri"))); }
     break;
 
-  case 811:
-
-/* Line 678 of lalr1.cc  */
-#line 6682 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 813:
+/* Line 661 of lalr1.cc  */
+#line 6699 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lax"))); }
     break;
 
-  case 812:
-
-/* Line 678 of lalr1.cc  */
-#line 6683 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 814:
+/* Line 661 of lalr1.cc  */
+#line 6700 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("strict"))); }
     break;
 
-  case 813:
-
-/* Line 678 of lalr1.cc  */
-#line 6684 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 815:
+/* Line 661 of lalr1.cc  */
+#line 6701 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("idiv"))); }
     break;
 
-  case 814:
-
-/* Line 678 of lalr1.cc  */
-#line 6685 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 816:
+/* Line 661 of lalr1.cc  */
+#line 6702 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("document"))); }
     break;
 
-  case 815:
-
-/* Line 678 of lalr1.cc  */
-#line 6686 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 817:
+/* Line 661 of lalr1.cc  */
+#line 6703 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ftnot"))); }
     break;
 
-  case 816:
-
-/* Line 678 of lalr1.cc  */
-#line 6687 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 818:
+/* Line 661 of lalr1.cc  */
+#line 6704 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("not"))); }
     break;
 
-  case 817:
-
-/* Line 678 of lalr1.cc  */
-#line 6688 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 819:
+/* Line 661 of lalr1.cc  */
+#line 6705 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sensitive"))); }
     break;
 
-  case 818:
-
-/* Line 678 of lalr1.cc  */
-#line 6689 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 820:
+/* Line 661 of lalr1.cc  */
+#line 6706 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("insensitive"))); }
     break;
 
-  case 819:
-
-/* Line 678 of lalr1.cc  */
-#line 6690 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 821:
+/* Line 661 of lalr1.cc  */
+#line 6707 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("diacritics"))); }
     break;
 
-  case 820:
-
-/* Line 678 of lalr1.cc  */
-#line 6691 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 822:
+/* Line 661 of lalr1.cc  */
+#line 6708 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("without"))); }
     break;
 
-  case 821:
-
-/* Line 678 of lalr1.cc  */
-#line 6692 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 823:
+/* Line 661 of lalr1.cc  */
+#line 6709 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stemming"))); }
     break;
 
-  case 822:
-
-/* Line 678 of lalr1.cc  */
-#line 6693 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 824:
+/* Line 661 of lalr1.cc  */
+#line 6710 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("thesaurus"))); }
     break;
 
-  case 823:
-
-/* Line 678 of lalr1.cc  */
-#line 6694 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 825:
+/* Line 661 of lalr1.cc  */
+#line 6711 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stop"))); }
     break;
 
-  case 824:
-
-/* Line 678 of lalr1.cc  */
-#line 6695 "/home/markos/zorba/repo/expr-memman2/src/compiler/parser/xquery_parser.y"
+  case 826:
+/* Line 661 of lalr1.cc  */
+#line 6712 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("wildcards"))); }
     break;
 
-  case 825:
-
-/* Line 678 of lalr1.cc  */
-#lin

Follow ups