← 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.

Commit message:
Fixed #1072644: broken error location

Requested reviews:
  Nicolae Brinza (nbrinza)
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
  Bug #1072644 in Zorba: "broken error location"
  https://bugs.launchpad.net/zorba/+bug/1072644

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

Fixed #1072644: broken error location
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142171
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2013-01-03 20:25:05 +0000
+++ ChangeLog	2013-01-07 18:18:21 +0000
@@ -25,6 +25,7 @@
   * Convert LET vars whose domain sequence has exactly one item to FOR vars.
 
 Bug Fixes/Other Changes:
+  * Fixed bug #1072644 (broken parser error location)
   * Change XQXQ (XQuery-for-XQuery) module now part of Zorba core
   * Fixed mustCopyInputNodes() method of no-copy, and jsoniq functions.
   * Fixed bug #868640 (Node lifetime is shorter than expected due to let

=== modified file 'src/compiler/parser/xquery_driver.cpp'
--- src/compiler/parser/xquery_driver.cpp	2012-09-19 21:16:15 +0000
+++ src/compiler/parser/xquery_driver.cpp	2013-01-07 18:18:21 +0000
@@ -146,7 +146,6 @@
   return parserError;
 }
 
-
 ZorbaParserError* xquery_driver::parserErr(const std::string& _message, const location& loc, Error const &code)
 {
   parserError = new ZorbaParserError(_message, loc, code);
@@ -159,7 +158,6 @@
   return parserError;
 }
 
-
 bool xquery_driver::parse_stream(std::istream& in, const zstring& aFilename)
 {
   int ch[3];

=== modified file 'src/compiler/parser/xquery_driver.h'
--- src/compiler/parser/xquery_driver.h	2012-09-19 21:16:15 +0000
+++ src/compiler/parser/xquery_driver.h	2013-01-07 18:18:21 +0000
@@ -70,9 +70,9 @@
 
   bool parse_file(const zstring& aFilename);
 
-	void set_expr(parsenode* e_p);
+  void set_expr(parsenode* e_p);
 
-	parsenode* get_expr() { return expr_p; }
+  parsenode* get_expr() { return expr_p; }
 
   QueryLoc createQueryLoc(const location& aLoc) const;
 

=== modified file 'src/compiler/parser/xquery_parser.cpp'
--- src/compiler/parser/xquery_parser.cpp	2012-12-18 15:57:51 +0000
+++ src/compiler/parser/xquery_parser.cpp	2013-01-07 18:18:21 +0000
@@ -1,10 +1,8 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* A Bison parser, made by GNU Bison 2.5.  */
 
 /* Skeleton implementation for Bison LALR(1) parsers in C++
    
-      Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
-   Foundation, Inc.
+      Copyright (C) 2002-2011 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -37,8 +35,8 @@
 
 /* First part of user declarations.  */
 
-/* Line 311 of lalr1.cc  */
-#line 87 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 293 of lalr1.cc  */
+#line 87 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 
 
 #include "common/common.h"
@@ -74,16 +72,16 @@
 
 
 
-/* Line 311 of lalr1.cc  */
-#line 79 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+/* Line 293 of lalr1.cc  */
+#line 77 "/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 909 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 299 of lalr1.cc  */
+#line 910 "/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...
@@ -94,8 +92,8 @@
     }
 }
 
-/* Line 317 of lalr1.cc  */
-#line 1034 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 299 of lalr1.cc  */
+#line 1035 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 
 #include "compiler/parser/xquery_scanner.h"
 
@@ -104,11 +102,11 @@
 
 
 
-/* Line 317 of lalr1.cc  */
-#line 109 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+/* Line 299 of lalr1.cc  */
+#line 107 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* FIXME: INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -119,6 +117,26 @@
 # endif
 #endif
 
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)                               \
+ do                                                                    \
+   if (N)                                                              \
+     {                                                                 \
+       (Current).begin = YYRHSLOC (Rhs, 1).begin;                      \
+       (Current).end   = YYRHSLOC (Rhs, N).end;                        \
+     }                                                                 \
+   else                                                                \
+     {                                                                 \
+       (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;        \
+     }                                                                 \
+ while (false)
+#endif
+
 /* Suppress unused-variable warnings by "using" E.  */
 #define YYUSE(e) ((void) (e))
 
@@ -168,14 +186,10 @@
 #define YYRECOVERING()  (!!yyerrstatus_)
 
 
-/* Line 380 of lalr1.cc  */
-#line 1 "[Bison:b4_percent_define_default]"
-
 namespace zorba {
 
-/* Line 380 of lalr1.cc  */
-#line 178 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
-#if YYERROR_VERBOSE
+/* Line 382 of lalr1.cc  */
+#line 193 "/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 +228,6 @@
     return yystr;
   }
 
-#endif
 
   /// Build a parser object.
   xquery_parser::xquery_parser (xquery_driver& driver_yyarg)
@@ -277,2531 +290,2531 @@
         case 110: /* "\"'DECIMAL'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 907 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 908 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->decval); };
 
 /* Line 480 of lalr1.cc  */
-#line 285 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 298 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 124: /* "\"'DOUBLE'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 906 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 907 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->dval); };
 
 /* Line 480 of lalr1.cc  */
-#line 294 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 307 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 149: /* "\"'INTEGER'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 905 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 906 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->ival); };
 
 /* Line 480 of lalr1.cc  */
-#line 303 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 316 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 338: /* "VersionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 312 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 325 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 339: /* "MainModule" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 321 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 334 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 340: /* "LibraryModule" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 330 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 343 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 341: /* "ModuleDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 339 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 352 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 342: /* "SIND_DeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 348 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 361 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 343: /* "SIND_Decl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 357 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 370 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 344: /* "Setter" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 366 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 379 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 345: /* "BoundarySpaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 375 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 388 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 346: /* "DefaultCollationDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 384 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 397 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 347: /* "BaseURIDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 393 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 406 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 348: /* "ConstructionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 402 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 415 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 349: /* "OrderingModeDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 411 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 424 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 350: /* "EmptyOrderDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 420 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 433 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 351: /* "CopyNamespacesDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 429 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 442 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 352: /* "Import" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 438 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 451 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 353: /* "SchemaImport" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 447 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 460 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 354: /* "URILiteralList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 456 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 469 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 355: /* "SchemaPrefix" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 465 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 478 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 356: /* "ModuleImport" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 474 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 487 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 357: /* "NamespaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 483 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 496 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 358: /* "DefaultNamespaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 492 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 505 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 359: /* "VFO_DeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 501 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 514 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 360: /* "VFO_Decl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 510 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 523 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 361: /* "DecimalFormatDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 519 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 532 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 362: /* "DecimalFormatParamList" */
 
 /* Line 480 of lalr1.cc  */
-#line 933 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 934 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->vstrpair); };
 
 /* Line 480 of lalr1.cc  */
-#line 528 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 541 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 363: /* "DecimalFormatParam" */
 
 /* Line 480 of lalr1.cc  */
-#line 933 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 934 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->strpair); };
 
 /* Line 480 of lalr1.cc  */
-#line 537 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 550 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 365: /* "OptionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 546 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 559 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 366: /* "FTOptionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 555 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 568 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 367: /* "CtxItemDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 564 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 577 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 368: /* "CtxItemDecl2" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 573 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 586 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 369: /* "CtxItemDecl3" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 582 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 595 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 370: /* "CtxItemDecl4" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 591 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 604 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 371: /* "VarDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 600 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 613 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 372: /* "VarNameAndType" */
 
 /* Line 480 of lalr1.cc  */
-#line 933 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 934 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->varnametype); };
 
 /* Line 480 of lalr1.cc  */
-#line 609 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 622 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 373: /* "AnnotationList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 618 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 631 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 374: /* "Annotation" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 627 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 640 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 375: /* "AnnotationLiteralList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 636 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 649 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 376: /* "FunctionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 645 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 658 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 377: /* "FunctionDecl2" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 654 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 667 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 378: /* "FunctionDeclSimple" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 663 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 676 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 379: /* "FunctionDeclUpdating" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 672 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 685 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 380: /* "FunctionSig" */
 
 /* Line 480 of lalr1.cc  */
-#line 933 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 934 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->fnsig); };
 
 /* Line 480 of lalr1.cc  */
-#line 681 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 694 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 381: /* "ParamList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 690 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 703 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 382: /* "Param" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 699 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 712 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 383: /* "CollectionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 708 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 721 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 385: /* "IndexDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 717 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 730 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 386: /* "IndexKeyList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 726 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 739 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 387: /* "IndexKeySpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 735 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 748 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 388: /* "IntegrityConstraintDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 744 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 757 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 389: /* "QueryBody" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 753 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 766 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 390: /* "StatementsAndOptionalExprTop" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 762 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 775 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 391: /* "StatementsAndOptionalExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 771 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 784 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 392: /* "StatementsAndExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 780 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 793 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 393: /* "Statements" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 789 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 802 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 394: /* "Statement" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 798 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 811 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 395: /* "BlockStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 807 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 820 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 396: /* "BlockExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 816 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 829 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 397: /* "EnclosedStatementsAndOptionalExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 825 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 838 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 398: /* "VarDeclStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 834 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 847 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 401: /* "AssignStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 843 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 856 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 402: /* "ApplyStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 852 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 865 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 403: /* "ExitStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 861 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 874 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 404: /* "WhileStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 870 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 883 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 405: /* "FlowCtlStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 879 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 892 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 406: /* "FLWORStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 888 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 901 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 407: /* "ReturnStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 897 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 910 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 408: /* "IfStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 906 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 919 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 409: /* "TryStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 915 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 928 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 410: /* "CatchListStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 937 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 411: /* "CatchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 933 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 946 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 412: /* "Expr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 942 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 955 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 413: /* "ExprSingle" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 951 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 964 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 414: /* "ExprSimple" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 960 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 973 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 415: /* "FLWORExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 969 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 982 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 416: /* "ReturnExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 978 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 991 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 419: /* "FLWORWinCond" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 987 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1000 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 420: /* "WindowClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 996 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1009 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 421: /* "CountClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1005 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1018 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 422: /* "ForLetWinClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1014 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1027 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 424: /* "FLWORClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1023 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1036 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 425: /* "ForClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1032 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1045 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 426: /* "VarInDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1041 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1054 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 427: /* "VarInDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1050 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1063 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 428: /* "PositionalVar" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1059 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1072 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 429: /* "FTScoreVar" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1068 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1081 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 430: /* "LetClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1077 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1090 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 431: /* "VarGetsDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1086 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1099 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 432: /* "VarGetsDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1095 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1108 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 433: /* "WindowVarDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1104 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1117 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 434: /* "WindowVars" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1113 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1126 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 435: /* "WindowVars3" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1122 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1135 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 436: /* "WindowVars2" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1131 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1144 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 437: /* "WhereClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1140 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1153 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 438: /* "GroupByClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1149 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1162 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 439: /* "GroupSpecList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1158 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1171 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 440: /* "GroupSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1167 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1180 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 441: /* "GroupCollationSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1176 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1189 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 442: /* "OrderByClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1185 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1198 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 443: /* "OrderSpecList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1194 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1207 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 444: /* "OrderSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1203 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1216 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 445: /* "OrderModifier" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1212 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1225 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 446: /* "OrderDirSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1221 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1234 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 447: /* "OrderEmptySpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1230 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1243 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 448: /* "OrderCollationSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1239 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1252 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 449: /* "QuantifiedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1248 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1261 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 450: /* "QVarInDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1257 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1270 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 451: /* "QVarInDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1266 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1279 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 452: /* "SwitchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1275 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1288 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 453: /* "SwitchCaseClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1284 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1297 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 454: /* "SwitchCaseClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1293 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1306 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 455: /* "SwitchCaseOperandList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1302 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1315 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 456: /* "SwitchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1311 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1324 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 459: /* "TypeswitchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1320 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1333 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 460: /* "TypeswitchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1329 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1342 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 461: /* "CaseClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1338 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1351 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 462: /* "CaseClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1347 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1360 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 465: /* "IfExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1356 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1369 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 466: /* "OrExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1365 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1378 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 467: /* "AndExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1374 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1387 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 468: /* "ComparisonExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1383 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1396 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 470: /* "FTContainsExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1392 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1405 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 471: /* "StringConcatExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1401 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1414 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 472: /* "opt_FTIgnoreOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1410 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1423 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 473: /* "RangeExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1419 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1432 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 474: /* "AdditiveExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1428 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1441 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 475: /* "MultiplicativeExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1437 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1450 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 476: /* "UnionExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1446 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1459 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 477: /* "IntersectExceptExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1455 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1468 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 478: /* "InstanceofExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1464 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1477 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 479: /* "TreatExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1473 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1486 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 480: /* "CastableExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1482 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1495 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 481: /* "CastExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1491 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1504 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 482: /* "SingleType" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1500 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1513 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 483: /* "UnaryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1509 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1522 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 484: /* "SignList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1518 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1531 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 485: /* "ValueExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1527 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1540 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 486: /* "SimpleMapExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1536 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1549 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 487: /* "ValueComp" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1545 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1558 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 488: /* "NodeComp" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1554 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1567 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 489: /* "ValidateExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1563 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1576 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 490: /* "ExtensionExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1572 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1585 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 491: /* "Pragma_list" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1581 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1594 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 492: /* "Pragma" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1590 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1603 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 493: /* "PathExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1599 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1612 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 495: /* "RelativePathExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1608 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1621 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 496: /* "StepExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1617 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1630 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 497: /* "AxisStep" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1626 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1639 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 498: /* "ForwardStep" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1635 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1648 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 499: /* "ForwardAxis" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1644 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1657 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 500: /* "AbbrevForwardStep" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1653 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1666 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 501: /* "ReverseStep" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1662 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1675 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 502: /* "ReverseAxis" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1671 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1684 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 503: /* "NodeTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1680 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1693 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 504: /* "NameTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1689 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1702 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 505: /* "Wildcard" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1698 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1711 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 506: /* "FilterExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1707 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1720 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 507: /* "PredicateList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1716 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1729 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 508: /* "Predicate" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1725 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1738 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 509: /* "PrimaryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1734 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1747 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 510: /* "Literal" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1743 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1756 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 511: /* "NumericLiteral" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1752 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1765 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 512: /* "VarRef" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1761 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1774 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 513: /* "ParenthesizedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1770 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1783 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 514: /* "ContextItemExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1779 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1792 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 515: /* "OrderedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1788 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1801 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 516: /* "UnorderedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1797 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1810 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 517: /* "FunctionCall" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1806 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1819 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 518: /* "ArgList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1815 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1828 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 519: /* "Constructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1824 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1837 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 520: /* "DirectConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1833 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1846 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 521: /* "DirElemConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1842 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1855 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 522: /* "DirElemContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1851 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1864 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 523: /* "DirAttributeList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1860 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1873 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 524: /* "DirAttr" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1869 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1882 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 526: /* "DirAttributeValue" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1878 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1891 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 527: /* "opt_QuoteAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1887 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1900 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 528: /* "QuoteAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1896 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1909 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 529: /* "opt_AposAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1905 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1918 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 530: /* "AposAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1914 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1927 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 531: /* "QuoteAttrValueContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1923 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1936 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 532: /* "AposAttrValueContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1932 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1945 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 533: /* "DirElemContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1941 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1954 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 534: /* "CommonContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1950 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1963 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 535: /* "DirCommentConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1959 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1972 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 536: /* "DirPIConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1968 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1981 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 537: /* "CDataSection" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1977 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1990 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 538: /* "ComputedConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1986 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 1999 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 539: /* "CompDocConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1995 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2008 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 540: /* "CompElemConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2004 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2017 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 541: /* "CompAttrConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2013 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2026 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 542: /* "CompTextConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2022 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2035 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 543: /* "CompCommentConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2031 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2044 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 544: /* "CompPIConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2040 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2053 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 545: /* "TypeDeclaration" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2049 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2062 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 546: /* "SequenceType" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2058 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2071 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 547: /* "OccurrenceIndicator" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2067 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2080 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 548: /* "ItemType" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2076 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2089 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 549: /* "TypeList" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2085 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2098 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 550: /* "AtomicType" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2094 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2107 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 551: /* "SimpleType" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2103 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2116 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 552: /* "KindTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2112 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2125 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 553: /* "AnyKindTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2121 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2134 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 554: /* "DocumentTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2130 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2143 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 555: /* "TextTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2139 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2152 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 556: /* "CommentTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2148 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2161 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 557: /* "PITest" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2157 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2170 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 558: /* "AttributeTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2166 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2179 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 559: /* "SchemaAttributeTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2175 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2188 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 560: /* "ElementTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2184 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2197 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 561: /* "SchemaElementTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2193 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2206 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 562: /* "TypeName" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2202 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2215 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 563: /* "TypeName_WITH_HOOK" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2211 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2224 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 564: /* "StringLiteral" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2220 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2233 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 569: /* "AnyFunctionTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2229 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2242 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 570: /* "TypedFunctionTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 921 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 922 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2238 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2251 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 573: /* "InsertExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2247 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2260 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 574: /* "DeleteExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2256 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2269 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 575: /* "ReplaceExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2265 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2278 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 576: /* "RenameExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2274 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2287 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 577: /* "TransformExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2283 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2296 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 578: /* "VarNameList" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2292 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2305 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 579: /* "VarNameDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2301 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2314 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 580: /* "TryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2310 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2323 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 581: /* "CatchListExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2319 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2332 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 582: /* "CatchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2328 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2341 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 583: /* "BracedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2337 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2350 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 584: /* "NameTestList" */
 
 /* Line 480 of lalr1.cc  */
-#line 933 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 934 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->name_test_list); };
 
 /* Line 480 of lalr1.cc  */
-#line 2346 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2359 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 585: /* "FTSelection" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2355 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2368 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 588: /* "FTOr" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2364 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2377 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 589: /* "FTAnd" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2373 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2386 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 590: /* "FTMildNot" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2382 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2395 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 591: /* "FTUnaryNot" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2391 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2404 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 592: /* "FTPrimaryWithOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2400 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2413 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 593: /* "opt_FTMatchOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2409 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2422 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 595: /* "FTWeight" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2418 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2431 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 596: /* "FTPrimary" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2427 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2440 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 597: /* "opt_FTTimes" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2436 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2449 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 598: /* "FTExtensionSelection" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2445 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2458 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 600: /* "FTWords" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2454 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2467 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 601: /* "FTWordsValue" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2463 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2476 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 603: /* "FTAnyallOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2472 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2485 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 606: /* "FTPosFilter" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2481 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2494 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 607: /* "FTOrder" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2490 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2503 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 608: /* "FTWindow" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2499 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2512 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 609: /* "FTDistance" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2508 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2521 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 610: /* "FTUnit" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2517 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2530 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 611: /* "FTMatchOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2526 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2539 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 612: /* "FTMatchOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2535 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2548 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 613: /* "FTCaseOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2544 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2557 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 614: /* "FTDiacriticsOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2553 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2566 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 615: /* "FTExtensionOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2562 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2575 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 616: /* "FTStemOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2571 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2584 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 617: /* "FTThesaurusOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2580 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2593 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 621: /* "FTThesaurusID" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2589 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2602 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 624: /* "FTStopWordOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2598 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2611 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 625: /* "FTStopWords" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2607 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2620 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 629: /* "FTStopWordsInclExcl" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2616 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2629 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 630: /* "FTLanguageOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2625 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2638 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 631: /* "FTWildCardOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2634 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2647 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 632: /* "FTContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2643 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2656 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 633: /* "FTTimes" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2652 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2665 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 634: /* "FTRange" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2661 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2674 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 635: /* "FTScope" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2670 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2683 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 636: /* "FTBigUnit" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2679 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2692 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 637: /* "FTIgnoreOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2688 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2701 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 638: /* "JSONArrayConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 928 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2697 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2710 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 639: /* "JSONSimpleObjectUnion" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 928 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2706 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2719 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 640: /* "JSONAccumulatorObjectUnion" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 928 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2715 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2728 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 641: /* "JSONObjectConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 928 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2724 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2737 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 642: /* "JSONPairList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 928 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2733 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2746 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 643: /* "JSONInsertExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 928 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2742 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2755 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 644: /* "JSONAppendExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 928 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2751 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2764 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 645: /* "JSONDeleteExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 928 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2760 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2773 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 646: /* "JSONRenameExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 928 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2769 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2782 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 647: /* "JSONReplaceExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 928 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2778 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2791 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 654: /* "QNAME" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2787 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2800 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 655: /* "FUNCTION_NAME" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2796 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2809 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 656: /* "EQNAME" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+#line 931 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2805 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+#line 2818 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
 
 	default:
@@ -2844,6 +2857,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 ()
   {
@@ -2865,7 +2890,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;
@@ -2879,14 +2904,14 @@
 
     /* User initialization code.  */
     
-/* Line 553 of lalr1.cc  */
-#line 140 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 565 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 2890 "/home/markos/zorba/repo/cast-to-simple-type/build/src/compiler/parser/xquery_parser.cpp"
+/* Line 565 of lalr1.cc  */
+#line 2915 "/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
@@ -2914,7 +2939,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.  */
@@ -2947,8 +2972,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;
       }
@@ -3004,8 +3029,8 @@
       {
 	  case 3:
 
-/* Line 678 of lalr1.cc  */
-#line 1052 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1053 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       }
@@ -3013,8 +3038,8 @@
 
   case 4:
 
-/* Line 678 of lalr1.cc  */
-#line 1056 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1057 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       }
@@ -3022,8 +3047,8 @@
 
   case 5:
 
-/* Line 678 of lalr1.cc  */
-#line 1060 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1061 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       }
@@ -3031,27 +3056,36 @@
 
   case 6:
 
-/* Line 678 of lalr1.cc  */
-#line 1071 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1069 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+        (yyval.node) = NULL;
+      }
+    break;
+
+  case 7:
+
+/* Line 690 of lalr1.cc  */
+#line 1075 "/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 1080 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-      driver.set_expr( (yyval.node) );
-    }
-    break;
-
   case 8:
 
