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

[Nicolae Brinza]

Fixed #1072644: broken error location

[Nicolae Brinza (nbrinza)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2013-01-07T18-19-01.443Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2013-01-07T19-04-50.336Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2013-01-07T19-50-48.489Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2013-01-07T20-36-47.472Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2013-01-07T21-22-48.853Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2013-01-07T22-08-48.172Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2013-01-07T22-54-51.33Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2013-01-07T23-40-46.807Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2013-01-08T00-26-54.704Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2013-01-08T01-12-53.098Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2013-01-08T01-58-49.912Z/log.html

[Chris Hillery (ceejatec)]

Nicolae - something seems to be weird with either your changes or with the RQ in general. As you see it started the queue a dozen times. Each time it timed out running the following test. Could your changes somehow be causing this test to hang?

211: Test command: /home/ceej/zo/testing/zorbatest/tester/remotequeue/error-messages-2013-01-07T22-54-51.33Z/bzr/zorba/build/test/rbkt/testdriver "w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTExtensionSelections/FTExtension-Opt-q3.xq"
211: Test timeout computed to be: 0
211: test w3c_full_text_testsuite/XQuery/Expressions/Operators/CompExpr/FTContainsExpr/FTExtensionSelections/FTExtension-Opt-q3
211: === Query: ===
211: (: Note to maintainers: This query has an intentional syntax error. Do not "fix" it. :)
211:
211: (: 3.4.8 Extension Option negative case, beginning # is missing:)
211:
211: declare namespace oraxqft = "http://www.oracle.com/technology/tech/xml/xmldb/index.html";
211: (: insert-start :)
211: declare variable $input-context external;
211: (: insert-end :)
211: /books/book/author[name contains text oraxqft:user-index #) {'Berner-lee'}]
211:
211:
211: === end of Query ===

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~nbrinza/zorba/error-messages into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job error-messages-2013-01-08T01-58-49.912Z is finished.
  The final status was:

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

  Not commiting changes.

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

[Chris Hillery (ceejatec)]

I've killed the most recent run manually. Before I did so I noted that "testdriver" was stuck spinning 100% of the CPU on the RQ machine, so it appears there's an infinite loop.

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

10843. By Nicolae Brinza on 2013-01-08

Fixed failing regressions

10844. By Nicolae Brinza on 2013-01-08

Further improved error message reporting for missing semicolon between statements

10845. By Nicolae Brinza on 2013-01-09

Unexpected QName errors now print the offending qname, fixes bug #949064

10846. By Nicolae Brinza on 2013-01-09

Merged with Zorba trunk

10847. By Nicolae Brinza on 2013-01-09

Updated test result to take into account the qname parser error message fix

10848. By Nicolae Brinza on 2013-01-22

Fixed bug #866958

10849. By Nicolae Brinza on 2013-01-22

Merged with Zorba trunk

10850. By Nicolae Brinza on 2013-01-22

Updated Changelog to mention the fix for bug #866958

10851. By Nicolae Brinza on 2013-02-13

Merged with Zorba trunk

10852. By Nicolae Brinza on 2013-02-13

Added a small comment to test the new FOTS remote queue

10853. By Nicolae Brinza on 2013-08-15

Merged with Zorba trunk

10854. By Nicolae Brinza on 2013-08-19

Merged with Zorba trunk

10855. By Nicolae Brinza on 2013-08-21

Fixed bugs #1210320 and #1212423 - misplaced compiler error

Unmerged revisions

=== modified file 'ChangeLog'
--- ChangeLog	2013-01-08 09:03:49 +0000
+++ ChangeLog	2013-01-08 13:48:29 +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-08 13:48:29 +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-08 13:48:29 +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-08 13:48:29 +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,45 @@
 
   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; YYABORT;
+        (yyval.node) = NULL;
       }
     break;
 
   case 7:
 
-/* Line 678 of lalr1.cc  */
-#line 1080 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1075 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
-      (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-      driver.set_expr( (yyval.node) );
-    }
+        (yyval.node) = NULL; YYABORT;
+      }
     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 1079 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+        (yyval.node) = NULL; YYABORT;
+      }
+    break;
+
+  case 9:
+
+/* Line 690 of lalr1.cc  */
+#line 1088 "/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 10:
+
+/* Line 690 of lalr1.cc  */
+#line 1094 "/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 +3103,20 @@
     }
     break;
 
