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

[Nicolae Brinza]

Improved parser error messages (bug #867357).

Improved parser error messages (bug #867357).

[David Graf (davidagraf)]

Tested it. Very cool.

Something that is unrelated:
Is it possible to make those things:
+#line 87 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
... with relative paths?

review: Approve

[Nicolae Brinza (nbrinza)]

I'm not aware of any options to do that. But I'll look into it to see if it is possible. Those paths look ugly indeed.

[Matthias Brantner (matthias-brantner)]

This branch has some conflicts with the current trunk. Also, if I merge the trunk, I get the following compile error:

/home/mbrantner/zorba/sandbox/src/compiler/parser/xquery_parser.y: In member function ‘virtual int zorba::xquery_parser::parse()’:
/home/mbrantner/zorba/sandbox/src/compiler/parser/xquery_parser.y:2653:94: error: ‘class zorba::VarInDecl’ has no member named ‘get_name’
/home/mbrantner/zorba/sandbox/src/compiler/parser/xquery_parser.y:2679:75: error: ‘class zorba::VarInDecl’ has no member named ‘get_name’

review: Needs Fixing

[Nicolae Brinza (nbrinza)]

I have fixed the conflicts.

[David Graf (davidagraf)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2012-06-21T19-09-01.242Z/log.html

[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:274 (message):
  Validation queue job error-messages-2012-06-21T19-09-01.242Z is finished.
  The final status was:

  3 tests did not succeed - changes not commited.

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2012-06-24T16-41-00.981Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job error-messages-2012-06-24T16-41-00.981Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

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

[David Graf (davidagraf)]

Do we need to approve again? Or is something broken and needs to get fixed?

[Nicolae Brinza (nbrinza)]

Yes, David, please approve it again. As you can see above, I've run the remote queue and all the tests succeeded.

[Matthias Brantner (matthias-brantner)]

review: Approve

[David Graf (davidagraf)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2012-06-25T16-51-10.454Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job error-messages-2012-06-25T16-51-10.454Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2012-06-23 00:26:39 +0000
+++ ChangeLog	2012-06-24 15:32:27 +0000
@@ -15,6 +15,7 @@
   * Big rewrite of plan serializer internals, resulting in big performance improvement.
 
 Bug Fixes/Other Changes:
+  * Fixed bug #867357 (Improved parser error messages)
   * Fixed bug #932314 (non-comparable values must be treated as distinct by
     fn:distinct-values)
   * Fixed bug #991088$ (raise XUST0001 in trycatch with mixed updating and simple clauses)

=== modified file 'src/compiler/parser/xquery_parser.cpp'
--- src/compiler/parser/xquery_parser.cpp	2012-06-18 10:06:47 +0000
+++ src/compiler/parser/xquery_parser.cpp	2012-06-24 15:32:27 +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/jsoniq-deactivated/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/jsoniq-deactivated/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 902 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 299 of lalr1.cc  */
+#line 902 "/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 1018 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 299 of lalr1.cc  */
+#line 1018 "/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/jsoniq-deactivated/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/jsoniq-deactivated/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,2513 +290,2513 @@
         case 110: /* "\"'DECIMAL'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 900 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 900 "/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/jsoniq-deactivated/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 899 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 899 "/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/jsoniq-deactivated/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 898 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 898 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 316 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 335: /* "VersionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 325 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 336: /* "MainModule" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 334 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 337: /* "LibraryModule" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 343 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 338: /* "ModuleDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 352 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 339: /* "SIND_DeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 361 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 340: /* "SIND_Decl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 370 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 341: /* "Setter" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 379 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 342: /* "BoundarySpaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 388 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 343: /* "DefaultCollationDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 397 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 344: /* "BaseURIDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 406 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 345: /* "ConstructionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 415 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 346: /* "OrderingModeDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 424 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 347: /* "EmptyOrderDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 433 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 348: /* "CopyNamespacesDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 442 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 349: /* "Import" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 451 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 350: /* "SchemaImport" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 460 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 351: /* "URILiteralList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 469 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 352: /* "SchemaPrefix" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 478 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 353: /* "ModuleImport" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 487 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 354: /* "NamespaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 496 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 355: /* "DefaultNamespaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 505 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 356: /* "VFO_DeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 514 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 357: /* "VFO_Decl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 523 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 358: /* "DecimalFormatDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 532 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 359: /* "DecimalFormatParamList" */
 
 /* Line 480 of lalr1.cc  */
-#line 926 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 926 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 541 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 360: /* "DecimalFormatParam" */
 
 /* Line 480 of lalr1.cc  */
-#line 926 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 926 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 550 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 362: /* "OptionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 559 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 363: /* "FTOptionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 568 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 364: /* "CtxItemDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 577 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 365: /* "CtxItemDecl2" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 586 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 366: /* "CtxItemDecl3" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 595 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 367: /* "CtxItemDecl4" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 604 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 368: /* "VarDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 613 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 369: /* "VarNameAndType" */
 
 /* Line 480 of lalr1.cc  */
-#line 926 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 926 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 622 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 370: /* "AnnotationList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 631 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 371: /* "Annotation" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 640 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 372: /* "AnnotationLiteralList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 649 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 373: /* "FunctionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 658 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 374: /* "FunctionDecl2" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 667 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 375: /* "FunctionDeclSimple" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 676 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 376: /* "FunctionDeclUpdating" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 685 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 377: /* "FunctionSig" */
 
 /* Line 480 of lalr1.cc  */
-#line 926 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 926 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 694 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 378: /* "ParamList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 703 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 379: /* "Param" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 712 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 380: /* "CollectionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 721 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 382: /* "IndexDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 730 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 383: /* "IndexKeyList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 739 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 384: /* "IndexKeySpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 748 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 385: /* "IntegrityConstraintDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 757 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 386: /* "QueryBody" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 766 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 387: /* "StatementsAndOptionalExprTop" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 775 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 388: /* "StatementsAndOptionalExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 784 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 389: /* "StatementsAndExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 793 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 390: /* "Statements" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 802 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 391: /* "Statement" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 811 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 392: /* "BlockStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 820 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 393: /* "BlockExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 829 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 394: /* "EnclosedStatementsAndOptionalExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 838 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 395: /* "VarDeclStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 847 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 398: /* "AssignStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 856 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 399: /* "ApplyStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 865 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 400: /* "ExitStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 874 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 401: /* "WhileStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 883 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 402: /* "FlowCtlStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 892 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 403: /* "FLWORStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 901 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 404: /* "ReturnStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 910 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 405: /* "IfStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 919 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 406: /* "TryStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 928 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 407: /* "CatchListStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 937 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 408: /* "CatchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 946 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 409: /* "Expr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 955 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 410: /* "ExprSingle" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 964 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 411: /* "ExprSimple" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 973 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 412: /* "FLWORExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 982 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 413: /* "ReturnExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 991 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 416: /* "FLWORWinCond" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1000 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 417: /* "WindowClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1009 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 418: /* "CountClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1018 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 419: /* "ForLetWinClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1027 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 421: /* "FLWORClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1036 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 422: /* "ForClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1045 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 423: /* "VarInDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1054 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 424: /* "VarInDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1063 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 425: /* "PositionalVar" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1072 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 426: /* "FTScoreVar" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1081 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 427: /* "LetClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1090 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 428: /* "VarGetsDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1099 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 429: /* "VarGetsDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1108 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 430: /* "WindowVarDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1117 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 431: /* "WindowVars" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1126 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 432: /* "WindowVars3" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1135 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 433: /* "WindowVars2" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1144 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 434: /* "WhereClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1153 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 435: /* "GroupByClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1162 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 436: /* "GroupSpecList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1171 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 437: /* "GroupSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1180 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 438: /* "GroupCollationSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1189 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 439: /* "OrderByClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1198 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 440: /* "OrderSpecList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1207 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 441: /* "OrderSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1216 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 442: /* "OrderModifier" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1225 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 443: /* "OrderDirSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1234 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 444: /* "OrderEmptySpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1243 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 445: /* "OrderCollationSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1252 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 446: /* "QuantifiedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1261 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 447: /* "QVarInDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1270 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 448: /* "QVarInDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1279 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 449: /* "SwitchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1288 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 450: /* "SwitchCaseClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1297 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 451: /* "SwitchCaseClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1306 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 452: /* "SwitchCaseOperandList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1315 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 453: /* "SwitchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1324 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 456: /* "TypeswitchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1333 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 457: /* "TypeswitchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1342 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 458: /* "CaseClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1351 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 459: /* "CaseClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1360 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 462: /* "IfExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1369 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 463: /* "OrExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1378 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 464: /* "AndExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1387 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 465: /* "ComparisonExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1396 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 467: /* "FTContainsExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1405 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 468: /* "StringConcatExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1414 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 469: /* "opt_FTIgnoreOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1423 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 470: /* "RangeExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1432 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 471: /* "AdditiveExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1441 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 472: /* "MultiplicativeExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1450 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 473: /* "UnionExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1459 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 474: /* "IntersectExceptExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1468 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 475: /* "InstanceofExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1477 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 476: /* "TreatExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1486 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 477: /* "CastableExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1495 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 478: /* "CastExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1504 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 479: /* "UnaryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1500 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1513 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 480: /* "SignList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1509 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1522 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 481: /* "ValueExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1518 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1531 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 482: /* "ValueComp" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1527 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1540 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 483: /* "NodeComp" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1536 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1549 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 484: /* "ValidateExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1545 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1558 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 485: /* "ExtensionExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1554 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1567 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 486: /* "Pragma_list" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1563 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1576 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 487: /* "Pragma" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1572 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1585 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 488: /* "PathExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1581 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1594 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 490: /* "RelativePathExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1590 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1603 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 491: /* "StepExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1612 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 492: /* "AxisStep" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1621 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 493: /* "ForwardStep" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1617 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1630 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 494: /* "ForwardAxis" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1626 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1639 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 495: /* "AbbrevForwardStep" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1648 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 496: /* "ReverseStep" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1657 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 497: /* "ReverseAxis" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1666 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 498: /* "NodeTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1675 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 499: /* "NameTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1684 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 500: /* "Wildcard" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1693 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 501: /* "FilterExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1689 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1702 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 502: /* "PredicateList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1711 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 503: /* "Predicate" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1720 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 504: /* "PrimaryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1716 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1729 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 505: /* "Literal" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1738 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 506: /* "NumericLiteral" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1747 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 507: /* "VarRef" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1756 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 508: /* "ParenthesizedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1765 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 509: /* "ContextItemExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1774 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 510: /* "OrderedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1783 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 511: /* "UnorderedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1792 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 512: /* "FunctionCall" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1801 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 513: /* "ArgList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1797 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1810 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 514: /* "Constructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1819 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 515: /* "DirectConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1815 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1828 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 516: /* "DirElemConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1837 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 517: /* "DirElemContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1833 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1846 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 518: /* "DirAttributeList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1842 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1855 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 519: /* "DirAttr" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1864 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 521: /* "DirAttributeValue" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1873 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 522: /* "opt_QuoteAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1882 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 523: /* "QuoteAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1891 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 524: /* "opt_AposAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1900 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 525: /* "AposAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1909 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 526: /* "QuoteAttrValueContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1918 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 527: /* "AposAttrValueContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1927 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 528: /* "DirElemContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1923 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1936 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 529: /* "CommonContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1932 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1945 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 530: /* "DirCommentConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1954 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 531: /* "DirPIConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1963 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 532: /* "CDataSection" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1972 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 533: /* "ComputedConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1981 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 534: /* "CompDocConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1990 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 535: /* "CompElemConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 1999 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 536: /* "CompAttrConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2008 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 537: /* "CompTextConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2017 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 538: /* "CompCommentConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2026 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 539: /* "CompPIConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2035 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 540: /* "SingleType" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2031 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2044 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 541: /* "TypeDeclaration" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2040 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2053 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 542: /* "SequenceType" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2062 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 543: /* "OccurrenceIndicator" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2071 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 544: /* "ItemType" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2080 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 545: /* "TypeList" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2089 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 546: /* "AtomicType" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2098 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 547: /* "KindTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2107 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 548: /* "AnyKindTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2116 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 549: /* "DocumentTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2125 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 550: /* "TextTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2134 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 551: /* "CommentTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2143 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 552: /* "PITest" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2152 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 553: /* "AttributeTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2161 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 554: /* "SchemaAttributeTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2170 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 555: /* "ElementTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2179 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 556: /* "SchemaElementTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2188 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 557: /* "TypeName" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2197 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 558: /* "TypeName_WITH_HOOK" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2206 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 559: /* "StringLiteral" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2202 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2215 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 564: /* "AnyFunctionTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2224 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 565: /* "TypedFunctionTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 914 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2220 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2233 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 568: /* "InsertExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2229 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2242 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 569: /* "DeleteExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2238 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2251 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 570: /* "ReplaceExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2260 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 571: /* "RenameExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2269 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 572: /* "TransformExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2278 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 573: /* "VarNameList" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2287 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 574: /* "VarNameDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2296 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 575: /* "TryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2305 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 576: /* "CatchListExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2314 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 577: /* "CatchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2323 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 578: /* "BracedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2332 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 579: /* "NameTestList" */
 
 /* Line 480 of lalr1.cc  */
-#line 926 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 926 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->name_test_list); };
 
 /* Line 480 of lalr1.cc  */
-#line 2328 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2341 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 580: /* "FTSelection" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2337 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2350 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 583: /* "FTOr" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2346 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2359 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 584: /* "FTAnd" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2368 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 585: /* "FTMildNot" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2377 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 586: /* "FTUnaryNot" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2386 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 587: /* "FTPrimaryWithOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2395 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 588: /* "opt_FTMatchOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2404 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 590: /* "FTWeight" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2413 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 591: /* "FTPrimary" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2422 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 592: /* "opt_FTTimes" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2431 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 593: /* "FTExtensionSelection" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2440 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 595: /* "FTWords" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2449 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 596: /* "FTWordsValue" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2458 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 598: /* "FTAnyallOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/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: /* "FTPosFilter" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2476 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 602: /* "FTOrder" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2485 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 603: /* "FTWindow" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2494 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 604: /* "FTDistance" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2503 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 605: /* "FTUnit" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2512 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 606: /* "FTMatchOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2521 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 607: /* "FTMatchOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2530 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 608: /* "FTCaseOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2539 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 609: /* "FTDiacriticsOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2548 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 610: /* "FTExtensionOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2557 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 611: /* "FTStemOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2566 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 612: /* "FTThesaurusOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/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: /* "FTThesaurusID" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2584 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 619: /* "FTStopWordOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2593 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 620: /* "FTStopWords" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/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: /* "FTStopWordsInclExcl" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/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: /* "FTLanguageOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2620 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 626: /* "FTWildCardOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2629 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 627: /* "FTContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2638 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 628: /* "FTTimes" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2647 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 629: /* "FTRange" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2656 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 630: /* "FTScope" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2665 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 631: /* "FTBigUnit" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2674 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 632: /* "FTIgnoreOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 917 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 917 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2683 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 633: /* "JSONArrayConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 920 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 920 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2679 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2692 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 634: /* "JSONSimpleObjectUnion" */
 
 /* Line 480 of lalr1.cc  */
-#line 920 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 920 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2688 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2701 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 635: /* "JSONAccumulatorObjectUnion" */
 
 /* Line 480 of lalr1.cc  */
-#line 920 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 920 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2710 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 636: /* "JSONObjectConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 920 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 920 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2719 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 637: /* "JSONPairList" */
 
 /* Line 480 of lalr1.cc  */
-#line 920 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 920 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2715 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2728 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 638: /* "JSONInsertExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 920 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 920 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2737 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 639: /* "JSONAppendExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 920 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 920 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2733 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2746 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 640: /* "JSONDeleteExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 920 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 920 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2755 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 641: /* "JSONRenameExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 920 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 920 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2764 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 642: /* "JSONReplaceExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 920 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 920 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2773 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 649: /* "QNAME" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2782 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 650: /* "FUNCTION_NAME" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2791 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 651: /* "EQNAME" */
 
 /* Line 480 of lalr1.cc  */
-#line 923 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+#line 923 "/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/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+#line 2800 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 	break;
 
 	default:
@@ -2826,6 +2839,18 @@
   }
 #endif
 
+  inline bool
+  xquery_parser::yy_pact_value_is_default_ (int yyvalue)
+  {
+    return yyvalue == yypact_ninf_;
+  }
+
+  inline bool
+  xquery_parser::yy_table_value_is_error_ (int yyvalue)
+  {
+    return yyvalue == yytable_ninf_;
+  }
+
   int
   xquery_parser::parse ()
   {
@@ -2847,7 +2872,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;
@@ -2861,14 +2886,14 @@
 
     /* User initialization code.  */
     
-/* Line 553 of lalr1.cc  */
-#line 140 "/home/markos/zorba/repo/jsoniq-deactivated/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 2872 "/home/markos/zorba/repo/jsoniq-deactivated/build/src/compiler/parser/xquery_parser.cpp"
+/* Line 565 of lalr1.cc  */
+#line 2897 "/home/colea/xquery_bzr/error-messages/build/src/compiler/parser/xquery_parser.cpp"
 
     /* Initialize the stacks.  The initial state will be pushed in
        yynewstate, since the latter expects the semantical and the
@@ -2896,7 +2921,7 @@
 
     /* Try to take a decision without lookahead.  */
     yyn = yypact_[yystate];
-    if (yyn == yypact_ninf_)
+    if (yy_pact_value_is_default_ (yyn))
       goto yydefault;
 
     /* Read a lookahead token.  */
@@ -2929,8 +2954,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;
       }
@@ -2986,8 +3011,8 @@
       {
 	  case 3:
 
-/* Line 678 of lalr1.cc  */
-#line 1036 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1036 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       }
@@ -2995,8 +3020,8 @@
 
   case 4:
 
-/* Line 678 of lalr1.cc  */
-#line 1045 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1045 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
         (yyval.node) = NULL; YYABORT;
       }
@@ -3004,8 +3029,8 @@
 
   case 5:
 
-/* Line 678 of lalr1.cc  */
-#line 1054 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1054 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
       driver.set_expr( (yyval.node) );
@@ -3014,8 +3039,8 @@
 
   case 6:
 
-/* Line 678 of lalr1.cc  */
-#line 1060 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1060 "/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)) );
@@ -3026,8 +3051,8 @@
 
   case 7:
 
-/* Line 678 of lalr1.cc  */
-#line 1068 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1068 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
       driver.set_expr( (yyval.node) );
@@ -3036,8 +3061,8 @@
 
   case 8:
 
-/* Line 678 of lalr1.cc  */
-#line 1074 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1074 "/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)) );
@@ -3048,8 +3073,8 @@
 
   case 9:
 
-/* Line 678 of lalr1.cc  */
-#line 1085 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1085 "/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" );
     }
@@ -3057,8 +3082,8 @@
 
   case 10:
 
-/* Line 678 of lalr1.cc  */
-#line 1090 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1090 "/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)) );
     }
@@ -3066,8 +3091,8 @@
 
   case 11:
 
-/* Line 678 of lalr1.cc  */
-#line 1098 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1098 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (1)].node)), NULL);
 
@@ -3077,8 +3102,8 @@
 
   case 12:
 
-/* Line 678 of lalr1.cc  */
-#line 1105 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1105 "/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)));
 
@@ -3088,8 +3113,8 @@
 
   case 13:
 
-/* Line 678 of lalr1.cc  */
-#line 1112 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1112 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)),
                                   static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (1)].node)),