-/* Line 678 of lalr1.cc  */
-#line 1086 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1084 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+      driver.set_expr( (yyval.node) );
+    }
+    break;
+
+  case 9:
+
+/* Line 690 of lalr1.cc  */
+#line 1090 "/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)) );
@@ -3060,20 +3094,20 @@
     }
     break;
 
-  case 9:
-
-/* Line 678 of lalr1.cc  */
-#line 1094 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-      driver.set_expr( (yyval.node) );
-    }
-    break;
-
   case 10:
 
-/* Line 678 of lalr1.cc  */
-#line 1100 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1098 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+      driver.set_expr( (yyval.node) );
+    }
+    break;
+
+  case 11:
+
+/* Line 690 of lalr1.cc  */
+#line 1104 "/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)) );
@@ -3082,28 +3116,28 @@
     }
     break;
 
-  case 11:
+  case 12:
 
-/* Line 678 of lalr1.cc  */
-#line 1111 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1115 "/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:
+  case 13:
 
-/* Line 678 of lalr1.cc  */
-#line 1116 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1120 "/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:
+  case 14:
 
-/* Line 678 of lalr1.cc  */
-#line 1124 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1128 "/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);
 
@@ -3111,10 +3145,10 @@
     }
     break;
 
-  case 14:
+  case 15:
 
-/* Line 678 of lalr1.cc  */
-#line 1131 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1135 "/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)));
 
@@ -3122,10 +3156,10 @@
     }
     break;
 
-  case 15:
+  case 16:
 
-/* Line 678 of lalr1.cc  */
-#line 1138 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1142 "/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)),
@@ -3135,19 +3169,19 @@
     }
     break;
 
-  case 16:
+  case 17:
 
-/* Line 678 of lalr1.cc  */
-#line 1147 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1151 "/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:
+  case 18:
 
-/* Line 678 of lalr1.cc  */
-#line 1154 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1158 "/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();
@@ -3156,22 +3190,22 @@
     }
     break;
 
-  case 18:
-
-/* Line 678 of lalr1.cc  */
-#line 1162 "/home/markos/zorba/repo/cast-to-simple-type/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();
-      error((yylocation_stack_[(3) - (1)]), "syntax error, missing semicolon \";\" after declaration.");
-      YYERROR;
-    }
-    break;
-
   case 19:
 
-/* Line 678 of lalr1.cc  */
-#line 1170 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1166 "/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();
+      error((yylocation_stack_[(3) - (1)]), "syntax error, missing semicolon \";\" after declaration.");
+      YYERROR;
+    }
+    break;
+
+  case 20:
+
+/* Line 690 of lalr1.cc  */
+#line 1174 "/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();
@@ -3180,10 +3214,10 @@
     }
     break;
 
-  case 20:
+  case 21:
 
-/* Line 678 of lalr1.cc  */
-#line 1178 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1182 "/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();
@@ -3192,19 +3226,19 @@
     }
     break;
 
-  case 21:
+  case 22:
 
-/* Line 678 of lalr1.cc  */
-#line 1189 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1193 "/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:
+  case 23:
 
-/* Line 678 of lalr1.cc  */
-#line 1194 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1198 "/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);
 
@@ -3212,10 +3246,10 @@
     }
     break;
 
-  case 23:
+  case 24:
 
-/* Line 678 of lalr1.cc  */
-#line 1201 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1205 "/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)));
 
@@ -3223,10 +3257,10 @@
     }
     break;
 
-  case 24:
+  case 25:
 
-/* Line 678 of lalr1.cc  */
-#line 1208 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1212 "/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)),
@@ -3236,10 +3270,10 @@
     }
     break;
 
-  case 25:
+  case 26:
 
-/* Line 678 of lalr1.cc  */
-#line 1220 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1224 "/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)) );
 
@@ -3247,10 +3281,10 @@
     }
     break;
 
-  case 26:
+  case 27:
 
-/* Line 678 of lalr1.cc  */
-#line 1230 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1234 "/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) );
@@ -3258,20 +3292,20 @@
     }
     break;
 
-  case 27:
+  case 28:
 
-/* Line 678 of lalr1.cc  */
-#line 1237 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1241 "/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);
     }
     break;
 
-  case 28:
+  case 29:
 
-/* Line 678 of lalr1.cc  */
-#line 1244 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1248 "/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
@@ -3281,136 +3315,136 @@
     }
     break;
 
-  case 42:
+  case 43:
 
-/* Line 678 of lalr1.cc  */
-#line 1279 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1283 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::preserve_space);
     }
     break;
 
-  case 43:
+  case 44:
 
-/* Line 678 of lalr1.cc  */
-#line 1284 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1288 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::strip_space);
     }
     break;
 
-  case 44:
+  case 45:
 
-/* Line 678 of lalr1.cc  */
-#line 1292 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1296 "/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:
+  case 46:
 
-/* Line 678 of lalr1.cc  */
-#line 1300 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1304 "/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:
+  case 47:
 
-/* Line 678 of lalr1.cc  */
-#line 1308 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1312 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_preserve);
     }
     break;
 
-  case 47:
+  case 48:
 
-/* Line 678 of lalr1.cc  */
-#line 1313 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1317 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_strip);
     }
     break;
 
-  case 48:
+  case 49:
 
-/* Line 678 of lalr1.cc  */
-#line 1321 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1325 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::ordered);
     }
     break;
 
-  case 49:
+  case 50:
 
-/* Line 678 of lalr1.cc  */
-#line 1326 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1330 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::unordered);
     }
     break;
 
-  case 50:
+  case 51:
 
-/* Line 678 of lalr1.cc  */
-#line 1334 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1338 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_greatest);
     }
     break;
 
-  case 51:
+  case 52:
 
-/* Line 678 of lalr1.cc  */
-#line 1339 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1343 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_least);
     }
     break;
 
-  case 52:
+  case 53:
 
-/* Line 678 of lalr1.cc  */
-#line 1347 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1351 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, true);
     }
     break;
 
-  case 53:
+  case 54:
 
-/* Line 678 of lalr1.cc  */
-#line 1352 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1356 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, false);
     }
     break;
 
-  case 54:
+  case 55:
 
-/* Line 678 of lalr1.cc  */
-#line 1357 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1361 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, true);
     }
     break;
 
-  case 55:
+  case 56:
 
-/* Line 678 of lalr1.cc  */
-#line 1362 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1366 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, false);
     }
     break;
 
-  case 58:
+  case 59:
 
-/* Line 678 of lalr1.cc  */
-#line 1375 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1379 "/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\".");
@@ -3418,19 +3452,19 @@
     }
     break;
 
-  case 59:
+  case 60:
 
-/* Line 678 of lalr1.cc  */
-#line 1385 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1389 "/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:
+  case 61:
 
-/* Line 678 of lalr1.cc  */
-#line 1390 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1394 "/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)),
@@ -3439,22 +3473,22 @@
     }
     break;
 
-  case 61:
-
-/* Line 678 of lalr1.cc  */
-#line 1398 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.node) = new SchemaImport(LOC((yyloc)),
-                            NULL,
-                            SYMTAB((yysemantic_stack_[(5) - (3)].sval)),
-                            dynamic_cast<URILiteralList*>((yysemantic_stack_[(5) - (5)].node)));
-    }
-    break;
-
   case 62:
 
-/* Line 678 of lalr1.cc  */
-#line 1406 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1402 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.node) = new SchemaImport(LOC((yyloc)),
+                            NULL,
+                            SYMTAB((yysemantic_stack_[(5) - (3)].sval)),
+                            dynamic_cast<URILiteralList*>((yysemantic_stack_[(5) - (5)].node)));
+    }
+    break;
+
+  case 63:
+
+/* Line 690 of lalr1.cc  */
+#line 1410 "/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)),
@@ -3463,10 +3497,10 @@
     }
     break;
 
-  case 63:
+  case 64:
 
-/* Line 678 of lalr1.cc  */
-#line 1417 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1421 "/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)) );
@@ -3474,10 +3508,10 @@
     }
     break;
 
-  case 64:
+  case 65:
 
-/* Line 678 of lalr1.cc  */
-#line 1424 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1428 "/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)) );
@@ -3486,28 +3520,28 @@
     }
     break;
 
-  case 65:
+  case 66:
 
-/* Line 678 of lalr1.cc  */
-#line 1435 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1439 "/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:
+  case 67:
 
-/* Line 678 of lalr1.cc  */
-#line 1440 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1444 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new SchemaPrefix( LOC((yyloc)), true );
     }
     break;
 
-  case 67:
+  case 68:
 
-/* Line 678 of lalr1.cc  */
-#line 1448 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1452 "/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);
 
@@ -3515,10 +3549,10 @@
     }
     break;
 
-  case 68:
+  case 69:
 
-/* Line 678 of lalr1.cc  */
-#line 1455 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1459 "/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);
 
@@ -3526,10 +3560,10 @@
     }
     break;
 
-  case 69:
+  case 70:
 
-/* Line 678 of lalr1.cc  */
-#line 1462 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1466 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)),
                             SYMTAB((yysemantic_stack_[(5) - (3)].sval)),
@@ -3539,10 +3573,10 @@
     }
     break;
 
-  case 70:
+  case 71:
 
-/* Line 678 of lalr1.cc  */
-#line 1471 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1475 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)),
                             SYMTAB((yysemantic_stack_[(8) - (4)].sval)),
@@ -3553,19 +3587,19 @@
     }
     break;
 
-  case 71:
+  case 72:
 
-/* Line 678 of lalr1.cc  */
-#line 1484 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1488 "/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:
+  case 73:
 
-/* Line 678 of lalr1.cc  */
-#line 1492 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1496 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_element_default,
@@ -3573,10 +3607,10 @@
     }
     break;
 
-  case 73:
+  case 74:
 
-/* Line 678 of lalr1.cc  */
-#line 1499 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1503 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_function_default,
@@ -3584,10 +3618,10 @@
     }
     break;
 
-  case 74:
+  case 75:
 
-/* Line 678 of lalr1.cc  */
-#line 1509 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1513 "/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) );
@@ -3595,20 +3629,20 @@
     }
     break;
 
-  case 75:
+  case 76:
 
-/* Line 678 of lalr1.cc  */
-#line 1516 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1520 "/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);
     }
     break;
 
-  case 76:
+  case 77:
 
-/* Line 678 of lalr1.cc  */
-#line 1523 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1527 "/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();
@@ -3617,30 +3651,30 @@
     }
     break;
 
-  case 85:
+  case 86:
 
-/* Line 678 of lalr1.cc  */
-#line 1546 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1550 "/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);
     }
     break;
 
-  case 86:
+  case 87:
 
-/* Line 678 of lalr1.cc  */
-#line 1552 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1556 "/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);
     }
     break;
 
-  case 87:
+  case 88:
 
-/* Line 678 of lalr1.cc  */
-#line 1561 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1565 "/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) );
@@ -3648,10 +3682,10 @@
     }
     break;
 
-  case 88:
+  case 89:
 
-/* Line 678 of lalr1.cc  */
-#line 1568 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1572 "/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);
@@ -3659,10 +3693,10 @@
     }
     break;
 
-  case 89:
+  case 90:
 
-/* Line 678 of lalr1.cc  */
-#line 1578 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1582 "/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() );
@@ -3670,107 +3704,107 @@
     }
     break;
 
-  case 90:
+  case 91:
 
-/* Line 678 of lalr1.cc  */
-#line 1587 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1591 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "decimal-separator"; }
     break;
 
-  case 91:
+  case 92:
 
-/* Line 678 of lalr1.cc  */
-#line 1588 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1592 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "digit"; }
     break;
 
-  case 92:
+  case 93:
 
-/* Line 678 of lalr1.cc  */
-#line 1589 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1593 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "grouping-separator"; }
     break;
 
-  case 93:
+  case 94:
 
-/* Line 678 of lalr1.cc  */
-#line 1590 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1594 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "infinty"; }
     break;
 
-  case 94:
+  case 95:
 
-/* Line 678 of lalr1.cc  */
-#line 1591 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1595 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "minus-sign"; }
     break;
 
-  case 95:
+  case 96:
 
-/* Line 678 of lalr1.cc  */
-#line 1592 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1596 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "NaN"; }
     break;
 
-  case 96:
+  case 97:
 
-/* Line 678 of lalr1.cc  */
-#line 1593 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1597 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "pattern-separator"; }
     break;
 
-  case 97:
+  case 98:
 
-/* Line 678 of lalr1.cc  */
-#line 1594 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1598 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "percent"; }
     break;
 
-  case 98:
+  case 99:
 
-/* Line 678 of lalr1.cc  */
-#line 1595 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1599 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "per-mille"; }
     break;
 
-  case 99:
+  case 100:
 
-/* Line 678 of lalr1.cc  */
-#line 1596 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1600 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "zero-digit"; }
     break;
 
-  case 100:
+  case 101:
 
-/* Line 678 of lalr1.cc  */
-#line 1602 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1606 "/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:
+  case 102:
 
-/* Line 678 of lalr1.cc  */
-#line 1610 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1614 "/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:
+  case 103:
 
-/* Line 678 of lalr1.cc  */
-#line 1618 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1622 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(4) - (4)].node);
     }
     break;
 
-  case 103:
+  case 104:
 
-/* Line 678 of lalr1.cc  */
-#line 1626 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1630 "/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);
@@ -3778,19 +3812,19 @@
     }
     break;
 
-  case 104:
-
-/* Line 678 of lalr1.cc  */
-#line 1633 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-    }
-    break;
-
   case 105:
 
-/* Line 678 of lalr1.cc  */
-#line 1641 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1637 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+    }
+    break;
+
+  case 106:
+
+/* Line 690 of lalr1.cc  */
+#line 1645 "/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;
@@ -3798,37 +3832,37 @@
     }
     break;
 
-  case 106:
+  case 107:
 
-/* Line 678 of lalr1.cc  */
-#line 1648 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1652 "/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 1653 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
-    }
-    break;
-
   case 108:
 
-/* Line 678 of lalr1.cc  */
-#line 1661 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1657 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
+    }
+    break;
+
+  case 109:
+
+/* Line 690 of lalr1.cc  */
+#line 1665 "/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:
+  case 110:
 
-/* Line 678 of lalr1.cc  */
-#line 1669 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1673 "/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)));
 
@@ -3843,10 +3877,10 @@
     }
     break;
 
-  case 110:
+  case 111:
 
-/* Line 678 of lalr1.cc  */
-#line 1683 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1687 "/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)));
 
@@ -3861,10 +3895,10 @@
     }
     break;
 
-  case 111:
+  case 112:
 
-/* Line 678 of lalr1.cc  */
-#line 1697 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1701 "/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)));
 
@@ -3879,19 +3913,19 @@
     }
     break;
 
-  case 112:
+  case 113:
 
-/* Line 678 of lalr1.cc  */
-#line 1714 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1718 "/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:
+  case 114:
 
-/* Line 678 of lalr1.cc  */
-#line 1719 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 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) - (3)].expr)),
@@ -3900,10 +3934,10 @@
     }
     break;
 
-  case 114:
+  case 115:
 
-/* Line 678 of lalr1.cc  */
-#line 1727 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 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_[(4) - (4)].expr)),
@@ -3912,10 +3946,10 @@
     }
     break;
 
-  case 115:
+  case 116:
 
-/* Line 678 of lalr1.cc  */
-#line 1735 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1739 "/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)),
@@ -3924,38 +3958,38 @@
     }
     break;
 
-  case 116:
+  case 117:
 
-/* Line 678 of lalr1.cc  */
-#line 1746 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1750 "/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:
+  case 118:
 
-/* Line 678 of lalr1.cc  */
-#line 1751 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1755 "/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);
     }
     break;
 
-  case 118:
+  case 119:
 
-/* Line 678 of lalr1.cc  */
-#line 1760 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1764 "/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:
+  case 120:
 
-/* Line 678 of lalr1.cc  */
-#line 1765 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1769 "/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))),
@@ -3963,19 +3997,19 @@
     }
     break;
 
-  case 120:
+  case 121:
 
-/* Line 678 of lalr1.cc  */
-#line 1772 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1776 "/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:
+  case 122:
 
-/* Line 678 of lalr1.cc  */
-#line 1777 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1781 "/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),
@@ -3983,39 +4017,39 @@
     }
     break;
 
-  case 122:
+  case 123:
 
-/* Line 678 of lalr1.cc  */
-#line 1787 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1791 "/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:
+  case 124:
 
-/* Line 678 of lalr1.cc  */
-#line 1792 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1796 "/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);
     }
     break;
 
-  case 124:
+  case 125:
 
-/* Line 678 of lalr1.cc  */
-#line 1801 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1805 "/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);
     }
     break;
 
-  case 125:
+  case 126:
 
-/* Line 678 of lalr1.cc  */
-#line 1807 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1811 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       FunctionDecl* fdecl = static_cast<FunctionDecl*>((yysemantic_stack_[(3) - (3)].node));
 
@@ -4026,19 +4060,10 @@
     }
     break;
 
-  case 126:
-
-/* Line 678 of lalr1.cc  */
-#line 1820 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-    }
-    break;
-
   case 127:
 
-/* Line 678 of lalr1.cc  */
-#line 1825 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1824 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -4046,8 +4071,17 @@
 
   case 128:
 
-/* Line 678 of lalr1.cc  */
-#line 1833 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1829 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+    }
+    break;
+
+  case 129:
+
+/* Line 690 of lalr1.cc  */
+#line 1837 "/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)),
@@ -4060,10 +4094,10 @@
     }
     break;
 
-  case 129:
+  case 130:
 
-/* Line 678 of lalr1.cc  */
-#line 1844 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1848 "/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)),
@@ -4076,10 +4110,10 @@
     }
     break;
 
-  case 130:
+  case 131:
 
-/* Line 678 of lalr1.cc  */
-#line 1859 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1863 "/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)),
@@ -4092,10 +4126,10 @@
     }
     break;
 
-  case 131:
+  case 132:
 
-/* Line 678 of lalr1.cc  */
-#line 1871 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1875 "/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)),
@@ -4108,46 +4142,46 @@
     }
     break;
 
-  case 132:
+  case 133:
 
-/* Line 678 of lalr1.cc  */
-#line 1886 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1890 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(NULL);
     }
     break;
 
-  case 133:
+  case 134:
 
-/* Line 678 of lalr1.cc  */
-#line 1891 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1895 "/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:
+  case 135:
 
-/* Line 678 of lalr1.cc  */
-#line 1896 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1900 "/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:
+  case 136:
 
-/* Line 678 of lalr1.cc  */
-#line 1901 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1905 "/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:
+  case 137:
 
-/* Line 678 of lalr1.cc  */
-#line 1909 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1913 "/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)) );
@@ -4155,10 +4189,10 @@
     }
     break;
 
-  case 137:
+  case 138:
 
-/* Line 678 of lalr1.cc  */
-#line 1916 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1920 "/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)) );
@@ -4167,19 +4201,19 @@
     }
     break;
 
-  case 138:
+  case 139:
 
-/* Line 678 of lalr1.cc  */
-#line 1927 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1931 "/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:
+  case 140:
 
-/* Line 678 of lalr1.cc  */
-#line 1932 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1936 "/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)),
@@ -4187,10 +4221,10 @@
     }
     break;
 
-  case 140:
+  case 141:
 
-/* Line 678 of lalr1.cc  */
-#line 1942 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1946 "/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)),
@@ -4201,10 +4235,10 @@
     }
     break;
 
-  case 141:
+  case 142:
 
-/* Line 678 of lalr1.cc  */
-#line 1951 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1955 "/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)),
@@ -4215,10 +4249,10 @@
     }
     break;
 
-  case 142:
+  case 143:
 
-/* Line 678 of lalr1.cc  */
-#line 1960 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1964 "/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)),
@@ -4229,10 +4263,10 @@
     }
     break;
 
-  case 143:
+  case 144:
 
-/* Line 678 of lalr1.cc  */
-#line 1969 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1973 "/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)),
@@ -4243,51 +4277,51 @@
     }
     break;
 
-  case 144:
-
-/* Line 678 of lalr1.cc  */
-#line 1981 "/home/markos/zorba/repo/cast-to-simple-type/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 1985 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1985 "/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),
-                                                    dynamic_cast<OccurrenceIndicator*>((yysemantic_stack_[(2) - (2)].node))));
+      (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
     }
     break;
 
   case 146:
 