-  case 9:
+  case 11:
 
-/* Line 678 of lalr1.cc  */
-#line 1094 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1102 "/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 10:
+  case 12:
 
-/* 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 1108 "/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 +3125,28 @@
     }
     break;
 
-  case 11:
+  case 13:
 
-/* 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 1119 "/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 14:
 
-/* 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 1124 "/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 15:
 
-/* 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 1132 "/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 +3154,10 @@
     }
     break;
 
-  case 14:
+  case 16:
 
-/* 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 1139 "/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 +3165,10 @@
     }
     break;
 
-  case 15:
+  case 17:
 
-/* 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 1146 "/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 +3178,19 @@
     }
     break;
 
-  case 16:
+  case 18:
 
-/* 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 1155 "/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 19:
 
-/* 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 1162 "/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,10 +3199,10 @@
     }
     break;
 
-  case 18:
+  case 20:
 
-/* Line 678 of lalr1.cc  */
-#line 1162 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1170 "/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();
@@ -3168,10 +3211,10 @@
     }
     break;
 
-  case 19:
+  case 21:
 
-/* 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 1178 "/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 +3223,10 @@
     }
     break;
 
-  case 20:
+  case 22:
 
-/* 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 1186 "/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 +3235,19 @@
     }
     break;
 
-  case 21:
+  case 23:
 
-/* 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 1197 "/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 24:
 
-/* 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 1202 "/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 +3255,10 @@
     }
     break;
 
-  case 23:
+  case 25:
 
-/* 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 1209 "/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 +3266,10 @@
     }
     break;
 
-  case 24:
+  case 26:
 
-/* 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 1216 "/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 +3279,10 @@
     }
     break;
 
-  case 25:
+  case 27:
 
-/* 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 1228 "/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 +3290,10 @@
     }
     break;
 
-  case 26:
+  case 28:
 
-/* 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 1238 "/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 +3301,20 @@
     }
     break;
 
-  case 27:
+  case 29:
 
-/* 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 1245 "/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 30:
 
-/* 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 1252 "/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 +3324,136 @@
     }
     break;
 
-  case 42:
+  case 44:
 
-/* 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 1287 "/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 45:
 
-/* 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 1292 "/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 46:
 
-/* 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 1300 "/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 47:
 
-/* 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 1308 "/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 48:
 
-/* 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 1316 "/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 49:
 
-/* 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 1321 "/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 50:
 
-/* 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 1329 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::ordered);
     }
     break;
 
-  case 49:
+  case 51:
 
-/* 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 1334 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::unordered);
     }
     break;
 
-  case 50:
+  case 52:
 
-/* 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 1342 "/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 53:
 
-/* 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 1347 "/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 54:
 
-/* 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 1355 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, true);
     }
     break;
 
-  case 53:
+  case 55:
 
-/* 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 1360 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, false);
     }
     break;
 
-  case 54:
+  case 56:
 
-/* 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 1365 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, true);
     }
     break;
 
-  case 55:
+  case 57:
 
-/* 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 1370 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, false);
     }
     break;
 
-  case 58:
+  case 60:
 
-/* 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 1383 "/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 +3461,19 @@
     }
     break;
 
-  case 59:
+  case 61:
 
-/* 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 1393 "/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 62:
 
-/* 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 1398 "/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,10 +3482,10 @@
     }
     break;
 
-  case 61:
+  case 63:
 
-/* Line 678 of lalr1.cc  */
-#line 1398 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1406 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             NULL,
@@ -3451,10 +3494,10 @@
     }
     break;
 
-  case 62:
+  case 64:
 