@@ -3101,8 +3126,8 @@
 
   case 14:
 
-/* Line 678 of lalr1.cc  */
-#line 1121 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1121 "/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 );
     }
@@ -3110,8 +3135,8 @@
 
   case 15:
 
-/* Line 678 of lalr1.cc  */
-#line 1128 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1128 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
       (yylocation_stack_[(3) - (1)]).step();
@@ -3122,8 +3147,8 @@
 
   case 16:
 
-/* Line 678 of lalr1.cc  */
-#line 1136 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1136 "/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();
@@ -3134,8 +3159,8 @@
 
   case 17:
 
-/* Line 678 of lalr1.cc  */
-#line 1144 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1144 "/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();
@@ -3146,8 +3171,8 @@
 
   case 18:
 
-/* Line 678 of lalr1.cc  */
-#line 1152 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1152 "/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();
@@ -3158,8 +3183,8 @@
 
   case 19:
 
-/* Line 678 of lalr1.cc  */
-#line 1163 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1163 "/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);
     }
@@ -3167,8 +3192,8 @@
 
   case 20:
 
-/* Line 678 of lalr1.cc  */
-#line 1168 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1168 "/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);
 
@@ -3178,8 +3203,8 @@
 
   case 21:
 
-/* Line 678 of lalr1.cc  */
-#line 1175 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1175 "/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)));
 