-/* Line 678 of lalr1.cc  */
-#line 1991 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1989 "/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));
+      (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
+                                                    (yysemantic_stack_[(2) - (1)].node),
+                                                    dynamic_cast<OccurrenceIndicator*>((yysemantic_stack_[(2) - (2)].node))));
     }
     break;
 
   case 147:
 
-/* Line 678 of lalr1.cc  */
-#line 1995 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1995 "/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),
-                                                    dynamic_cast<OccurrenceIndicator*>((yysemantic_stack_[(2) - (2)].node))));
-
+      (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
     }
     break;
 
   case 148:
 
-/* Line 678 of lalr1.cc  */
-#line 2005 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1999 "/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),
+                                                    dynamic_cast<OccurrenceIndicator*>((yysemantic_stack_[(2) - (2)].node))));
+
+    }
+    break;
+
+  case 149:
+
+/* Line 690 of lalr1.cc  */
+#line 2009 "/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)),
@@ -4299,10 +4333,10 @@
     }
     break;
 
-  case 149:
+  case 150:
 
-/* Line 678 of lalr1.cc  */
-#line 2015 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2019 "/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)),
@@ -4314,10 +4348,10 @@
     }
     break;
 
-  case 150:
+  case 151:
 
-/* Line 678 of lalr1.cc  */
-#line 2028 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2032 "/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)));
@@ -4325,29 +4359,29 @@
     }
     break;
 
-  case 151:
+  case 152:
 
-/* Line 678 of lalr1.cc  */
-#line 2034 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2038 "/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);
     }
     break;
 
-  case 152:
+  case 153:
 
-/* Line 678 of lalr1.cc  */
-#line 2043 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2047 "/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:
+  case 154:
 
-/* Line 678 of lalr1.cc  */
-#line 2048 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2052 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -4356,10 +4390,10 @@
     }
     break;
 
-  case 154:
+  case 155:
 
-/* Line 678 of lalr1.cc  */
-#line 2055 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2059 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -4368,10 +4402,10 @@
     }
     break;
 
-  case 155:
+  case 156:
 
-/* Line 678 of lalr1.cc  */
-#line 2062 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2066 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(3) - (1)].expr),
@@ -4380,10 +4414,10 @@
     }
     break;
 
-  case 156:
+  case 157:
 
-/* Line 678 of lalr1.cc  */
-#line 2074 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2078 "/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)),
@@ -4393,10 +4427,10 @@
     }
     break;
 
-  case 157:
+  case 158:
 
-/* Line 678 of lalr1.cc  */
-#line 2084 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2088 "/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)),
@@ -4406,10 +4440,10 @@
     }
     break;
 
-  case 158:
+  case 159:
 
-/* Line 678 of lalr1.cc  */
-#line 2094 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2098 "/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)),
@@ -4419,10 +4453,10 @@
     }
     break;
 
-  case 159:
+  case 160:
 
-/* Line 678 of lalr1.cc  */
-#line 2105 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2109 "/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)),
@@ -4435,10 +4469,10 @@
     }
     break;
 
-  case 160:
+  case 161:
 
-/* Line 678 of lalr1.cc  */
-#line 2121 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2125 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       if ((yysemantic_stack_[(1) - (1)].expr) == NULL)
       {
@@ -4456,19 +4490,10 @@
     }
     break;
 
-  case 161:
-
-/* Line 678 of lalr1.cc  */
-#line 2141 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-    }
-    break;
-
   case 162:
 
-/* Line 678 of lalr1.cc  */
-#line 2145 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2145 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4476,26 +4501,26 @@
 
   case 163:
 
-/* Line 678 of lalr1.cc  */
-#line 2149 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2149 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+    }
+    break;
+
+  case 164:
+
+/* Line 690 of lalr1.cc  */
+#line 2153 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) =  NULL;
     }
     break;
 
-  case 164:
-
-/* Line 678 of lalr1.cc  */
-#line 2157 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-    }
-    break;
-
   case 165:
 
-/* Line 678 of lalr1.cc  */
-#line 2161 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2161 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4503,39 +4528,48 @@
 
   case 166:
 
-/* Line 678 of lalr1.cc  */
-#line 2165 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2165 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+    }
+    break;
+
+  case 167:
+
+/* Line 690 of lalr1.cc  */
+#line 2169 "/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 2173 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
-    }
-    break;
-
   case 168:
 
-/* Line 678 of lalr1.cc  */
-#line 2178 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2177 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
-
-      blk->add((yysemantic_stack_[(2) - (2)].expr));
-
-      (yyval.expr) = blk;
+      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
     break;
 
   case 169:
 
-/* Line 678 of lalr1.cc  */
-#line 2190 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2182 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
+
+      blk->add((yysemantic_stack_[(2) - (2)].expr));
+
+      (yyval.expr) = blk;
+    }
+    break;
+
+  case 170:
+
+/* Line 690 of lalr1.cc  */
+#line 2194 "/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));
@@ -4543,10 +4577,10 @@
     }
     break;
 
-  case 170:
+  case 171:
 
-/* Line 678 of lalr1.cc  */
-#line 2197 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2201 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
 
@@ -4556,28 +4590,28 @@
     }
     break;
 
-  case 183:
-
-/* Line 678 of lalr1.cc  */
-#line 2226 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
-    }
-    break;
-
   case 184:
 
-/* Line 678 of lalr1.cc  */
-#line 2231 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2230 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
+    }
+    break;
+
+  case 185:
+
+/* Line 690 of lalr1.cc  */
+#line 2235 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new BlockBody(LOC((yyloc)));
     }
     break;
 
-  case 185:
+  case 186:
 
-/* Line 678 of lalr1.cc  */
-#line 2239 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2243 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       if (dynamic_cast<BlockBody*>((yysemantic_stack_[(3) - (2)].expr)) == NULL)
       {
@@ -4592,28 +4626,28 @@
     }
     break;
 
-  case 186:
-
-/* Line 678 of lalr1.cc  */
-#line 2256 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
-    {
-      (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
-    }
-    break;
-
   case 187:
 
-/* Line 678 of lalr1.cc  */
-#line 2264 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2260 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      (yyval.expr) = (yysemantic_stack_[(2) - (1)].expr);
+      (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
     break;
 
   case 188:
 
-/* Line 678 of lalr1.cc  */
-#line 2272 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2268 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.expr) = (yysemantic_stack_[(2) - (1)].expr);
+    }
+    break;
+
+  case 189:
+
+/* Line 690 of lalr1.cc  */
+#line 2276 "/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));
@@ -4621,10 +4655,10 @@
     }
     break;
 
-  case 189:
+  case 190:
 
-/* Line 678 of lalr1.cc  */
-#line 2279 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2283 "/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));
@@ -4632,10 +4666,10 @@
     }
     break;
 
-  case 190:
+  case 191:
 
-/* Line 678 of lalr1.cc  */
-#line 2286 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2290 "/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)));
@@ -4644,10 +4678,10 @@
     }
     break;
 
-  case 191:
+  case 192:
 
-/* Line 678 of lalr1.cc  */
-#line 2297 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2301 "/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)),
@@ -4658,10 +4692,10 @@
     }
     break;
 
-  case 192:
+  case 193:
 
-/* Line 678 of lalr1.cc  */
-#line 2306 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2310 "/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)),
@@ -4672,10 +4706,10 @@
     }
     break;
 
-  case 193:
+  case 194:
 
-/* Line 678 of lalr1.cc  */
-#line 2315 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2319 "/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)),
@@ -4686,10 +4720,10 @@
     }
     break;
 
-  case 194:
+  case 195:
 
-/* Line 678 of lalr1.cc  */
-#line 2324 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2328 "/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)),
@@ -4700,37 +4734,37 @@
     }
     break;
 
-  case 195:
+  case 196:
 
-/* Line 678 of lalr1.cc  */
-#line 2337 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2341 "/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:
+  case 197:
 
-/* Line 678 of lalr1.cc  */
-#line 2345 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2349 "/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:
+  case 198:
 
-/* Line 678 of lalr1.cc  */
-#line 2353 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2357 "/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:
+  case 199:
 
-/* Line 678 of lalr1.cc  */
-#line 2361 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2365 "/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)
@@ -4743,28 +4777,28 @@
     }
     break;
 
-  case 199:
+  case 200:
 
-/* Line 678 of lalr1.cc  */
-#line 2376 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2380 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new FlowCtlStatement(LOC((yyloc)), FlowCtlStatement::BREAK);
     }
     break;
 
-  case 200:
+  case 201:
 
-/* Line 678 of lalr1.cc  */
-#line 2381 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2385 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new FlowCtlStatement( LOC((yyloc)), FlowCtlStatement::CONTINUE );
     }
     break;
 
-  case 201:
+  case 202:
 
-/* Line 678 of lalr1.cc  */
-#line 2389 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2393 "/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)),
@@ -4776,10 +4810,10 @@
     }
     break;
 
-  case 202:
+  case 203:
 
-/* Line 678 of lalr1.cc  */
-#line 2403 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2407 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       exprnode* retExpr = (yysemantic_stack_[(2) - (2)].expr);
 
@@ -4794,10 +4828,10 @@
     }
     break;
 
-  case 203:
+  case 204:
 
-/* Line 678 of lalr1.cc  */
-#line 2420 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2424 "/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);
@@ -4820,19 +4854,19 @@
     }
     break;
 
-  case 204:
+  case 205:
 
-/* Line 678 of lalr1.cc  */
-#line 2445 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2449 "/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:
+  case 206:
 
-/* Line 678 of lalr1.cc  */
-#line 2453 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2457 "/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)) );
@@ -4840,10 +4874,10 @@
     }
     break;
 
-  case 206:
+  case 207:
 
-/* Line 678 of lalr1.cc  */
-#line 2460 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2464 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
       if ( cle )
@@ -4852,29 +4886,29 @@
     }
     break;
 
-  case 207:
-
-/* Line 678 of lalr1.cc  */
-#line 2471 "/home/markos/zorba/repo/cast-to-simple-type/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 208:
 
-/* Line 678 of lalr1.cc  */
-#line 2481 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2475 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+       (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 209:
 
-/* Line 678 of lalr1.cc  */
-#line 2486 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2485 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+    }
+    break;
+
+  case 210:
+
+/* Line 690 of lalr1.cc  */
+#line 2490 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       Expr* expr = dynamic_cast<Expr*>((yysemantic_stack_[(3) - (1)].expr));
       if ( !expr )
@@ -4887,38 +4921,24 @@
     }
     break;
 
-  case 210:
-
-/* Line 678 of lalr1.cc  */
-#line 2498 "/home/markos/zorba/repo/cast-to-simple-type/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?)");
-      delete (yysemantic_stack_[(4) - (1)].expr); // these need to be deleted here because the parser deallocator will skip them
-      delete (yysemantic_stack_[(4) - (3)].expr);
-      YYERROR;
-    }
-    break;
-
   case 211:
 
-/* Line 678 of lalr1.cc  */
-#line 2507 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2503 "/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;
+      error((yylocation_stack_[(3) - (2)]), "syntax error, unexpected ExprSingle (missing comma \",\" between expressions?)");
+      delete (yysemantic_stack_[(3) - (1)].expr); // these need to be deleted here because the parser deallocator will skip them
+      delete (yysemantic_stack_[(3) - (3)].expr);
+      YYABORT;
     }
     break;
 
   case 230:
 
-/* Line 678 of lalr1.cc  */
-#line 2550 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2546 "/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)),
@@ -4932,8 +4952,8 @@
 
   case 231:
 
-/* Line 678 of lalr1.cc  */
-#line 2564 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2560 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new ReturnExpr( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr) );
     }
@@ -4941,8 +4961,8 @@
 
   case 232:
 
-/* Line 678 of lalr1.cc  */
-#line 2572 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2568 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.strval) = parser::the_sliding;
     }
@@ -4950,8 +4970,8 @@
 
   case 233:
 
-/* Line 678 of lalr1.cc  */
-#line 2577 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2573 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.strval) = parser::the_tumbling;
     }
@@ -4959,8 +4979,8 @@
 
   case 234:
 
-/* Line 678 of lalr1.cc  */
-#line 2585 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2581 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.strval) = parser::the_start;
     }
@@ -4968,8 +4988,8 @@
 
   case 235:
 
-/* Line 678 of lalr1.cc  */
-#line 2590 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2586 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.strval) = parser::the_end;
     }
@@ -4977,8 +4997,8 @@
 
   case 236:
 
-/* Line 678 of lalr1.cc  */
-#line 2595 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2591 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
     (yyval.strval) = parser::the_only_end;
   }
@@ -4986,8 +5006,8 @@
 
   case 237:
 
-/* Line 678 of lalr1.cc  */
-#line 2603 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2599 "/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)),
@@ -4999,8 +5019,8 @@
 
   case 238:
 
-/* Line 678 of lalr1.cc  */
-#line 2612 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2608 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new FLWORWinCond(LOC((yyloc)),
                             NULL,
@@ -5012,8 +5032,8 @@
 
   case 239:
 
-/* Line 678 of lalr1.cc  */
-#line 2624 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2620 "/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 ?
@@ -5027,8 +5047,8 @@
 
   case 240:
 
-/* Line 678 of lalr1.cc  */
-#line 2634 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2630 "/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 ?
@@ -5041,8 +5061,8 @@
 
   case 241:
 
-/* Line 678 of lalr1.cc  */
-#line 2647 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2643 "/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)));
     }
@@ -5050,8 +5070,8 @@
 
   case 250:
 
-/* Line 678 of lalr1.cc  */
-#line 2671 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2667 "/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)) );
@@ -5061,8 +5081,8 @@
 
   case 251:
 
-/* Line 678 of lalr1.cc  */
-#line 2678 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2674 "/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)) );
@@ -5072,8 +5092,8 @@
 
   case 252:
 
-/* Line 678 of lalr1.cc  */
-#line 2688 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2684 "/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)));
     }
@@ -5081,8 +5101,8 @@
 
   case 253:
 
-/* Line 678 of lalr1.cc  */
-#line 2694 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2690 "/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 \""
@@ -5094,8 +5114,8 @@
 
   case 254:
 
-/* Line 678 of lalr1.cc  */
-#line 2703 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2699 "/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
@@ -5105,8 +5125,8 @@
 
   case 255:
 
-/* Line 678 of lalr1.cc  */
-#line 2713 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2709 "/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)) );
@@ -5116,8 +5136,8 @@
 
   case 256:
 
-/* Line 678 of lalr1.cc  */
-#line 2720 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2716 "/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)) );
@@ -5127,8 +5147,8 @@
 
   case 257:
 
-/* Line 678 of lalr1.cc  */
-#line 2728 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2724 "/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 \""
@@ -5140,8 +5160,8 @@
 
   case 258:
 
-/* Line 678 of lalr1.cc  */
-#line 2740 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2736 "/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)),
@@ -5155,8 +5175,8 @@
 
   case 259:
 
-/* Line 678 of lalr1.cc  */
-#line 2750 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2746 "/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)),
@@ -5170,8 +5190,8 @@
 
   case 260:
 
-/* Line 678 of lalr1.cc  */
-#line 2760 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2756 "/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)),
@@ -5185,8 +5205,8 @@
 
   case 261:
 
-/* Line 678 of lalr1.cc  */
-#line 2770 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2766 "/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)),
@@ -5200,8 +5220,8 @@
 
   case 262:
 
-/* Line 678 of lalr1.cc  */
-#line 2780 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2776 "/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)),
@@ -5215,8 +5235,8 @@
 
   case 263:
 
-/* Line 678 of lalr1.cc  */
-#line 2790 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2786 "/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)),
@@ -5230,8 +5250,8 @@
 
   case 264:
 
-/* Line 678 of lalr1.cc  */
-#line 2800 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2796 "/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)),
@@ -5245,8 +5265,8 @@
 
   case 265:
 
-/* Line 678 of lalr1.cc  */
-#line 2810 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2806 "/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)),
@@ -5260,8 +5280,8 @@
 
   case 266:
 
-/* Line 678 of lalr1.cc  */
-#line 2821 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2817 "/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)),
@@ -5274,8 +5294,8 @@
 
   case 267:
 
-/* Line 678 of lalr1.cc  */
-#line 2830 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2826 "/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)),
@@ -5289,8 +5309,8 @@
 
   case 268:
 
-/* Line 678 of lalr1.cc  */
-#line 2840 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2836 "/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)),
@@ -5304,8 +5324,8 @@
 
   case 269:
 
-/* Line 678 of lalr1.cc  */
-#line 2850 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2846 "/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)),
@@ -5319,8 +5339,8 @@
 
   case 270:
 
-/* Line 678 of lalr1.cc  */
-#line 2866 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2862 "/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)));
     }
@@ -5328,8 +5348,8 @@
 
   case 271:
 
-/* Line 678 of lalr1.cc  */
-#line 2875 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2871 "/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)));
     }
@@ -5337,8 +5357,8 @@
 
   case 272:
 
-/* Line 678 of lalr1.cc  */
-#line 2884 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2880 "/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)) );
         }
@@ -5346,8 +5366,8 @@
 
   case 273:
 
-/* Line 678 of lalr1.cc  */
-#line 2892 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2888 "/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)) );
@@ -5357,8 +5377,8 @@
 
   case 274:
 
-/* Line 678 of lalr1.cc  */
-#line 2898 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2894 "/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)) );
@@ -5368,8 +5388,8 @@
 
   case 275:
 
-/* Line 678 of lalr1.cc  */
-#line 2910 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2906 "/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)),
@@ -5381,8 +5401,8 @@
 
   case 276:
 
-/* Line 678 of lalr1.cc  */
-#line 2918 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2914 "/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)),
@@ -5394,8 +5414,8 @@
 
   case 277:
 
-/* Line 678 of lalr1.cc  */
-#line 2928 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2924 "/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(),
@@ -5407,8 +5427,8 @@
 
   case 278:
 
-/* Line 678 of lalr1.cc  */
-#line 2936 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2932 "/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)),
@@ -5420,8 +5440,8 @@
 
   case 279:
 
-/* Line 678 of lalr1.cc  */
-#line 2948 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2944 "/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)),
@@ -5431,8 +5451,8 @@
 
   case 280:
 
-/* Line 678 of lalr1.cc  */
-#line 2954 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2950 "/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)),
@@ -5443,8 +5463,8 @@
 
   case 282:
 
-/* Line 678 of lalr1.cc  */
-#line 2967 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2963 "/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);
     }
@@ -5452,8 +5472,8 @@
 
   case 283:
 
-/* Line 678 of lalr1.cc  */
-#line 2971 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2967 "/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)));
@@ -5462,8 +5482,8 @@
 
   case 284:
 
-/* Line 678 of lalr1.cc  */
-#line 2979 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2975 "/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);
     }
@@ -5471,8 +5491,8 @@
 
   case 285:
 
-/* Line 678 of lalr1.cc  */
-#line 2983 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2979 "/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)));
@@ -5481,8 +5501,8 @@
 
   case 287:
 
-/* Line 678 of lalr1.cc  */
-#line 2992 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2988 "/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)));
     }
@@ -5490,8 +5510,8 @@
 
   case 288:
 
-/* Line 678 of lalr1.cc  */
-#line 2996 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2992 "/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)));
     }
@@ -5499,8 +5519,8 @@
 
   case 289:
 
-/* Line 678 of lalr1.cc  */
-#line 3000 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2996 "/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);
     }
@@ -5508,8 +5528,8 @@
 
   case 290:
 
-/* Line 678 of lalr1.cc  */
-#line 3010 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3006 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new WhereClause(LOC ((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
     }
@@ -5517,8 +5537,8 @@
 
   case 291:
 
-/* Line 678 of lalr1.cc  */
-#line 3018 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3014 "/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)));
     }
@@ -5526,8 +5546,8 @@
 
   case 292:
 
-/* Line 678 of lalr1.cc  */
-#line 3025 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3021 "/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)));
@@ -5537,8 +5557,8 @@
 
   case 293:
 
-/* Line 678 of lalr1.cc  */
-#line 3031 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3027 "/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)));
@@ -5548,8 +5568,8 @@
 
   case 294:
 
-/* Line 678 of lalr1.cc  */
-#line 3041 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3037 "/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);
     }
@@ -5557,8 +5577,8 @@
 
   case 295:
 
-/* Line 678 of lalr1.cc  */
-#line 3045 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3041 "/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);
     }
@@ -5566,8 +5586,8 @@
 
   case 296:
 
-/* Line 678 of lalr1.cc  */
-#line 3049 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3045 "/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)),
@@ -5579,8 +5599,8 @@
 
   case 297:
 
-/* Line 678 of lalr1.cc  */
-#line 3057 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3053 "/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)),
@@ -5592,8 +5612,8 @@
 
   case 298:
 
-/* Line 678 of lalr1.cc  */
-#line 3065 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3061 "/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)),
@@ -5605,8 +5625,8 @@
 
   case 299:
 
-/* Line 678 of lalr1.cc  */
-#line 3073 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3069 "/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)),
@@ -5618,8 +5638,8 @@
 
   case 300:
 
-/* Line 678 of lalr1.cc  */
-#line 3085 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3081 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new GroupCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
     }
@@ -5627,8 +5647,8 @@
 
   case 301:
 
-/* Line 678 of lalr1.cc  */
-#line 3093 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3089 "/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))
@@ -5638,8 +5658,8 @@
 
   case 302:
 
-/* Line 678 of lalr1.cc  */
-#line 3099 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3095 "/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
@@ -5649,8 +5669,8 @@
 
   case 303:
 
-/* Line 678 of lalr1.cc  */
-#line 3109 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3105 "/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)) );
@@ -5660,8 +5680,8 @@
 
   case 304:
 
-/* Line 678 of lalr1.cc  */
-#line 3115 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3111 "/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)) );
@@ -5671,8 +5691,8 @@
 
   case 305:
 
-/* Line 678 of lalr1.cc  */
-#line 3125 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3121 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderSpec( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL );
         }
@@ -5680,8 +5700,8 @@
 
   case 306:
 
-/* Line 678 of lalr1.cc  */
-#line 3129 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3125 "/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))
@@ -5691,8 +5711,8 @@
 
   case 307:
 
-/* Line 678 of lalr1.cc  */
-#line 3139 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3135 "/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
@@ -5702,8 +5722,8 @@
 
   case 308:
 
-/* Line 678 of lalr1.cc  */
-#line 3145 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3141 "/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
@@ -5713,8 +5733,8 @@
 
   case 309:
 
-/* Line 678 of lalr1.cc  */
-#line 3151 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3147 "/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))
@@ -5724,8 +5744,8 @@
 
   case 310:
 
-/* Line 678 of lalr1.cc  */
-#line 3157 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3153 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5738,8 +5758,8 @@
 
   case 311:
 
-/* Line 678 of lalr1.cc  */
-#line 3166 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3162 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5752,8 +5772,8 @@
 
   case 312:
 
-/* Line 678 of lalr1.cc  */
-#line 3175 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3171 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5766,8 +5786,8 @@
 
   case 313:
 
-/* Line 678 of lalr1.cc  */
-#line 3184 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3180 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderModifierPN(
                 LOC((yyloc)),
@@ -5780,8 +5800,8 @@
 
   case 314:
 
-/* Line 678 of lalr1.cc  */
-#line 3197 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3193 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_ascending );
         }
@@ -5789,8 +5809,8 @@
 
   case 315:
 
-/* Line 678 of lalr1.cc  */
-#line 3201 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3197 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_descending );
         }
@@ -5798,8 +5818,8 @@
 
   case 316:
 
-/* Line 678 of lalr1.cc  */
-#line 3209 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3205 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderEmptySpec(
                 LOC((yyloc)), StaticContextConsts::empty_greatest
@@ -5809,8 +5829,8 @@
 
   case 317:
 
-/* Line 678 of lalr1.cc  */
-#line 3215 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3211 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderEmptySpec(
                 LOC((yyloc)), StaticContextConsts::empty_least
@@ -5820,8 +5840,8 @@
 
   case 318:
 
-/* Line 678 of lalr1.cc  */
-#line 3225 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3221 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OrderCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
         }
@@ -5829,8 +5849,8 @@
 
   case 319:
 
-/* Line 678 of lalr1.cc  */
-#line 3233 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3229 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new QuantifiedExpr(
                 LOC((yyloc)),
@@ -5843,8 +5863,8 @@
 
   case 320:
 
-/* Line 678 of lalr1.cc  */
-#line 3242 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3238 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new QuantifiedExpr(
                 LOC((yyloc)),
@@ -5857,8 +5877,8 @@
 
   case 321:
 
-/* Line 678 of lalr1.cc  */
-#line 3255 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3251 "/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)) );
@@ -5869,8 +5889,8 @@
 
   case 322:
 
-/* Line 678 of lalr1.cc  */
-#line 3262 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3258 "/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)) );
@@ -5880,8 +5900,8 @@
 
   case 323:
 
-/* Line 678 of lalr1.cc  */
-#line 3274 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3270 "/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));
     }
@@ -5889,8 +5909,8 @@
 
   case 324:
 
-/* Line 678 of lalr1.cc  */
-#line 3278 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3274 "/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)),
@@ -5901,8 +5921,8 @@
 
   case 325:
 
-/* Line 678 of lalr1.cc  */
-#line 3290 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3286 "/home/colea/xquery_bzr/error-messages/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));
     }
@@ -5910,8 +5930,8 @@
 
   case 326:
 
-/* Line 678 of lalr1.cc  */
-#line 3297 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3293 "/home/colea/xquery_bzr/error-messages/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)));
@@ -5921,8 +5941,8 @@
 
   case 327:
 
-/* Line 678 of lalr1.cc  */
-#line 3303 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3299 "/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)));
@@ -5932,8 +5952,8 @@
 
   case 328:
 
-/* Line 678 of lalr1.cc  */
-#line 3312 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3308 "/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));
     }
@@ -5941,8 +5961,8 @@
 
   case 329:
 
-/* Line 678 of lalr1.cc  */
-#line 3319 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3315 "/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));
@@ -5952,8 +5972,8 @@
 
   case 330:
 
-/* Line 678 of lalr1.cc  */
-#line 3325 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3321 "/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));
@@ -5963,8 +5983,8 @@
 
   case 331:
 
-/* Line 678 of lalr1.cc  */
-#line 3336 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3332 "/home/colea/xquery_bzr/error-messages/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));
     }
@@ -5972,8 +5992,8 @@
 
   case 332:
 
-/* Line 678 of lalr1.cc  */
-#line 3343 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3339 "/home/colea/xquery_bzr/error-messages/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)));
@@ -5983,8 +6003,8 @@
 
   case 333:
 
-/* Line 678 of lalr1.cc  */
-#line 3349 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3345 "/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)));
@@ -5994,8 +6014,8 @@
 
   case 334:
 
-/* Line 678 of lalr1.cc  */
-#line 3358 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3354 "/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));
     }
@@ -6003,8 +6023,8 @@
 
   case 335:
 
-/* Line 678 of lalr1.cc  */
-#line 3367 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3363 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
                               (yysemantic_stack_[(8) - (3)].expr),
@@ -6015,8 +6035,8 @@
 
   case 336:
 
-/* Line 678 of lalr1.cc  */
-#line 3374 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3370 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
                               (yysemantic_stack_[(10) - (3)].expr),
@@ -6028,8 +6048,8 @@
 
   case 337:
 
-/* Line 678 of lalr1.cc  */
-#line 3385 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3381 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
                               (yysemantic_stack_[(8) - (3)].expr),
@@ -6040,8 +6060,8 @@
 
   case 338:
 
-/* Line 678 of lalr1.cc  */
-#line 3392 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3388 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
                               (yysemantic_stack_[(10) - (3)].expr),
@@ -6053,8 +6073,8 @@
 
   case 339:
 
-/* Line 678 of lalr1.cc  */
-#line 3404 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3400 "/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)));
@@ -6064,8 +6084,8 @@
 
   case 340:
 
-/* Line 678 of lalr1.cc  */
-#line 3410 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3406 "/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)));
@@ -6075,8 +6095,8 @@
 
   case 341:
 
-/* Line 678 of lalr1.cc  */
-#line 3422 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3418 "/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)),
@@ -6086,8 +6106,8 @@
 
   case 342:
 
-/* Line 678 of lalr1.cc  */
-#line 3428 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3424 "/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)),
@@ -6098,8 +6118,8 @@
 
   case 343:
 
-/* Line 678 of lalr1.cc  */
-#line 3439 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3435 "/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)));
@@ -6109,8 +6129,8 @@
 
   case 344:
 
-/* Line 678 of lalr1.cc  */
-#line 3445 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3441 "/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)));
@@ -6120,8 +6140,8 @@
 
   case 345:
 
-/* Line 678 of lalr1.cc  */
-#line 3456 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3452 "/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)),
@@ -6131,8 +6151,8 @@
 
   case 346:
 
-/* Line 678 of lalr1.cc  */
-#line 3462 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3458 "/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)),
@@ -6143,8 +6163,8 @@
 
   case 347:
 
-/* Line 678 of lalr1.cc  */
-#line 3473 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3469 "/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));
     }
@@ -6152,8 +6172,8 @@
 
   case 348:
 
-/* Line 678 of lalr1.cc  */
-#line 3482 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3478 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -6161,8 +6181,8 @@
 
   case 349:
 
-/* Line 678 of lalr1.cc  */
-#line 3486 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3482 "/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) );
     }
@@ -6170,8 +6190,8 @@
 
   case 350:
 
-/* Line 678 of lalr1.cc  */
-#line 3495 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3491 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6179,8 +6199,8 @@
 
   case 351:
 
-/* Line 678 of lalr1.cc  */
-#line 3499 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3495 "/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) );
         }
@@ -6188,8 +6208,8 @@
 
   case 352:
 
-/* Line 678 of lalr1.cc  */
-#line 3507 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3503 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6197,8 +6217,8 @@
 
   case 353:
 
-/* Line 678 of lalr1.cc  */
-#line 3511 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3507 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             /*  ::=  "eq" | "ne" | "lt" | "le" | "gt" | "ge" */
             (yyval.expr) = new ComparisonExpr(
@@ -6212,8 +6232,8 @@
 
   case 354:
 
-/* Line 678 of lalr1.cc  */
-#line 3521 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3517 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             /*  ::=  "is" | "<<" | ">>" */
             (yyval.expr) = new ComparisonExpr(
@@ -6224,8 +6244,8 @@
 
   case 355:
 
-/* Line 678 of lalr1.cc  */
-#line 3528 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3524 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6238,8 +6258,8 @@
 
   case 356:
 
-/* Line 678 of lalr1.cc  */
-#line 3537 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3533 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6252,8 +6272,8 @@
 
   case 357:
 
-/* Line 678 of lalr1.cc  */
-#line 3546 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3542 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             /* this call is needed */
             driver.lexer->interpretAsLessThan();
@@ -6262,8 +6282,8 @@
 
   case 358:
 
-/* Line 678 of lalr1.cc  */
-#line 3551 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3547 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6276,8 +6296,8 @@
 
   case 359:
 
-/* Line 678 of lalr1.cc  */
-#line 3560 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3556 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6290,8 +6310,8 @@
 
   case 360:
 
-/* Line 678 of lalr1.cc  */
-#line 3569 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3565 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6304,8 +6324,8 @@
 
   case 361:
 
-/* Line 678 of lalr1.cc  */
-#line 3578 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3574 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ComparisonExpr(
                 LOC((yyloc)),
@@ -6318,8 +6338,8 @@
 
   case 362:
 
-/* Line 678 of lalr1.cc  */
-#line 3591 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3587 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6327,8 +6347,8 @@
 
   case 363:
 
-/* Line 678 of lalr1.cc  */
-#line 3595 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3591 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new FTContainsExpr(
                 LOC((yyloc)),
@@ -6341,8 +6361,8 @@
 
   case 364:
 
-/* Line 678 of lalr1.cc  */
-#line 3607 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3603 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6350,8 +6370,8 @@
 
   case 365:
 
-/* Line 678 of lalr1.cc  */
-#line 3611 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3607 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = new StringConcatExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
         }
@@ -6359,8 +6379,8 @@
 
   case 366:
 
-/* Line 678 of lalr1.cc  */
-#line 3618 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3614 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -6368,8 +6388,8 @@
 
   case 367:
 
-/* Line 678 of lalr1.cc  */
-#line 3622 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3618 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -6377,8 +6397,8 @@
 
   case 368:
 
-/* Line 678 of lalr1.cc  */
-#line 3629 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3625 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6386,8 +6406,8 @@
 
   case 369:
 
-/* Line 678 of lalr1.cc  */
-#line 3633 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3629 "/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) );
         }
@@ -6395,8 +6415,8 @@
 
   case 370:
 
-/* Line 678 of lalr1.cc  */
-#line 3642 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3638 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6404,8 +6424,8 @@
 
   case 371:
 
-/* Line 678 of lalr1.cc  */
-#line 3646 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3642 "/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) );
         }
@@ -6413,8 +6433,8 @@
 
   case 372:
 
-/* Line 678 of lalr1.cc  */
-#line 3650 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3646 "/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) );
         }
@@ -6422,8 +6442,8 @@
 
   case 373:
 
-/* Line 678 of lalr1.cc  */
-#line 3658 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3654 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6431,8 +6451,8 @@
 
   case 374:
 
-/* Line 678 of lalr1.cc  */
-#line 3662 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3658 "/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)
@@ -6442,8 +6462,8 @@
 
   case 375:
 
-/* Line 678 of lalr1.cc  */
-#line 3668 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3664 "/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)
@@ -6453,8 +6473,8 @@
 
   case 376:
 
-/* Line 678 of lalr1.cc  */
-#line 3674 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3670 "/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)
@@ -6464,8 +6484,8 @@
 
   case 377:
 
-/* Line 678 of lalr1.cc  */
-#line 3680 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3676 "/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)
@@ -6475,8 +6495,8 @@
 
   case 378:
 
-/* Line 678 of lalr1.cc  */
-#line 3690 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3686 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6484,8 +6504,8 @@
 
   case 379:
 
-/* Line 678 of lalr1.cc  */
-#line 3694 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3690 "/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) );
         }
@@ -6493,8 +6513,8 @@
 
   case 380:
 
-/* Line 678 of lalr1.cc  */
-#line 3698 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3694 "/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) );
         }
@@ -6502,8 +6522,8 @@
 
   case 381:
 
-/* Line 678 of lalr1.cc  */
-#line 3706 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3702 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6511,8 +6531,8 @@
 
   case 382:
 
-/* Line 678 of lalr1.cc  */
-#line 3710 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3706 "/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)
@@ -6522,8 +6542,8 @@
 
   case 383:
 
-/* Line 678 of lalr1.cc  */
-#line 3716 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3712 "/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)
@@ -6533,8 +6553,8 @@
 
   case 384:
 
-/* Line 678 of lalr1.cc  */
-#line 3726 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3722 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6542,8 +6562,8 @@
 
   case 385:
 
-/* Line 678 of lalr1.cc  */
-#line 3730 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3726 "/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))
@@ -6553,8 +6573,8 @@
 
   case 386:
 
-/* Line 678 of lalr1.cc  */
-#line 3740 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3736 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6562,8 +6582,8 @@
 
   case 387:
 
-/* Line 678 of lalr1.cc  */
-#line 3744 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3740 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new TreatExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node))
@@ -6573,8 +6593,8 @@
 
   case 388:
 
-/* Line 678 of lalr1.cc  */
-#line 3754 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3750 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6582,8 +6602,8 @@
 
   case 389:
 
-/* Line 678 of lalr1.cc  */
-#line 3758 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3754 "/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))
@@ -6593,8 +6613,8 @@
 
   case 390:
 
-/* Line 678 of lalr1.cc  */
-#line 3768 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3764 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6602,8 +6622,8 @@
 
   case 391:
 
-/* Line 678 of lalr1.cc  */
-#line 3772 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3768 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new CastExpr(
                 LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SingleType*>((yysemantic_stack_[(4) - (4)].node))
@@ -6613,8 +6633,8 @@
 
   case 392:
 
-/* Line 678 of lalr1.cc  */
-#line 3782 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3778 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new SingleType(LOC((yyloc)), dynamic_cast<SimpleType*>((yysemantic_stack_[(1) - (1)].node)), false);
     }
@@ -6622,8 +6642,8 @@
 
   case 393:
 
-/* Line 678 of lalr1.cc  */
-#line 3786 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3782 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new SingleType(LOC((yyloc)), dynamic_cast<SimpleType*>((yysemantic_stack_[(2) - (1)].node)), true);
     }
@@ -6631,8 +6651,8 @@
 
   case 394:
 
-/* Line 678 of lalr1.cc  */
-#line 3795 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3791 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6640,8 +6660,8 @@
 
   case 395:
 
-/* Line 678 of lalr1.cc  */
-#line 3799 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3795 "/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) );
         }
@@ -6649,8 +6669,8 @@
 
   case 396:
 
-/* Line 678 of lalr1.cc  */
-#line 3807 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3803 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new SignList( LOC((yyloc)), true );
         }
@@ -6658,8 +6678,8 @@
 
   case 397:
 
-/* Line 678 of lalr1.cc  */
-#line 3811 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3807 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new SignList( LOC((yyloc)), false );
         }
@@ -6667,8 +6687,8 @@
 
   case 398:
 
-/* Line 678 of lalr1.cc  */
-#line 3815 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3811 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
         }
@@ -6676,8 +6696,8 @@
 
   case 399:
 
-/* Line 678 of lalr1.cc  */
-#line 3819 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3815 "/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();
@@ -6687,8 +6707,8 @@
 
   case 400:
 
-/* Line 678 of lalr1.cc  */
-#line 3829 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3825 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6696,8 +6716,8 @@
 
   case 401:
 
-/* Line 678 of lalr1.cc  */
-#line 3833 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3829 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6705,8 +6725,8 @@
 
   case 402:
 
-/* Line 678 of lalr1.cc  */
-#line 3837 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3833 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -6714,8 +6734,8 @@
 
   case 403:
 
-/* Line 678 of lalr1.cc  */
-#line 3844 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3840 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
         (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
       }
@@ -6723,8 +6743,8 @@
 
   case 404:
 
-/* Line 678 of lalr1.cc  */
-#line 3849 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3845 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
         (yyval.expr) = new SimpleMapExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
       }
@@ -6732,8 +6752,8 @@
 
   case 405:
 
-/* Line 678 of lalr1.cc  */
-#line 3857 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3853 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_eq );
         }
@@ -6741,8 +6761,8 @@
 
   case 406:
 
-/* Line 678 of lalr1.cc  */
-#line 3861 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3857 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ne );
         }
@@ -6750,8 +6770,8 @@
 
   case 407:
 
-/* Line 678 of lalr1.cc  */
-#line 3865 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3861 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_lt );
         }
@@ -6759,8 +6779,8 @@
 
   case 408:
 
-/* Line 678 of lalr1.cc  */
-#line 3869 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3865 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_le );
         }
@@ -6768,8 +6788,8 @@
 
   case 409:
 
-/* Line 678 of lalr1.cc  */
-#line 3873 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3869 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_gt );
         }
@@ -6777,8 +6797,8 @@
 
   case 410:
 
-/* Line 678 of lalr1.cc  */
-#line 3877 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3873 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ge );
         }
@@ -6786,8 +6806,8 @@
 
   case 411:
 
-/* Line 678 of lalr1.cc  */
-#line 3885 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3881 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new NodeComp( LOC((yyloc)), ParseConstants::op_is );
         }
@@ -6795,8 +6815,8 @@
 
   case 412:
 
-/* Line 678 of lalr1.cc  */
-#line 3889 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3885 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new NodeComp( LOC((yyloc)), ParseConstants::op_precedes );
         }
@@ -6804,8 +6824,8 @@
 
   case 413:
 
-/* Line 678 of lalr1.cc  */
-#line 3893 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3889 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new NodeComp( LOC((yyloc)), ParseConstants::op_follows );
         }
@@ -6813,8 +6833,8 @@
 
   case 414:
 
-/* Line 678 of lalr1.cc  */
-#line 3901 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3897 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -6822,8 +6842,8 @@
 
   case 415:
 
-/* Line 678 of lalr1.cc  */
-#line 3905 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3901 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "lax", (yysemantic_stack_[(5) - (4)].expr) );
         }
@@ -6831,8 +6851,8 @@
 
   case 416:
 
-/* Line 678 of lalr1.cc  */
-#line 3909 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3905 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(5) - (4)].expr) );
         }
@@ -6840,8 +6860,8 @@
 
   case 417:
 
-/* Line 678 of lalr1.cc  */
-#line 3913 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3909 "/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)
@@ -6852,8 +6872,8 @@
 
   case 418:
 
-/* Line 678 of lalr1.cc  */
-#line 3924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3920 "/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
@@ -6863,8 +6883,8 @@
 
   case 419:
 
-/* Line 678 of lalr1.cc  */
-#line 3930 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3926 "/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)
@@ -6874,8 +6894,8 @@
 
   case 420:
 
-/* Line 678 of lalr1.cc  */
-#line 3940 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3936 "/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)) );
@@ -6885,8 +6905,8 @@
 
   case 421:
 
-/* Line 678 of lalr1.cc  */
-#line 3946 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3942 "/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)) );
@@ -6896,8 +6916,8 @@
 
   case 422:
 
-/* Line 678 of lalr1.cc  */
-#line 3956 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3952 "/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)) );
         }
@@ -6905,8 +6925,8 @@
 
   case 423:
 
-/* Line 678 of lalr1.cc  */
-#line 3960 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3956 "/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)) ), "" );
         }
@@ -6914,8 +6934,8 @@
 
   case 424:
 
-/* Line 678 of lalr1.cc  */
-#line 3964 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3960 "/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 ), "" );
         }
@@ -6923,8 +6943,8 @@
 
   case 425:
 
-/* Line 678 of lalr1.cc  */
-#line 4002 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 3998 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new PathExpr(LOC((yyloc)), ParseConstants::path_leading_lone_slash, NULL);
     }
@@ -6932,8 +6952,8 @@
 
   case 426:
 
-/* Line 678 of lalr1.cc  */
-#line 4006 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4002 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       RelativePathExpr* rpe;
 
@@ -6947,8 +6967,8 @@
 
   case 427:
 
-/* Line 678 of lalr1.cc  */
-#line 4016 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4012 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       RelativePathExpr* rpe;
 
@@ -6962,8 +6982,8 @@
 
   case 428:
 
-/* Line 678 of lalr1.cc  */
-#line 4026 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4022 "/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 ?
@@ -6974,8 +6994,8 @@
 
   case 429:
 
-/* Line 678 of lalr1.cc  */
-#line 4039 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4035 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = NULL;
     }
@@ -6983,8 +7003,8 @@
 
   case 430:
 
-/* Line 678 of lalr1.cc  */
-#line 4048 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4044 "/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 ?
@@ -6998,8 +7018,8 @@
 
   case 431:
 
-/* Line 678 of lalr1.cc  */
-#line 4058 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4054 "/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);
     }
@@ -7007,8 +7027,8 @@
 
   case 432:
 
-/* Line 678 of lalr1.cc  */
-#line 4062 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4058 "/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);
     }
@@ -7016,8 +7036,8 @@
 
   case 433:
 
-/* Line 678 of lalr1.cc  */
-#line 4071 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4067 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7025,8 +7045,8 @@
 
   case 434:
 
-/* Line 678 of lalr1.cc  */
-#line 4075 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4071 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -7034,8 +7054,8 @@
 
   case 435:
 
-/* Line 678 of lalr1.cc  */
-#line 4084 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4080 "/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
@@ -7045,8 +7065,8 @@
 
   case 436:
 
-/* Line 678 of lalr1.cc  */
-#line 4090 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4086 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new AxisStep(
                 LOC((yyloc)),
@@ -7058,8 +7078,8 @@
 
   case 437:
 
-/* Line 678 of lalr1.cc  */
-#line 4098 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4094 "/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
@@ -7069,8 +7089,8 @@
 
   case 438:
 
-/* Line 678 of lalr1.cc  */
-#line 4104 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4100 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new AxisStep(
                 LOC((yyloc)),
@@ -7082,8 +7102,8 @@
 
   case 439:
 
-/* Line 678 of lalr1.cc  */
-#line 4116 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4112 "/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)
@@ -7093,8 +7113,8 @@
 
   case 440:
 
-/* Line 678 of lalr1.cc  */
-#line 4122 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4118 "/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))
@@ -7104,8 +7124,8 @@
 
   case 441:
 
-/* Line 678 of lalr1.cc  */
-#line 4132 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4128 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_child );
         }
@@ -7113,8 +7133,8 @@
 
   case 442:
 
-/* Line 678 of lalr1.cc  */
-#line 4136 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4132 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_descendant);
         }
@@ -7122,8 +7142,8 @@
 
   case 443:
 
-/* Line 678 of lalr1.cc  */
-#line 4140 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4136 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_attribute );
         }
@@ -7131,8 +7151,8 @@
 
   case 444:
 
-/* Line 678 of lalr1.cc  */
-#line 4144 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4140 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_self );
         }
@@ -7140,8 +7160,8 @@
 
   case 445:
 
-/* Line 678 of lalr1.cc  */
-#line 4148 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4144 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ForwardAxis(
                 LOC((yyloc)), ParseConstants::axis_descendant_or_self
@@ -7151,8 +7171,8 @@
 
   case 446:
 
-/* Line 678 of lalr1.cc  */
-#line 4154 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4150 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ForwardAxis(
                 LOC((yyloc)), ParseConstants::axis_following_sibling
@@ -7162,8 +7182,8 @@
 
   case 447:
 
-/* Line 678 of lalr1.cc  */
-#line 4160 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4156 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ForwardAxis( LOC((yyloc)), ParseConstants::axis_following );
         }
@@ -7171,8 +7191,8 @@
 
   case 448:
 
-/* Line 678 of lalr1.cc  */
-#line 4168 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4164 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new AbbrevForwardStep( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), false );
         }
@@ -7180,8 +7200,8 @@
 
   case 449:
 
-/* Line 678 of lalr1.cc  */
-#line 4172 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4168 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new AbbrevForwardStep( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].node), true );
         }
@@ -7189,8 +7209,8 @@
 
   case 450:
 
-/* Line 678 of lalr1.cc  */
-#line 4180 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4176 "/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) );
         }
@@ -7198,8 +7218,8 @@
 
   case 451:
 
-/* Line 678 of lalr1.cc  */
-#line 4184 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4180 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             ReverseAxis *ra = new ReverseAxis(
                 LOC((yyloc)), ParseConstants::axis_parent
@@ -7210,8 +7230,8 @@
 
   case 452:
 
-/* Line 678 of lalr1.cc  */
-#line 4195 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4191 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ReverseAxis( LOC((yyloc)), ParseConstants::axis_parent );
         }
@@ -7219,8 +7239,8 @@
 
   case 453:
 
-/* Line 678 of lalr1.cc  */
-#line 4199 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4195 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ReverseAxis( LOC((yyloc)), ParseConstants::axis_ancestor );
         }
@@ -7228,8 +7248,8 @@
 
   case 454:
 
-/* Line 678 of lalr1.cc  */
-#line 4203 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4199 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ReverseAxis(
                 LOC((yyloc)), ParseConstants::axis_preceding_sibling
@@ -7239,8 +7259,8 @@
 
   case 455:
 
-/* Line 678 of lalr1.cc  */
-#line 4209 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4205 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ReverseAxis( LOC((yyloc)), ParseConstants::axis_preceding );
         }
@@ -7248,8 +7268,8 @@
 
   case 456:
 
-/* Line 678 of lalr1.cc  */
-#line 4213 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4209 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ReverseAxis(
                 LOC((yyloc)), ParseConstants::axis_ancestor_or_self
@@ -7259,8 +7279,8 @@
 
   case 457:
 
-/* Line 678 of lalr1.cc  */
-#line 4227 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4223 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -7268,8 +7288,8 @@
 
   case 458:
 
-/* Line 678 of lalr1.cc  */
-#line 4231 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4227 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -7277,8 +7297,8 @@
 
   case 459:
 
-/* Line 678 of lalr1.cc  */
-#line 4239 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4235 "/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)) );
         }
@@ -7286,8 +7306,8 @@
 
   case 460:
 
-/* Line 678 of lalr1.cc  */
-#line 4243 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4239 "/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)) );
         }
@@ -7295,8 +7315,8 @@
 
   case 461:
 
-/* Line 678 of lalr1.cc  */
-#line 4253 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4249 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new Wildcard(LOC((yyloc)), "", "", ParseConstants::wild_all, false);
     }
@@ -7304,8 +7324,8 @@
 
   case 462:
 
-/* Line 678 of lalr1.cc  */
-#line 4257 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4253 "/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);
     }
@@ -7313,8 +7333,8 @@
 
   case 463:
 
-/* Line 678 of lalr1.cc  */
-#line 4261 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4257 "/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);
     }
@@ -7322,8 +7342,8 @@
 
   case 464:
 
-/* Line 678 of lalr1.cc  */
-#line 4265 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4261 "/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);
     }
@@ -7331,8 +7351,8 @@
 
   case 465:
 
-/* Line 678 of lalr1.cc  */
-#line 4274 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4270 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
        (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
      }
@@ -7340,8 +7360,8 @@
 
   case 466:
 
-/* Line 678 of lalr1.cc  */
-#line 4278 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4274 "/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)));
      }
@@ -7349,8 +7369,8 @@
 
   case 467:
 
-/* Line 678 of lalr1.cc  */
-#line 4282 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4278 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
        (yyval.expr) = new DynamicFunctionInvocation(LOC ((yyloc)), (yysemantic_stack_[(3) - (1)].expr));
      }
@@ -7358,8 +7378,8 @@
 
   case 468:
 
-/* Line 678 of lalr1.cc  */
-#line 4286 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4282 "/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)));
      }
@@ -7367,8 +7387,8 @@
 
   case 469:
 
-/* Line 678 of lalr1.cc  */
-#line 4294 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4290 "/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)) );
@@ -7378,8 +7398,8 @@
 
   case 470:
 
-/* Line 678 of lalr1.cc  */
-#line 4300 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4296 "/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)) );
@@ -7389,8 +7409,8 @@
 
   case 471:
 
-/* Line 678 of lalr1.cc  */
-#line 4310 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4306 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
         }
@@ -7398,8 +7418,8 @@
 
   case 472:
 
-/* Line 678 of lalr1.cc  */
-#line 4318 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4314 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7407,8 +7427,8 @@
 
   case 473:
 
-/* Line 678 of lalr1.cc  */
-#line 4322 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4318 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7416,8 +7436,8 @@
 
   case 474:
 
-/* Line 678 of lalr1.cc  */
-#line 4326 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4322 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7425,8 +7445,8 @@
 
   case 475:
 
-/* Line 678 of lalr1.cc  */
-#line 4330 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4326 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7434,8 +7454,8 @@
 
   case 476:
 
-/* Line 678 of lalr1.cc  */
-#line 4334 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4330 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7443,8 +7463,8 @@
 
   case 477:
 
-/* Line 678 of lalr1.cc  */
-#line 4338 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4334 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7452,8 +7472,8 @@
 
   case 478:
 
-/* Line 678 of lalr1.cc  */
-#line 4342 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4338 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7461,8 +7481,8 @@
 
   case 479:
 
-/* Line 678 of lalr1.cc  */
-#line 4346 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4342 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7470,8 +7490,8 @@
 
   case 480:
 
-/* Line 678 of lalr1.cc  */
-#line 4350 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4346 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7479,8 +7499,8 @@
 
   case 481:
 
-/* Line 678 of lalr1.cc  */
-#line 4354 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4350 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7488,8 +7508,8 @@
 
   case 482:
 
-/* Line 678 of lalr1.cc  */
-#line 4359 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4355 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7497,8 +7517,8 @@
 
   case 483:
 
-/* Line 678 of lalr1.cc  */
-#line 4363 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4359 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7506,8 +7526,8 @@
 
   case 484:
 
-/* Line 678 of lalr1.cc  */
-#line 4367 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4363 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7515,8 +7535,8 @@
 
   case 485:
 
-/* Line 678 of lalr1.cc  */
-#line 4371 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4367 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7524,8 +7544,8 @@
 
   case 486:
 
-/* Line 678 of lalr1.cc  */
-#line 4379 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4375 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7533,8 +7553,8 @@
 
   case 487:
 
-/* Line 678 of lalr1.cc  */
-#line 4383 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4379 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7542,8 +7562,8 @@
 
   case 488:
 
-/* Line 678 of lalr1.cc  */
-#line 4391 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4387 "/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)
@@ -7554,8 +7574,8 @@
 
   case 489:
 
-/* Line 678 of lalr1.cc  */
-#line 4398 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4394 "/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)
@@ -7566,8 +7586,8 @@
 
   case 490:
 
-/* Line 678 of lalr1.cc  */
-#line 4405 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4401 "/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)
@@ -7578,8 +7598,8 @@
 
   case 491:
 
-/* Line 678 of lalr1.cc  */
-#line 4416 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4412 "/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)));
         }
@@ -7587,8 +7607,8 @@
 
   case 492:
 
-/* Line 678 of lalr1.cc  */
-#line 4424 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4420 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), NULL);
         }
@@ -7596,8 +7616,8 @@
 
   case 493:
 
-/* Line 678 of lalr1.cc  */
-#line 4428 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4424 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
         }
@@ -7605,8 +7625,8 @@
 
   case 494:
 
-/* Line 678 of lalr1.cc  */
-#line 4436 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4432 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new ContextItemExpr( LOC((yyloc)) );
         }
@@ -7614,8 +7634,8 @@
 
   case 495:
 
-/* Line 678 of lalr1.cc  */
-#line 4444 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4440 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new OrderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -7623,8 +7643,8 @@
 
   case 496:
 
-/* Line 678 of lalr1.cc  */
-#line 4452 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4448 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new UnorderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -7632,8 +7652,8 @@
 
   case 497:
 
-/* Line 678 of lalr1.cc  */
-#line 4506 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4502 "/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 );
         }
@@ -7641,8 +7661,8 @@
 
   case 498:
 
-/* Line 678 of lalr1.cc  */
-#line 4510 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4506 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new FunctionCall(
                 LOC((yyloc)),
@@ -7654,8 +7674,8 @@
 
   case 499:
 
-/* Line 678 of lalr1.cc  */
-#line 4523 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4519 "/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) );
@@ -7665,8 +7685,8 @@
 
   case 500:
 
-/* Line 678 of lalr1.cc  */
-#line 4529 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4525 "/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) );
@@ -7676,8 +7696,8 @@
 
   case 501:
 
-/* Line 678 of lalr1.cc  */
-#line 4539 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4535 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7685,8 +7705,8 @@
 
   case 502:
 
-/* Line 678 of lalr1.cc  */
-#line 4543 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4539 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7694,8 +7714,8 @@
 
   case 503:
 
-/* Line 678 of lalr1.cc  */
-#line 4551 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4547 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7703,8 +7723,8 @@
 
   case 504:
 
-/* Line 678 of lalr1.cc  */
-#line 4555 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4551 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7712,8 +7732,8 @@
 
   case 505:
 
-/* Line 678 of lalr1.cc  */
-#line 4559 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4555 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
         }
@@ -7721,8 +7741,8 @@
 
   case 506:
 
-/* Line 678 of lalr1.cc  */
-#line 4567 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4563 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new DirElemConstructor(
                 LOC((yyloc)),
@@ -7736,8 +7756,8 @@
 
   case 507:
 
-/* Line 678 of lalr1.cc  */
-#line 4577 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4573 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new DirElemConstructor(
                 LOC((yyloc)),
@@ -7751,8 +7771,8 @@
 
   case 508:
 
-/* Line 678 of lalr1.cc  */
-#line 4587 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4583 "/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())
             {
@@ -7773,8 +7793,8 @@
 
   case 509:
 
-/* Line 678 of lalr1.cc  */
-#line 4604 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4600 "/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())
             {
@@ -7795,8 +7815,8 @@
 
   case 510:
 
-/* Line 678 of lalr1.cc  */
-#line 4621 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4617 "/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())
             {
@@ -7817,8 +7837,8 @@
 
   case 511:
 
-/* Line 678 of lalr1.cc  */
-#line 4638 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4634 "/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())
             {
@@ -7839,8 +7859,8 @@
 
   case 512:
 
-/* Line 678 of lalr1.cc  */
-#line 4660 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4656 "/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)) );
@@ -7850,8 +7870,8 @@
 
   case 513:
 
-/* Line 678 of lalr1.cc  */
-#line 4666 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4662 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             DirElemContentList *decl = dynamic_cast<DirElemContentList*>((yysemantic_stack_[(2) - (1)].node));
             if ( decl )
@@ -7862,8 +7882,8 @@
 
   case 514:
 
-/* Line 678 of lalr1.cc  */
-#line 4677 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4673 "/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)) );
@@ -7873,8 +7893,8 @@
 
   case 515:
 
-/* Line 678 of lalr1.cc  */
-#line 4683 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4679 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             DirAttributeList *dal = dynamic_cast<DirAttributeList*>((yysemantic_stack_[(2) - (1)].node));
             if ( dal )
@@ -7885,8 +7905,8 @@
 
   case 516:
 
-/* Line 678 of lalr1.cc  */
-#line 4694 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4690 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new DirAttr(
                 LOC((yyloc)),
@@ -7898,8 +7918,8 @@
 
   case 519:
 
-/* Line 678 of lalr1.cc  */
-#line 4711 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4707 "/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)));
@@ -7908,8 +7928,8 @@
 
   case 520:
 
-/* Line 678 of lalr1.cc  */
-#line 4716 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4712 "/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)));
@@ -7918,8 +7938,8 @@
 
   case 521:
 
-/* Line 678 of lalr1.cc  */
-#line 4725 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4721 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new QuoteAttrContentList( LOC((yyloc)) );
         }
@@ -7927,8 +7947,8 @@
 
   case 522:
 
-/* Line 678 of lalr1.cc  */
-#line 4729 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4725 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -7936,8 +7956,8 @@
 
   case 523:
 
-/* Line 678 of lalr1.cc  */
-#line 4736 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4732 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
             qacl->push_back( new QuoteAttrValueContent( LOC((yyloc)), "\"" ) );
@@ -7947,8 +7967,8 @@
 
   case 524:
 
-/* Line 678 of lalr1.cc  */
-#line 4742 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4738 "/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)) );
@@ -7958,8 +7978,8 @@
 
   case 525:
 
-/* Line 678 of lalr1.cc  */
-#line 4748 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4744 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             QuoteAttrContentList *qacl =
                 dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
@@ -7971,8 +7991,8 @@
 
   case 526:
 
-/* Line 678 of lalr1.cc  */
-#line 4756 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4752 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             QuoteAttrContentList *qacl =
                 dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
@@ -7984,8 +8004,8 @@
 
   case 527:
 
-/* Line 678 of lalr1.cc  */
-#line 4768 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4764 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new AposAttrContentList( LOC((yyloc)) );
         }
@@ -7993,8 +8013,8 @@
 
   case 528:
 
-/* Line 678 of lalr1.cc  */
-#line 4772 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4768 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8002,8 +8022,8 @@
 
   case 529:
 
-/* Line 678 of lalr1.cc  */
-#line 4779 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4775 "/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)),"'") );
@@ -8013,8 +8033,8 @@
 
   case 530:
 
-/* Line 678 of lalr1.cc  */
-#line 4785 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4781 "/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)) );
@@ -8024,8 +8044,8 @@
 
   case 531:
 
-/* Line 678 of lalr1.cc  */
-#line 4791 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4787 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
             if (aacl)
@@ -8036,8 +8056,8 @@
 
   case 532:
 
-/* Line 678 of lalr1.cc  */
-#line 4798 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4794 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
             if ( aacl )
@@ -8048,8 +8068,8 @@
 
   case 533:
 
-/* Line 678 of lalr1.cc  */
-#line 4809 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4805 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new QuoteAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
         }
@@ -8057,8 +8077,8 @@
 
   case 534:
 
-/* Line 678 of lalr1.cc  */
-#line 4813 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4809 "/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))
@@ -8068,8 +8088,8 @@
 
   case 535:
 
-/* Line 678 of lalr1.cc  */
-#line 4823 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4819 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new AposAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
         }
@@ -8077,8 +8097,8 @@
 
   case 536:
 
-/* Line 678 of lalr1.cc  */
-#line 4827 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4823 "/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))
@@ -8088,8 +8108,8 @@
 
   case 537:
 
-/* Line 678 of lalr1.cc  */
-#line 4837 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4833 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new DirElemContent( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr) );
         }
@@ -8097,8 +8117,8 @@
 
   case 538:
 
-/* Line 678 of lalr1.cc  */
-#line 4841 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4837 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new DirElemContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
         }
@@ -8106,8 +8126,8 @@
 
   case 539:
 
-/* Line 678 of lalr1.cc  */
-#line 4845 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4841 "/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 );
@@ -8116,8 +8136,8 @@
 
   case 540:
 
-/* Line 678 of lalr1.cc  */
-#line 4850 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4846 "/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 );
@@ -8126,8 +8146,8 @@
 
   case 541:
 
-/* Line 678 of lalr1.cc  */
-#line 4859 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4855 "/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))
@@ -8137,8 +8157,8 @@
 
   case 542:
 
-/* Line 678 of lalr1.cc  */
-#line 4865 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4861 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new CommonContent(
                 LOC((yyloc)), ParseConstants::cont_escape_lbrace
@@ -8148,8 +8168,8 @@
 
   case 543:
 
-/* Line 678 of lalr1.cc  */
-#line 4871 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4867 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new CommonContent(
                 LOC((yyloc)), ParseConstants::cont_escape_rbrace
@@ -8159,8 +8179,8 @@
 
   case 544:
 
-/* Line 678 of lalr1.cc  */
-#line 4877 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4873 "/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)));
         }
@@ -8168,8 +8188,8 @@
 
   case 545:
 
-/* Line 678 of lalr1.cc  */
-#line 4885 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4881 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new DirCommentConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
@@ -8177,8 +8197,8 @@
 
   case 546:
 
-/* Line 678 of lalr1.cc  */
-#line 4890 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4886 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new DirCommentConstructor( LOC((yyloc)), "" );
     }
@@ -8186,8 +8206,8 @@
 
   case 547:
 
-/* Line 678 of lalr1.cc  */
-#line 4898 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4894 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new DirPIConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
@@ -8195,8 +8215,8 @@
 
   case 548:
 
-/* Line 678 of lalr1.cc  */
-#line 4903 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4899 "/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)) );
     }
@@ -8204,8 +8224,8 @@
 
   case 549:
 
-/* Line 678 of lalr1.cc  */
-#line 4911 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4907 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new CDataSection( LOC((yyloc)),SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
     }
@@ -8213,8 +8233,8 @@
 
   case 550:
 
-/* Line 678 of lalr1.cc  */
-#line 4919 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4915 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8222,8 +8242,8 @@
 
   case 551:
 
-/* Line 678 of lalr1.cc  */
-#line 4924 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4920 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8231,8 +8251,8 @@
 
   case 552:
 
-/* Line 678 of lalr1.cc  */
-#line 4929 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4925 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8240,8 +8260,8 @@
 
   case 553:
 
-/* Line 678 of lalr1.cc  */
-#line 4934 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4930 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8249,8 +8269,8 @@
 
   case 554:
 
-/* Line 678 of lalr1.cc  */
-#line 4939 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4935 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8258,8 +8278,8 @@
 
   case 555:
 
-/* Line 678 of lalr1.cc  */
-#line 4944 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4940 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8267,8 +8287,8 @@
 
   case 556:
 
-/* Line 678 of lalr1.cc  */
-#line 4953 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4949 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new CompDocConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -8276,8 +8296,8 @@
 
   case 557:
 
-/* Line 678 of lalr1.cc  */
-#line 4961 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4957 "/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));
         }
@@ -8285,8 +8305,8 @@
 
   case 558:
 
-/* Line 678 of lalr1.cc  */
-#line 4965 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4961 "/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) );
         }
@@ -8294,8 +8314,8 @@
 
   case 559:
 
-/* Line 678 of lalr1.cc  */
-#line 4982 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4978 "/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) );
         }
@@ -8303,8 +8323,8 @@
 
   case 560:
 
-/* Line 678 of lalr1.cc  */
-#line 4986 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4982 "/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) );
         }
@@ -8312,8 +8332,8 @@
 
   case 561:
 
-/* Line 678 of lalr1.cc  */
-#line 4994 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4990 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new CompTextConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -8321,8 +8341,8 @@
 
   case 562:
 
-/* Line 678 of lalr1.cc  */
-#line 5002 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 4998 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new CompCommentConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
         }
@@ -8330,8 +8350,8 @@
 
   case 563:
 
-/* Line 678 of lalr1.cc  */
-#line 5010 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5006 "/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) );
         }
@@ -8339,8 +8359,8 @@
 
   case 564:
 
-/* Line 678 of lalr1.cc  */
-#line 5014 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5010 "/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) );
         }
@@ -8348,8 +8368,8 @@
 
   case 565:
 
-/* Line 678 of lalr1.cc  */
-#line 5022 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5018 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
     }
@@ -8357,8 +8377,8 @@
 
   case 566:
 
-/* Line 678 of lalr1.cc  */
-#line 5030 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5026 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new SequenceType( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL );
         }
@@ -8366,8 +8386,8 @@
 
   case 567:
 
-/* Line 678 of lalr1.cc  */
-#line 5034 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5030 "/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)));
         }
@@ -8375,8 +8395,8 @@
 
   case 568:
 
-/* Line 678 of lalr1.cc  */
-#line 5038 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5034 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new SequenceType( LOC((yyloc)), NULL, NULL );
         }
@@ -8384,8 +8404,8 @@
 
   case 569:
 
-/* Line 678 of lalr1.cc  */
-#line 5073 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5069 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_optionally
@@ -8395,8 +8415,8 @@
 
   case 570:
 
-/* Line 678 of lalr1.cc  */
-#line 5079 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5075 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_zero_or_more
@@ -8406,8 +8426,8 @@
 
   case 571:
 
-/* Line 678 of lalr1.cc  */
-#line 5085 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5081 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new OccurrenceIndicator(
                 LOC((yyloc)), ParseConstants::occurs_one_or_more
@@ -8417,8 +8437,8 @@
 
   case 572:
 
-/* Line 678 of lalr1.cc  */
-#line 5095 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5091 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8426,8 +8446,8 @@
 
   case 573:
 
-/* Line 678 of lalr1.cc  */
-#line 5099 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5095 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8435,8 +8455,8 @@
 
   case 574:
 
-/* Line 678 of lalr1.cc  */
-#line 5103 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5099 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ItemType( LOC((yyloc)), true );
         }
@@ -8444,8 +8464,8 @@
 
   case 575:
 
-/* Line 678 of lalr1.cc  */
-#line 5107 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5103 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new StructuredItemType(LOC((yyloc)));
         }
@@ -8453,8 +8473,8 @@
 
   case 576:
 
-/* Line 678 of lalr1.cc  */
-#line 5111 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5107 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8462,8 +8482,8 @@
 
   case 577:
 
-/* Line 678 of lalr1.cc  */
-#line 5115 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5111 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8471,8 +8491,8 @@
 
   case 578:
 
-/* Line 678 of lalr1.cc  */
-#line 5119 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5115 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8480,8 +8500,8 @@
 
   case 579:
 
-/* Line 678 of lalr1.cc  */
-#line 5126 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5122 "/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)));
@@ -8491,8 +8511,8 @@
 
   case 580:
 
-/* Line 678 of lalr1.cc  */
-#line 5132 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5128 "/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)));
@@ -8502,8 +8522,8 @@
 
   case 581:
 
-/* Line 678 of lalr1.cc  */
-#line 5142 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5138 "/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)) );
     }
@@ -8511,8 +8531,8 @@
 
   case 582:
 
-/* Line 678 of lalr1.cc  */
-#line 5150 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5146 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new SimpleType( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
     }
@@ -8520,8 +8540,8 @@
 
   case 583:
 
-/* Line 678 of lalr1.cc  */
-#line 5158 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5154 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8529,8 +8549,8 @@
 
   case 584:
 
-/* Line 678 of lalr1.cc  */
-#line 5162 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5158 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8538,8 +8558,8 @@
 
   case 585:
 
-/* Line 678 of lalr1.cc  */
-#line 5166 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5162 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8547,8 +8567,8 @@
 
   case 586:
 
-/* Line 678 of lalr1.cc  */
-#line 5170 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5166 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8556,8 +8576,8 @@
 
   case 587:
 
-/* Line 678 of lalr1.cc  */
-#line 5174 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5170 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8565,8 +8585,8 @@
 
   case 588:
 
-/* Line 678 of lalr1.cc  */
-#line 5178 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5174 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8574,8 +8594,8 @@
 
   case 589:
 
-/* Line 678 of lalr1.cc  */
-#line 5182 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5178 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8583,8 +8603,8 @@
 
   case 590:
 
-/* Line 678 of lalr1.cc  */
-#line 5186 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5182 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8592,8 +8612,8 @@
 
   case 591:
 
-/* Line 678 of lalr1.cc  */
-#line 5190 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5186 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -8601,8 +8621,8 @@
 
   case 592:
 
-/* Line 678 of lalr1.cc  */
-#line 5198 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5194 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new AnyKindTest( LOC((yyloc)) );
         }
@@ -8610,8 +8630,8 @@
 
   case 593:
 
-/* Line 678 of lalr1.cc  */
-#line 5206 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5202 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new DocumentTest( LOC((yyloc)) );
         }
@@ -8619,8 +8639,8 @@
 
   case 594:
 
-/* Line 678 of lalr1.cc  */
-#line 5210 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5206 "/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)) );
         }
@@ -8628,8 +8648,8 @@
 
   case 595:
 
-/* Line 678 of lalr1.cc  */
-#line 5214 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5210 "/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))
@@ -8639,8 +8659,8 @@
 
   case 596:
 
-/* Line 678 of lalr1.cc  */
-#line 5224 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5220 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new TextTest( LOC((yyloc)) );
         }
@@ -8648,8 +8668,8 @@
 
   case 597:
 
-/* Line 678 of lalr1.cc  */
-#line 5232 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5228 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new CommentTest( LOC((yyloc)));
         }
@@ -8657,8 +8677,8 @@
 
   case 598:
 
-/* Line 678 of lalr1.cc  */
-#line 5240 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5236 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new PITest( LOC((yyloc)), "" );
         }
@@ -8666,8 +8686,8 @@
 
   case 599:
 
-/* Line 678 of lalr1.cc  */
-#line 5244 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5240 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
         }
@@ -8675,8 +8695,8 @@
 
   case 600:
 
-/* Line 678 of lalr1.cc  */
-#line 5248 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5244 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
         }
@@ -8684,8 +8704,8 @@
 
   case 601:
 
-/* Line 678 of lalr1.cc  */
-#line 5256 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5252 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
         }
@@ -8693,8 +8713,8 @@
 
   case 602:
 
-/* Line 678 of lalr1.cc  */
-#line 5260 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5256 "/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
@@ -8704,8 +8724,8 @@
 
   case 603:
 
-/* Line 678 of lalr1.cc  */
-#line 5266 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5262 "/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))
@@ -8715,8 +8735,8 @@
 
   case 604:
 
-/* Line 678 of lalr1.cc  */
-#line 5272 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5268 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
         }
@@ -8724,8 +8744,8 @@
 
   case 605:
 
-/* Line 678 of lalr1.cc  */
-#line 5276 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5272 "/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))
@@ -8735,8 +8755,8 @@
 
   case 606:
 
-/* Line 678 of lalr1.cc  */
-#line 5286 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5282 "/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)) );
         }
@@ -8744,8 +8764,8 @@
 
   case 607:
 
-/* Line 678 of lalr1.cc  */
-#line 5294 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5290 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ElementTest( LOC((yyloc)), NULL, NULL, true );
         }
@@ -8753,8 +8773,8 @@
 
   case 608:
 
-/* Line 678 of lalr1.cc  */
-#line 5298 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5294 "/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
@@ -8764,8 +8784,8 @@
 
   case 609:
 
-/* Line 678 of lalr1.cc  */
-#line 5304 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5300 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)),
@@ -8778,8 +8798,8 @@
 
   case 610:
 
-/* Line 678 of lalr1.cc  */
-#line 5313 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5309 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)),
@@ -8792,8 +8812,8 @@
 
   case 611:
 
-/* Line 678 of lalr1.cc  */
-#line 5322 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5318 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new ElementTest(
                 LOC((yyloc)), NULL, NULL, true
@@ -8803,8 +8823,8 @@
 
   case 612:
 
-/* Line 678 of lalr1.cc  */
-#line 5328 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5324 "/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
@@ -8814,8 +8834,8 @@
 
   case 613:
 
-/* Line 678 of lalr1.cc  */
-#line 5334 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5330 "/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
@@ -8825,8 +8845,8 @@
 
   case 614:
 
-/* Line 678 of lalr1.cc  */
-#line 5344 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5340 "/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)) );
         }
@@ -8834,8 +8854,8 @@
 
   case 615:
 
-/* Line 678 of lalr1.cc  */
-#line 5361 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5357 "/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)) );
         }
@@ -8843,8 +8863,8 @@
 
   case 616:
 
-/* Line 678 of lalr1.cc  */
-#line 5368 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5364 "/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 );
         }
@@ -8852,8 +8872,8 @@
 
   case 617:
 
-/* Line 678 of lalr1.cc  */
-#line 5383 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5379 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
         }
@@ -8861,8 +8881,8 @@
 
   case 618:
 
-/* Line 678 of lalr1.cc  */
-#line 5419 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5415 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8870,8 +8890,8 @@
 
   case 619:
 
-/* Line 678 of lalr1.cc  */
-#line 5423 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5419 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -8879,8 +8899,8 @@
 
   case 620:
 
-/* Line 678 of lalr1.cc  */
-#line 5431 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5427 "/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));
     }
@@ -8888,8 +8908,8 @@
 
   case 621:
 
-/* Line 678 of lalr1.cc  */
-#line 5439 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5435 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new InlineFunction(LOC((yyloc)),
                               &*(yysemantic_stack_[(3) - (2)].fnsig)->theParams,
@@ -8901,8 +8921,8 @@
 
   case 622:
 
-/* Line 678 of lalr1.cc  */
-#line 5451 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5447 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8910,8 +8930,8 @@
 
   case 623:
 
-/* Line 678 of lalr1.cc  */
-#line 5455 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5451 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -8919,8 +8939,8 @@
 
   case 624:
 
-/* Line 678 of lalr1.cc  */
-#line 5463 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5459 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new AnyFunctionTest(LOC((yyloc)));
     }
@@ -8928,8 +8948,8 @@
 
   case 625:
 
-/* Line 678 of lalr1.cc  */
-#line 5471 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5467 "/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)));
         }
@@ -8937,8 +8957,8 @@
 
   case 626:
 
-/* Line 678 of lalr1.cc  */
-#line 5475 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5471 "/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)),
@@ -8948,8 +8968,8 @@
 
   case 627:
 
-/* Line 678 of lalr1.cc  */
-#line 5486 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5482 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
            (yyval.node) = (yysemantic_stack_[(3) - (2)].node);
         }
@@ -8957,8 +8977,8 @@
 
   case 628:
 
-/* Line 678 of lalr1.cc  */
-#line 5503 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5499 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::strict_validation
@@ -8968,8 +8988,8 @@
 
   case 629:
 
-/* Line 678 of lalr1.cc  */
-#line 5509 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5505 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::lax_validation
@@ -8979,8 +8999,8 @@
 
   case 630:
 
-/* Line 678 of lalr1.cc  */
-#line 5515 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5511 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new RevalidationDecl(
                 LOC((yyloc)), StaticContextConsts::skip_validation
@@ -8990,8 +9010,8 @@
 
   case 631:
 
-/* Line 678 of lalr1.cc  */
-#line 5525 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5521 "/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) );
         }
@@ -8999,8 +9019,8 @@
 
   case 632:
 
-/* Line 678 of lalr1.cc  */
-#line 5529 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5525 "/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)
@@ -9010,8 +9030,8 @@
 
   case 633:
 
-/* Line 678 of lalr1.cc  */
-#line 5535 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5531 "/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)
@@ -9021,8 +9041,8 @@
 
   case 634:
 
-/* Line 678 of lalr1.cc  */
-#line 5541 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5537 "/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) );
         }
@@ -9030,8 +9050,8 @@
 
   case 635:
 
-/* Line 678 of lalr1.cc  */
-#line 5545 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5541 "/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)
@@ -9041,8 +9061,8 @@
 
   case 636:
 
-/* Line 678 of lalr1.cc  */
-#line 5551 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5547 "/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) );
         }
@@ -9050,8 +9070,8 @@
 
   case 637:
 
-/* Line 678 of lalr1.cc  */
-#line 5555 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5551 "/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)
@@ -9061,8 +9081,8 @@
 
   case 638:
 
-/* Line 678 of lalr1.cc  */
-#line 5561 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5557 "/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)
@@ -9072,8 +9092,8 @@
 
   case 639:
 
-/* Line 678 of lalr1.cc  */
-#line 5567 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5563 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new InsertExpr(
                 LOC ((yyloc)),
@@ -9084,8 +9104,8 @@
 
   case 640:
 
-/* Line 678 of lalr1.cc  */
-#line 5574 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5570 "/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)
@@ -9095,8 +9115,8 @@
 
   case 641:
 
-/* Line 678 of lalr1.cc  */
-#line 5584 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5580 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -9104,8 +9124,8 @@
 
   case 642:
 
-/* Line 678 of lalr1.cc  */
-#line 5589 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5585 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
         }
@@ -9113,8 +9133,8 @@
 
   case 643:
 
-/* Line 678 of lalr1.cc  */
-#line 5597 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5593 "/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)
@@ -9124,8 +9144,8 @@
 
   case 644:
 
-/* Line 678 of lalr1.cc  */
-#line 5603 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5599 "/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)
@@ -9135,8 +9155,8 @@
 
   case 645:
 
-/* Line 678 of lalr1.cc  */
-#line 5613 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5609 "/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) );
         }
@@ -9144,8 +9164,8 @@
 
   case 646:
 
-/* Line 678 of lalr1.cc  */
-#line 5635 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5631 "/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) );
@@ -9154,8 +9174,8 @@
 
   case 647:
 
-/* Line 678 of lalr1.cc  */
-#line 5644 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5640 "/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)));
@@ -9165,8 +9185,8 @@
 
   case 648:
 
-/* Line 678 of lalr1.cc  */
-#line 5650 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5646 "/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));
@@ -9177,8 +9197,8 @@
 
   case 649:
 
-/* Line 678 of lalr1.cc  */
-#line 5663 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5659 "/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));
     }
@@ -9186,8 +9206,8 @@
 
   case 650:
 
-/* Line 678 of lalr1.cc  */
-#line 5677 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5673 "/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) );
         }
@@ -9195,8 +9215,8 @@
 
   case 651:
 
-/* Line 678 of lalr1.cc  */
-#line 5684 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5680 "/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)) );
@@ -9206,8 +9226,8 @@
 
   case 652:
 
-/* Line 678 of lalr1.cc  */
-#line 5690 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5686 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
             if ( cle )
@@ -9218,8 +9238,8 @@
 
   case 653:
 
-/* Line 678 of lalr1.cc  */
-#line 5700 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5696 "/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);
@@ -9228,8 +9248,8 @@
 
   case 654:
 
-/* Line 678 of lalr1.cc  */
-#line 5709 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5705 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -9237,8 +9257,8 @@
 
   case 655:
 
-/* Line 678 of lalr1.cc  */
-#line 5717 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5713 "/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)) );
@@ -9248,8 +9268,8 @@
 
   case 656:
 
-/* Line 678 of lalr1.cc  */
-#line 5723 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5719 "/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));
@@ -9260,8 +9280,8 @@
 
   case 657:
 
-/* Line 678 of lalr1.cc  */
-#line 5741 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5737 "/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);
@@ -9270,8 +9290,8 @@
 
   case 658:
 
-/* Line 678 of lalr1.cc  */
-#line 5749 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5745 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.pos_filter_list) = NULL;
         }
@@ -9279,8 +9299,8 @@
 
   case 659:
 
-/* Line 678 of lalr1.cc  */
-#line 5753 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5749 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.pos_filter_list) = (yysemantic_stack_[(1) - (1)].pos_filter_list);
         }
@@ -9288,8 +9308,8 @@
 
   case 660:
 
-/* Line 678 of lalr1.cc  */
-#line 5760 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5756 "/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)) );
@@ -9298,8 +9318,8 @@
 
   case 661:
 
-/* Line 678 of lalr1.cc  */
-#line 5765 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5761 "/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);
@@ -9308,8 +9328,8 @@
 
   case 662:
 
-/* Line 678 of lalr1.cc  */
-#line 5773 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5769 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9317,8 +9337,8 @@
 
   case 663:
 
-/* Line 678 of lalr1.cc  */
-#line 5777 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5773 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTOr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
         }
@@ -9326,8 +9346,8 @@
 
   case 664:
 
-/* Line 678 of lalr1.cc  */
-#line 5784 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5780 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9335,8 +9355,8 @@
 
   case 665:
 
-/* Line 678 of lalr1.cc  */
-#line 5788 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5784 "/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) );
         }
@@ -9344,8 +9364,8 @@
 
   case 666:
 
-/* Line 678 of lalr1.cc  */
-#line 5795 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5791 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9353,8 +9373,8 @@
 
   case 667:
 
-/* Line 678 of lalr1.cc  */
-#line 5799 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5795 "/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) );
         }
@@ -9362,8 +9382,8 @@
 
   case 668:
 
-/* Line 678 of lalr1.cc  */
-#line 5806 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5802 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9371,8 +9391,8 @@
 
   case 669:
 
-/* Line 678 of lalr1.cc  */
-#line 5810 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5806 "/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))
@@ -9382,8 +9402,8 @@
 
   case 670:
 
-/* Line 678 of lalr1.cc  */
-#line 5819 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5815 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTPrimaryWithOptions(
                 LOC((yyloc)),
@@ -9396,8 +9416,8 @@
 
   case 671:
 
-/* Line 678 of lalr1.cc  */
-#line 5831 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5827 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9405,8 +9425,8 @@
 
   case 672:
 
-/* Line 678 of lalr1.cc  */
-#line 5835 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5831 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9414,8 +9434,8 @@
 
   case 673:
 
-/* Line 678 of lalr1.cc  */
-#line 5842 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5838 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9423,8 +9443,8 @@
 
   case 674:
 
-/* Line 678 of lalr1.cc  */
-#line 5846 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5842 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9432,8 +9452,8 @@
 
   case 675:
 
-/* Line 678 of lalr1.cc  */
-#line 5854 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5850 "/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)) );
         }
@@ -9441,8 +9461,8 @@
 
   case 676:
 
-/* Line 678 of lalr1.cc  */
-#line 5862 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5858 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTWordsTimes(
                 LOC((yyloc)),
@@ -9454,8 +9474,8 @@
 
   case 677:
 
-/* Line 678 of lalr1.cc  */
-#line 5870 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5866 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(3) - (2)].node);
         }
@@ -9463,8 +9483,8 @@
 
   case 678:
 
-/* Line 678 of lalr1.cc  */
-#line 5874 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5870 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9472,8 +9492,8 @@
 
   case 679:
 
-/* Line 678 of lalr1.cc  */
-#line 5881 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5877 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9481,8 +9501,8 @@
 
   case 680:
 
-/* Line 678 of lalr1.cc  */
-#line 5885 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5881 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9490,8 +9510,8 @@
 
   case 681:
 
-/* Line 678 of lalr1.cc  */
-#line 5893 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5889 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTExtensionSelection(
                 LOC((yyloc)),
@@ -9503,8 +9523,8 @@
 
   case 682:
 
-/* Line 678 of lalr1.cc  */
-#line 5904 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5900 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9512,8 +9532,8 @@
 
   case 683:
 
-/* Line 678 of lalr1.cc  */
-#line 5908 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5904 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9521,8 +9541,8 @@
 
   case 684:
 
-/* Line 678 of lalr1.cc  */
-#line 5916 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5912 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTWords(
                 LOC((yyloc)),
@@ -9534,8 +9554,8 @@
 
   case 685:
 
-/* Line 678 of lalr1.cc  */
-#line 5928 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5924 "/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
@@ -9545,8 +9565,8 @@
 
   case 686:
 
-/* Line 678 of lalr1.cc  */
-#line 5934 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5930 "/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))
@@ -9556,8 +9576,8 @@
 
   case 687:
 
-/* Line 678 of lalr1.cc  */
-#line 5943 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5939 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::any );
         }
@@ -9565,8 +9585,8 @@
 
   case 688:
 
-/* Line 678 of lalr1.cc  */
-#line 5947 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5943 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9574,8 +9594,8 @@
 
   case 689:
 
-/* Line 678 of lalr1.cc  */
-#line 5955 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5951 "/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) );
         }
@@ -9583,8 +9603,8 @@
 
   case 690:
 
-/* Line 678 of lalr1.cc  */
-#line 5959 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5955 "/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) );
         }
@@ -9592,8 +9612,8 @@
 
   case 691:
 
-/* Line 678 of lalr1.cc  */
-#line 5963 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5959 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::phrase );
         }
@@ -9601,8 +9621,8 @@
 
   case 692:
 
-/* Line 678 of lalr1.cc  */
-#line 5970 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5966 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::any;
         }
@@ -9610,8 +9630,8 @@
 
   case 693:
 
-/* Line 678 of lalr1.cc  */
-#line 5974 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5970 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::any_word;
         }
@@ -9619,8 +9639,8 @@
 
   case 694:
 
-/* Line 678 of lalr1.cc  */
-#line 5981 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5977 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::all;
         }
@@ -9628,8 +9648,8 @@
 
   case 695:
 
-/* Line 678 of lalr1.cc  */
-#line 5985 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5981 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.ft_anyall_value) = ft_anyall_mode::all_words;
         }
@@ -9637,8 +9657,8 @@
 
   case 696:
 
-/* Line 678 of lalr1.cc  */
-#line 5993 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5989 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9646,8 +9666,8 @@
 
   case 697:
 
-/* Line 678 of lalr1.cc  */
-#line 5997 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5993 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9655,8 +9675,8 @@
 
   case 698:
 
-/* Line 678 of lalr1.cc  */
-#line 6001 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 5997 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9664,8 +9684,8 @@
 
   case 699:
 
-/* Line 678 of lalr1.cc  */
-#line 6005 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6001 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9673,8 +9693,8 @@
 
   case 700:
 
-/* Line 678 of lalr1.cc  */
-#line 6009 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6005 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9682,8 +9702,8 @@
 
   case 701:
 
-/* Line 678 of lalr1.cc  */
-#line 6017 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6013 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTOrder( LOC((yyloc)) );
         }
@@ -9691,8 +9711,8 @@
 
   case 702:
 
-/* Line 678 of lalr1.cc  */
-#line 6025 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6021 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTWindow(
                 LOC((yyloc)),
@@ -9704,8 +9724,8 @@
 
   case 703:
 
-/* Line 678 of lalr1.cc  */
-#line 6037 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6033 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTDistance(
                 LOC((yyloc)),
@@ -9717,8 +9737,8 @@
 
   case 704:
 
-/* Line 678 of lalr1.cc  */
-#line 6049 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6045 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::words );
         }
@@ -9726,8 +9746,8 @@
 
   case 705:
 
-/* Line 678 of lalr1.cc  */
-#line 6053 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6049 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::sentences );
         }
@@ -9735,8 +9755,8 @@
 
   case 706:
 
-/* Line 678 of lalr1.cc  */
-#line 6057 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6053 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::paragraphs );
         }
@@ -9744,8 +9764,8 @@
 
   case 707:
 
-/* Line 678 of lalr1.cc  */
-#line 6065 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6061 "/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)) );
@@ -9755,8 +9775,8 @@
 
   case 708:
 
-/* Line 678 of lalr1.cc  */
-#line 6071 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6067 "/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)) );
@@ -9766,8 +9786,8 @@
 
   case 709:
 
-/* Line 678 of lalr1.cc  */
-#line 6081 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6077 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9775,8 +9795,8 @@
 
   case 710:
 
-/* Line 678 of lalr1.cc  */
-#line 6085 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6081 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9784,8 +9804,8 @@
 
   case 711:
 
-/* Line 678 of lalr1.cc  */
-#line 6089 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6085 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9793,8 +9813,8 @@
 
   case 712:
 
-/* Line 678 of lalr1.cc  */
-#line 6093 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6089 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9802,8 +9822,8 @@
 
   case 713:
 
-/* Line 678 of lalr1.cc  */
-#line 6097 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6093 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9811,8 +9831,8 @@
 
   case 714:
 
-/* Line 678 of lalr1.cc  */
-#line 6101 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6097 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9820,8 +9840,8 @@
 
   case 715:
 
-/* Line 678 of lalr1.cc  */
-#line 6105 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6101 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9829,8 +9849,8 @@
 
   case 716:
 
-/* Line 678 of lalr1.cc  */
-#line 6109 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6105 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9838,8 +9858,8 @@
 
   case 717:
 
-/* Line 678 of lalr1.cc  */
-#line 6117 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6113 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::sensitive );
         }
@@ -9847,8 +9867,8 @@
 
   case 718:
 
-/* Line 678 of lalr1.cc  */
-#line 6121 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6117 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::insensitive );
         }
@@ -9856,8 +9876,8 @@
 
   case 719:
 
-/* Line 678 of lalr1.cc  */
-#line 6125 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6121 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::lower );
         }
@@ -9865,8 +9885,8 @@
 
   case 720:
 
-/* Line 678 of lalr1.cc  */
-#line 6129 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6125 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::upper );
         }
@@ -9874,8 +9894,8 @@
 
   case 721:
 
-/* Line 678 of lalr1.cc  */
-#line 6137 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6133 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTDiacriticsOption(
                 LOC((yyloc)), ft_diacritics_mode::sensitive
@@ -9885,8 +9905,8 @@
 
   case 722:
 
-/* Line 678 of lalr1.cc  */
-#line 6143 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6139 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTDiacriticsOption(
                 LOC((yyloc)), ft_diacritics_mode::insensitive
@@ -9896,8 +9916,8 @@
 
   case 723:
 
-/* Line 678 of lalr1.cc  */
-#line 6153 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6149 "/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))
@@ -9907,8 +9927,8 @@
 
   case 724:
 
-/* Line 678 of lalr1.cc  */
-#line 6163 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6159 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::stemming );
         }
@@ -9916,8 +9936,8 @@
 
   case 725:
 
-/* Line 678 of lalr1.cc  */
-#line 6167 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6163 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::no_stemming );
         }
@@ -9925,8 +9945,8 @@
 
   case 726:
 
-/* Line 678 of lalr1.cc  */
-#line 6175 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6171 "/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) ) {
@@ -9940,8 +9960,8 @@
 
   case 727:
 
-/* Line 678 of lalr1.cc  */
-#line 6185 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6181 "/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) ) {
@@ -9956,8 +9976,8 @@
 
   case 728:
 
-/* Line 678 of lalr1.cc  */
-#line 6196 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6192 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTThesaurusOption( LOC((yyloc)), NULL, false, true );
         }
@@ -9965,8 +9985,8 @@
 
   case 729:
 
-/* Line 678 of lalr1.cc  */
-#line 6203 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6199 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -9974,8 +9994,8 @@
 
   case 730:
 
-/* Line 678 of lalr1.cc  */
-#line 6207 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6203 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -9983,8 +10003,8 @@
 
   case 731:
 
-/* Line 678 of lalr1.cc  */
-#line 6214 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6210 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.thesaurus_id_list) = NULL;
         }
@@ -9992,8 +10012,8 @@
 
   case 732:
 
-/* Line 678 of lalr1.cc  */
-#line 6218 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6214 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.thesaurus_id_list) = (yysemantic_stack_[(2) - (2)].thesaurus_id_list);
         }
@@ -10001,8 +10021,8 @@
 
   case 733:
 
-/* Line 678 of lalr1.cc  */
-#line 6225 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6221 "/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)) );
@@ -10011,8 +10031,8 @@
 
   case 734:
 
-/* Line 678 of lalr1.cc  */
-#line 6230 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6226 "/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);
@@ -10021,8 +10041,8 @@
 
   case 735:
 
-/* Line 678 of lalr1.cc  */
-#line 6239 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6235 "/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))
@@ -10032,8 +10052,8 @@
 
   case 736:
 
-/* Line 678 of lalr1.cc  */
-#line 6248 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6244 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.sval) = 0;
         }
@@ -10041,8 +10061,8 @@
 
   case 737:
 
-/* Line 678 of lalr1.cc  */
-#line 6252 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6248 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.sval) = (yysemantic_stack_[(2) - (2)].sval);
         }
@@ -10050,8 +10070,8 @@
 
   case 738:
 
-/* Line 678 of lalr1.cc  */
-#line 6259 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6255 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = NULL;
         }
@@ -10059,8 +10079,8 @@
 
   case 739:
 
-/* Line 678 of lalr1.cc  */
-#line 6263 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6259 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
         }
@@ -10068,8 +10088,8 @@
 
   case 740:
 
-/* Line 678 of lalr1.cc  */
-#line 6271 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6267 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTStopWordOption(
                 LOC((yyloc)),
@@ -10082,8 +10102,8 @@
 
   case 741:
 
-/* Line 678 of lalr1.cc  */
-#line 6280 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6276 "/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
@@ -10094,8 +10114,8 @@
 
   case 742:
 
-/* Line 678 of lalr1.cc  */
-#line 6287 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6283 "/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
@@ -10105,8 +10125,8 @@
 
   case 743:
 
-/* Line 678 of lalr1.cc  */
-#line 6297 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6293 "/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 );
         }
@@ -10114,8 +10134,8 @@
 
   case 744:
 
-/* Line 678 of lalr1.cc  */
-#line 6301 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6297 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTStopWords( LOC((yyloc)), "", (yysemantic_stack_[(3) - (2)].strlist) );
         }
@@ -10123,8 +10143,8 @@
 
   case 745:
 
-/* Line 678 of lalr1.cc  */
-#line 6308 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6304 "/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)) );
@@ -10134,8 +10154,8 @@
 
   case 746:
 
-/* Line 678 of lalr1.cc  */
-#line 6314 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6310 "/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)) );
@@ -10145,8 +10165,8 @@
 
   case 747:
 
-/* Line 678 of lalr1.cc  */
-#line 6323 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6319 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.incl_excl_list) = NULL;
         }
@@ -10154,8 +10174,8 @@
 
   case 748:
 
-/* Line 678 of lalr1.cc  */
-#line 6327 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6323 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.incl_excl_list) = (yysemantic_stack_[(1) - (1)].incl_excl_list);
         }
@@ -10163,8 +10183,8 @@
 
   case 749:
 
-/* Line 678 of lalr1.cc  */
-#line 6334 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6330 "/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)) );
@@ -10173,8 +10193,8 @@
 
   case 750:
 
-/* Line 678 of lalr1.cc  */
-#line 6339 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6335 "/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 )
@@ -10186,8 +10206,8 @@
 
   case 751:
 
-/* Line 678 of lalr1.cc  */
-#line 6351 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6347 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTStopWordsInclExcl(
                 LOC((yyloc)),
@@ -10199,8 +10219,8 @@
 
   case 752:
 
-/* Line 678 of lalr1.cc  */
-#line 6359 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6355 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTStopWordsInclExcl(
                 LOC((yyloc)),
@@ -10212,8 +10232,8 @@
 
   case 753:
 
-/* Line 678 of lalr1.cc  */
-#line 6371 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6367 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTLanguageOption( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
         }
@@ -10221,8 +10241,8 @@
 
   case 754:
 
-/* Line 678 of lalr1.cc  */
-#line 6379 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6375 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::with );
         }
@@ -10230,8 +10250,8 @@
 
   case 755:
 
-/* Line 678 of lalr1.cc  */
-#line 6383 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6379 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::without );
         }
@@ -10239,8 +10259,8 @@
 
   case 756:
 
-/* Line 678 of lalr1.cc  */
-#line 6391 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6387 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_start );
         }
@@ -10248,8 +10268,8 @@
 
   case 757:
 
-/* Line 678 of lalr1.cc  */
-#line 6395 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6391 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_end );
         }
@@ -10257,8 +10277,8 @@
 
   case 758:
 
-/* Line 678 of lalr1.cc  */
-#line 6399 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6395 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::entire );
         }
@@ -10266,8 +10286,8 @@
 
   case 759:
 
-/* Line 678 of lalr1.cc  */
-#line 6407 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6403 "/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)) );
         }
@@ -10275,8 +10295,8 @@
 
   case 760:
 
-/* Line 678 of lalr1.cc  */
-#line 6415 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6411 "/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) );
         }
@@ -10284,8 +10304,8 @@
 
   case 761:
 
-/* Line 678 of lalr1.cc  */
-#line 6419 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6415 "/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) );
         }
@@ -10293,8 +10313,8 @@
 
   case 762:
 
-/* Line 678 of lalr1.cc  */
-#line 6423 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6419 "/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) );
         }
@@ -10302,8 +10322,8 @@
 
   case 763:
 
-/* Line 678 of lalr1.cc  */
-#line 6427 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6423 "/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) );
         }
@@ -10311,8 +10331,8 @@
 
   case 764:
 
-/* Line 678 of lalr1.cc  */
-#line 6435 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6431 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTScope(
                 LOC((yyloc)),
@@ -10324,8 +10344,8 @@
 
   case 765:
 
-/* Line 678 of lalr1.cc  */
-#line 6443 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6439 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTScope(
                 LOC((yyloc)),
@@ -10337,8 +10357,8 @@
 
   case 766:
 
-/* Line 678 of lalr1.cc  */
-#line 6455 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6451 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::sentence );
         }
@@ -10346,8 +10366,8 @@
 
   case 767:
 
-/* Line 678 of lalr1.cc  */
-#line 6459 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6455 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
             (yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::paragraph );
         }
@@ -10355,8 +10375,8 @@
 
   case 768:
 
-/* Line 678 of lalr1.cc  */
-#line 6467 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6463 "/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)) );
         }
@@ -10364,8 +10384,8 @@
 
   case 769:
 
-/* Line 678 of lalr1.cc  */
-#line 6481 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6477 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), NULL );
         }
@@ -10373,8 +10393,8 @@
 
   case 770:
 
-/* Line 678 of lalr1.cc  */
-#line 6485 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6481 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
         }
@@ -10382,8 +10402,8 @@
 
   case 771:
 
-/* Line 678 of lalr1.cc  */
-#line 6492 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6488 "/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);
@@ -10392,8 +10412,8 @@
 
   case 772:
 
-/* Line 678 of lalr1.cc  */
-#line 6497 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6493 "/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);
@@ -10402,8 +10422,8 @@
 
   case 773:
 
-/* Line 678 of lalr1.cc  */
-#line 6505 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6501 "/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);
@@ -10412,8 +10432,8 @@
 
   case 774:
 
-/* Line 678 of lalr1.cc  */
-#line 6510 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6506 "/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);
@@ -10422,8 +10442,8 @@
 
   case 775:
 
-/* Line 678 of lalr1.cc  */
-#line 6519 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6515 "/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)));
@@ -10432,8 +10452,8 @@
 
   case 776:
 
-/* Line 678 of lalr1.cc  */
-#line 6527 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6523 "/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)));
@@ -10443,8 +10463,8 @@
 
   case 777:
 
-/* Line 678 of lalr1.cc  */
-#line 6533 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6529 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (1)].node));
           assert(jpl);
@@ -10455,8 +10475,8 @@
 
   case 778:
 
-/* Line 678 of lalr1.cc  */
-#line 6543 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6539 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = new JSONObjectInsertExpr(LOC((yyloc)),
                                         (yysemantic_stack_[(5) - (3)].expr),
@@ -10466,8 +10486,8 @@
 
   case 779:
 
-/* Line 678 of lalr1.cc  */
-#line 6549 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6545 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (3)].node));
           (yyval.expr) = new JSONObjectInsertExpr(
@@ -10481,8 +10501,8 @@
 
   case 780:
 
-/* Line 678 of lalr1.cc  */
-#line 6559 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6555 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = new JSONArrayInsertExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), (yysemantic_stack_[(8) - (5)].expr), (yysemantic_stack_[(8) - (8)].expr));
         }
@@ -10490,8 +10510,8 @@
 
   case 781:
 
-/* Line 678 of lalr1.cc  */
-#line 6566 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6562 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.expr) = new JSONArrayAppendExpr(LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr));
         }
@@ -10499,8 +10519,8 @@
 
   case 782:
 
-/* Line 678 of lalr1.cc  */
-#line 6573 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6569 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(3) - (3)].expr));
@@ -10526,8 +10546,8 @@
 
   case 783:
 
-/* Line 678 of lalr1.cc  */
-#line 6598 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6594 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(5) - (3)].expr));
@@ -10556,8 +10576,8 @@
 
   case 784:
 
-/* Line 678 of lalr1.cc  */
-#line 6626 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6622 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
           dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(7) - (5)].expr));
@@ -10586,8 +10606,8 @@
 
   case 785:
 
-/* Line 678 of lalr1.cc  */
-#line 6654 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6650 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -10595,8 +10615,8 @@
 
   case 786:
 
-/* Line 678 of lalr1.cc  */
-#line 6658 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6654 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -10604,8 +10624,8 @@
 
   case 787:
 
-/* Line 678 of lalr1.cc  */
-#line 6662 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6658 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
         }
@@ -10613,8 +10633,8 @@
 
   case 788:
 
-/* Line 678 of lalr1.cc  */
-#line 6669 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6665 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonItem);
         }
@@ -10622,8 +10642,8 @@
 
   case 789:
 
-/* Line 678 of lalr1.cc  */
-#line 6676 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6672 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonObject);
         }
@@ -10631,8 +10651,8 @@
 
   case 790:
 
-/* Line 678 of lalr1.cc  */
-#line 6683 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6679 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
           (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonArray);
         }
@@ -10640,8 +10660,8 @@
 
   case 793:
 
-/* Line 678 of lalr1.cc  */
-#line 6700 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6696 "/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();
@@ -10655,1558 +10675,1569 @@
 
   case 795:
 
-/* Line 678 of lalr1.cc  */
-#line 6713 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 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("attribute"))); }
     break;
 
   case 796:
 
-/* Line 678 of lalr1.cc  */
-#line 6714 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 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("comment"))); }
     break;
 
   case 797:
 
-/* Line 678 of lalr1.cc  */
-#line 6715 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 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("document-node"))); }
     break;
 
   case 798:
 
-/* Line 678 of lalr1.cc  */
-#line 6716 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 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("element"))); }
     break;
 
   case 799:
 
-/* Line 678 of lalr1.cc  */
-#line 6717 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6713 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("item"))); }
     break;
 
   case 800:
 
-/* Line 678 of lalr1.cc  */
-#line 6718 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6714 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("if"))); }
     break;
 
   case 801:
 
-/* Line 678 of lalr1.cc  */
-#line 6719 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6715 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("node"))); }
     break;
 
   case 802:
 
-/* Line 678 of lalr1.cc  */
-#line 6720 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6716 "/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 803:
 
-/* Line 678 of lalr1.cc  */
-#line 6721 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6717 "/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 804:
 
-/* Line 678 of lalr1.cc  */
-#line 6722 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6718 "/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 805:
 
-/* Line 678 of lalr1.cc  */
-#line 6723 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6719 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("text"))); }
     break;
 
   case 806:
 
-/* Line 678 of lalr1.cc  */
-#line 6724 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6720 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("typeswitch"))); }
     break;
 
   case 807:
 
-/* Line 678 of lalr1.cc  */
-#line 6725 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6721 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("switch"))); }
     break;
 
   case 808:
 
-/* Line 678 of lalr1.cc  */
-#line 6726 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6722 "/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 809:
 
-/* Line 678 of lalr1.cc  */
-#line 6727 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6723 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("while"))); }
     break;
 
   case 811:
 
-/* Line 678 of lalr1.cc  */
-#line 6732 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6728 "/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 812:
 
-/* Line 678 of lalr1.cc  */
-#line 6733 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6729 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("xquery"))); }
     break;
 
   case 813:
 
-/* Line 678 of lalr1.cc  */
-#line 6734 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6730 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("empty"))); }
     break;
 
   case 814:
 
-/* Line 678 of lalr1.cc  */
-#line 6735 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6731 "/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 815:
 
-/* Line 678 of lalr1.cc  */
-#line 6736 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6732 "/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 816:
 
-/* Line 678 of lalr1.cc  */
-#line 6737 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6733 "/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 817:
 
-/* Line 678 of lalr1.cc  */
-#line 6738 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6734 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lax"))); }
     break;
 
   case 818:
 
-/* Line 678 of lalr1.cc  */
-#line 6739 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6735 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("strict"))); }
     break;
 
   case 819:
 
-/* Line 678 of lalr1.cc  */
-#line 6740 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6736 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("idiv"))); }
     break;
 
   case 820:
 
-/* Line 678 of lalr1.cc  */
-#line 6741 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6737 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("document"))); }
     break;
 
   case 821:
 
-/* Line 678 of lalr1.cc  */
-#line 6742 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6738 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ftnot"))); }
     break;
 
   case 822:
 
-/* Line 678 of lalr1.cc  */
-#line 6743 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6739 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("not"))); }
     break;
 
   case 823:
 
-/* Line 678 of lalr1.cc  */
-#line 6744 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6740 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sensitive"))); }
     break;
 
   case 824:
 
-/* Line 678 of lalr1.cc  */
-#line 6745 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6741 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("insensitive"))); }
     break;
 
   case 825:
 
-/* Line 678 of lalr1.cc  */
-#line 6746 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6742 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("diacritics"))); }
     break;
 
   case 826:
 
-/* Line 678 of lalr1.cc  */
-#line 6747 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6743 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("without"))); }
     break;
 
   case 827:
 
-/* Line 678 of lalr1.cc  */
-#line 6748 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6744 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stemming"))); }
     break;
 
   case 828:
 
-/* Line 678 of lalr1.cc  */
-#line 6749 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6745 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("thesaurus"))); }
     break;
 
   case 829:
 
-/* Line 678 of lalr1.cc  */
-#line 6750 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6746 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stop"))); }
     break;
 
   case 830:
 
-/* Line 678 of lalr1.cc  */
-#line 6751 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6747 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("wildcards"))); }
     break;
 
   case 831:
 
-/* Line 678 of lalr1.cc  */
-#line 6752 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6748 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("entire"))); }
     break;
 
   case 832:
 
-/* Line 678 of lalr1.cc  */
-#line 6753 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6749 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("content"))); }
     break;
 
   case 833:
 
-/* Line 678 of lalr1.cc  */
-#line 6754 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6750 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("word"))); }
     break;
 
   case 834:
 
-/* Line 678 of lalr1.cc  */
-#line 6755 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6751 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("start"))); }
     break;
 
   case 835:
 
-/* Line 678 of lalr1.cc  */
-#line 6756 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6752 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("end"))); }
     break;
 
   case 836:
 
-/* Line 678 of lalr1.cc  */
-#line 6757 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6753 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("most"))); }
     break;
 
   case 837:
 
-/* Line 678 of lalr1.cc  */
-#line 6758 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6754 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("skip"))); }
     break;
 
   case 838:
 
-/* Line 678 of lalr1.cc  */
-#line 6759 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6755 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("copy"))); }
     break;
 
   case 839:
 
-/* Line 678 of lalr1.cc  */
-#line 6760 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6756 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("general"))); }
     break;
 
   case 840:
 
-/* Line 678 of lalr1.cc  */
-#line 6761 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6757 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("value"))); }
     break;
 
   case 841:
 
-/* Line 678 of lalr1.cc  */
-#line 6762 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6758 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("eq"))); }
     break;
 
   case 842:
 
-/* Line 678 of lalr1.cc  */
-#line 6763 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6759 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ne"))); }
     break;
 
   case 843:
 
-/* Line 678 of lalr1.cc  */
-#line 6764 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6760 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lt"))); }
     break;
 
   case 844:
 
-/* Line 678 of lalr1.cc  */
-#line 6765 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6761 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("le"))); }
     break;
 
   case 845:
 
-/* Line 678 of lalr1.cc  */
-#line 6766 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6762 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("gt"))); }
     break;
 
   case 846:
 
-/* Line 678 of lalr1.cc  */
-#line 6767 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6763 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ge"))); }
     break;
 
   case 847:
 
-/* Line 678 of lalr1.cc  */
-#line 6768 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6764 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("at"))); }
     break;
 
   case 848:
 
-/* Line 678 of lalr1.cc  */
-#line 6769 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6765 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("context"))); }
     break;
 
   case 849:
 
-/* Line 678 of lalr1.cc  */
-#line 6770 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6766 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("variable"))); }
     break;
 
   case 850:
 
-/* Line 678 of lalr1.cc  */
-#line 6771 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6767 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("return"))); }
     break;
 
   case 851:
 
-/* Line 678 of lalr1.cc  */
-#line 6772 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6768 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("for"))); }
     break;
 
   case 852:
 
-/* Line 678 of lalr1.cc  */
-#line 6773 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6769 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("allowing"))); }
     break;
 
   case 853:
 
-/* Line 678 of lalr1.cc  */
-#line 6774 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6770 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sliding"))); }
     break;
 
   case 854:
 
-/* Line 678 of lalr1.cc  */
-#line 6775 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6771 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("tumbling"))); }
     break;
 
   case 855:
 
-/* Line 678 of lalr1.cc  */
-#line 6776 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6772 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("previous"))); }
     break;
 
   case 856:
 
-/* Line 678 of lalr1.cc  */
-#line 6777 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6773 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("next"))); }
     break;
 
   case 857:
 
-/* Line 678 of lalr1.cc  */
-#line 6778 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6774 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("only"))); }
     break;
 
   case 858:
 
-/* Line 678 of lalr1.cc  */
-#line 6779 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6775 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("when"))); }
     break;
 
   case 859:
 
-/* Line 678 of lalr1.cc  */
-#line 6780 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6776 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("count"))); }
     break;
 
   case 860:
 
-/* Line 678 of lalr1.cc  */
-#line 6781 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6777 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("in"))); }
     break;
 
   case 861:
 
-/* Line 678 of lalr1.cc  */
-#line 6782 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6778 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("let"))); }
     break;
 
   case 862:
 
-/* Line 678 of lalr1.cc  */
-#line 6783 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6779 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("where"))); }
     break;
 
   case 863:
 
-/* Line 678 of lalr1.cc  */
-#line 6784 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6780 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("by"))); }
     break;
 
   case 864:
 
-/* Line 678 of lalr1.cc  */
-#line 6785 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6781 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("group"))); }
     break;
 
   case 865:
 
-/* Line 678 of lalr1.cc  */
-#line 6786 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6782 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("order"))); }
     break;
 
   case 866:
 
-/* Line 678 of lalr1.cc  */
-#line 6787 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6783 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stable"))); }
     break;
 
   case 867:
 
-/* Line 678 of lalr1.cc  */
-#line 6788 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6784 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ascending"))); }
     break;
 
   case 868:
 
-/* Line 678 of lalr1.cc  */
-#line 6789 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6785 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descending"))); }
     break;
 
   case 869:
 
-/* Line 678 of lalr1.cc  */
-#line 6790 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6786 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("greatest"))); }
     break;
 
   case 870:
 
-/* Line 678 of lalr1.cc  */
-#line 6791 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6787 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("least"))); }
     break;
 
   case 871:
 
-/* Line 678 of lalr1.cc  */
-#line 6792 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6788 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("collation"))); }
     break;
 
   case 872:
 
-/* Line 678 of lalr1.cc  */
-#line 6793 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6789 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("some"))); }
     break;
 
   case 873:
 
-/* Line 678 of lalr1.cc  */
-#line 6794 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6790 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("every"))); }
     break;
 
   case 874:
 
-/* Line 678 of lalr1.cc  */
-#line 6795 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6791 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("satisfies"))); }
     break;
 
   case 875:
 
-/* Line 678 of lalr1.cc  */
-#line 6796 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6792 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("case"))); }
     break;
 
   case 876:
 
-/* Line 678 of lalr1.cc  */
-#line 6797 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6793 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("as"))); }
     break;
 
   case 877:
 
-/* Line 678 of lalr1.cc  */
-#line 6798 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6794 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("then"))); }
     break;
 
   case 878:
 
-/* Line 678 of lalr1.cc  */
-#line 6799 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6795 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("else"))); }
     break;
 
   case 879:
 
-/* Line 678 of lalr1.cc  */
-#line 6800 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6796 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("or"))); }
     break;
 
   case 880:
 
-/* Line 678 of lalr1.cc  */
-#line 6801 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6797 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("and"))); }
     break;
 
   case 881:
 
-/* Line 678 of lalr1.cc  */
-#line 6802 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6798 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("instance"))); }
     break;
 
   case 882:
 
-/* Line 678 of lalr1.cc  */
-#line 6803 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6799 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("of"))); }
     break;
 
   case 883:
 
-/* Line 678 of lalr1.cc  */
-#line 6804 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6800 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("castable"))); }
     break;
 
   case 884:
 
-/* Line 678 of lalr1.cc  */
-#line 6805 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6801 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("to"))); }
     break;
 
   case 885:
 
-/* Line 678 of lalr1.cc  */
-#line 6806 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6802 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("div"))); }
     break;
 
   case 886:
 
-/* Line 678 of lalr1.cc  */
-#line 6807 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6803 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("mod"))); }
     break;
 
   case 887:
 
-/* Line 678 of lalr1.cc  */
-#line 6808 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6804 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("union"))); }
     break;
 
   case 888:
 
-/* Line 678 of lalr1.cc  */
-#line 6809 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6805 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("intersect"))); }
     break;
 
   case 889:
 
-/* Line 678 of lalr1.cc  */
-#line 6810 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6806 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("except"))); }
     break;
 
   case 890:
 
-/* Line 678 of lalr1.cc  */
-#line 6811 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6807 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("validate"))); }
     break;
 
   case 891:
 
-/* Line 678 of lalr1.cc  */
-#line 6812 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6808 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("type"))); }
     break;
 
   case 892:
 
-/* Line 678 of lalr1.cc  */
-#line 6813 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6809 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("cast"))); }
     break;
 
   case 893:
 
-/* Line 678 of lalr1.cc  */
-#line 6814 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6810 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("treat"))); }
     break;
 
   case 894:
 
-/* Line 678 of lalr1.cc  */
-#line 6815 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6811 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("is"))); }
     break;
 
   case 895:
 
-/* Line 678 of lalr1.cc  */
-#line 6816 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6812 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preserve"))); }
     break;
 
   case 896:
 
-/* Line 678 of lalr1.cc  */
-#line 6817 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6813 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("strip"))); }
     break;
 
   case 897:
 
-/* Line 678 of lalr1.cc  */
-#line 6818 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6814 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("namespace"))); }
     break;
 
   case 898:
 
-/* Line 678 of lalr1.cc  */
-#line 6819 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6815 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("external"))); }
     break;
 
   case 899:
 
-/* Line 678 of lalr1.cc  */
-#line 6820 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6816 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("encoding"))); }
     break;
 
   case 900:
 
-/* Line 678 of lalr1.cc  */
-#line 6821 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6817 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("no-preserve"))); }
     break;
 
   case 901:
 
-/* Line 678 of lalr1.cc  */
-#line 6822 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6818 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("inherit"))); }
     break;
 
   case 902:
 
-/* Line 678 of lalr1.cc  */
-#line 6823 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6819 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("no-inherit"))); }
     break;
 
   case 903:
 
-/* Line 678 of lalr1.cc  */
-#line 6824 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6820 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("declare"))); }
     break;
 
   case 904:
 
-/* Line 678 of lalr1.cc  */
-#line 6825 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6821 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("construction"))); }
     break;
 
   case 905:
 
-/* Line 678 of lalr1.cc  */
-#line 6826 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6822 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ordering"))); }
     break;
 
   case 906:
 
-/* Line 678 of lalr1.cc  */
-#line 6827 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6823 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("default"))); }
     break;
 
   case 907:
 
-/* Line 678 of lalr1.cc  */
-#line 6828 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6824 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("copy-namespaces"))); }
     break;
 
   case 908:
 
-/* Line 678 of lalr1.cc  */
-#line 6829 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6825 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("option"))); }
     break;
 
   case 909:
 
-/* Line 678 of lalr1.cc  */
-#line 6830 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6826 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("version"))); }
     break;
 
   case 910:
 
-/* Line 678 of lalr1.cc  */
-#line 6831 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6827 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("import"))); }
     break;
 
   case 911:
 
-/* Line 678 of lalr1.cc  */
-#line 6832 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6828 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema"))); }
     break;
 
   case 912:
 
-/* Line 678 of lalr1.cc  */
-#line 6833 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6829 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("module"))); }
     break;
 
   case 913:
 
-/* Line 678 of lalr1.cc  */
-#line 6834 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6830 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("function"))); }
     break;
 
   case 914:
 
-/* Line 678 of lalr1.cc  */
-#line 6835 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6831 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("score"))); }
     break;
 
   case 915:
 
-/* Line 678 of lalr1.cc  */
-#line 6836 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6832 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("contains"))); }
     break;
 
   case 916:
 
-/* Line 678 of lalr1.cc  */
-#line 6837 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6833 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("weight"))); }
     break;
 
   case 917:
 
-/* Line 678 of lalr1.cc  */
-#line 6838 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6834 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("window"))); }
     break;
 
   case 918:
 
-/* Line 678 of lalr1.cc  */
-#line 6839 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6835 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("distance"))); }
     break;
 
   case 919:
 
-/* Line 678 of lalr1.cc  */
-#line 6840 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6836 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("occurs"))); }
     break;
 
   case 920:
 
-/* Line 678 of lalr1.cc  */
-#line 6841 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6837 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("times"))); }
     break;
 
   case 921:
 
-/* Line 678 of lalr1.cc  */
-#line 6842 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6838 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("same"))); }
     break;
 
   case 922:
 
-/* Line 678 of lalr1.cc  */
-#line 6843 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6839 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("different"))); }
     break;
 
   case 923:
 
-/* Line 678 of lalr1.cc  */
-#line 6844 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6840 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lowercase"))); }
     break;
 
   case 924:
 
-/* Line 678 of lalr1.cc  */
-#line 6845 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6841 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("uppercase"))); }
     break;
 
   case 925:
 
-/* Line 678 of lalr1.cc  */
-#line 6846 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6842 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("relationship"))); }
     break;
 
   case 926:
 
-/* Line 678 of lalr1.cc  */
-#line 6847 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6843 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("levels"))); }
     break;
 
   case 927:
 
-/* Line 678 of lalr1.cc  */
-#line 6848 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6844 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("language"))); }
     break;
 
   case 928:
 
-/* Line 678 of lalr1.cc  */
-#line 6849 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6845 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("any"))); }
     break;
 
   case 929:
 
-/* Line 678 of lalr1.cc  */
-#line 6850 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6846 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("all"))); }
     break;
 
   case 930:
 
-/* Line 678 of lalr1.cc  */
-#line 6851 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6847 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("exactly"))); }
     break;
 
   case 931:
 
-/* Line 678 of lalr1.cc  */
-#line 6852 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6848 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("from"))); }
     break;
 
   case 932:
 
-/* Line 678 of lalr1.cc  */
-#line 6853 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6849 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("words"))); }
     break;
 
   case 933:
 
-/* Line 678 of lalr1.cc  */
-#line 6854 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6850 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sentences"))); }
     break;
 
   case 934:
 
-/* Line 678 of lalr1.cc  */
-#line 6855 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6851 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sentence"))); }
     break;
 
   case 935:
 
-/* Line 678 of lalr1.cc  */
-#line 6856 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6852 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("phrase"))); }
     break;
 
   case 936:
 
-/* Line 678 of lalr1.cc  */
-#line 6857 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6853 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("paragraph"))); }
     break;
 
   case 937:
 
-/* Line 678 of lalr1.cc  */
-#line 6858 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6854 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("paragraphs"))); }
     break;
 
   case 938:
 
-/* Line 678 of lalr1.cc  */
-#line 6859 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6855 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("replace"))); }
     break;
 
   case 939:
 
-/* Line 678 of lalr1.cc  */
-#line 6860 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6856 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("modify"))); }
     break;
 
   case 940:
 
-/* Line 678 of lalr1.cc  */
-#line 6861 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6857 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("first"))); }
     break;
 
   case 941:
 
-/* Line 678 of lalr1.cc  */
-#line 6862 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6858 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("insert"))); }
     break;
 
   case 942:
 
-/* Line 678 of lalr1.cc  */
-#line 6863 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6859 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("before"))); }
     break;
 
   case 943:
 
-/* Line 678 of lalr1.cc  */
-#line 6864 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6860 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("after"))); }
     break;
 
   case 944:
 
-/* Line 678 of lalr1.cc  */
-#line 6865 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6861 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("revalidation"))); }
     break;
 
   case 945:
 
-/* Line 678 of lalr1.cc  */
-#line 6866 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6862 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("with"))); }
     break;
 
   case 946:
 
-/* Line 678 of lalr1.cc  */
-#line 6867 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6863 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("nodes"))); }
     break;
 
   case 947:
 
-/* Line 678 of lalr1.cc  */
-#line 6868 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6864 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("rename"))); }
     break;
 
   case 948:
 
-/* Line 678 of lalr1.cc  */
-#line 6869 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6865 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("last"))); }
     break;
 
   case 949:
 
-/* Line 678 of lalr1.cc  */
-#line 6870 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6866 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("delete"))); }
     break;
 
   case 950:
 
-/* Line 678 of lalr1.cc  */
-#line 6871 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6867 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("into"))); }
     break;
 
   case 951:
 
-/* Line 678 of lalr1.cc  */
-#line 6872 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6868 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("simple"))); }
     break;
 
   case 952:
 
-/* Line 678 of lalr1.cc  */
-#line 6873 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6869 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sequential"))); }
     break;
 
   case 953:
 
-/* Line 678 of lalr1.cc  */
-#line 6874 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6870 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("updating"))); }
     break;
 
   case 954:
 
-/* Line 678 of lalr1.cc  */
-#line 6875 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6871 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ordered"))); }
     break;
 
   case 955:
 
-/* Line 678 of lalr1.cc  */
-#line 6876 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6872 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("unordered"))); }
     break;
 
   case 956:
 
-/* Line 678 of lalr1.cc  */
-#line 6877 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6873 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("returning"))); }
     break;
 
   case 957:
 
-/* Line 678 of lalr1.cc  */
-#line 6878 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6874 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("exit"))); }
     break;
 
   case 958:
 
-/* Line 678 of lalr1.cc  */
-#line 6879 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6875 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("loop"))); }
     break;
 
   case 959:
 
-/* Line 678 of lalr1.cc  */
-#line 6880 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6876 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("break"))); }
     break;
 
   case 960:
 
-/* Line 678 of lalr1.cc  */
-#line 6881 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6877 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("continue"))); }
     break;
 
   case 961:
 
-/* Line 678 of lalr1.cc  */
-#line 6882 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6878 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("try"))); }
     break;
 
   case 962:
 
-/* Line 678 of lalr1.cc  */
-#line 6883 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6879 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("catch"))); }
     break;
 
   case 963:
 
-/* Line 678 of lalr1.cc  */
-#line 6884 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6880 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("using"))); }
     break;
 
   case 964:
 
-/* Line 678 of lalr1.cc  */
-#line 6885 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6881 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("set"))); }
     break;
 
   case 965:
 
-/* Line 678 of lalr1.cc  */
-#line 6886 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6882 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("index"))); }
     break;
 
   case 966:
 
-/* Line 678 of lalr1.cc  */
-#line 6887 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6883 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("unique"))); }
     break;
 
   case 967:
 
-/* Line 678 of lalr1.cc  */
-#line 6888 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6884 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("non"))); }
     break;
 
   case 968:
 
-/* Line 678 of lalr1.cc  */
-#line 6889 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6885 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("on"))); }
     break;
 
   case 969:
 
-/* Line 678 of lalr1.cc  */
-#line 6890 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6886 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("range"))); }
     break;
 
   case 970:
 
-/* Line 678 of lalr1.cc  */
-#line 6891 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6887 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("equality"))); }
     break;
 
   case 971:
 
-/* Line 678 of lalr1.cc  */
-#line 6892 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6888 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("manually"))); }
     break;
 
   case 972:
 
-/* Line 678 of lalr1.cc  */
-#line 6893 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6889 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("automatically"))); }
     break;
 
   case 973:
 
-/* Line 678 of lalr1.cc  */
-#line 6894 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6890 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("maintained"))); }
     break;
 
   case 974:
 
-/* Line 678 of lalr1.cc  */
-#line 6895 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6891 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("decimal-format"))); }
     break;
 
   case 975:
 
-/* Line 678 of lalr1.cc  */
-#line 6896 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6892 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("decimal-separator"))); }
     break;
 
   case 976:
 
-/* Line 678 of lalr1.cc  */
-#line 6897 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6893 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("grouping-separator"))); }
     break;
 
   case 977:
 
-/* Line 678 of lalr1.cc  */
-#line 6898 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6894 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("infinity"))); }
     break;
 
   case 978:
 
-/* Line 678 of lalr1.cc  */
-#line 6899 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6895 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("minus-sign"))); }
     break;
 
   case 979:
 
-/* Line 678 of lalr1.cc  */
-#line 6900 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6896 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("NaN"))); }
     break;
 
   case 980:
 
-/* Line 678 of lalr1.cc  */
-#line 6901 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6897 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("percent"))); }
     break;
 
   case 981:
 
-/* Line 678 of lalr1.cc  */
-#line 6902 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6898 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("per-mille"))); }
     break;
 
   case 982:
 
-/* Line 678 of lalr1.cc  */
-#line 6903 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6899 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("zero-digit"))); }
     break;
 
   case 983:
 
-/* Line 678 of lalr1.cc  */
-#line 6904 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6900 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("digit"))); }
     break;
 
   case 984:
 
-/* Line 678 of lalr1.cc  */
-#line 6905 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6901 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("pattern-separator"))); }
     break;
 
   case 985:
 
-/* Line 678 of lalr1.cc  */
-#line 6906 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6902 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("collection"))); }
     break;
 
   case 986:
 
-/* Line 678 of lalr1.cc  */
-#line 6907 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 6903 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yy

Follow ups