-/* 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 1414 "/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 +3506,10 @@
     }
     break;
 
-  case 63:
+  case 65:
 
-/* 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 1425 "/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 +3517,10 @@
     }
     break;
 
-  case 64:
+  case 66:
 
-/* 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 1432 "/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 +3529,28 @@
     }
     break;
 
-  case 65:
+  case 67:
 
-/* 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 1443 "/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 68:
 
-/* 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 1448 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new SchemaPrefix( LOC((yyloc)), true );
     }
     break;
 
-  case 67:
+  case 69:
 
-/* 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 1456 "/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 +3558,10 @@
     }
     break;
 
-  case 68:
+  case 70:
 
-/* 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 1463 "/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 +3569,10 @@
     }
     break;
 
-  case 69:
+  case 71:
 
-/* 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 1470 "/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 +3582,10 @@
     }
     break;
 
-  case 70:
+  case 72:
 
-/* 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 1479 "/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 +3596,19 @@
     }
     break;
 
-  case 71:
+  case 73:
 
-/* 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 1492 "/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 74:
 
-/* 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 1500 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_element_default,
@@ -3573,10 +3616,10 @@
     }
     break;
 
-  case 73:
+  case 75:
 
-/* 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 1507 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_function_default,
@@ -3584,10 +3627,10 @@
     }
     break;
 
-  case 74:
+  case 76:
 
-/* 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 1517 "/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 +3638,20 @@
     }
     break;
 
-  case 75:
+  case 77:
 
-/* 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 1524 "/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 78:
 
-/* 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 1531 "/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 +3660,30 @@
     }
     break;
 
-  case 85:
+  case 87:
 
-/* 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 1554 "/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 88:
 
-/* 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 1560 "/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 89:
 
-/* 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 1569 "/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 +3691,10 @@
     }
     break;
 
-  case 88:
+  case 90:
 
-/* 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 1576 "/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 +3702,10 @@
     }
     break;
 
-  case 89:
+  case 91:
 
-/* 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 1586 "/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 +3713,107 @@
     }
     break;
 
-  case 90:
+  case 92:
 
-/* 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 1595 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "decimal-separator"; }
     break;
 
-  case 91:
+  case 93:
 
-/* 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 1596 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "digit"; }
     break;
 
-  case 92:
+  case 94:
 
-/* 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 1597 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "grouping-separator"; }
     break;
 
-  case 93:
+  case 95:
 
-/* 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 1598 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "infinty"; }
     break;
 
-  case 94:
+  case 96:
 
-/* 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 1599 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "minus-sign"; }
     break;
 
-  case 95:
+  case 97:
 
-/* 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 1600 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "NaN"; }
     break;
 
-  case 96:
+  case 98:
 
-/* 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 1601 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "pattern-separator"; }
     break;
 
-  case 97:
+  case 99:
 
-/* 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 1602 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "percent"; }
     break;
 
-  case 98:
+  case 100:
 
-/* 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 1603 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "per-mille"; }
     break;
 
-  case 99:
+  case 101:
 
-/* 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 1604 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "zero-digit"; }
     break;
 
-  case 100:
+  case 102:
 
-/* 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 1610 "/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 103:
 
-/* 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 1618 "/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 104:
 
-/* 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 1626 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(4) - (4)].node);
     }
     break;
 
-  case 103:
+  case 105:
 
-/* 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 1634 "/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 +3821,19 @@
     }
     break;
 
-  case 104:
+  case 106:
 
-/* Line 678 of lalr1.cc  */
-#line 1633 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1641 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
     break;
 
-  case 105:
+  case 107:
 
-/* 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 1649 "/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 +3841,37 @@
     }
     break;
 
-  case 106:
+  case 108:
 
-/* 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 1656 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CtxItemDecl(LOC((yyloc)), NULL);
     }
     break;
 
-  case 107:
+  case 109:
 
-/* Line 678 of lalr1.cc  */
-#line 1653 "/home/markos/zorba/repo/cast-to-simple-type/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1661 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
     }
     break;
 
-  case 108:
+  case 110:
 