@@ -3189,8 +3214,8 @@
 
   case 22:
 
-/* Line 678 of lalr1.cc  */
-#line 1182 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1182 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)),
                                   static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (2)].node)),
@@ -3202,8 +3227,8 @@
 
   case 23:
 
-/* Line 678 of lalr1.cc  */
-#line 1194 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1194 "/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)) );
 
@@ -3213,8 +3238,8 @@
 
   case 24:
 
-/* Line 678 of lalr1.cc  */
-#line 1204 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1204 "/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) );
@@ -3224,8 +3249,8 @@
 
   case 25:
 
-/* Line 678 of lalr1.cc  */
-#line 1211 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1211 "/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);
@@ -3234,8 +3259,8 @@
 
   case 26:
 
-/* Line 678 of lalr1.cc  */
-#line 1218 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1218 "/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
@@ -3247,8 +3272,8 @@
 
   case 40:
 
-/* Line 678 of lalr1.cc  */
-#line 1253 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1253 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::preserve_space);
     }
@@ -3256,8 +3281,8 @@
 
   case 41:
 
-/* Line 678 of lalr1.cc  */
-#line 1258 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1258 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::strip_space);
     }
@@ -3265,8 +3290,8 @@
 
   case 42:
 
-/* Line 678 of lalr1.cc  */
-#line 1266 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1266 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new DefaultCollationDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)) );
     }
@@ -3274,8 +3299,8 @@
 
   case 43:
 
-/* Line 678 of lalr1.cc  */
-#line 1274 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1274 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new BaseURIDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
     }
@@ -3283,8 +3308,8 @@
 
   case 44:
 
-/* Line 678 of lalr1.cc  */
-#line 1282 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1282 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_preserve);
     }
@@ -3292,8 +3317,8 @@
 
   case 45:
 
-/* Line 678 of lalr1.cc  */
-#line 1287 "/home/markos/zorba/repo/jsoniq-deactivated/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 ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_strip);
     }
@@ -3301,8 +3326,8 @@
 
   case 46:
 
-/* Line 678 of lalr1.cc  */
-#line 1295 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1295 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::ordered);
     }
@@ -3310,8 +3335,8 @@
 
   case 47:
 
-/* Line 678 of lalr1.cc  */
-#line 1300 "/home/markos/zorba/repo/jsoniq-deactivated/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 OrderingModeDecl(LOC((yyloc)), StaticContextConsts::unordered);
     }
@@ -3319,8 +3344,8 @@
 
   case 48:
 
-/* Line 678 of lalr1.cc  */
-#line 1308 "/home/markos/zorba/repo/jsoniq-deactivated/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 EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_greatest);
     }
@@ -3328,8 +3353,8 @@
 
   case 49:
 
-/* Line 678 of lalr1.cc  */
-#line 1313 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1313 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_least);
     }
@@ -3337,8 +3362,8 @@
 
   case 50:
 
-/* Line 678 of lalr1.cc  */
-#line 1321 "/home/markos/zorba/repo/jsoniq-deactivated/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 CopyNamespacesDecl(LOC((yyloc)),
                                   StaticContextConsts::preserve_ns,
@@ -3348,8 +3373,8 @@
 
   case 51:
 
-/* Line 678 of lalr1.cc  */
-#line 1328 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1328 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)),
                                   StaticContextConsts::preserve_ns,
@@ -3359,8 +3384,8 @@
 
   case 52:
 
-/* Line 678 of lalr1.cc  */
-#line 1335 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1335 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)),
                                   StaticContextConsts::no_preserve_ns,
@@ -3370,8 +3395,8 @@
 
   case 53:
 
-/* Line 678 of lalr1.cc  */
-#line 1342 "/home/markos/zorba/repo/jsoniq-deactivated/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 CopyNamespacesDecl(LOC((yyloc)),
                                   StaticContextConsts::no_preserve_ns,
@@ -3381,8 +3406,8 @@
 
   case 56:
 
-/* Line 678 of lalr1.cc  */
-#line 1357 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1357 "/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\".");
@@ -3392,8 +3417,8 @@
 
   case 57:
 
-/* Line 678 of lalr1.cc  */
-#line 1367 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1367 "/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 );
     }
@@ -3401,8 +3426,8 @@
 
   case 58:
 
-/* Line 678 of lalr1.cc  */
-#line 1372 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1372 "/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)),
@@ -3413,8 +3438,8 @@
 
   case 59:
 
-/* Line 678 of lalr1.cc  */
-#line 1380 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1380 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             NULL,
@@ -3425,8 +3450,8 @@
 
   case 60:
 
-/* Line 678 of lalr1.cc  */
-#line 1388 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1388 "/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)),
@@ -3437,8 +3462,8 @@
 
   case 61:
 
-/* Line 678 of lalr1.cc  */
-#line 1399 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1399 "/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)) );
@@ -3448,8 +3473,8 @@
 
   case 62:
 
-/* Line 678 of lalr1.cc  */
-#line 1406 "/home/markos/zorba/repo/jsoniq-deactivated/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"
     {
       if ( URILiteralList *ull = dynamic_cast<URILiteralList*>((yysemantic_stack_[(3) - (1)].node)) )
         ull->push_back( SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
@@ -3460,8 +3485,8 @@
 
   case 63:
 
-/* Line 678 of lalr1.cc  */
-#line 1417 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1417 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new SchemaPrefix( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
@@ -3469,8 +3494,8 @@
 
   case 64:
 
-/* Line 678 of lalr1.cc  */
-#line 1422 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1422 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new SchemaPrefix( LOC((yyloc)), true );
     }
@@ -3478,8 +3503,8 @@
 
   case 65:
 
-/* Line 678 of lalr1.cc  */
-#line 1430 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1430 "/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);
 
@@ -3489,8 +3514,8 @@
 
   case 66:
 
-/* Line 678 of lalr1.cc  */
-#line 1437 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1437 "/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);
 
@@ -3500,8 +3525,8 @@
 
   case 67:
 
-/* Line 678 of lalr1.cc  */
-#line 1444 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1444 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)),
                             SYMTAB((yysemantic_stack_[(5) - (3)].sval)),
@@ -3513,8 +3538,8 @@
 
   case 68:
 
-/* Line 678 of lalr1.cc  */
-#line 1453 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1453 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)),
                             SYMTAB((yysemantic_stack_[(8) - (4)].sval)),
@@ -3527,8 +3552,8 @@
 
   case 69:
 
-/* Line 678 of lalr1.cc  */
-#line 1466 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1466 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new NamespaceDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(5) - (3)].sval)), SYMTAB((yysemantic_stack_[(5) - (5)].sval)) );
     }
@@ -3536,8 +3561,8 @@
 
   case 70:
 
-/* Line 678 of lalr1.cc  */
-#line 1474 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1474 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_element_default,
@@ -3547,8 +3572,8 @@
 
   case 71:
 
-/* Line 678 of lalr1.cc  */
-#line 1481 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1481 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_function_default,
@@ -3558,8 +3583,8 @@
 
   case 72:
 
-/* Line 678 of lalr1.cc  */
-#line 1491 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1491 "/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) );
@@ -3569,8 +3594,8 @@
 
   case 73:
 
-/* Line 678 of lalr1.cc  */
-#line 1498 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1498 "/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);
@@ -3579,8 +3604,8 @@
 
   case 74:
 
-/* Line 678 of lalr1.cc  */
-#line 1505 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1505 "/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();
@@ -3591,8 +3616,8 @@
 
   case 83:
 
-/* Line 678 of lalr1.cc  */
-#line 1528 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1528 "/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);
@@ -3601,8 +3626,8 @@
 
   case 84:
 
-/* Line 678 of lalr1.cc  */
-#line 1534 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1534 "/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);
@@ -3611,8 +3636,8 @@
 
   case 85:
 
-/* Line 678 of lalr1.cc  */
-#line 1543 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1543 "/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) );
@@ -3622,8 +3647,8 @@
 
   case 86:
 
-/* Line 678 of lalr1.cc  */
-#line 1550 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1550 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yysemantic_stack_[(2) - (1)].vstrpair)->push_back( *(yysemantic_stack_[(2) - (2)].strpair) );
       delete (yysemantic_stack_[(2) - (2)].strpair);
@@ -3633,8 +3658,8 @@
 
   case 87:
 
-/* Line 678 of lalr1.cc  */
-#line 1560 "/home/markos/zorba/repo/jsoniq-deactivated/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"
     {
       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() );
@@ -3644,78 +3669,78 @@
 
   case 88:
 
-/* Line 678 of lalr1.cc  */
-#line 1569 "/home/markos/zorba/repo/jsoniq-deactivated/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.strval) = "decimal-separator"; }
     break;
 
   case 89:
 
-/* Line 678 of lalr1.cc  */
-#line 1570 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1570 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "digit"; }
     break;
 
   case 90:
 
-/* Line 678 of lalr1.cc  */
-#line 1571 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1571 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "grouping-separator"; }
     break;
 
   case 91:
 
-/* Line 678 of lalr1.cc  */
-#line 1572 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1572 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "infinty"; }
     break;
 
   case 92:
 
-/* Line 678 of lalr1.cc  */
-#line 1573 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1573 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "minus-sign"; }
     break;
 
   case 93:
 
-/* Line 678 of lalr1.cc  */
-#line 1574 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1574 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "NaN"; }
     break;
 
   case 94:
 
-/* Line 678 of lalr1.cc  */
-#line 1575 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1575 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "pattern-separator"; }
     break;
 
   case 95:
 
-/* Line 678 of lalr1.cc  */
-#line 1576 "/home/markos/zorba/repo/jsoniq-deactivated/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"
     { (yyval.strval) = "percent"; }
     break;
 
   case 96:
 
-/* Line 678 of lalr1.cc  */
-#line 1577 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1577 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "per-mille"; }
     break;
 
   case 97:
 
-/* Line 678 of lalr1.cc  */
-#line 1578 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1578 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     { (yyval.strval) = "zero-digit"; }
     break;
 
   case 98:
 
-/* Line 678 of lalr1.cc  */
-#line 1584 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1584 "/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)));
     }
@@ -3723,8 +3748,8 @@
 
   case 99:
 
-/* Line 678 of lalr1.cc  */
-#line 1592 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1592 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new FTOptionDecl( LOC((yyloc)), dynamic_cast<FTMatchOptions*>((yysemantic_stack_[(3) - (3)].node)) );
     }
@@ -3732,8 +3757,8 @@
 
   case 100:
 
-/* Line 678 of lalr1.cc  */
-#line 1600 "/home/markos/zorba/repo/jsoniq-deactivated/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.node) = (yysemantic_stack_[(4) - (4)].node);
     }
@@ -3741,8 +3766,8 @@
 
   case 101:
 
-/* Line 678 of lalr1.cc  */
-#line 1608 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1608 "/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);
@@ -3752,8 +3777,8 @@
 
   case 102:
 
-/* Line 678 of lalr1.cc  */
-#line 1615 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1615 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -3761,8 +3786,8 @@
 
   case 103:
 
-/* Line 678 of lalr1.cc  */
-#line 1623 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1623 "/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;
@@ -3772,8 +3797,8 @@
 
   case 104:
 
-/* Line 678 of lalr1.cc  */
-#line 1630 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1630 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CtxItemDecl(LOC((yyloc)), NULL);
     }
@@ -3781,8 +3806,8 @@
 
   case 105:
 
-/* Line 678 of lalr1.cc  */
-#line 1635 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1635 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
     }
@@ -3790,8 +3815,8 @@
 
   case 106:
 
-/* Line 678 of lalr1.cc  */
-#line 1643 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1643 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new CtxItemDecl(LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
     }
@@ -3799,8 +3824,8 @@
 
   case 107:
 
-/* Line 678 of lalr1.cc  */
-#line 1651 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1651 "/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)));
 
@@ -3818,8 +3843,8 @@
 
   case 108:
 
-/* Line 678 of lalr1.cc  */
-#line 1666 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1666 "/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)));
 
@@ -3837,8 +3862,8 @@
 
   case 109:
 
-/* Line 678 of lalr1.cc  */
-#line 1681 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1681 "/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)));
 
@@ -3856,8 +3881,8 @@
 
   case 110:
 
-/* Line 678 of lalr1.cc  */
-#line 1699 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1699 "/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);
     }
@@ -3865,8 +3890,8 @@
 
   case 111:
 
-/* Line 678 of lalr1.cc  */
-#line 1704 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1704 "/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)),
@@ -3877,8 +3902,8 @@
 
   case 112:
 
-/* Line 678 of lalr1.cc  */
-#line 1712 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1712 "/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)),
@@ -3889,8 +3914,8 @@
 
   case 113:
 
-/* Line 678 of lalr1.cc  */
-#line 1720 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1720 "/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)),
@@ -3901,8 +3926,8 @@
 
   case 114:
 
-/* Line 678 of lalr1.cc  */
-#line 1731 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1731 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new AnnotationListParsenode(LOC((yyloc)), static_cast<AnnotationParsenode*>((yysemantic_stack_[(1) - (1)].node)));
     }
@@ -3910,8 +3935,8 @@
 
   case 115:
 
-/* Line 678 of lalr1.cc  */
-#line 1736 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1736 "/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);
@@ -3920,8 +3945,8 @@
 
   case 116:
 
-/* Line 678 of lalr1.cc  */
-#line 1745 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1745 "/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);
     }
@@ -3929,8 +3954,8 @@
 
   case 117:
 
-/* Line 678 of lalr1.cc  */
-#line 1750 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1750 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
                                    new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval))),
@@ -3940,8 +3965,8 @@
 
   case 118:
 
-/* Line 678 of lalr1.cc  */
-#line 1757 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1757 "/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);
     }
@@ -3949,8 +3974,8 @@
 
   case 119:
 
-/* Line 678 of lalr1.cc  */
-#line 1762 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1762 "/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),
@@ -3960,8 +3985,8 @@
 
   case 120:
 
-/* Line 678 of lalr1.cc  */
-#line 1772 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1772 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new AnnotationLiteralListParsenode(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr));
     }
@@ -3969,8 +3994,8 @@
 
   case 121:
 
-/* Line 678 of lalr1.cc  */
-#line 1777 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1777 "/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);
@@ -3979,8 +4004,8 @@
 
   case 122:
 
-/* Line 678 of lalr1.cc  */
-#line 1786 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1786 "/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);
@@ -3989,8 +4014,8 @@
 
   case 123:
 
-/* Line 678 of lalr1.cc  */
-#line 1792 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1792 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       FunctionDecl* fdecl = static_cast<FunctionDecl*>((yysemantic_stack_[(3) - (3)].node));
 
@@ -4003,8 +4028,8 @@
 
   case 124:
 
-/* Line 678 of lalr1.cc  */
-#line 1805 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1805 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -4012,8 +4037,8 @@
 
   case 125:
 
-/* Line 678 of lalr1.cc  */
-#line 1810 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1810 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -4021,8 +4046,8 @@
 
   case 126:
 
-/* Line 678 of lalr1.cc  */
-#line 1818 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1818 "/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)),
@@ -4037,8 +4062,8 @@
 
   case 127:
 
-/* Line 678 of lalr1.cc  */
-#line 1829 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1829 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC ((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4053,8 +4078,8 @@
 
   case 128:
 
-/* Line 678 of lalr1.cc  */
-#line 1844 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1844 "/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)),
@@ -4069,8 +4094,8 @@
 
   case 129:
 
-/* Line 678 of lalr1.cc  */
-#line 1856 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1856 "/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)),
@@ -4085,8 +4110,8 @@
 
   case 130:
 
-/* Line 678 of lalr1.cc  */
-#line 1871 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1871 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(NULL);
     }
@@ -4094,8 +4119,8 @@
 
   case 131:
 
-/* Line 678 of lalr1.cc  */
-#line 1876 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1876 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(3) - (2)].node)));
     }
@@ -4103,8 +4128,8 @@
 
   case 132:
 
-/* Line 678 of lalr1.cc  */
-#line 1881 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1881 "/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)));
     }
@@ -4112,8 +4137,8 @@
 
   case 133:
 
-/* Line 678 of lalr1.cc  */
-#line 1886 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1886 "/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)));
     }
@@ -4121,8 +4146,8 @@
 
   case 134:
 
-/* Line 678 of lalr1.cc  */
-#line 1894 "/home/markos/zorba/repo/jsoniq-deactivated/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"
     {
       ParamList *pl = new ParamList( LOC((yyloc)) );
       pl->push_back( dynamic_cast<Param*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -4132,8 +4157,8 @@
 
   case 135:
 
-/* Line 678 of lalr1.cc  */
-#line 1901 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1901 "/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)) );
@@ -4144,8 +4169,8 @@
 
   case 136:
 
-/* Line 678 of lalr1.cc  */
-#line 1912 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1912 "/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);
     }
@@ -4153,8 +4178,8 @@
 
   case 137:
 
-/* Line 678 of lalr1.cc  */
-#line 1917 "/home/markos/zorba/repo/jsoniq-deactivated/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"
     {
       (yyval.node) = new Param(LOC((yyloc)),
                      static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4164,8 +4189,8 @@
 
   case 138:
 
-/* Line 678 of lalr1.cc  */
-#line 1927 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1927 "/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)),
@@ -4176,8 +4201,8 @@
 
   case 139:
 
-/* Line 678 of lalr1.cc  */
-#line 1934 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1934 "/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)),
@@ -4188,8 +4213,8 @@
 
   case 140:
 
-/* Line 678 of lalr1.cc  */
-#line 1941 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1941 "/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)),
@@ -4200,8 +4225,8 @@
 
   case 141:
 
-/* Line 678 of lalr1.cc  */
-#line 1948 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1948 "/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)),
@@ -4212,8 +4237,8 @@
 
   case 142:
 
-/* Line 678 of lalr1.cc  */
-#line 1958 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1958 "/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));
     }
@@ -4221,8 +4246,8 @@
 
   case 143:
 
-/* Line 678 of lalr1.cc  */
-#line 1962 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1962 "/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),
@@ -4232,8 +4257,8 @@
 
   case 144:
 
-/* Line 678 of lalr1.cc  */
-#line 1972 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1972 "/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)),
@@ -4245,8 +4270,8 @@
 
   case 145:
 
-/* Line 678 of lalr1.cc  */
-#line 1980 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1980 "/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)),
@@ -4258,8 +4283,8 @@
 
   case 146:
 
-/* Line 678 of lalr1.cc  */
-#line 1991 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1991 "/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)));
@@ -4269,8 +4294,8 @@
 
   case 147:
 
-/* Line 678 of lalr1.cc  */
-#line 1997 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 1997 "/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);
@@ -4279,8 +4304,8 @@
 
   case 148:
 
-/* Line 678 of lalr1.cc  */
-#line 2006 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2006 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL, NULL);
     }
@@ -4288,8 +4313,8 @@
 
   case 149:
 
-/* Line 678 of lalr1.cc  */
-#line 2011 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2011 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -4300,8 +4325,8 @@
 
   case 150:
 
-/* Line 678 of lalr1.cc  */
-#line 2018 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2018 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -4312,8 +4337,8 @@
 
   case 151:
 
-/* Line 678 of lalr1.cc  */
-#line 2025 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2025 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(3) - (1)].expr),
@@ -4324,8 +4349,8 @@
 
   case 152:
 
-/* Line 678 of lalr1.cc  */
-#line 2037 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2037 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ICCollSimpleCheck(LOC((yyloc)),
                                  static_cast<QName*>((yysemantic_stack_[(11) - (4)].expr)),
@@ -4337,8 +4362,8 @@
 
   case 153:
 
-/* Line 678 of lalr1.cc  */
-#line 2047 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2047 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ICCollUniqueKeyCheck(LOC((yyloc)),
                                     static_cast<QName*>((yysemantic_stack_[(14) - (4)].expr)),
@@ -4350,8 +4375,8 @@
 
   case 154:
 
-/* Line 678 of lalr1.cc  */
-#line 2057 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2057 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ICCollForeachNode(LOC((yyloc)),
                                  static_cast<QName*>((yysemantic_stack_[(13) - (4)].expr)),
@@ -4363,8 +4388,8 @@
 
   case 155:
 
-/* Line 678 of lalr1.cc  */
-#line 2068 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2068 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.node) = new ICForeignKey( LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(22) - (4)].expr)),
@@ -4379,8 +4404,8 @@
 
   case 156:
 
-/* Line 678 of lalr1.cc  */
-#line 2084 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2084 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       if ((yysemantic_stack_[(1) - (1)].expr) == NULL)
       {
@@ -4400,8 +4425,8 @@
 
   case 157:
 
-/* Line 678 of lalr1.cc  */
-#line 2104 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2104 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4409,8 +4434,8 @@
 
   case 158:
 
-/* Line 678 of lalr1.cc  */
-#line 2108 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2108 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4418,8 +4443,8 @@
 
   case 159:
 
-/* Line 678 of lalr1.cc  */
-#line 2112 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2112 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) =  NULL;
     }
@@ -4427,8 +4452,8 @@
 
   case 160:
 
-/* Line 678 of lalr1.cc  */
-#line 2120 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2120 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4436,8 +4461,8 @@
 
   case 161:
 
-/* Line 678 of lalr1.cc  */
-#line 2124 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2124 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4445,8 +4470,8 @@
 
   case 162:
 
-/* Line 678 of lalr1.cc  */
-#line 2128 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2128 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) =  new BlockBody(LOC((yyloc)));
     }
@@ -4454,8 +4479,8 @@
 
   case 163:
 
-/* Line 678 of lalr1.cc  */
-#line 2136 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2136 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4463,8 +4488,8 @@
 
   case 164:
 
-/* Line 678 of lalr1.cc  */
-#line 2141 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2141 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
 
@@ -4476,8 +4501,8 @@
 
   case 165:
 
-/* Line 678 of lalr1.cc  */
-#line 2153 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2153 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       BlockBody* blk = new BlockBody(LOC((yyloc)));
       blk->add((yysemantic_stack_[(1) - (1)].expr));
@@ -4487,8 +4512,8 @@
 
   case 166:
 
-/* Line 678 of lalr1.cc  */
-#line 2160 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2160 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
 
@@ -4500,8 +4525,8 @@
 
   case 179:
 
-/* Line 678 of lalr1.cc  */
-#line 2189 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2189 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -4509,8 +4534,8 @@
 
   case 180:
 
-/* Line 678 of lalr1.cc  */
-#line 2194 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2194 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new BlockBody(LOC((yyloc)));
     }
@@ -4518,8 +4543,8 @@
 
   case 181:
 
-/* Line 678 of lalr1.cc  */
-#line 2202 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2202 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       if (dynamic_cast<BlockBody*>((yysemantic_stack_[(3) - (2)].expr)) == NULL)
       {
@@ -4536,8 +4561,8 @@
 
   case 182:
 
-/* Line 678 of lalr1.cc  */
-#line 2219 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2219 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -4545,8 +4570,8 @@
 
   case 183:
 
-/* Line 678 of lalr1.cc  */
-#line 2227 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2227 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(2) - (1)].expr);
     }
@@ -4554,8 +4579,8 @@
 
   case 184:
 
-/* Line 678 of lalr1.cc  */
-#line 2235 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2235 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       VarDeclStmt* vdecl = static_cast<VarDeclStmt*>((yysemantic_stack_[(3) - (1)].expr));
       vdecl->add((yysemantic_stack_[(3) - (3)].node));
@@ -4565,8 +4590,8 @@
 
   case 185:
 
-/* Line 678 of lalr1.cc  */
-#line 2242 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2242 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)), NULL);
       vdecl->add((yysemantic_stack_[(2) - (2)].node));
@@ -4576,8 +4601,8 @@
 
   case 186:
 
-/* Line 678 of lalr1.cc  */
-#line 2249 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2249 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)), static_cast<AnnotationListParsenode*>((yysemantic_stack_[(3) - (1)].node)));
       vdecl->add((yysemantic_stack_[(3) - (3)].node));
@@ -4587,8 +4612,8 @@
 
   case 187:
 
-/* Line 678 of lalr1.cc  */
-#line 2259 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2259 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       VarDecl* vd = new VarDecl(LOC((yyloc)),
                                 static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)),
@@ -4604,8 +4629,8 @@
 
   case 188:
 
-/* Line 678 of lalr1.cc  */
-#line 2271 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2271 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       VarDecl* vd = new VarDecl(LOC((yyloc)),
                                 static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4622,8 +4647,8 @@
 
   case 189:
 
-/* Line 678 of lalr1.cc  */
-#line 2284 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2284 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       VarDecl* vd = new VarDecl(LOC((yyloc)),
                                 static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4639,8 +4664,8 @@
 
   case 190:
 
-/* Line 678 of lalr1.cc  */
-#line 2296 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2296 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       VarDecl* vd = new VarDecl(LOC((yyloc)),
                                 static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -4656,8 +4681,8 @@
 
   case 191:
 
-/* Line 678 of lalr1.cc  */
-#line 2312 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2312 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new AssignExpr(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)), (yysemantic_stack_[(5) - (4)].expr));
     }
@@ -4665,8 +4690,8 @@
 
   case 192:
 
-/* Line 678 of lalr1.cc  */
-#line 2320 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2320 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new ApplyExpr(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr));
     }
@@ -4674,8 +4699,8 @@
 
   case 193:
 
-/* Line 678 of lalr1.cc  */
-#line 2328 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2328 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new ExitExpr(LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr));
     }
@@ -4683,8 +4708,8 @@
 
   case 194:
 
-/* Line 678 of lalr1.cc  */
-#line 2336 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2336 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       BlockBody* bb = dynamic_cast<BlockBody *>((yysemantic_stack_[(5) - (5)].expr));
       if (bb == NULL)
@@ -4699,8 +4724,8 @@
 
   case 195:
 
-/* Line 678 of lalr1.cc  */
-#line 2351 "/home/markos/zorba/repo/jsoniq-deactivated/src/compiler/parser/xquery_parser.y"
+/* Line 690 of lalr1.cc  */
+#line 2351 "/home/colea/xquery_bzr/error-messages/src/compiler/parser/xquery_parser.y"
     {
       (yyval.expr) = new FlowCtlStatement(LOC((yyloc)), FlowCtlStatement::BREAK);
     }
@@ -4708,8 +4733,8 @@
 
   case 196:
 
-/* Line 678 of lalr1.cc  */