-/* 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 1669 "/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 111:
 
-/* 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 1677 "/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 +3886,10 @@
     }
     break;
 
-  case 110:
+  case 112:
 
-/* 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 1691 "/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 +3904,10 @@
     }
     break;
 
-  case 111:
+  case 113:
 
-/* 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 1705 "/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 +3922,19 @@
     }
     break;
 
-  case 112:
+  case 114:
 
-/* 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 1722 "/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 115:
 
-/* 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 1727 "/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 +3943,10 @@
     }
     break;
 
-  case 114:
+  case 116:
 
-/* 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 1735 "/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 +3955,10 @@
     }
     break;
 
-  case 115:
+  case 117:
 
-/* 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 1743 "/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 +3967,38 @@
     }
     break;
 
-  case 116:
+  case 118:
 
-/* 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 1754 "/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 119:
 
-/* 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 1759 "/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 120:
 
-/* 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 1768 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))), NULL);
     }
     break;
 
-  case 119:
+  case 121:
 
-/* 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 1773 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
                                    new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval))),
@@ -3963,19 +4006,19 @@
     }
     break;
 
-  case 120:
+  case 122:
 
-/* 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 1780 "/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 123:
 
-/* 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 1785 "/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 +4026,39 @@
     }
     break;
 
-  case 122:
+  case 124:
 
-/* 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 1795 "/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 125:
 
-/* 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 1800 "/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 126:
 
-/* 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 1809 "/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 127:
 
-/* 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 1815 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       FunctionDecl* fdecl = static_cast<FunctionDecl*>((yysemantic_stack_[(3) - (3)].node));
 
@@ -4026,28 +4069,28 @@
     }
     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"
-    {
-      (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
-    }
-    break;
-
   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 1828 "/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 1833 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
+    {
+      (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+    }
+    break;
+
+  case 130:
+
+/* Line 690 of lalr1.cc  */
+#line 1841 "/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 +4103,10 @@
     }
     break;
 
-  case 129:
+  case 131:
 
-/* 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 1852 "/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 +4119,10 @@
     }
     break;
 
-  case 130:
+  case 132:
 
-/* 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 1867 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC ((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4092,10 +4135,10 @@
     }
     break;
 
-  case 131:
+  case 133:
 
-/* 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 1879 "/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 +4151,46 @@
     }
     break;
 
-  case 132:
+  case 134:
 
-/* 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 1894 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(NULL);
     }
     break;
 
-  case 133:
+  case 135:
 
-/* 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 1899 "/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 136:
 
-/* 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 1904 "/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 137:
 
-/* 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 1909 "/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 138:
 
-/* 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 1917 "/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 +4198,10 @@
     }
     break;
 
-  case 137:
+  case 139:
 
-/* 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 1924 "/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 +4210,19 @@
     }
     break;
 
-  case 138:
+  case 140:
 
-/* 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 1935 "/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 141:
 
-/* 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 1940 "/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 +4230,10 @@
     }
     break;
 
-  case 140:
+  case 142:
 
-/* 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 1950 "/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 +4244,10 @@
     }
     break;
 
-  case 141:
+  case 143:
 
-/* 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 1959 "/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 +4258,10 @@
     }
     break;
 
-  case 142:
+  case 144:
 
-/* 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 1968 "/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 +4272,10 @@
     }
     break;
 
-  case 143:
+  case 145:
 
-/* 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 1977 "/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,30 +4286,10 @@
     }
     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"
-    {
-      (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
-                                                    (yysemantic_stack_[(2) - (1)].node),
-                                                    dynamic_cast<OccurrenceIndicator*>((yysemantic_stack_[(2) - (2)].node))));
-    }
-    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));
     }
@@ -4274,20 +4297,40 @@
 
   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 1993 "/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 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_[(1) - (1)].node), NULL));
+    }
+    break;
+
+  case 149:
+
+/* Line 690 of lalr1.cc  */
+#line 2003 "/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 150:
+
+/* Line 690 of lalr1.cc  */
+#line 2013 "/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 +4342,10 @@
     }
     break;
 
-  case 149:
+  case 151:
 
-/* 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 2023 "/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 +4357,10 @@
     }
     break;
 
-  case 150:
+  case 152:
 
-/* 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 2036 "/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 +4368,29 @@
     }
     break;
 
-  case 151:
+  case 153:
 
-/* 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 2042 "/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 154: