Zorba

Merge lp:~zorba-coders/zorba/bug-900688 into lp:zorba

  1. bug-900688
  2. Merge into trunk
Proposed by Markos Zaharioudakis
Status: Merged
Approved by: Markos Zaharioudakis
Approved revision: 10983
Merged at revision: 10990
Proposed branch: lp:~zorba-coders/zorba/bug-900688
Merge into: lp:zorba
Diff against target: 17424 lines (+3567/-3411)
20 files modified
src/compiler/parser/xquery_parser.cpp (+2666/-2772)
src/compiler/parser/xquery_parser.hpp (+59/-18)
src/compiler/parser/xquery_parser.y (+43/-58)
src/compiler/parser/xquery_scanner.cpp (+359/-359)
src/compiler/parsetree/parsenode_print_xml_visitor.cpp (+17/-2)
src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp (+5/-9)
src/compiler/parsetree/parsenode_print_xquery_visitor.cpp (+36/-10)
src/compiler/parsetree/parsenode_visitor.h (+2/-1)
src/compiler/parsetree/parsenodes.cpp (+40/-18)
src/compiler/parsetree/parsenodes.h (+33/-10)
src/compiler/translator/prolog_graph.cpp (+27/-7)
src/compiler/translator/prolog_graph.h (+5/-4)
src/compiler/translator/translator.cpp (+246/-133)
src/context/static_context.cpp (+16/-5)
test/rbkt/Queries/CMakeLists.txt (+0/-3)
test/rbkt/Queries/zorba/ext_var/w3c/extvardef-011.xq (+1/-0)
test/rbkt/Queries/zorba/ext_var/w3c/extvardef-014.xq (+1/-0)
test/rbkt/Queries/zorba/ext_var/w3c/extvardef-015.xq (+3/-0)
test/rbkt/Queries/zorba/ext_var/w3c/extvardef-016.xq (+3/-0)
test/rbkt/Queries/zorba/ext_var/w3c/extvardef-022.xq (+5/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-900688
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Review via email: mp+119998@code.launchpad.net

Commit message

Allow prolog variables to be referenced before they are declared (XQuery 3.0 feature) (fixes bug #900688)

Description of the change

Allow prolog variables to be referenced before they are declared (XQuery 3.0 feature) (fixes bug #900688)

To post a comment you must log in.
Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-900688-2012-08-16T21-31-59.449Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/bug-900688 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 bug-900688-2012-08-16T21-31-59.449Z is finished. The
  final status was:

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

  Not commiting changes.

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

lp:~zorba-coders/zorba/bug-900688 updated
10983. By Markos Zaharioudakis

parser generated files

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-900688-2012-08-16T21-49-08.157Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-900688-2012-08-16T21-49-08.157Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/compiler/parser/xquery_parser.cpp'
2--- src/compiler/parser/xquery_parser.cpp 2012-08-14 11:13:50 +0000
3+++ src/compiler/parser/xquery_parser.cpp 2012-08-16 21:47:23 +0000
4@@ -1,8 +1,10 @@
5-/* A Bison parser, made by GNU Bison 2.5. */
6+
7+/* A Bison parser, made by GNU Bison 2.4.1. */
8
9 /* Skeleton implementation for Bison LALR(1) parsers in C++
10
11- Copyright (C) 2002-2011 Free Software Foundation, Inc.
12+ Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
13+ Foundation, Inc.
14
15 This program is free software: you can redistribute it and/or modify
16 it under the terms of the GNU General Public License as published by
17@@ -35,8 +37,8 @@
18
19 /* First part of user declarations. */
20
21-/* Line 293 of lalr1.cc */
22-#line 87 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
23+/* Line 311 of lalr1.cc */
24+#line 87 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
25
26
27 #include "common/common.h"
28@@ -72,16 +74,16 @@
29
30
31
32-/* Line 293 of lalr1.cc */
33-#line 77 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
34+/* Line 311 of lalr1.cc */
35+#line 79 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
36
37
38 #include "xquery_parser.hpp"
39
40 /* User implementation prologue. */
41
42-/* Line 299 of lalr1.cc */
43-#line 906 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
44+/* Line 317 of lalr1.cc */
45+#line 906 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
46
47 // HACK to trigger rchandle release: rchandles are freed when refcount == 0
48 // (not <= 0); but Bison never increments the refcount, so we do it manually...
49@@ -92,8 +94,8 @@
50 }
51 }
52
53-/* Line 299 of lalr1.cc */
54-#line 1022 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
55+/* Line 317 of lalr1.cc */
56+#line 1022 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
57
58 #include "compiler/parser/xquery_scanner.h"
59
60@@ -102,11 +104,11 @@
61
62
63
64-/* Line 299 of lalr1.cc */
65-#line 107 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
66+/* Line 317 of lalr1.cc */
67+#line 109 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
68
69 #ifndef YY_
70-# if defined YYENABLE_NLS && YYENABLE_NLS
71+# if YYENABLE_NLS
72 # if ENABLE_NLS
73 # include <libintl.h> /* FIXME: INFRINGES ON USER NAME SPACE */
74 # define YY_(msgid) dgettext ("bison-runtime", msgid)
75@@ -117,26 +119,6 @@
76 # endif
77 #endif
78
79-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
80- If N is 0, then set CURRENT to the empty location which ends
81- the previous symbol: RHS[0] (always defined). */
82-
83-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
84-#ifndef YYLLOC_DEFAULT
85-# define YYLLOC_DEFAULT(Current, Rhs, N) \
86- do \
87- if (N) \
88- { \
89- (Current).begin = YYRHSLOC (Rhs, 1).begin; \
90- (Current).end = YYRHSLOC (Rhs, N).end; \
91- } \
92- else \
93- { \
94- (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end; \
95- } \
96- while (false)
97-#endif
98-
99 /* Suppress unused-variable warnings by "using" E. */
100 #define YYUSE(e) ((void) (e))
101
102@@ -186,10 +168,14 @@
103 #define YYRECOVERING() (!!yyerrstatus_)
104
105
106+/* Line 380 of lalr1.cc */
107+#line 1 "[Bison:b4_percent_define_default]"
108+
109 namespace zorba {
110
111-/* Line 382 of lalr1.cc */
112-#line 193 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
113+/* Line 380 of lalr1.cc */
114+#line 178 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
115+#if YYERROR_VERBOSE
116
117 /* Return YYSTR after stripping away unnecessary quotes and
118 backslashes, so that it's suitable for yyerror. The heuristic is
119@@ -228,6 +214,7 @@
120 return yystr;
121 }
122
123+#endif
124
125 /// Build a parser object.
126 xquery_parser::xquery_parser (xquery_driver& driver_yyarg)
127@@ -290,2513 +277,2513 @@
128 case 110: /* "\"'DECIMAL'\"" */
129
130 /* Line 480 of lalr1.cc */
131-#line 904 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
132+#line 904 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
133 { delete (yyvaluep->decval); };
134
135 /* Line 480 of lalr1.cc */
136-#line 298 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
137+#line 285 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
138 break;
139 case 124: /* "\"'DOUBLE'\"" */
140
141 /* Line 480 of lalr1.cc */
142-#line 903 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
143+#line 903 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
144 { delete (yyvaluep->dval); };
145
146 /* Line 480 of lalr1.cc */
147-#line 307 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
148+#line 294 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
149 break;
150 case 149: /* "\"'INTEGER'\"" */
151
152 /* Line 480 of lalr1.cc */
153-#line 902 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
154+#line 902 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
155 { delete (yyvaluep->ival); };
156
157 /* Line 480 of lalr1.cc */
158-#line 316 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
159+#line 303 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
160 break;
161 case 336: /* "VersionDecl" */
162
163 /* Line 480 of lalr1.cc */
164-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
165+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
166 { release_hack( (yyvaluep->node) ); };
167
168 /* Line 480 of lalr1.cc */
169-#line 325 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
170+#line 312 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
171 break;
172 case 337: /* "MainModule" */
173
174 /* Line 480 of lalr1.cc */
175-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
176+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
177 { release_hack( (yyvaluep->node) ); };
178
179 /* Line 480 of lalr1.cc */
180-#line 334 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
181+#line 321 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
182 break;
183 case 338: /* "LibraryModule" */
184
185 /* Line 480 of lalr1.cc */
186-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
187+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
188 { release_hack( (yyvaluep->node) ); };
189
190 /* Line 480 of lalr1.cc */
191-#line 343 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
192+#line 330 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
193 break;
194 case 339: /* "ModuleDecl" */
195
196 /* Line 480 of lalr1.cc */
197-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
198+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
199 { release_hack( (yyvaluep->node) ); };
200
201 /* Line 480 of lalr1.cc */
202-#line 352 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
203+#line 339 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
204 break;
205 case 340: /* "SIND_DeclList" */
206
207 /* Line 480 of lalr1.cc */
208-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
209+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
210 { release_hack( (yyvaluep->node) ); };
211
212 /* Line 480 of lalr1.cc */
213-#line 361 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
214+#line 348 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
215 break;
216 case 341: /* "SIND_Decl" */
217
218 /* Line 480 of lalr1.cc */
219-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
220+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
221 { release_hack( (yyvaluep->node) ); };
222
223 /* Line 480 of lalr1.cc */
224-#line 370 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
225+#line 357 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
226 break;
227 case 342: /* "Setter" */
228
229 /* Line 480 of lalr1.cc */
230-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
231+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
232 { release_hack( (yyvaluep->node) ); };
233
234 /* Line 480 of lalr1.cc */
235-#line 379 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
236+#line 366 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
237 break;
238 case 343: /* "BoundarySpaceDecl" */
239
240 /* Line 480 of lalr1.cc */
241-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
242+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
243 { release_hack( (yyvaluep->node) ); };
244
245 /* Line 480 of lalr1.cc */
246-#line 388 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
247+#line 375 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
248 break;
249 case 344: /* "DefaultCollationDecl" */
250
251 /* Line 480 of lalr1.cc */
252-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
253+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
254 { release_hack( (yyvaluep->node) ); };
255
256 /* Line 480 of lalr1.cc */
257-#line 397 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
258+#line 384 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
259 break;
260 case 345: /* "BaseURIDecl" */
261
262 /* Line 480 of lalr1.cc */
263-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
264+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
265 { release_hack( (yyvaluep->node) ); };
266
267 /* Line 480 of lalr1.cc */
268-#line 406 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
269+#line 393 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
270 break;
271 case 346: /* "ConstructionDecl" */
272
273 /* Line 480 of lalr1.cc */
274-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
275+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
276 { release_hack( (yyvaluep->node) ); };
277
278 /* Line 480 of lalr1.cc */
279-#line 415 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
280+#line 402 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
281 break;
282 case 347: /* "OrderingModeDecl" */
283
284 /* Line 480 of lalr1.cc */
285-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
286+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
287 { release_hack( (yyvaluep->node) ); };
288
289 /* Line 480 of lalr1.cc */
290-#line 424 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
291+#line 411 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
292 break;
293 case 348: /* "EmptyOrderDecl" */
294
295 /* Line 480 of lalr1.cc */
296-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
297+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
298 { release_hack( (yyvaluep->node) ); };
299
300 /* Line 480 of lalr1.cc */
301-#line 433 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
302+#line 420 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
303 break;
304 case 349: /* "CopyNamespacesDecl" */
305
306 /* Line 480 of lalr1.cc */
307-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
308+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
309 { release_hack( (yyvaluep->node) ); };
310
311 /* Line 480 of lalr1.cc */
312-#line 442 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
313+#line 429 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
314 break;
315 case 350: /* "Import" */
316
317 /* Line 480 of lalr1.cc */
318-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
319+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
320 { release_hack( (yyvaluep->node) ); };
321
322 /* Line 480 of lalr1.cc */
323-#line 451 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
324+#line 438 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
325 break;
326 case 351: /* "SchemaImport" */
327
328 /* Line 480 of lalr1.cc */
329-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
330+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
331 { release_hack( (yyvaluep->node) ); };
332
333 /* Line 480 of lalr1.cc */
334-#line 460 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
335+#line 447 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
336 break;
337 case 352: /* "URILiteralList" */
338
339 /* Line 480 of lalr1.cc */
340-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
341+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
342 { release_hack( (yyvaluep->node) ); };
343
344 /* Line 480 of lalr1.cc */
345-#line 469 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
346+#line 456 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
347 break;
348 case 353: /* "SchemaPrefix" */
349
350 /* Line 480 of lalr1.cc */
351-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
352+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
353 { release_hack( (yyvaluep->node) ); };
354
355 /* Line 480 of lalr1.cc */
356-#line 478 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
357+#line 465 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
358 break;
359 case 354: /* "ModuleImport" */
360
361 /* Line 480 of lalr1.cc */
362-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
363+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
364 { release_hack( (yyvaluep->node) ); };
365
366 /* Line 480 of lalr1.cc */
367-#line 487 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
368+#line 474 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
369 break;
370 case 355: /* "NamespaceDecl" */
371
372 /* Line 480 of lalr1.cc */
373-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
374+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
375 { release_hack( (yyvaluep->node) ); };
376
377 /* Line 480 of lalr1.cc */
378-#line 496 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
379+#line 483 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
380 break;
381 case 356: /* "DefaultNamespaceDecl" */
382
383 /* Line 480 of lalr1.cc */
384-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
385+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
386 { release_hack( (yyvaluep->node) ); };
387
388 /* Line 480 of lalr1.cc */
389-#line 505 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
390+#line 492 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
391 break;
392 case 357: /* "VFO_DeclList" */
393
394 /* Line 480 of lalr1.cc */
395-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
396+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
397 { release_hack( (yyvaluep->node) ); };
398
399 /* Line 480 of lalr1.cc */
400-#line 514 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
401+#line 501 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
402 break;
403 case 358: /* "VFO_Decl" */
404
405 /* Line 480 of lalr1.cc */
406-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
407+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
408 { release_hack( (yyvaluep->node) ); };
409
410 /* Line 480 of lalr1.cc */
411-#line 523 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
412+#line 510 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
413 break;
414 case 359: /* "DecimalFormatDecl" */
415
416 /* Line 480 of lalr1.cc */
417-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
418+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
419 { release_hack( (yyvaluep->node) ); };
420
421 /* Line 480 of lalr1.cc */
422-#line 532 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
423+#line 519 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
424 break;
425 case 360: /* "DecimalFormatParamList" */
426
427 /* Line 480 of lalr1.cc */
428-#line 930 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
429+#line 930 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
430 { delete (yyvaluep->vstrpair); };
431
432 /* Line 480 of lalr1.cc */
433-#line 541 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
434+#line 528 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
435 break;
436 case 361: /* "DecimalFormatParam" */
437
438 /* Line 480 of lalr1.cc */
439-#line 930 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
440+#line 930 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
441 { delete (yyvaluep->strpair); };
442
443 /* Line 480 of lalr1.cc */
444-#line 550 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
445+#line 537 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
446 break;
447 case 363: /* "OptionDecl" */
448
449 /* Line 480 of lalr1.cc */
450-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
451+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
452 { release_hack( (yyvaluep->node) ); };
453
454 /* Line 480 of lalr1.cc */
455-#line 559 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
456+#line 546 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
457 break;
458 case 364: /* "FTOptionDecl" */
459
460 /* Line 480 of lalr1.cc */
461-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
462+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
463 { release_hack( (yyvaluep->node) ); };
464
465 /* Line 480 of lalr1.cc */
466-#line 568 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
467+#line 555 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
468 break;
469 case 365: /* "CtxItemDecl" */
470
471 /* Line 480 of lalr1.cc */
472-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
473+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
474 { release_hack( (yyvaluep->node) ); };
475
476 /* Line 480 of lalr1.cc */
477-#line 577 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
478+#line 564 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
479 break;
480 case 366: /* "CtxItemDecl2" */
481
482 /* Line 480 of lalr1.cc */
483-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
484+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
485 { release_hack( (yyvaluep->node) ); };
486
487 /* Line 480 of lalr1.cc */
488-#line 586 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
489+#line 573 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
490 break;
491 case 367: /* "CtxItemDecl3" */
492
493 /* Line 480 of lalr1.cc */
494-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
495+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
496 { release_hack( (yyvaluep->node) ); };
497
498 /* Line 480 of lalr1.cc */
499-#line 595 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
500+#line 582 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
501 break;
502 case 368: /* "CtxItemDecl4" */
503
504 /* Line 480 of lalr1.cc */
505-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
506+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
507 { release_hack( (yyvaluep->node) ); };
508
509 /* Line 480 of lalr1.cc */
510-#line 604 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
511+#line 591 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
512 break;
513 case 369: /* "VarDecl" */
514
515 /* Line 480 of lalr1.cc */
516-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
517+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
518 { release_hack( (yyvaluep->node) ); };
519
520 /* Line 480 of lalr1.cc */
521-#line 613 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
522+#line 600 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
523 break;
524 case 370: /* "VarNameAndType" */
525
526 /* Line 480 of lalr1.cc */
527-#line 930 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
528+#line 930 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
529 { delete (yyvaluep->varnametype); };
530
531 /* Line 480 of lalr1.cc */
532-#line 622 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
533+#line 609 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
534 break;
535 case 371: /* "AnnotationList" */
536
537 /* Line 480 of lalr1.cc */
538-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
539+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
540 { release_hack( (yyvaluep->node) ); };
541
542 /* Line 480 of lalr1.cc */
543-#line 631 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
544+#line 618 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
545 break;
546 case 372: /* "Annotation" */
547
548 /* Line 480 of lalr1.cc */
549-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
550+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
551 { release_hack( (yyvaluep->node) ); };
552
553 /* Line 480 of lalr1.cc */
554-#line 640 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
555+#line 627 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
556 break;
557 case 373: /* "AnnotationLiteralList" */
558
559 /* Line 480 of lalr1.cc */
560-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
561+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
562 { release_hack( (yyvaluep->node) ); };
563
564 /* Line 480 of lalr1.cc */
565-#line 649 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
566+#line 636 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
567 break;
568 case 374: /* "FunctionDecl" */
569
570 /* Line 480 of lalr1.cc */
571-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
572+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
573 { release_hack( (yyvaluep->node) ); };
574
575 /* Line 480 of lalr1.cc */
576-#line 658 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
577+#line 645 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
578 break;
579 case 375: /* "FunctionDecl2" */
580
581 /* Line 480 of lalr1.cc */
582-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
583+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
584 { release_hack( (yyvaluep->node) ); };
585
586 /* Line 480 of lalr1.cc */
587-#line 667 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
588+#line 654 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
589 break;
590 case 376: /* "FunctionDeclSimple" */
591
592 /* Line 480 of lalr1.cc */
593-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
594+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
595 { release_hack( (yyvaluep->node) ); };
596
597 /* Line 480 of lalr1.cc */
598-#line 676 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
599+#line 663 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
600 break;
601 case 377: /* "FunctionDeclUpdating" */
602
603 /* Line 480 of lalr1.cc */
604-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
605+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
606 { release_hack( (yyvaluep->node) ); };
607
608 /* Line 480 of lalr1.cc */
609-#line 685 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
610+#line 672 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
611 break;
612 case 378: /* "FunctionSig" */
613
614 /* Line 480 of lalr1.cc */
615-#line 930 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
616+#line 930 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
617 { delete (yyvaluep->fnsig); };
618
619 /* Line 480 of lalr1.cc */
620-#line 694 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
621+#line 681 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
622 break;
623 case 379: /* "ParamList" */
624
625 /* Line 480 of lalr1.cc */
626-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
627+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
628 { release_hack( (yyvaluep->node) ); };
629
630 /* Line 480 of lalr1.cc */
631-#line 703 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
632+#line 690 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
633 break;
634 case 380: /* "Param" */
635
636 /* Line 480 of lalr1.cc */
637-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
638+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
639 { release_hack( (yyvaluep->node) ); };
640
641 /* Line 480 of lalr1.cc */
642-#line 712 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
643+#line 699 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
644 break;
645 case 381: /* "CollectionDecl" */
646
647 /* Line 480 of lalr1.cc */
648-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
649+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
650 { release_hack( (yyvaluep->node) ); };
651
652 /* Line 480 of lalr1.cc */
653-#line 721 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
654+#line 708 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
655 break;
656 case 383: /* "IndexDecl" */
657
658 /* Line 480 of lalr1.cc */
659-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
660+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
661 { release_hack( (yyvaluep->node) ); };
662
663 /* Line 480 of lalr1.cc */
664-#line 730 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
665+#line 717 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
666 break;
667 case 384: /* "IndexKeyList" */
668
669 /* Line 480 of lalr1.cc */
670-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
671+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
672 { release_hack( (yyvaluep->node) ); };
673
674 /* Line 480 of lalr1.cc */
675-#line 739 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
676+#line 726 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
677 break;
678 case 385: /* "IndexKeySpec" */
679
680 /* Line 480 of lalr1.cc */
681-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
682+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
683 { release_hack( (yyvaluep->node) ); };
684
685 /* Line 480 of lalr1.cc */
686-#line 748 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
687+#line 735 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
688 break;
689 case 386: /* "IntegrityConstraintDecl" */
690
691 /* Line 480 of lalr1.cc */
692-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
693+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
694 { release_hack( (yyvaluep->node) ); };
695
696 /* Line 480 of lalr1.cc */
697-#line 757 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
698+#line 744 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
699 break;
700 case 387: /* "QueryBody" */
701
702 /* Line 480 of lalr1.cc */
703-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
704+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
705 { release_hack( (yyvaluep->expr) ); };
706
707 /* Line 480 of lalr1.cc */
708-#line 766 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
709+#line 753 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
710 break;
711 case 388: /* "StatementsAndOptionalExprTop" */
712
713 /* Line 480 of lalr1.cc */
714-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
715+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
716 { release_hack( (yyvaluep->expr) ); };
717
718 /* Line 480 of lalr1.cc */
719-#line 775 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
720+#line 762 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
721 break;
722 case 389: /* "StatementsAndOptionalExpr" */
723
724 /* Line 480 of lalr1.cc */
725-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
726+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
727 { release_hack( (yyvaluep->expr) ); };
728
729 /* Line 480 of lalr1.cc */
730-#line 784 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
731+#line 771 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
732 break;
733 case 390: /* "StatementsAndExpr" */
734
735 /* Line 480 of lalr1.cc */
736-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
737+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
738 { release_hack( (yyvaluep->expr) ); };
739
740 /* Line 480 of lalr1.cc */
741-#line 793 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
742+#line 780 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
743 break;
744 case 391: /* "Statements" */
745
746 /* Line 480 of lalr1.cc */
747-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
748+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
749 { release_hack( (yyvaluep->expr) ); };
750
751 /* Line 480 of lalr1.cc */
752-#line 802 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
753+#line 789 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
754 break;
755 case 392: /* "Statement" */
756
757 /* Line 480 of lalr1.cc */
758-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
759+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
760 { release_hack( (yyvaluep->expr) ); };
761
762 /* Line 480 of lalr1.cc */
763-#line 811 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
764+#line 798 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
765 break;
766 case 393: /* "BlockStatement" */
767
768 /* Line 480 of lalr1.cc */
769-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
770+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
771 { release_hack( (yyvaluep->expr) ); };
772
773 /* Line 480 of lalr1.cc */
774-#line 820 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
775+#line 807 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
776 break;
777 case 394: /* "BlockExpr" */
778
779 /* Line 480 of lalr1.cc */
780-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
781+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
782 { release_hack( (yyvaluep->expr) ); };
783
784 /* Line 480 of lalr1.cc */
785-#line 829 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
786+#line 816 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
787 break;
788 case 395: /* "EnclosedStatementsAndOptionalExpr" */
789
790 /* Line 480 of lalr1.cc */
791-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
792+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
793 { release_hack( (yyvaluep->expr) ); };
794
795 /* Line 480 of lalr1.cc */
796-#line 838 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
797+#line 825 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
798 break;
799 case 396: /* "VarDeclStatement" */
800
801 /* Line 480 of lalr1.cc */
802-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
803+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
804 { release_hack( (yyvaluep->expr) ); };
805
806 /* Line 480 of lalr1.cc */
807-#line 847 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
808+#line 834 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
809 break;
810 case 399: /* "AssignStatement" */
811
812 /* Line 480 of lalr1.cc */
813-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
814+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
815 { release_hack( (yyvaluep->expr) ); };
816
817 /* Line 480 of lalr1.cc */
818-#line 856 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
819+#line 843 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
820 break;
821 case 400: /* "ApplyStatement" */
822
823 /* Line 480 of lalr1.cc */
824-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
825+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
826 { release_hack( (yyvaluep->expr) ); };
827
828 /* Line 480 of lalr1.cc */
829-#line 865 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
830+#line 852 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
831 break;
832 case 401: /* "ExitStatement" */
833
834 /* Line 480 of lalr1.cc */
835-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
836+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
837 { release_hack( (yyvaluep->expr) ); };
838
839 /* Line 480 of lalr1.cc */
840-#line 874 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
841+#line 861 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
842 break;
843 case 402: /* "WhileStatement" */
844
845 /* Line 480 of lalr1.cc */
846-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
847+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
848 { release_hack( (yyvaluep->expr) ); };
849
850 /* Line 480 of lalr1.cc */
851-#line 883 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
852+#line 870 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
853 break;
854 case 403: /* "FlowCtlStatement" */
855
856 /* Line 480 of lalr1.cc */
857-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
858+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
859 { release_hack( (yyvaluep->expr) ); };
860
861 /* Line 480 of lalr1.cc */
862-#line 892 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
863+#line 879 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
864 break;
865 case 404: /* "FLWORStatement" */
866
867 /* Line 480 of lalr1.cc */
868-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
869+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
870 { release_hack( (yyvaluep->expr) ); };
871
872 /* Line 480 of lalr1.cc */
873-#line 901 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
874+#line 888 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
875 break;
876 case 405: /* "ReturnStatement" */
877
878 /* Line 480 of lalr1.cc */
879-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
880+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
881 { release_hack( (yyvaluep->expr) ); };
882
883 /* Line 480 of lalr1.cc */
884-#line 910 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
885+#line 897 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
886 break;
887 case 406: /* "IfStatement" */
888
889 /* Line 480 of lalr1.cc */
890-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
891+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
892 { release_hack( (yyvaluep->expr) ); };
893
894 /* Line 480 of lalr1.cc */
895-#line 919 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
896+#line 906 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
897 break;
898 case 407: /* "TryStatement" */
899
900 /* Line 480 of lalr1.cc */
901-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
902+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
903 { release_hack( (yyvaluep->expr) ); };
904
905 /* Line 480 of lalr1.cc */
906-#line 928 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
907+#line 915 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
908 break;
909 case 408: /* "CatchListStatement" */
910
911 /* Line 480 of lalr1.cc */
912-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
913+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
914 { release_hack( (yyvaluep->expr) ); };
915
916 /* Line 480 of lalr1.cc */
917-#line 937 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
918+#line 924 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
919 break;
920 case 409: /* "CatchStatement" */
921
922 /* Line 480 of lalr1.cc */
923-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
924+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
925 { release_hack( (yyvaluep->expr) ); };
926
927 /* Line 480 of lalr1.cc */
928-#line 946 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
929+#line 933 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
930 break;
931 case 410: /* "Expr" */
932
933 /* Line 480 of lalr1.cc */
934-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
935+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
936 { release_hack( (yyvaluep->expr) ); };
937
938 /* Line 480 of lalr1.cc */
939-#line 955 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
940+#line 942 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
941 break;
942 case 411: /* "ExprSingle" */
943
944 /* Line 480 of lalr1.cc */
945-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
946+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
947 { release_hack( (yyvaluep->expr) ); };
948
949 /* Line 480 of lalr1.cc */
950-#line 964 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
951+#line 951 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
952 break;
953 case 412: /* "ExprSimple" */
954
955 /* Line 480 of lalr1.cc */
956-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
957+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
958 { release_hack( (yyvaluep->expr) ); };
959
960 /* Line 480 of lalr1.cc */
961-#line 973 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
962+#line 960 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
963 break;
964 case 413: /* "FLWORExpr" */
965
966 /* Line 480 of lalr1.cc */
967-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
968+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
969 { release_hack( (yyvaluep->expr) ); };
970
971 /* Line 480 of lalr1.cc */
972-#line 982 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
973+#line 969 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
974 break;
975 case 414: /* "ReturnExpr" */
976
977 /* Line 480 of lalr1.cc */
978-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
979+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
980 { release_hack( (yyvaluep->expr) ); };
981
982 /* Line 480 of lalr1.cc */
983-#line 991 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
984+#line 978 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
985 break;
986 case 417: /* "FLWORWinCond" */
987
988 /* Line 480 of lalr1.cc */
989-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
990+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
991 { release_hack( (yyvaluep->node) ); };
992
993 /* Line 480 of lalr1.cc */
994-#line 1000 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
995+#line 987 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
996 break;
997 case 418: /* "WindowClause" */
998
999 /* Line 480 of lalr1.cc */
1000-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1001+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1002 { release_hack( (yyvaluep->node) ); };
1003
1004 /* Line 480 of lalr1.cc */
1005-#line 1009 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1006+#line 996 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1007 break;
1008 case 419: /* "CountClause" */
1009
1010 /* Line 480 of lalr1.cc */
1011-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1012+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1013 { release_hack( (yyvaluep->node) ); };
1014
1015 /* Line 480 of lalr1.cc */
1016-#line 1018 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1017+#line 1005 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1018 break;
1019 case 420: /* "ForLetWinClause" */
1020
1021 /* Line 480 of lalr1.cc */
1022-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1023+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1024 { release_hack( (yyvaluep->node) ); };
1025
1026 /* Line 480 of lalr1.cc */
1027-#line 1027 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1028+#line 1014 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1029 break;
1030 case 422: /* "FLWORClauseList" */
1031
1032 /* Line 480 of lalr1.cc */
1033-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1034+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1035 { release_hack( (yyvaluep->node) ); };
1036
1037 /* Line 480 of lalr1.cc */
1038-#line 1036 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1039+#line 1023 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1040 break;
1041 case 423: /* "ForClause" */
1042
1043 /* Line 480 of lalr1.cc */
1044-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1045+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1046 { release_hack( (yyvaluep->node) ); };
1047
1048 /* Line 480 of lalr1.cc */
1049-#line 1045 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1050+#line 1032 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1051 break;
1052 case 424: /* "VarInDeclList" */
1053
1054 /* Line 480 of lalr1.cc */
1055-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1056+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1057 { release_hack( (yyvaluep->node) ); };
1058
1059 /* Line 480 of lalr1.cc */
1060-#line 1054 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1061+#line 1041 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1062 break;
1063 case 425: /* "VarInDecl" */
1064
1065 /* Line 480 of lalr1.cc */
1066-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1067+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1068 { release_hack( (yyvaluep->node) ); };
1069
1070 /* Line 480 of lalr1.cc */
1071-#line 1063 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1072+#line 1050 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1073 break;
1074 case 426: /* "PositionalVar" */
1075
1076 /* Line 480 of lalr1.cc */
1077-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1078+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1079 { release_hack( (yyvaluep->node) ); };
1080
1081 /* Line 480 of lalr1.cc */
1082-#line 1072 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1083+#line 1059 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1084 break;
1085 case 427: /* "FTScoreVar" */
1086
1087 /* Line 480 of lalr1.cc */
1088-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1089+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1090 { release_hack( (yyvaluep->node) ); };
1091
1092 /* Line 480 of lalr1.cc */
1093-#line 1081 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1094+#line 1068 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1095 break;
1096 case 428: /* "LetClause" */
1097
1098 /* Line 480 of lalr1.cc */
1099-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1100+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1101 { release_hack( (yyvaluep->node) ); };
1102
1103 /* Line 480 of lalr1.cc */
1104-#line 1090 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1105+#line 1077 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1106 break;
1107 case 429: /* "VarGetsDeclList" */
1108
1109 /* Line 480 of lalr1.cc */
1110-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1111+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1112 { release_hack( (yyvaluep->node) ); };
1113
1114 /* Line 480 of lalr1.cc */
1115-#line 1099 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1116+#line 1086 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1117 break;
1118 case 430: /* "VarGetsDecl" */
1119
1120 /* Line 480 of lalr1.cc */
1121-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1122+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1123 { release_hack( (yyvaluep->node) ); };
1124
1125 /* Line 480 of lalr1.cc */
1126-#line 1108 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1127+#line 1095 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1128 break;
1129 case 431: /* "WindowVarDecl" */
1130
1131 /* Line 480 of lalr1.cc */
1132-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1133+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1134 { release_hack( (yyvaluep->node) ); };
1135
1136 /* Line 480 of lalr1.cc */
1137-#line 1117 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1138+#line 1104 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1139 break;
1140 case 432: /* "WindowVars" */
1141
1142 /* Line 480 of lalr1.cc */
1143-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1144+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1145 { release_hack( (yyvaluep->node) ); };
1146
1147 /* Line 480 of lalr1.cc */
1148-#line 1126 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1149+#line 1113 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1150 break;
1151 case 433: /* "WindowVars3" */
1152
1153 /* Line 480 of lalr1.cc */
1154-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1155+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1156 { release_hack( (yyvaluep->node) ); };
1157
1158 /* Line 480 of lalr1.cc */
1159-#line 1135 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1160+#line 1122 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1161 break;
1162 case 434: /* "WindowVars2" */
1163
1164 /* Line 480 of lalr1.cc */
1165-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1166+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1167 { release_hack( (yyvaluep->node) ); };
1168
1169 /* Line 480 of lalr1.cc */
1170-#line 1144 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1171+#line 1131 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1172 break;
1173 case 435: /* "WhereClause" */
1174
1175 /* Line 480 of lalr1.cc */
1176-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1177+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1178 { release_hack( (yyvaluep->node) ); };
1179
1180 /* Line 480 of lalr1.cc */
1181-#line 1153 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1182+#line 1140 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1183 break;
1184 case 436: /* "GroupByClause" */
1185
1186 /* Line 480 of lalr1.cc */
1187-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1188+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1189 { release_hack( (yyvaluep->node) ); };
1190
1191 /* Line 480 of lalr1.cc */
1192-#line 1162 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1193+#line 1149 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1194 break;
1195 case 437: /* "GroupSpecList" */
1196
1197 /* Line 480 of lalr1.cc */
1198-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1199+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1200 { release_hack( (yyvaluep->node) ); };
1201
1202 /* Line 480 of lalr1.cc */
1203-#line 1171 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1204+#line 1158 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1205 break;
1206 case 438: /* "GroupSpec" */
1207
1208 /* Line 480 of lalr1.cc */
1209-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1210+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1211 { release_hack( (yyvaluep->node) ); };
1212
1213 /* Line 480 of lalr1.cc */
1214-#line 1180 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1215+#line 1167 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1216 break;
1217 case 439: /* "GroupCollationSpec" */
1218
1219 /* Line 480 of lalr1.cc */
1220-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1221+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1222 { release_hack( (yyvaluep->node) ); };
1223
1224 /* Line 480 of lalr1.cc */
1225-#line 1189 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1226+#line 1176 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1227 break;
1228 case 440: /* "OrderByClause" */
1229
1230 /* Line 480 of lalr1.cc */
1231-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1232+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1233 { release_hack( (yyvaluep->node) ); };
1234
1235 /* Line 480 of lalr1.cc */
1236-#line 1198 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1237+#line 1185 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1238 break;
1239 case 441: /* "OrderSpecList" */
1240
1241 /* Line 480 of lalr1.cc */
1242-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1243+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1244 { release_hack( (yyvaluep->node) ); };
1245
1246 /* Line 480 of lalr1.cc */
1247-#line 1207 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1248+#line 1194 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1249 break;
1250 case 442: /* "OrderSpec" */
1251
1252 /* Line 480 of lalr1.cc */
1253-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1254+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1255 { release_hack( (yyvaluep->node) ); };
1256
1257 /* Line 480 of lalr1.cc */
1258-#line 1216 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1259+#line 1203 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1260 break;
1261 case 443: /* "OrderModifier" */
1262
1263 /* Line 480 of lalr1.cc */
1264-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1265+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1266 { release_hack( (yyvaluep->node) ); };
1267
1268 /* Line 480 of lalr1.cc */
1269-#line 1225 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1270+#line 1212 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1271 break;
1272 case 444: /* "OrderDirSpec" */
1273
1274 /* Line 480 of lalr1.cc */
1275-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1276+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1277 { release_hack( (yyvaluep->node) ); };
1278
1279 /* Line 480 of lalr1.cc */
1280-#line 1234 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1281+#line 1221 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1282 break;
1283 case 445: /* "OrderEmptySpec" */
1284
1285 /* Line 480 of lalr1.cc */
1286-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1287+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1288 { release_hack( (yyvaluep->node) ); };
1289
1290 /* Line 480 of lalr1.cc */
1291-#line 1243 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1292+#line 1230 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1293 break;
1294 case 446: /* "OrderCollationSpec" */
1295
1296 /* Line 480 of lalr1.cc */
1297-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1298+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1299 { release_hack( (yyvaluep->node) ); };
1300
1301 /* Line 480 of lalr1.cc */
1302-#line 1252 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1303+#line 1239 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1304 break;
1305 case 447: /* "QuantifiedExpr" */
1306
1307 /* Line 480 of lalr1.cc */
1308-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1309+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1310 { release_hack( (yyvaluep->expr) ); };
1311
1312 /* Line 480 of lalr1.cc */
1313-#line 1261 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1314+#line 1248 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1315 break;
1316 case 448: /* "QVarInDeclList" */
1317
1318 /* Line 480 of lalr1.cc */
1319-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1320+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1321 { release_hack( (yyvaluep->node) ); };
1322
1323 /* Line 480 of lalr1.cc */
1324-#line 1270 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1325+#line 1257 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1326 break;
1327 case 449: /* "QVarInDecl" */
1328
1329 /* Line 480 of lalr1.cc */
1330-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1331+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1332 { release_hack( (yyvaluep->node) ); };
1333
1334 /* Line 480 of lalr1.cc */
1335-#line 1279 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1336+#line 1266 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1337 break;
1338 case 450: /* "SwitchExpr" */
1339
1340 /* Line 480 of lalr1.cc */
1341-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1342+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1343 { release_hack( (yyvaluep->expr) ); };
1344
1345 /* Line 480 of lalr1.cc */
1346-#line 1288 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1347+#line 1275 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1348 break;
1349 case 451: /* "SwitchCaseClauseList" */
1350
1351 /* Line 480 of lalr1.cc */
1352-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1353+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1354 { release_hack( (yyvaluep->node) ); };
1355
1356 /* Line 480 of lalr1.cc */
1357-#line 1297 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1358+#line 1284 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1359 break;
1360 case 452: /* "SwitchCaseClause" */
1361
1362 /* Line 480 of lalr1.cc */
1363-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1364+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1365 { release_hack( (yyvaluep->node) ); };
1366
1367 /* Line 480 of lalr1.cc */
1368-#line 1306 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1369+#line 1293 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1370 break;
1371 case 453: /* "SwitchCaseOperandList" */
1372
1373 /* Line 480 of lalr1.cc */
1374-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1375+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1376 { release_hack( (yyvaluep->node) ); };
1377
1378 /* Line 480 of lalr1.cc */
1379-#line 1315 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1380+#line 1302 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1381 break;
1382 case 454: /* "SwitchStatement" */
1383
1384 /* Line 480 of lalr1.cc */
1385-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1386+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1387 { release_hack( (yyvaluep->expr) ); };
1388
1389 /* Line 480 of lalr1.cc */
1390-#line 1324 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1391+#line 1311 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1392 break;
1393 case 457: /* "TypeswitchExpr" */
1394
1395 /* Line 480 of lalr1.cc */
1396-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1397+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1398 { release_hack( (yyvaluep->expr) ); };
1399
1400 /* Line 480 of lalr1.cc */
1401-#line 1333 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1402+#line 1320 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1403 break;
1404 case 458: /* "TypeswitchStatement" */
1405
1406 /* Line 480 of lalr1.cc */
1407-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1408+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1409 { release_hack( (yyvaluep->expr) ); };
1410
1411 /* Line 480 of lalr1.cc */
1412-#line 1342 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1413+#line 1329 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1414 break;
1415 case 459: /* "CaseClauseList" */
1416
1417 /* Line 480 of lalr1.cc */
1418-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1419+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1420 { release_hack( (yyvaluep->node) ); };
1421
1422 /* Line 480 of lalr1.cc */
1423-#line 1351 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1424+#line 1338 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1425 break;
1426 case 460: /* "CaseClause" */
1427
1428 /* Line 480 of lalr1.cc */
1429-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1430+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1431 { release_hack( (yyvaluep->node) ); };
1432
1433 /* Line 480 of lalr1.cc */
1434-#line 1360 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1435+#line 1347 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1436 break;
1437 case 463: /* "IfExpr" */
1438
1439 /* Line 480 of lalr1.cc */
1440-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1441+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1442 { release_hack( (yyvaluep->expr) ); };
1443
1444 /* Line 480 of lalr1.cc */
1445-#line 1369 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1446+#line 1356 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1447 break;
1448 case 464: /* "OrExpr" */
1449
1450 /* Line 480 of lalr1.cc */
1451-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1452+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1453 { release_hack( (yyvaluep->expr) ); };
1454
1455 /* Line 480 of lalr1.cc */
1456-#line 1378 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1457+#line 1365 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1458 break;
1459 case 465: /* "AndExpr" */
1460
1461 /* Line 480 of lalr1.cc */
1462-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1463+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1464 { release_hack( (yyvaluep->expr) ); };
1465
1466 /* Line 480 of lalr1.cc */
1467-#line 1387 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1468+#line 1374 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1469 break;
1470 case 466: /* "ComparisonExpr" */
1471
1472 /* Line 480 of lalr1.cc */
1473-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1474+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1475 { release_hack( (yyvaluep->expr) ); };
1476
1477 /* Line 480 of lalr1.cc */
1478-#line 1396 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1479+#line 1383 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1480 break;
1481 case 468: /* "FTContainsExpr" */
1482
1483 /* Line 480 of lalr1.cc */
1484-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1485+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1486 { release_hack( (yyvaluep->expr) ); };
1487
1488 /* Line 480 of lalr1.cc */
1489-#line 1405 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1490+#line 1392 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1491 break;
1492 case 469: /* "StringConcatExpr" */
1493
1494 /* Line 480 of lalr1.cc */
1495-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1496+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1497 { release_hack( (yyvaluep->expr) ); };
1498
1499 /* Line 480 of lalr1.cc */
1500-#line 1414 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1501+#line 1401 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1502 break;
1503 case 470: /* "opt_FTIgnoreOption" */
1504
1505 /* Line 480 of lalr1.cc */
1506-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1507+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1508 { release_hack( (yyvaluep->node) ); };
1509
1510 /* Line 480 of lalr1.cc */
1511-#line 1423 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1512+#line 1410 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1513 break;
1514 case 471: /* "RangeExpr" */
1515
1516 /* Line 480 of lalr1.cc */
1517-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1518+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1519 { release_hack( (yyvaluep->expr) ); };
1520
1521 /* Line 480 of lalr1.cc */
1522-#line 1432 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1523+#line 1419 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1524 break;
1525 case 472: /* "AdditiveExpr" */
1526
1527 /* Line 480 of lalr1.cc */
1528-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1529+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1530 { release_hack( (yyvaluep->expr) ); };
1531
1532 /* Line 480 of lalr1.cc */
1533-#line 1441 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1534+#line 1428 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1535 break;
1536 case 473: /* "MultiplicativeExpr" */
1537
1538 /* Line 480 of lalr1.cc */
1539-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1540+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1541 { release_hack( (yyvaluep->expr) ); };
1542
1543 /* Line 480 of lalr1.cc */
1544-#line 1450 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1545+#line 1437 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1546 break;
1547 case 474: /* "UnionExpr" */
1548
1549 /* Line 480 of lalr1.cc */
1550-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1551+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1552 { release_hack( (yyvaluep->expr) ); };
1553
1554 /* Line 480 of lalr1.cc */
1555-#line 1459 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1556+#line 1446 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1557 break;
1558 case 475: /* "IntersectExceptExpr" */
1559
1560 /* Line 480 of lalr1.cc */
1561-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1562+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1563 { release_hack( (yyvaluep->expr) ); };
1564
1565 /* Line 480 of lalr1.cc */
1566-#line 1468 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1567+#line 1455 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1568 break;
1569 case 476: /* "InstanceofExpr" */
1570
1571 /* Line 480 of lalr1.cc */
1572-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1573+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1574 { release_hack( (yyvaluep->expr) ); };
1575
1576 /* Line 480 of lalr1.cc */
1577-#line 1477 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1578+#line 1464 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1579 break;
1580 case 477: /* "TreatExpr" */
1581
1582 /* Line 480 of lalr1.cc */
1583-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1584+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1585 { release_hack( (yyvaluep->expr) ); };
1586
1587 /* Line 480 of lalr1.cc */
1588-#line 1486 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1589+#line 1473 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1590 break;
1591 case 478: /* "CastableExpr" */
1592
1593 /* Line 480 of lalr1.cc */
1594-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1595+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1596 { release_hack( (yyvaluep->expr) ); };
1597
1598 /* Line 480 of lalr1.cc */
1599-#line 1495 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1600+#line 1482 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1601 break;
1602 case 479: /* "CastExpr" */
1603
1604 /* Line 480 of lalr1.cc */
1605-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1606+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1607 { release_hack( (yyvaluep->expr) ); };
1608
1609 /* Line 480 of lalr1.cc */
1610-#line 1504 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1611+#line 1491 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1612 break;
1613 case 480: /* "UnaryExpr" */
1614
1615 /* Line 480 of lalr1.cc */
1616-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1617+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1618 { release_hack( (yyvaluep->expr) ); };
1619
1620 /* Line 480 of lalr1.cc */
1621-#line 1513 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1622+#line 1500 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1623 break;
1624 case 481: /* "SignList" */
1625
1626 /* Line 480 of lalr1.cc */
1627-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1628+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1629 { release_hack( (yyvaluep->node) ); };
1630
1631 /* Line 480 of lalr1.cc */
1632-#line 1522 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1633+#line 1509 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1634 break;
1635 case 482: /* "ValueExpr" */
1636
1637 /* Line 480 of lalr1.cc */
1638-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1639+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1640 { release_hack( (yyvaluep->expr) ); };
1641
1642 /* Line 480 of lalr1.cc */
1643-#line 1531 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1644+#line 1518 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1645 break;
1646 case 483: /* "ValueComp" */
1647
1648 /* Line 480 of lalr1.cc */
1649-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1650+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1651 { release_hack( (yyvaluep->node) ); };
1652
1653 /* Line 480 of lalr1.cc */
1654-#line 1540 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1655+#line 1527 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1656 break;
1657 case 484: /* "NodeComp" */
1658
1659 /* Line 480 of lalr1.cc */
1660-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1661+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1662 { release_hack( (yyvaluep->node) ); };
1663
1664 /* Line 480 of lalr1.cc */
1665-#line 1549 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1666+#line 1536 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1667 break;
1668 case 485: /* "ValidateExpr" */
1669
1670 /* Line 480 of lalr1.cc */
1671-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1672+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1673 { release_hack( (yyvaluep->expr) ); };
1674
1675 /* Line 480 of lalr1.cc */
1676-#line 1558 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1677+#line 1545 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1678 break;
1679 case 486: /* "ExtensionExpr" */
1680
1681 /* Line 480 of lalr1.cc */
1682-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1683+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1684 { release_hack( (yyvaluep->expr) ); };
1685
1686 /* Line 480 of lalr1.cc */
1687-#line 1567 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1688+#line 1554 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1689 break;
1690 case 487: /* "Pragma_list" */
1691
1692 /* Line 480 of lalr1.cc */
1693-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1694+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1695 { release_hack( (yyvaluep->node) ); };
1696
1697 /* Line 480 of lalr1.cc */
1698-#line 1576 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1699+#line 1563 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1700 break;
1701 case 488: /* "Pragma" */
1702
1703 /* Line 480 of lalr1.cc */
1704-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1705+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1706 { release_hack( (yyvaluep->node) ); };
1707
1708 /* Line 480 of lalr1.cc */
1709-#line 1585 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1710+#line 1572 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1711 break;
1712 case 489: /* "PathExpr" */
1713
1714 /* Line 480 of lalr1.cc */
1715-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1716+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1717 { release_hack( (yyvaluep->expr) ); };
1718
1719 /* Line 480 of lalr1.cc */
1720-#line 1594 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1721+#line 1581 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1722 break;
1723 case 491: /* "RelativePathExpr" */
1724
1725 /* Line 480 of lalr1.cc */
1726-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1727+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1728 { release_hack( (yyvaluep->expr) ); };
1729
1730 /* Line 480 of lalr1.cc */
1731-#line 1603 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1732+#line 1590 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1733 break;
1734 case 492: /* "StepExpr" */
1735
1736 /* Line 480 of lalr1.cc */
1737-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1738+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1739 { release_hack( (yyvaluep->expr) ); };
1740
1741 /* Line 480 of lalr1.cc */
1742-#line 1612 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1743+#line 1599 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1744 break;
1745 case 493: /* "AxisStep" */
1746
1747 /* Line 480 of lalr1.cc */
1748-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1749+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1750 { release_hack( (yyvaluep->expr) ); };
1751
1752 /* Line 480 of lalr1.cc */
1753-#line 1621 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1754+#line 1608 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1755 break;
1756 case 494: /* "ForwardStep" */
1757
1758 /* Line 480 of lalr1.cc */
1759-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1760+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1761 { release_hack( (yyvaluep->node) ); };
1762
1763 /* Line 480 of lalr1.cc */
1764-#line 1630 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1765+#line 1617 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1766 break;
1767 case 495: /* "ForwardAxis" */
1768
1769 /* Line 480 of lalr1.cc */
1770-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1771+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1772 { release_hack( (yyvaluep->node) ); };
1773
1774 /* Line 480 of lalr1.cc */
1775-#line 1639 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1776+#line 1626 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1777 break;
1778 case 496: /* "AbbrevForwardStep" */
1779
1780 /* Line 480 of lalr1.cc */
1781-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1782+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1783 { release_hack( (yyvaluep->node) ); };
1784
1785 /* Line 480 of lalr1.cc */
1786-#line 1648 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1787+#line 1635 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1788 break;
1789 case 497: /* "ReverseStep" */
1790
1791 /* Line 480 of lalr1.cc */
1792-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1793+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1794 { release_hack( (yyvaluep->node) ); };
1795
1796 /* Line 480 of lalr1.cc */
1797-#line 1657 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1798+#line 1644 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1799 break;
1800 case 498: /* "ReverseAxis" */
1801
1802 /* Line 480 of lalr1.cc */
1803-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1804+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1805 { release_hack( (yyvaluep->node) ); };
1806
1807 /* Line 480 of lalr1.cc */
1808-#line 1666 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1809+#line 1653 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1810 break;
1811 case 499: /* "NodeTest" */
1812
1813 /* Line 480 of lalr1.cc */
1814-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1815+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1816 { release_hack( (yyvaluep->node) ); };
1817
1818 /* Line 480 of lalr1.cc */
1819-#line 1675 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1820+#line 1662 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1821 break;
1822 case 500: /* "NameTest" */
1823
1824 /* Line 480 of lalr1.cc */
1825-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1826+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1827 { release_hack( (yyvaluep->node) ); };
1828
1829 /* Line 480 of lalr1.cc */
1830-#line 1684 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1831+#line 1671 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1832 break;
1833 case 501: /* "Wildcard" */
1834
1835 /* Line 480 of lalr1.cc */
1836-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1837+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1838 { release_hack( (yyvaluep->node) ); };
1839
1840 /* Line 480 of lalr1.cc */
1841-#line 1693 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1842+#line 1680 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1843 break;
1844 case 502: /* "FilterExpr" */
1845
1846 /* Line 480 of lalr1.cc */
1847-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1848+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1849 { release_hack( (yyvaluep->expr) ); };
1850
1851 /* Line 480 of lalr1.cc */
1852-#line 1702 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1853+#line 1689 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1854 break;
1855 case 503: /* "PredicateList" */
1856
1857 /* Line 480 of lalr1.cc */
1858-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1859+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1860 { release_hack( (yyvaluep->node) ); };
1861
1862 /* Line 480 of lalr1.cc */
1863-#line 1711 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1864+#line 1698 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1865 break;
1866 case 504: /* "Predicate" */
1867
1868 /* Line 480 of lalr1.cc */
1869-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1870+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1871 { release_hack( (yyvaluep->expr) ); };
1872
1873 /* Line 480 of lalr1.cc */
1874-#line 1720 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1875+#line 1707 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1876 break;
1877 case 505: /* "PrimaryExpr" */
1878
1879 /* Line 480 of lalr1.cc */
1880-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1881+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1882 { release_hack( (yyvaluep->expr) ); };
1883
1884 /* Line 480 of lalr1.cc */
1885-#line 1729 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1886+#line 1716 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1887 break;
1888 case 506: /* "Literal" */
1889
1890 /* Line 480 of lalr1.cc */
1891-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1892+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1893 { release_hack( (yyvaluep->expr) ); };
1894
1895 /* Line 480 of lalr1.cc */
1896-#line 1738 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1897+#line 1725 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1898 break;
1899 case 507: /* "NumericLiteral" */
1900
1901 /* Line 480 of lalr1.cc */
1902-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1903+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1904 { release_hack( (yyvaluep->expr) ); };
1905
1906 /* Line 480 of lalr1.cc */
1907-#line 1747 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1908+#line 1734 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1909 break;
1910 case 508: /* "VarRef" */
1911
1912 /* Line 480 of lalr1.cc */
1913-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1914+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1915 { release_hack( (yyvaluep->expr) ); };
1916
1917 /* Line 480 of lalr1.cc */
1918-#line 1756 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1919+#line 1743 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1920 break;
1921 case 509: /* "ParenthesizedExpr" */
1922
1923 /* Line 480 of lalr1.cc */
1924-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1925+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1926 { release_hack( (yyvaluep->expr) ); };
1927
1928 /* Line 480 of lalr1.cc */
1929-#line 1765 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1930+#line 1752 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1931 break;
1932 case 510: /* "ContextItemExpr" */
1933
1934 /* Line 480 of lalr1.cc */
1935-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1936+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1937 { release_hack( (yyvaluep->expr) ); };
1938
1939 /* Line 480 of lalr1.cc */
1940-#line 1774 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1941+#line 1761 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1942 break;
1943 case 511: /* "OrderedExpr" */
1944
1945 /* Line 480 of lalr1.cc */
1946-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1947+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1948 { release_hack( (yyvaluep->expr) ); };
1949
1950 /* Line 480 of lalr1.cc */
1951-#line 1783 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1952+#line 1770 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1953 break;
1954 case 512: /* "UnorderedExpr" */
1955
1956 /* Line 480 of lalr1.cc */
1957-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1958+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1959 { release_hack( (yyvaluep->expr) ); };
1960
1961 /* Line 480 of lalr1.cc */
1962-#line 1792 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1963+#line 1779 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1964 break;
1965 case 513: /* "FunctionCall" */
1966
1967 /* Line 480 of lalr1.cc */
1968-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1969+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1970 { release_hack( (yyvaluep->expr) ); };
1971
1972 /* Line 480 of lalr1.cc */
1973-#line 1801 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1974+#line 1788 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1975 break;
1976 case 514: /* "ArgList" */
1977
1978 /* Line 480 of lalr1.cc */
1979-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1980+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1981 { release_hack( (yyvaluep->node) ); };
1982
1983 /* Line 480 of lalr1.cc */
1984-#line 1810 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1985+#line 1797 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1986 break;
1987 case 515: /* "Constructor" */
1988
1989 /* Line 480 of lalr1.cc */
1990-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
1991+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
1992 { release_hack( (yyvaluep->expr) ); };
1993
1994 /* Line 480 of lalr1.cc */
1995-#line 1819 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
1996+#line 1806 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
1997 break;
1998 case 516: /* "DirectConstructor" */
1999
2000 /* Line 480 of lalr1.cc */
2001-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2002+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2003 { release_hack( (yyvaluep->expr) ); };
2004
2005 /* Line 480 of lalr1.cc */
2006-#line 1828 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2007+#line 1815 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2008 break;
2009 case 517: /* "DirElemConstructor" */
2010
2011 /* Line 480 of lalr1.cc */
2012-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2013+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2014 { release_hack( (yyvaluep->expr) ); };
2015
2016 /* Line 480 of lalr1.cc */
2017-#line 1837 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2018+#line 1824 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2019 break;
2020 case 518: /* "DirElemContentList" */
2021
2022 /* Line 480 of lalr1.cc */
2023-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2024+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2025 { release_hack( (yyvaluep->node) ); };
2026
2027 /* Line 480 of lalr1.cc */
2028-#line 1846 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2029+#line 1833 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2030 break;
2031 case 519: /* "DirAttributeList" */
2032
2033 /* Line 480 of lalr1.cc */
2034-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2035+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2036 { release_hack( (yyvaluep->node) ); };
2037
2038 /* Line 480 of lalr1.cc */
2039-#line 1855 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2040+#line 1842 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2041 break;
2042 case 520: /* "DirAttr" */
2043
2044 /* Line 480 of lalr1.cc */
2045-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2046+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2047 { release_hack( (yyvaluep->node) ); };
2048
2049 /* Line 480 of lalr1.cc */
2050-#line 1864 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2051+#line 1851 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2052 break;
2053 case 522: /* "DirAttributeValue" */
2054
2055 /* Line 480 of lalr1.cc */
2056-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2057+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2058 { release_hack( (yyvaluep->node) ); };
2059
2060 /* Line 480 of lalr1.cc */
2061-#line 1873 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2062+#line 1860 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2063 break;
2064 case 523: /* "opt_QuoteAttrContentList" */
2065
2066 /* Line 480 of lalr1.cc */
2067-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2068+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2069 { release_hack( (yyvaluep->node) ); };
2070
2071 /* Line 480 of lalr1.cc */
2072-#line 1882 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2073+#line 1869 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2074 break;
2075 case 524: /* "QuoteAttrContentList" */
2076
2077 /* Line 480 of lalr1.cc */
2078-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2079+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2080 { release_hack( (yyvaluep->node) ); };
2081
2082 /* Line 480 of lalr1.cc */
2083-#line 1891 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2084+#line 1878 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2085 break;
2086 case 525: /* "opt_AposAttrContentList" */
2087
2088 /* Line 480 of lalr1.cc */
2089-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2090+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2091 { release_hack( (yyvaluep->node) ); };
2092
2093 /* Line 480 of lalr1.cc */
2094-#line 1900 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2095+#line 1887 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2096 break;
2097 case 526: /* "AposAttrContentList" */
2098
2099 /* Line 480 of lalr1.cc */
2100-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2101+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2102 { release_hack( (yyvaluep->node) ); };
2103
2104 /* Line 480 of lalr1.cc */
2105-#line 1909 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2106+#line 1896 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2107 break;
2108 case 527: /* "QuoteAttrValueContent" */
2109
2110 /* Line 480 of lalr1.cc */
2111-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2112+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2113 { release_hack( (yyvaluep->node) ); };
2114
2115 /* Line 480 of lalr1.cc */
2116-#line 1918 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2117+#line 1905 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2118 break;
2119 case 528: /* "AposAttrValueContent" */
2120
2121 /* Line 480 of lalr1.cc */
2122-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2123+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2124 { release_hack( (yyvaluep->node) ); };
2125
2126 /* Line 480 of lalr1.cc */
2127-#line 1927 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2128+#line 1914 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2129 break;
2130 case 529: /* "DirElemContent" */
2131
2132 /* Line 480 of lalr1.cc */
2133-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2134+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2135 { release_hack( (yyvaluep->expr) ); };
2136
2137 /* Line 480 of lalr1.cc */
2138-#line 1936 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2139+#line 1923 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2140 break;
2141 case 530: /* "CommonContent" */
2142
2143 /* Line 480 of lalr1.cc */
2144-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2145+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2146 { release_hack( (yyvaluep->expr) ); };
2147
2148 /* Line 480 of lalr1.cc */
2149-#line 1945 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2150+#line 1932 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2151 break;
2152 case 531: /* "DirCommentConstructor" */
2153
2154 /* Line 480 of lalr1.cc */
2155-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2156+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2157 { release_hack( (yyvaluep->expr) ); };
2158
2159 /* Line 480 of lalr1.cc */
2160-#line 1954 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2161+#line 1941 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2162 break;
2163 case 532: /* "DirPIConstructor" */
2164
2165 /* Line 480 of lalr1.cc */
2166-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2167+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2168 { release_hack( (yyvaluep->expr) ); };
2169
2170 /* Line 480 of lalr1.cc */
2171-#line 1963 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2172+#line 1950 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2173 break;
2174 case 533: /* "CDataSection" */
2175
2176 /* Line 480 of lalr1.cc */
2177-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2178+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2179 { release_hack( (yyvaluep->expr) ); };
2180
2181 /* Line 480 of lalr1.cc */
2182-#line 1972 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2183+#line 1959 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2184 break;
2185 case 534: /* "ComputedConstructor" */
2186
2187 /* Line 480 of lalr1.cc */
2188-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2189+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2190 { release_hack( (yyvaluep->expr) ); };
2191
2192 /* Line 480 of lalr1.cc */
2193-#line 1981 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2194+#line 1968 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2195 break;
2196 case 535: /* "CompDocConstructor" */
2197
2198 /* Line 480 of lalr1.cc */
2199-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2200+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2201 { release_hack( (yyvaluep->expr) ); };
2202
2203 /* Line 480 of lalr1.cc */
2204-#line 1990 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2205+#line 1977 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2206 break;
2207 case 536: /* "CompElemConstructor" */
2208
2209 /* Line 480 of lalr1.cc */
2210-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2211+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2212 { release_hack( (yyvaluep->expr) ); };
2213
2214 /* Line 480 of lalr1.cc */
2215-#line 1999 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2216+#line 1986 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2217 break;
2218 case 537: /* "CompAttrConstructor" */
2219
2220 /* Line 480 of lalr1.cc */
2221-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2222+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2223 { release_hack( (yyvaluep->expr) ); };
2224
2225 /* Line 480 of lalr1.cc */
2226-#line 2008 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2227+#line 1995 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2228 break;
2229 case 538: /* "CompTextConstructor" */
2230
2231 /* Line 480 of lalr1.cc */
2232-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2233+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2234 { release_hack( (yyvaluep->expr) ); };
2235
2236 /* Line 480 of lalr1.cc */
2237-#line 2017 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2238+#line 2004 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2239 break;
2240 case 539: /* "CompCommentConstructor" */
2241
2242 /* Line 480 of lalr1.cc */
2243-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2244+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2245 { release_hack( (yyvaluep->expr) ); };
2246
2247 /* Line 480 of lalr1.cc */
2248-#line 2026 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2249+#line 2013 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2250 break;
2251 case 540: /* "CompPIConstructor" */
2252
2253 /* Line 480 of lalr1.cc */
2254-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2255+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2256 { release_hack( (yyvaluep->expr) ); };
2257
2258 /* Line 480 of lalr1.cc */
2259-#line 2035 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2260+#line 2022 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2261 break;
2262 case 541: /* "SingleType" */
2263
2264 /* Line 480 of lalr1.cc */
2265-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2266+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2267 { release_hack( (yyvaluep->node) ); };
2268
2269 /* Line 480 of lalr1.cc */
2270-#line 2044 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2271+#line 2031 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2272 break;
2273 case 542: /* "TypeDeclaration" */
2274
2275 /* Line 480 of lalr1.cc */
2276-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2277+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2278 { release_hack( (yyvaluep->node) ); };
2279
2280 /* Line 480 of lalr1.cc */
2281-#line 2053 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2282+#line 2040 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2283 break;
2284 case 543: /* "SequenceType" */
2285
2286 /* Line 480 of lalr1.cc */
2287-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2288+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2289 { release_hack( (yyvaluep->node) ); };
2290
2291 /* Line 480 of lalr1.cc */
2292-#line 2062 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2293+#line 2049 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2294 break;
2295 case 544: /* "OccurrenceIndicator" */
2296
2297 /* Line 480 of lalr1.cc */
2298-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2299+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2300 { release_hack( (yyvaluep->node) ); };
2301
2302 /* Line 480 of lalr1.cc */
2303-#line 2071 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2304+#line 2058 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2305 break;
2306 case 545: /* "ItemType" */
2307
2308 /* Line 480 of lalr1.cc */
2309-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2310+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2311 { release_hack( (yyvaluep->node) ); };
2312
2313 /* Line 480 of lalr1.cc */
2314-#line 2080 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2315+#line 2067 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2316 break;
2317 case 546: /* "TypeList" */
2318
2319 /* Line 480 of lalr1.cc */
2320-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2321+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2322 { release_hack( (yyvaluep->node) ); };
2323
2324 /* Line 480 of lalr1.cc */
2325-#line 2089 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2326+#line 2076 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2327 break;
2328 case 547: /* "AtomicType" */
2329
2330 /* Line 480 of lalr1.cc */
2331-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2332+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2333 { release_hack( (yyvaluep->node) ); };
2334
2335 /* Line 480 of lalr1.cc */
2336-#line 2098 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2337+#line 2085 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2338 break;
2339 case 548: /* "KindTest" */
2340
2341 /* Line 480 of lalr1.cc */
2342-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2343+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2344 { release_hack( (yyvaluep->node) ); };
2345
2346 /* Line 480 of lalr1.cc */
2347-#line 2107 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2348+#line 2094 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2349 break;
2350 case 549: /* "AnyKindTest" */
2351
2352 /* Line 480 of lalr1.cc */
2353-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2354+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2355 { release_hack( (yyvaluep->node) ); };
2356
2357 /* Line 480 of lalr1.cc */
2358-#line 2116 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2359+#line 2103 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2360 break;
2361 case 550: /* "DocumentTest" */
2362
2363 /* Line 480 of lalr1.cc */
2364-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2365+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2366 { release_hack( (yyvaluep->node) ); };
2367
2368 /* Line 480 of lalr1.cc */
2369-#line 2125 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2370+#line 2112 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2371 break;
2372 case 551: /* "TextTest" */
2373
2374 /* Line 480 of lalr1.cc */
2375-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2376+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2377 { release_hack( (yyvaluep->node) ); };
2378
2379 /* Line 480 of lalr1.cc */
2380-#line 2134 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2381+#line 2121 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2382 break;
2383 case 552: /* "CommentTest" */
2384
2385 /* Line 480 of lalr1.cc */
2386-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2387+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2388 { release_hack( (yyvaluep->node) ); };
2389
2390 /* Line 480 of lalr1.cc */
2391-#line 2143 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2392+#line 2130 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2393 break;
2394 case 553: /* "PITest" */
2395
2396 /* Line 480 of lalr1.cc */
2397-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2398+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2399 { release_hack( (yyvaluep->node) ); };
2400
2401 /* Line 480 of lalr1.cc */
2402-#line 2152 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2403+#line 2139 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2404 break;
2405 case 554: /* "AttributeTest" */
2406
2407 /* Line 480 of lalr1.cc */
2408-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2409+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2410 { release_hack( (yyvaluep->node) ); };
2411
2412 /* Line 480 of lalr1.cc */
2413-#line 2161 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2414+#line 2148 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2415 break;
2416 case 555: /* "SchemaAttributeTest" */
2417
2418 /* Line 480 of lalr1.cc */
2419-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2420+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2421 { release_hack( (yyvaluep->node) ); };
2422
2423 /* Line 480 of lalr1.cc */
2424-#line 2170 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2425+#line 2157 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2426 break;
2427 case 556: /* "ElementTest" */
2428
2429 /* Line 480 of lalr1.cc */
2430-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2431+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2432 { release_hack( (yyvaluep->node) ); };
2433
2434 /* Line 480 of lalr1.cc */
2435-#line 2179 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2436+#line 2166 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2437 break;
2438 case 557: /* "SchemaElementTest" */
2439
2440 /* Line 480 of lalr1.cc */
2441-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2442+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2443 { release_hack( (yyvaluep->node) ); };
2444
2445 /* Line 480 of lalr1.cc */
2446-#line 2188 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2447+#line 2175 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2448 break;
2449 case 558: /* "TypeName" */
2450
2451 /* Line 480 of lalr1.cc */
2452-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2453+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2454 { release_hack( (yyvaluep->node) ); };
2455
2456 /* Line 480 of lalr1.cc */
2457-#line 2197 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2458+#line 2184 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2459 break;
2460 case 559: /* "TypeName_WITH_HOOK" */
2461
2462 /* Line 480 of lalr1.cc */
2463-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2464+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2465 { release_hack( (yyvaluep->node) ); };
2466
2467 /* Line 480 of lalr1.cc */
2468-#line 2206 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2469+#line 2193 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2470 break;
2471 case 560: /* "StringLiteral" */
2472
2473 /* Line 480 of lalr1.cc */
2474-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2475+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2476 { release_hack( (yyvaluep->expr) ); };
2477
2478 /* Line 480 of lalr1.cc */
2479-#line 2215 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2480+#line 2202 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2481 break;
2482 case 565: /* "AnyFunctionTest" */
2483
2484 /* Line 480 of lalr1.cc */
2485-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2486+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2487 { release_hack( (yyvaluep->node) ); };
2488
2489 /* Line 480 of lalr1.cc */
2490-#line 2224 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2491+#line 2211 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2492 break;
2493 case 566: /* "TypedFunctionTest" */
2494
2495 /* Line 480 of lalr1.cc */
2496-#line 918 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2497+#line 918 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2498 { release_hack( (yyvaluep->node) ); };
2499
2500 /* Line 480 of lalr1.cc */
2501-#line 2233 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2502+#line 2220 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2503 break;
2504 case 569: /* "InsertExpr" */
2505
2506 /* Line 480 of lalr1.cc */
2507-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2508+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2509 { release_hack( (yyvaluep->expr) ); };
2510
2511 /* Line 480 of lalr1.cc */
2512-#line 2242 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2513+#line 2229 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2514 break;
2515 case 570: /* "DeleteExpr" */
2516
2517 /* Line 480 of lalr1.cc */
2518-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2519+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2520 { release_hack( (yyvaluep->expr) ); };
2521
2522 /* Line 480 of lalr1.cc */
2523-#line 2251 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2524+#line 2238 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2525 break;
2526 case 571: /* "ReplaceExpr" */
2527
2528 /* Line 480 of lalr1.cc */
2529-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2530+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2531 { release_hack( (yyvaluep->expr) ); };
2532
2533 /* Line 480 of lalr1.cc */
2534-#line 2260 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2535+#line 2247 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2536 break;
2537 case 572: /* "RenameExpr" */
2538
2539 /* Line 480 of lalr1.cc */
2540-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2541+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2542 { release_hack( (yyvaluep->expr) ); };
2543
2544 /* Line 480 of lalr1.cc */
2545-#line 2269 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2546+#line 2256 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2547 break;
2548 case 573: /* "TransformExpr" */
2549
2550 /* Line 480 of lalr1.cc */
2551-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2552+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2553 { release_hack( (yyvaluep->expr) ); };
2554
2555 /* Line 480 of lalr1.cc */
2556-#line 2278 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2557+#line 2265 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2558 break;
2559 case 574: /* "VarNameList" */
2560
2561 /* Line 480 of lalr1.cc */
2562-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2563+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2564 { release_hack( (yyvaluep->expr) ); };
2565
2566 /* Line 480 of lalr1.cc */
2567-#line 2287 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2568+#line 2274 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2569 break;
2570 case 575: /* "VarNameDecl" */
2571
2572 /* Line 480 of lalr1.cc */
2573-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2574+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2575 { release_hack( (yyvaluep->expr) ); };
2576
2577 /* Line 480 of lalr1.cc */
2578-#line 2296 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2579+#line 2283 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2580 break;
2581 case 576: /* "TryExpr" */
2582
2583 /* Line 480 of lalr1.cc */
2584-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2585+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2586 { release_hack( (yyvaluep->expr) ); };
2587
2588 /* Line 480 of lalr1.cc */
2589-#line 2305 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2590+#line 2292 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2591 break;
2592 case 577: /* "CatchListExpr" */
2593
2594 /* Line 480 of lalr1.cc */
2595-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2596+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2597 { release_hack( (yyvaluep->expr) ); };
2598
2599 /* Line 480 of lalr1.cc */
2600-#line 2314 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2601+#line 2301 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2602 break;
2603 case 578: /* "CatchExpr" */
2604
2605 /* Line 480 of lalr1.cc */
2606-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2607+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2608 { release_hack( (yyvaluep->expr) ); };
2609
2610 /* Line 480 of lalr1.cc */
2611-#line 2323 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2612+#line 2310 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2613 break;
2614 case 579: /* "BracedExpr" */
2615
2616 /* Line 480 of lalr1.cc */
2617-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2618+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2619 { release_hack( (yyvaluep->expr) ); };
2620
2621 /* Line 480 of lalr1.cc */
2622-#line 2332 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2623+#line 2319 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2624 break;
2625 case 580: /* "NameTestList" */
2626
2627 /* Line 480 of lalr1.cc */
2628-#line 930 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2629+#line 930 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2630 { delete (yyvaluep->name_test_list); };
2631
2632 /* Line 480 of lalr1.cc */
2633-#line 2341 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2634+#line 2328 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2635 break;
2636 case 581: /* "FTSelection" */
2637
2638 /* Line 480 of lalr1.cc */
2639-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2640+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2641 { release_hack( (yyvaluep->node) ); };
2642
2643 /* Line 480 of lalr1.cc */
2644-#line 2350 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2645+#line 2337 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2646 break;
2647 case 584: /* "FTOr" */
2648
2649 /* Line 480 of lalr1.cc */
2650-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2651+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2652 { release_hack( (yyvaluep->node) ); };
2653
2654 /* Line 480 of lalr1.cc */
2655-#line 2359 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2656+#line 2346 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2657 break;
2658 case 585: /* "FTAnd" */
2659
2660 /* Line 480 of lalr1.cc */
2661-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2662+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2663 { release_hack( (yyvaluep->node) ); };
2664
2665 /* Line 480 of lalr1.cc */
2666-#line 2368 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2667+#line 2355 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2668 break;
2669 case 586: /* "FTMildNot" */
2670
2671 /* Line 480 of lalr1.cc */
2672-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2673+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2674 { release_hack( (yyvaluep->node) ); };
2675
2676 /* Line 480 of lalr1.cc */
2677-#line 2377 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2678+#line 2364 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2679 break;
2680 case 587: /* "FTUnaryNot" */
2681
2682 /* Line 480 of lalr1.cc */
2683-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2684+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2685 { release_hack( (yyvaluep->node) ); };
2686
2687 /* Line 480 of lalr1.cc */
2688-#line 2386 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2689+#line 2373 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2690 break;
2691 case 588: /* "FTPrimaryWithOptions" */
2692
2693 /* Line 480 of lalr1.cc */
2694-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2695+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2696 { release_hack( (yyvaluep->node) ); };
2697
2698 /* Line 480 of lalr1.cc */
2699-#line 2395 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2700+#line 2382 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2701 break;
2702 case 589: /* "opt_FTMatchOptions" */
2703
2704 /* Line 480 of lalr1.cc */
2705-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2706+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2707 { release_hack( (yyvaluep->node) ); };
2708
2709 /* Line 480 of lalr1.cc */
2710-#line 2404 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2711+#line 2391 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2712 break;
2713 case 591: /* "FTWeight" */
2714
2715 /* Line 480 of lalr1.cc */
2716-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2717+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2718 { release_hack( (yyvaluep->node) ); };
2719
2720 /* Line 480 of lalr1.cc */
2721-#line 2413 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2722+#line 2400 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2723 break;
2724 case 592: /* "FTPrimary" */
2725
2726 /* Line 480 of lalr1.cc */
2727-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2728+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2729 { release_hack( (yyvaluep->node) ); };
2730
2731 /* Line 480 of lalr1.cc */
2732-#line 2422 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2733+#line 2409 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2734 break;
2735 case 593: /* "opt_FTTimes" */
2736
2737 /* Line 480 of lalr1.cc */
2738-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2739+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2740 { release_hack( (yyvaluep->node) ); };
2741
2742 /* Line 480 of lalr1.cc */
2743-#line 2431 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2744+#line 2418 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2745 break;
2746 case 594: /* "FTExtensionSelection" */
2747
2748 /* Line 480 of lalr1.cc */
2749-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2750+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2751 { release_hack( (yyvaluep->node) ); };
2752
2753 /* Line 480 of lalr1.cc */
2754-#line 2440 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2755+#line 2427 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2756 break;
2757 case 596: /* "FTWords" */
2758
2759 /* Line 480 of lalr1.cc */
2760-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2761+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2762 { release_hack( (yyvaluep->node) ); };
2763
2764 /* Line 480 of lalr1.cc */
2765-#line 2449 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2766+#line 2436 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2767 break;
2768 case 597: /* "FTWordsValue" */
2769
2770 /* Line 480 of lalr1.cc */
2771-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2772+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2773 { release_hack( (yyvaluep->node) ); };
2774
2775 /* Line 480 of lalr1.cc */
2776-#line 2458 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2777+#line 2445 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2778 break;
2779 case 599: /* "FTAnyallOption" */
2780
2781 /* Line 480 of lalr1.cc */
2782-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2783+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2784 { release_hack( (yyvaluep->node) ); };
2785
2786 /* Line 480 of lalr1.cc */
2787-#line 2467 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2788+#line 2454 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2789 break;
2790 case 602: /* "FTPosFilter" */
2791
2792 /* Line 480 of lalr1.cc */
2793-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2794+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2795 { release_hack( (yyvaluep->node) ); };
2796
2797 /* Line 480 of lalr1.cc */
2798-#line 2476 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2799+#line 2463 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2800 break;
2801 case 603: /* "FTOrder" */
2802
2803 /* Line 480 of lalr1.cc */
2804-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2805+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2806 { release_hack( (yyvaluep->node) ); };
2807
2808 /* Line 480 of lalr1.cc */
2809-#line 2485 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2810+#line 2472 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2811 break;
2812 case 604: /* "FTWindow" */
2813
2814 /* Line 480 of lalr1.cc */
2815-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2816+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2817 { release_hack( (yyvaluep->node) ); };
2818
2819 /* Line 480 of lalr1.cc */
2820-#line 2494 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2821+#line 2481 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2822 break;
2823 case 605: /* "FTDistance" */
2824
2825 /* Line 480 of lalr1.cc */
2826-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2827+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2828 { release_hack( (yyvaluep->node) ); };
2829
2830 /* Line 480 of lalr1.cc */
2831-#line 2503 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2832+#line 2490 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2833 break;
2834 case 606: /* "FTUnit" */
2835
2836 /* Line 480 of lalr1.cc */
2837-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2838+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2839 { release_hack( (yyvaluep->node) ); };
2840
2841 /* Line 480 of lalr1.cc */
2842-#line 2512 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2843+#line 2499 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2844 break;
2845 case 607: /* "FTMatchOptions" */
2846
2847 /* Line 480 of lalr1.cc */
2848-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2849+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2850 { release_hack( (yyvaluep->node) ); };
2851
2852 /* Line 480 of lalr1.cc */
2853-#line 2521 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2854+#line 2508 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2855 break;
2856 case 608: /* "FTMatchOption" */
2857
2858 /* Line 480 of lalr1.cc */
2859-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2860+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2861 { release_hack( (yyvaluep->node) ); };
2862
2863 /* Line 480 of lalr1.cc */
2864-#line 2530 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2865+#line 2517 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2866 break;
2867 case 609: /* "FTCaseOption" */
2868
2869 /* Line 480 of lalr1.cc */
2870-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2871+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2872 { release_hack( (yyvaluep->node) ); };
2873
2874 /* Line 480 of lalr1.cc */
2875-#line 2539 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2876+#line 2526 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2877 break;
2878 case 610: /* "FTDiacriticsOption" */
2879
2880 /* Line 480 of lalr1.cc */
2881-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2882+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2883 { release_hack( (yyvaluep->node) ); };
2884
2885 /* Line 480 of lalr1.cc */
2886-#line 2548 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2887+#line 2535 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2888 break;
2889 case 611: /* "FTExtensionOption" */
2890
2891 /* Line 480 of lalr1.cc */
2892-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2893+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2894 { release_hack( (yyvaluep->node) ); };
2895
2896 /* Line 480 of lalr1.cc */
2897-#line 2557 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2898+#line 2544 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2899 break;
2900 case 612: /* "FTStemOption" */
2901
2902 /* Line 480 of lalr1.cc */
2903-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2904+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2905 { release_hack( (yyvaluep->node) ); };
2906
2907 /* Line 480 of lalr1.cc */
2908-#line 2566 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2909+#line 2553 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2910 break;
2911 case 613: /* "FTThesaurusOption" */
2912
2913 /* Line 480 of lalr1.cc */
2914-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2915+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2916 { release_hack( (yyvaluep->node) ); };
2917
2918 /* Line 480 of lalr1.cc */
2919-#line 2575 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2920+#line 2562 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2921 break;
2922 case 617: /* "FTThesaurusID" */
2923
2924 /* Line 480 of lalr1.cc */
2925-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2926+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2927 { release_hack( (yyvaluep->node) ); };
2928
2929 /* Line 480 of lalr1.cc */
2930-#line 2584 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2931+#line 2571 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2932 break;
2933 case 620: /* "FTStopWordOption" */
2934
2935 /* Line 480 of lalr1.cc */
2936-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2937+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2938 { release_hack( (yyvaluep->node) ); };
2939
2940 /* Line 480 of lalr1.cc */
2941-#line 2593 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2942+#line 2580 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2943 break;
2944 case 621: /* "FTStopWords" */
2945
2946 /* Line 480 of lalr1.cc */
2947-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2948+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2949 { release_hack( (yyvaluep->node) ); };
2950
2951 /* Line 480 of lalr1.cc */
2952-#line 2602 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2953+#line 2589 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2954 break;
2955 case 625: /* "FTStopWordsInclExcl" */
2956
2957 /* Line 480 of lalr1.cc */
2958-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2959+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2960 { release_hack( (yyvaluep->node) ); };
2961
2962 /* Line 480 of lalr1.cc */
2963-#line 2611 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2964+#line 2598 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2965 break;
2966 case 626: /* "FTLanguageOption" */
2967
2968 /* Line 480 of lalr1.cc */
2969-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2970+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2971 { release_hack( (yyvaluep->node) ); };
2972
2973 /* Line 480 of lalr1.cc */
2974-#line 2620 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2975+#line 2607 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2976 break;
2977 case 627: /* "FTWildCardOption" */
2978
2979 /* Line 480 of lalr1.cc */
2980-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2981+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2982 { release_hack( (yyvaluep->node) ); };
2983
2984 /* Line 480 of lalr1.cc */
2985-#line 2629 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2986+#line 2616 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2987 break;
2988 case 628: /* "FTContent" */
2989
2990 /* Line 480 of lalr1.cc */
2991-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
2992+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
2993 { release_hack( (yyvaluep->node) ); };
2994
2995 /* Line 480 of lalr1.cc */
2996-#line 2638 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
2997+#line 2625 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
2998 break;
2999 case 629: /* "FTTimes" */
3000
3001 /* Line 480 of lalr1.cc */
3002-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3003+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3004 { release_hack( (yyvaluep->node) ); };
3005
3006 /* Line 480 of lalr1.cc */
3007-#line 2647 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3008+#line 2634 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3009 break;
3010 case 630: /* "FTRange" */
3011
3012 /* Line 480 of lalr1.cc */
3013-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3014+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3015 { release_hack( (yyvaluep->node) ); };
3016
3017 /* Line 480 of lalr1.cc */
3018-#line 2656 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3019+#line 2643 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3020 break;
3021 case 631: /* "FTScope" */
3022
3023 /* Line 480 of lalr1.cc */
3024-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3025+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3026 { release_hack( (yyvaluep->node) ); };
3027
3028 /* Line 480 of lalr1.cc */
3029-#line 2665 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3030+#line 2652 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3031 break;
3032 case 632: /* "FTBigUnit" */
3033
3034 /* Line 480 of lalr1.cc */
3035-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3036+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3037 { release_hack( (yyvaluep->node) ); };
3038
3039 /* Line 480 of lalr1.cc */
3040-#line 2674 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3041+#line 2661 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3042 break;
3043 case 633: /* "FTIgnoreOption" */
3044
3045 /* Line 480 of lalr1.cc */
3046-#line 921 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3047+#line 921 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3048 { release_hack( (yyvaluep->node) ); };
3049
3050 /* Line 480 of lalr1.cc */
3051-#line 2683 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3052+#line 2670 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3053 break;
3054 case 634: /* "JSONArrayConstructor" */
3055
3056 /* Line 480 of lalr1.cc */
3057-#line 924 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3058+#line 924 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3059 { release_hack( (yyvaluep->expr) ); };
3060
3061 /* Line 480 of lalr1.cc */
3062-#line 2692 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3063+#line 2679 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3064 break;
3065 case 635: /* "JSONSimpleObjectUnion" */
3066
3067 /* Line 480 of lalr1.cc */
3068-#line 924 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3069+#line 924 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3070 { release_hack( (yyvaluep->expr) ); };
3071
3072 /* Line 480 of lalr1.cc */
3073-#line 2701 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3074+#line 2688 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3075 break;
3076 case 636: /* "JSONAccumulatorObjectUnion" */
3077
3078 /* Line 480 of lalr1.cc */
3079-#line 924 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3080+#line 924 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3081 { release_hack( (yyvaluep->expr) ); };
3082
3083 /* Line 480 of lalr1.cc */
3084-#line 2710 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3085+#line 2697 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3086 break;
3087 case 637: /* "JSONObjectConstructor" */
3088
3089 /* Line 480 of lalr1.cc */
3090-#line 924 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3091+#line 924 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3092 { release_hack( (yyvaluep->expr) ); };
3093
3094 /* Line 480 of lalr1.cc */
3095-#line 2719 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3096+#line 2706 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3097 break;
3098 case 638: /* "JSONPairList" */
3099
3100 /* Line 480 of lalr1.cc */
3101-#line 924 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3102+#line 924 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3103 { release_hack( (yyvaluep->node) ); };
3104
3105 /* Line 480 of lalr1.cc */
3106-#line 2728 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3107+#line 2715 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3108 break;
3109 case 639: /* "JSONInsertExpr" */
3110
3111 /* Line 480 of lalr1.cc */
3112-#line 924 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3113+#line 924 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3114 { release_hack( (yyvaluep->expr) ); };
3115
3116 /* Line 480 of lalr1.cc */
3117-#line 2737 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3118+#line 2724 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3119 break;
3120 case 640: /* "JSONAppendExpr" */
3121
3122 /* Line 480 of lalr1.cc */
3123-#line 924 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3124+#line 924 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3125 { release_hack( (yyvaluep->expr) ); };
3126
3127 /* Line 480 of lalr1.cc */
3128-#line 2746 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3129+#line 2733 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3130 break;
3131 case 641: /* "JSONDeleteExpr" */
3132
3133 /* Line 480 of lalr1.cc */
3134-#line 924 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3135+#line 924 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3136 { release_hack( (yyvaluep->expr) ); };
3137
3138 /* Line 480 of lalr1.cc */
3139-#line 2755 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3140+#line 2742 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3141 break;
3142 case 642: /* "JSONRenameExpr" */
3143
3144 /* Line 480 of lalr1.cc */
3145-#line 924 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3146+#line 924 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3147 { release_hack( (yyvaluep->expr) ); };
3148
3149 /* Line 480 of lalr1.cc */
3150-#line 2764 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3151+#line 2751 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3152 break;
3153 case 643: /* "JSONReplaceExpr" */
3154
3155 /* Line 480 of lalr1.cc */
3156-#line 924 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3157+#line 924 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3158 { release_hack( (yyvaluep->expr) ); };
3159
3160 /* Line 480 of lalr1.cc */
3161-#line 2773 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3162+#line 2760 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3163 break;
3164 case 650: /* "QNAME" */
3165
3166 /* Line 480 of lalr1.cc */
3167-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3168+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3169 { release_hack( (yyvaluep->expr) ); };
3170
3171 /* Line 480 of lalr1.cc */
3172-#line 2782 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3173+#line 2769 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3174 break;
3175 case 651: /* "FUNCTION_NAME" */
3176
3177 /* Line 480 of lalr1.cc */
3178-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3179+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3180 { release_hack( (yyvaluep->expr) ); };
3181
3182 /* Line 480 of lalr1.cc */
3183-#line 2791 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3184+#line 2778 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3185 break;
3186 case 652: /* "EQNAME" */
3187
3188 /* Line 480 of lalr1.cc */
3189-#line 927 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3190+#line 927 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3191 { release_hack( (yyvaluep->expr) ); };
3192
3193 /* Line 480 of lalr1.cc */
3194-#line 2800 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3195+#line 2787 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3196 break;
3197
3198 default:
3199@@ -2839,18 +2826,6 @@
3200 }
3201 #endif
3202
3203- inline bool
3204- xquery_parser::yy_pact_value_is_default_ (int yyvalue)
3205- {
3206- return yyvalue == yypact_ninf_;
3207- }
3208-
3209- inline bool
3210- xquery_parser::yy_table_value_is_error_ (int yyvalue)
3211- {
3212- return yyvalue == yytable_ninf_;
3213- }
3214-
3215 int
3216 xquery_parser::parse ()
3217 {
3218@@ -2872,7 +2847,7 @@
3219 /// Location of the lookahead.
3220 location_type yylloc;
3221 /// The locations where the error started and ended.
3222- location_type yyerror_range[3];
3223+ location_type yyerror_range[2];
3224
3225 /// $$.
3226 semantic_type yyval;
3227@@ -2886,14 +2861,14 @@
3228
3229 /* User initialization code. */
3230
3231-/* Line 565 of lalr1.cc */
3232-#line 140 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3233+/* Line 553 of lalr1.cc */
3234+#line 140 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3235 {
3236 yylloc.begin.filename = yylloc.end.filename = &(driver.theFilename2);
3237 }
3238
3239-/* Line 565 of lalr1.cc */
3240-#line 2897 "/home/ceej/zo/src/build/src/compiler/parser/xquery_parser.cpp"
3241+/* Line 553 of lalr1.cc */
3242+#line 2872 "/home/markos/zorba/repo/bug-900688/build-opt/src/compiler/parser/xquery_parser.cpp"
3243
3244 /* Initialize the stacks. The initial state will be pushed in
3245 yynewstate, since the latter expects the semantical and the
3246@@ -2921,7 +2896,7 @@
3247
3248 /* Try to take a decision without lookahead. */
3249 yyn = yypact_[yystate];
3250- if (yy_pact_value_is_default_ (yyn))
3251+ if (yyn == yypact_ninf_)
3252 goto yydefault;
3253
3254 /* Read a lookahead token. */
3255@@ -2954,8 +2929,8 @@
3256 yyn = yytable_[yyn];
3257 if (yyn <= 0)
3258 {
3259- if (yy_table_value_is_error_ (yyn))
3260- goto yyerrlab;
3261+ if (yyn == 0 || yyn == yytable_ninf_)
3262+ goto yyerrlab;
3263 yyn = -yyn;
3264 goto yyreduce;
3265 }
3266@@ -3011,8 +2986,8 @@
3267 {
3268 case 3:
3269
3270-/* Line 690 of lalr1.cc */
3271-#line 1040 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3272+/* Line 678 of lalr1.cc */
3273+#line 1040 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3274 {
3275 (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
3276 }
3277@@ -3020,8 +2995,8 @@
3278
3279 case 4:
3280
3281-/* Line 690 of lalr1.cc */
3282-#line 1044 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3283+/* Line 678 of lalr1.cc */
3284+#line 1044 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3285 {
3286 (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
3287 }
3288@@ -3029,8 +3004,8 @@
3289
3290 case 5:
3291
3292-/* Line 690 of lalr1.cc */
3293-#line 1048 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3294+/* Line 678 of lalr1.cc */
3295+#line 1048 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3296 {
3297 (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
3298 }
3299@@ -3038,8 +3013,8 @@
3300
3301 case 6:
3302
3303-/* Line 690 of lalr1.cc */
3304-#line 1059 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3305+/* Line 678 of lalr1.cc */
3306+#line 1059 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3307 {
3308 (yyval.node) = NULL; YYABORT;
3309 }
3310@@ -3047,8 +3022,8 @@
3311
3312 case 7:
3313
3314-/* Line 690 of lalr1.cc */
3315-#line 1068 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3316+/* Line 678 of lalr1.cc */
3317+#line 1068 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3318 {
3319 (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
3320 driver.set_expr( (yyval.node) );
3321@@ -3057,8 +3032,8 @@
3322
3323 case 8:
3324
3325-/* Line 690 of lalr1.cc */
3326-#line 1074 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3327+/* Line 678 of lalr1.cc */
3328+#line 1074 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3329 {
3330 MainModule* mm = dynamic_cast<MainModule*>((yysemantic_stack_[(2) - (2)].node));
3331 mm->set_version_decl( static_cast<VersionDecl*>((yysemantic_stack_[(2) - (1)].node)) );
3332@@ -3069,8 +3044,8 @@
3333
3334 case 9:
3335
3336-/* Line 690 of lalr1.cc */
3337-#line 1082 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3338+/* Line 678 of lalr1.cc */
3339+#line 1082 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3340 {
3341 (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
3342 driver.set_expr( (yyval.node) );
3343@@ -3079,8 +3054,8 @@
3344
3345 case 10:
3346
3347-/* Line 690 of lalr1.cc */
3348-#line 1088 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3349+/* Line 678 of lalr1.cc */
3350+#line 1088 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3351 {
3352 LibraryModule* lm = dynamic_cast<LibraryModule*>((yysemantic_stack_[(2) - (2)].node));
3353 lm->set_version_decl( static_cast<VersionDecl*>((yysemantic_stack_[(2) - (1)].node)) );
3354@@ -3091,8 +3066,8 @@
3355
3356 case 11:
3357
3358-/* Line 690 of lalr1.cc */
3359-#line 1099 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3360+/* Line 678 of lalr1.cc */
3361+#line 1099 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3362 {
3363 (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)), "utf-8" );
3364 }
3365@@ -3100,8 +3075,8 @@
3366
3367 case 12:
3368
3369-/* Line 690 of lalr1.cc */
3370-#line 1104 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3371+/* Line 678 of lalr1.cc */
3372+#line 1104 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3373 {
3374 (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)) );
3375 }
3376@@ -3109,8 +3084,8 @@
3377
3378 case 13:
3379
3380-/* Line 690 of lalr1.cc */
3381-#line 1112 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3382+/* Line 678 of lalr1.cc */
3383+#line 1112 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3384 {
3385 Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (1)].node)), NULL);
3386
3387@@ -3120,8 +3095,8 @@
3388
3389 case 14:
3390
3391-/* Line 690 of lalr1.cc */
3392-#line 1119 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3393+/* Line 678 of lalr1.cc */
3394+#line 1119 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3395 {
3396 Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (1)].node)));
3397
3398@@ -3131,8 +3106,8 @@
3399
3400 case 15:
3401
3402-/* Line 690 of lalr1.cc */
3403-#line 1126 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3404+/* Line 678 of lalr1.cc */
3405+#line 1126 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3406 {
3407 Prolog* prolog = new Prolog(LOC((yyloc)),
3408 static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (1)].node)),
3409@@ -3144,8 +3119,8 @@
3410
3411 case 16:
3412
3413-/* Line 690 of lalr1.cc */
3414-#line 1135 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3415+/* Line 678 of lalr1.cc */
3416+#line 1135 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3417 {
3418 (yyval.node) = new MainModule( LOC((yyloc)), static_cast<QueryBody*>((yysemantic_stack_[(1) - (1)].expr)), NULL );
3419 }
3420@@ -3153,8 +3128,8 @@
3421
3422 case 17:
3423
3424-/* Line 690 of lalr1.cc */
3425-#line 1142 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3426+/* Line 678 of lalr1.cc */
3427+#line 1142 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3428 {
3429 (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
3430 (yylocation_stack_[(3) - (1)]).step();
3431@@ -3165,8 +3140,8 @@
3432
3433 case 18:
3434
3435-/* Line 690 of lalr1.cc */
3436-#line 1150 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3437+/* Line 678 of lalr1.cc */
3438+#line 1150 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3439 {
3440 (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
3441 (yylocation_stack_[(3) - (1)]).step();
3442@@ -3177,8 +3152,8 @@
3443
3444 case 19:
3445
3446-/* Line 690 of lalr1.cc */
3447-#line 1158 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3448+/* Line 678 of lalr1.cc */
3449+#line 1158 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3450 {
3451 (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
3452 (yylocation_stack_[(5) - (3)]).step();
3453@@ -3189,8 +3164,8 @@
3454
3455 case 20:
3456
3457-/* Line 690 of lalr1.cc */
3458-#line 1166 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3459+/* Line 678 of lalr1.cc */
3460+#line 1166 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3461 {
3462 (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
3463 (yylocation_stack_[(5) - (1)]).step();
3464@@ -3201,8 +3176,8 @@
3465
3466 case 21:
3467
3468-/* Line 690 of lalr1.cc */
3469-#line 1177 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3470+/* Line 678 of lalr1.cc */
3471+#line 1177 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3472 {
3473 (yyval.node) = new LibraryModule(LOC((yyloc)), static_cast<ModuleDecl*>((yysemantic_stack_[(1) - (1)].node)), NULL);
3474 }
3475@@ -3210,8 +3185,8 @@
3476
3477 case 22:
3478
3479-/* Line 690 of lalr1.cc */
3480-#line 1182 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3481+/* Line 678 of lalr1.cc */
3482+#line 1182 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3483 {
3484 Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (2)].node)), NULL);
3485
3486@@ -3221,8 +3196,8 @@
3487
3488 case 23:
3489
3490-/* Line 690 of lalr1.cc */
3491-#line 1189 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3492+/* Line 678 of lalr1.cc */
3493+#line 1189 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3494 {
3495 Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (2)].node)));
3496
3497@@ -3232,8 +3207,8 @@
3498
3499 case 24:
3500
3501-/* Line 690 of lalr1.cc */
3502-#line 1196 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3503+/* Line 678 of lalr1.cc */
3504+#line 1196 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3505 {
3506 Prolog* prolog = new Prolog(LOC((yyloc)),
3507 static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (2)].node)),
3508@@ -3245,8 +3220,8 @@
3509
3510 case 25:
3511
3512-/* Line 690 of lalr1.cc */
3513-#line 1208 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3514+/* Line 678 of lalr1.cc */
3515+#line 1208 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3516 {
3517 (yyval.node) = new ModuleDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)) );
3518
3519@@ -3256,8 +3231,8 @@
3520
3521 case 26:
3522
3523-/* Line 690 of lalr1.cc */
3524-#line 1218 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3525+/* Line 678 of lalr1.cc */
3526+#line 1218 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3527 {
3528 SIND_DeclList *sdl = new SIND_DeclList( LOC((yyloc)) );
3529 sdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
3530@@ -3267,8 +3242,8 @@
3531
3532 case 27:
3533
3534-/* Line 690 of lalr1.cc */
3535-#line 1225 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3536+/* Line 678 of lalr1.cc */
3537+#line 1225 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3538 {
3539 ((SIND_DeclList*)(yysemantic_stack_[(3) - (1)].node))->push_back( (yysemantic_stack_[(3) - (3)].node) );
3540 (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
3541@@ -3277,8 +3252,8 @@
3542
3543 case 28:
3544
3545-/* Line 690 of lalr1.cc */
3546-#line 1232 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3547+/* Line 678 of lalr1.cc */
3548+#line 1232 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3549 {
3550 // error
3551 (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
3552@@ -3290,8 +3265,8 @@
3553
3554 case 42:
3555
3556-/* Line 690 of lalr1.cc */
3557-#line 1267 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3558+/* Line 678 of lalr1.cc */
3559+#line 1267 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3560 {
3561 (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::preserve_space);
3562 }
3563@@ -3299,8 +3274,8 @@
3564
3565 case 43:
3566
3567-/* Line 690 of lalr1.cc */
3568-#line 1272 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3569+/* Line 678 of lalr1.cc */
3570+#line 1272 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3571 {
3572 (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::strip_space);
3573 }
3574@@ -3308,8 +3283,8 @@
3575
3576 case 44:
3577
3578-/* Line 690 of lalr1.cc */
3579-#line 1280 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3580+/* Line 678 of lalr1.cc */
3581+#line 1280 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3582 {
3583 (yyval.node) = new DefaultCollationDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)) );
3584 }
3585@@ -3317,8 +3292,8 @@
3586
3587 case 45:
3588
3589-/* Line 690 of lalr1.cc */
3590-#line 1288 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3591+/* Line 678 of lalr1.cc */
3592+#line 1288 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3593 {
3594 (yyval.node) = new BaseURIDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
3595 }
3596@@ -3326,8 +3301,8 @@
3597
3598 case 46:
3599
3600-/* Line 690 of lalr1.cc */
3601-#line 1296 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3602+/* Line 678 of lalr1.cc */
3603+#line 1296 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3604 {
3605 (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_preserve);
3606 }
3607@@ -3335,8 +3310,8 @@
3608
3609 case 47:
3610
3611-/* Line 690 of lalr1.cc */
3612-#line 1301 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3613+/* Line 678 of lalr1.cc */
3614+#line 1301 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3615 {
3616 (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_strip);
3617 }
3618@@ -3344,8 +3319,8 @@
3619
3620 case 48:
3621
3622-/* Line 690 of lalr1.cc */
3623-#line 1309 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3624+/* Line 678 of lalr1.cc */
3625+#line 1309 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3626 {
3627 (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::ordered);
3628 }
3629@@ -3353,8 +3328,8 @@
3630
3631 case 49:
3632
3633-/* Line 690 of lalr1.cc */
3634-#line 1314 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3635+/* Line 678 of lalr1.cc */
3636+#line 1314 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3637 {
3638 (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::unordered);
3639 }
3640@@ -3362,8 +3337,8 @@
3641
3642 case 50:
3643
3644-/* Line 690 of lalr1.cc */
3645-#line 1322 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3646+/* Line 678 of lalr1.cc */
3647+#line 1322 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3648 {
3649 (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_greatest);
3650 }
3651@@ -3371,8 +3346,8 @@
3652
3653 case 51:
3654
3655-/* Line 690 of lalr1.cc */
3656-#line 1327 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3657+/* Line 678 of lalr1.cc */
3658+#line 1327 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3659 {
3660 (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_least);
3661 }
3662@@ -3380,8 +3355,8 @@
3663
3664 case 52:
3665
3666-/* Line 690 of lalr1.cc */
3667-#line 1335 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3668+/* Line 678 of lalr1.cc */
3669+#line 1335 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3670 {
3671 (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)),
3672 StaticContextConsts::preserve_ns,
3673@@ -3391,8 +3366,8 @@
3674
3675 case 53:
3676
3677-/* Line 690 of lalr1.cc */
3678-#line 1342 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3679+/* Line 678 of lalr1.cc */
3680+#line 1342 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3681 {
3682 (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)),
3683 StaticContextConsts::preserve_ns,
3684@@ -3402,8 +3377,8 @@
3685
3686 case 54:
3687
3688-/* Line 690 of lalr1.cc */
3689-#line 1349 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3690+/* Line 678 of lalr1.cc */
3691+#line 1349 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3692 {
3693 (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)),
3694 StaticContextConsts::no_preserve_ns,
3695@@ -3413,8 +3388,8 @@
3696
3697 case 55:
3698
3699-/* Line 690 of lalr1.cc */
3700-#line 1356 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3701+/* Line 678 of lalr1.cc */
3702+#line 1356 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3703 {
3704 (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)),
3705 StaticContextConsts::no_preserve_ns,
3706@@ -3424,8 +3399,8 @@
3707
3708 case 58:
3709
3710-/* Line 690 of lalr1.cc */
3711-#line 1371 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3712+/* Line 678 of lalr1.cc */
3713+#line 1371 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3714 {
3715 (yyval.node) = (yyval.node); // to prevent the Bison warning
3716 error((yylocation_stack_[(3) - (2)]), "syntax error, \"import\" should be followed by either \"schema\" or \"module\".");
3717@@ -3435,8 +3410,8 @@
3718
3719 case 59:
3720
3721-/* Line 690 of lalr1.cc */
3722-#line 1381 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3723+/* Line 678 of lalr1.cc */
3724+#line 1381 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3725 {
3726 (yyval.node) = new SchemaImport( LOC((yyloc)), NULL, SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL );
3727 }
3728@@ -3444,8 +3419,8 @@
3729
3730 case 60:
3731
3732-/* Line 690 of lalr1.cc */
3733-#line 1386 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3734+/* Line 678 of lalr1.cc */
3735+#line 1386 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3736 {
3737 (yyval.node) = new SchemaImport(LOC((yyloc)),
3738 dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(4) - (3)].node)),
3739@@ -3456,8 +3431,8 @@
3740
3741 case 61:
3742
3743-/* Line 690 of lalr1.cc */
3744-#line 1394 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3745+/* Line 678 of lalr1.cc */
3746+#line 1394 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3747 {
3748 (yyval.node) = new SchemaImport(LOC((yyloc)),
3749 NULL,
3750@@ -3468,8 +3443,8 @@
3751
3752 case 62:
3753
3754-/* Line 690 of lalr1.cc */
3755-#line 1402 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3756+/* Line 678 of lalr1.cc */
3757+#line 1402 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3758 {
3759 (yyval.node) = new SchemaImport(LOC((yyloc)),
3760 dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(6) - (3)].node)),
3761@@ -3480,8 +3455,8 @@
3762
3763 case 63:
3764
3765-/* Line 690 of lalr1.cc */
3766-#line 1413 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3767+/* Line 678 of lalr1.cc */
3768+#line 1413 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3769 {
3770 URILiteralList *ull = new URILiteralList( LOC((yyloc)));
3771 ull->push_back( SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
3772@@ -3491,8 +3466,8 @@
3773
3774 case 64:
3775
3776-/* Line 690 of lalr1.cc */
3777-#line 1420 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3778+/* Line 678 of lalr1.cc */
3779+#line 1420 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3780 {
3781 if ( URILiteralList *ull = dynamic_cast<URILiteralList*>((yysemantic_stack_[(3) - (1)].node)) )
3782 ull->push_back( SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
3783@@ -3503,8 +3478,8 @@
3784
3785 case 65:
3786
3787-/* Line 690 of lalr1.cc */
3788-#line 1431 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3789+/* Line 678 of lalr1.cc */
3790+#line 1431 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3791 {
3792 (yyval.node) = new SchemaPrefix( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
3793 }
3794@@ -3512,8 +3487,8 @@
3795
3796 case 66:
3797
3798-/* Line 690 of lalr1.cc */
3799-#line 1436 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3800+/* Line 678 of lalr1.cc */
3801+#line 1436 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3802 {
3803 (yyval.node) = new SchemaPrefix( LOC((yyloc)), true );
3804 }
3805@@ -3521,8 +3496,8 @@
3806
3807 case 67:
3808
3809-/* Line 690 of lalr1.cc */
3810-#line 1444 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3811+/* Line 678 of lalr1.cc */
3812+#line 1444 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3813 {
3814 (yyval.node) = new ModuleImport(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL);
3815
3816@@ -3532,8 +3507,8 @@
3817
3818 case 68:
3819
3820-/* Line 690 of lalr1.cc */
3821-#line 1451 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3822+/* Line 678 of lalr1.cc */
3823+#line 1451 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3824 {
3825 (yyval.node) = new ModuleImport(LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (4)].sval)), SYMTAB((yysemantic_stack_[(6) - (6)].sval)), NULL);
3826
3827@@ -3543,8 +3518,8 @@
3828
3829 case 69:
3830
3831-/* Line 690 of lalr1.cc */
3832-#line 1458 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3833+/* Line 678 of lalr1.cc */
3834+#line 1458 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3835 {
3836 (yyval.node) = new ModuleImport(LOC((yyloc)),
3837 SYMTAB((yysemantic_stack_[(5) - (3)].sval)),
3838@@ -3556,8 +3531,8 @@
3839
3840 case 70:
3841
3842-/* Line 690 of lalr1.cc */
3843-#line 1467 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3844+/* Line 678 of lalr1.cc */
3845+#line 1467 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3846 {
3847 (yyval.node) = new ModuleImport(LOC((yyloc)),
3848 SYMTAB((yysemantic_stack_[(8) - (4)].sval)),
3849@@ -3570,8 +3545,8 @@
3850
3851 case 71:
3852
3853-/* Line 690 of lalr1.cc */
3854-#line 1480 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3855+/* Line 678 of lalr1.cc */
3856+#line 1480 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3857 {
3858 (yyval.node) = new NamespaceDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(5) - (3)].sval)), SYMTAB((yysemantic_stack_[(5) - (5)].sval)) );
3859 }
3860@@ -3579,8 +3554,8 @@
3861
3862 case 72:
3863
3864-/* Line 690 of lalr1.cc */
3865-#line 1488 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3866+/* Line 678 of lalr1.cc */
3867+#line 1488 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3868 {
3869 (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
3870 ParseConstants::ns_element_default,
3871@@ -3590,8 +3565,8 @@
3872
3873 case 73:
3874
3875-/* Line 690 of lalr1.cc */
3876-#line 1495 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3877+/* Line 678 of lalr1.cc */
3878+#line 1495 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3879 {
3880 (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
3881 ParseConstants::ns_function_default,
3882@@ -3601,8 +3576,8 @@
3883
3884 case 74:
3885
3886-/* Line 690 of lalr1.cc */
3887-#line 1505 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3888+/* Line 678 of lalr1.cc */
3889+#line 1505 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3890 {
3891 VFO_DeclList *vdl = new VFO_DeclList( LOC((yyloc)));
3892 vdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
3893@@ -3612,8 +3587,8 @@
3894
3895 case 75:
3896
3897-/* Line 690 of lalr1.cc */
3898-#line 1512 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3899+/* Line 678 of lalr1.cc */
3900+#line 1512 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3901 {
3902 ((VFO_DeclList*)(yysemantic_stack_[(3) - (1)].node))->push_back( (yysemantic_stack_[(3) - (3)].node) );
3903 (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
3904@@ -3622,8 +3597,8 @@
3905
3906 case 76:
3907
3908-/* Line 690 of lalr1.cc */
3909-#line 1519 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3910+/* Line 678 of lalr1.cc */
3911+#line 1519 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3912 {
3913 (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
3914 (yylocation_stack_[(3) - (1)]).step();
3915@@ -3634,8 +3609,8 @@
3916
3917 case 85:
3918
3919-/* Line 690 of lalr1.cc */
3920-#line 1542 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3921+/* Line 678 of lalr1.cc */
3922+#line 1542 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3923 {
3924 (yyval.node) = new DecimalFormatNode(LOC((yyloc)), (yysemantic_stack_[(4) - (4)].vstrpair));
3925 delete (yysemantic_stack_[(4) - (4)].vstrpair);
3926@@ -3644,8 +3619,8 @@
3927
3928 case 86:
3929
3930-/* Line 690 of lalr1.cc */
3931-#line 1548 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3932+/* Line 678 of lalr1.cc */
3933+#line 1548 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3934 {
3935 (yyval.node) = new DecimalFormatNode(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), (yysemantic_stack_[(4) - (4)].vstrpair));
3936 delete (yysemantic_stack_[(4) - (4)].vstrpair);
3937@@ -3654,8 +3629,8 @@
3938
3939 case 87:
3940
3941-/* Line 690 of lalr1.cc */
3942-#line 1557 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3943+/* Line 678 of lalr1.cc */
3944+#line 1557 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3945 {
3946 (yyval.vstrpair) = new vector<string_pair_t>();
3947 (yyval.vstrpair)->push_back( *(yysemantic_stack_[(1) - (1)].strpair) );
3948@@ -3665,8 +3640,8 @@
3949
3950 case 88:
3951
3952-/* Line 690 of lalr1.cc */
3953-#line 1564 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3954+/* Line 678 of lalr1.cc */
3955+#line 1564 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3956 {
3957 (yysemantic_stack_[(2) - (1)].vstrpair)->push_back( *(yysemantic_stack_[(2) - (2)].strpair) );
3958 delete (yysemantic_stack_[(2) - (2)].strpair);
3959@@ -3676,8 +3651,8 @@
3960
3961 case 89:
3962
3963-/* Line 690 of lalr1.cc */
3964-#line 1574 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3965+/* Line 678 of lalr1.cc */
3966+#line 1574 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3967 {
3968 StringLiteral *sl = static_cast<StringLiteral*>((yysemantic_stack_[(3) - (3)].expr));
3969 (yyval.strpair) = new string_pair_t( (yysemantic_stack_[(3) - (1)].strval), sl->get_strval().str() );
3970@@ -3687,78 +3662,78 @@
3971
3972 case 90:
3973
3974-/* Line 690 of lalr1.cc */
3975-#line 1583 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3976+/* Line 678 of lalr1.cc */
3977+#line 1583 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3978 { (yyval.strval) = "decimal-separator"; }
3979 break;
3980
3981 case 91:
3982
3983-/* Line 690 of lalr1.cc */
3984-#line 1584 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3985+/* Line 678 of lalr1.cc */
3986+#line 1584 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3987 { (yyval.strval) = "digit"; }
3988 break;
3989
3990 case 92:
3991
3992-/* Line 690 of lalr1.cc */
3993-#line 1585 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
3994+/* Line 678 of lalr1.cc */
3995+#line 1585 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
3996 { (yyval.strval) = "grouping-separator"; }
3997 break;
3998
3999 case 93:
4000
4001-/* Line 690 of lalr1.cc */
4002-#line 1586 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4003+/* Line 678 of lalr1.cc */
4004+#line 1586 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4005 { (yyval.strval) = "infinty"; }
4006 break;
4007
4008 case 94:
4009
4010-/* Line 690 of lalr1.cc */
4011-#line 1587 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4012+/* Line 678 of lalr1.cc */
4013+#line 1587 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4014 { (yyval.strval) = "minus-sign"; }
4015 break;
4016
4017 case 95:
4018
4019-/* Line 690 of lalr1.cc */
4020-#line 1588 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4021+/* Line 678 of lalr1.cc */
4022+#line 1588 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4023 { (yyval.strval) = "NaN"; }
4024 break;
4025
4026 case 96:
4027
4028-/* Line 690 of lalr1.cc */
4029-#line 1589 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4030+/* Line 678 of lalr1.cc */
4031+#line 1589 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4032 { (yyval.strval) = "pattern-separator"; }
4033 break;
4034
4035 case 97:
4036
4037-/* Line 690 of lalr1.cc */
4038-#line 1590 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4039+/* Line 678 of lalr1.cc */
4040+#line 1590 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4041 { (yyval.strval) = "percent"; }
4042 break;
4043
4044 case 98:
4045
4046-/* Line 690 of lalr1.cc */
4047-#line 1591 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4048+/* Line 678 of lalr1.cc */
4049+#line 1591 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4050 { (yyval.strval) = "per-mille"; }
4051 break;
4052
4053 case 99:
4054
4055-/* Line 690 of lalr1.cc */
4056-#line 1592 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4057+/* Line 678 of lalr1.cc */
4058+#line 1592 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4059 { (yyval.strval) = "zero-digit"; }
4060 break;
4061
4062 case 100:
4063
4064-/* Line 690 of lalr1.cc */
4065-#line 1598 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4066+/* Line 678 of lalr1.cc */
4067+#line 1598 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4068 {
4069 (yyval.node) = new OptionDecl(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)));
4070 }
4071@@ -3766,8 +3741,8 @@
4072
4073 case 101:
4074
4075-/* Line 690 of lalr1.cc */
4076-#line 1606 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4077+/* Line 678 of lalr1.cc */
4078+#line 1606 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4079 {
4080 (yyval.node) = new FTOptionDecl( LOC((yyloc)), dynamic_cast<FTMatchOptions*>((yysemantic_stack_[(3) - (3)].node)) );
4081 }
4082@@ -3775,8 +3750,8 @@
4083
4084 case 102:
4085
4086-/* Line 690 of lalr1.cc */
4087-#line 1614 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4088+/* Line 678 of lalr1.cc */
4089+#line 1614 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4090 {
4091 (yyval.node) = (yysemantic_stack_[(4) - (4)].node);
4092 }
4093@@ -3784,8 +3759,8 @@
4094
4095 case 103:
4096
4097-/* Line 690 of lalr1.cc */
4098-#line 1622 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4099+/* Line 678 of lalr1.cc */
4100+#line 1622 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4101 {
4102 CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(3) - (3)].node));
4103 d->theType = (yysemantic_stack_[(3) - (2)].node);
4104@@ -3795,8 +3770,8 @@
4105
4106 case 104:
4107
4108-/* Line 690 of lalr1.cc */
4109-#line 1629 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4110+/* Line 678 of lalr1.cc */
4111+#line 1629 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4112 {
4113 (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
4114 }
4115@@ -3804,8 +3779,8 @@
4116
4117 case 105:
4118
4119-/* Line 690 of lalr1.cc */
4120-#line 1637 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4121+/* Line 678 of lalr1.cc */
4122+#line 1637 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4123 {
4124 CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(1) - (1)].node));
4125 d->theIsExternal = false;
4126@@ -3815,8 +3790,8 @@
4127
4128 case 106:
4129
4130-/* Line 690 of lalr1.cc */
4131-#line 1644 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4132+/* Line 678 of lalr1.cc */
4133+#line 1644 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4134 {
4135 (yyval.node) = new CtxItemDecl(LOC((yyloc)), NULL);
4136 }
4137@@ -3824,8 +3799,8 @@
4138
4139 case 107:
4140
4141-/* Line 690 of lalr1.cc */
4142-#line 1649 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4143+/* Line 678 of lalr1.cc */
4144+#line 1649 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4145 {
4146 (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
4147 }
4148@@ -3833,8 +3808,8 @@
4149
4150 case 108:
4151
4152-/* Line 690 of lalr1.cc */
4153-#line 1657 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4154+/* Line 678 of lalr1.cc */
4155+#line 1657 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4156 {
4157 (yyval.node) = new CtxItemDecl(LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
4158 }
4159@@ -3842,65 +3817,62 @@
4160
4161 case 109:
4162
4163-/* Line 690 of lalr1.cc */
4164-#line 1665 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4165+/* Line 678 of lalr1.cc */
4166+#line 1665 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4167 {
4168 std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(4) - (2)].varnametype)));
4169
4170- (yyval.node) = new VarDecl(LOC((yyloc)),
4171- nt->theName,
4172- nt->theType,
4173- (yysemantic_stack_[(4) - (4)].expr),
4174- nt->get_annotations(),
4175- true, // global
4176- false); // not external
4177+ (yyval.node) = new GlobalVarDecl(LOC((yyloc)),
4178+ nt->theName,
4179+ nt->theType,
4180+ (yysemantic_stack_[(4) - (4)].expr),
4181+ nt->get_annotations(),
4182+ false); // not external
4183
4184- dynamic_cast<VarDecl*>((yyval.node))->setComment(SYMTAB((yysemantic_stack_[(4) - (1)].sval)));
4185+ static_cast<GlobalVarDecl*>((yyval.node))->setComment(SYMTAB((yysemantic_stack_[(4) - (1)].sval)));
4186 }
4187 break;
4188
4189 case 110:
4190
4191-/* Line 690 of lalr1.cc */
4192-#line 1680 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4193+/* Line 678 of lalr1.cc */
4194+#line 1679 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4195 {
4196 std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(3) - (2)].varnametype)));
4197
4198- (yyval.node) = new VarDecl(LOC((yyloc)),
4199- nt->theName,
4200- nt->theType,
4201- NULL, // no init expr
4202- nt->get_annotations(),
4203- true, // global
4204- true); // external
4205+ (yyval.node) = new GlobalVarDecl(LOC((yyloc)),
4206+ nt->theName,
4207+ nt->theType,
4208+ NULL, // no init expr
4209+ nt->get_annotations(),
4210+ true); // external
4211
4212- dynamic_cast<VarDecl*>((yyval.node))->setComment(SYMTAB((yysemantic_stack_[(3) - (1)].sval)));
4213+ static_cast<GlobalVarDecl*>((yyval.node))->setComment(SYMTAB((yysemantic_stack_[(3) - (1)].sval)));
4214 }
4215 break;
4216
4217 case 111:
4218
4219-/* Line 690 of lalr1.cc */
4220-#line 1695 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4221+/* Line 678 of lalr1.cc */
4222+#line 1693 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4223 {
4224 std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(5) - (2)].varnametype)));
4225
4226- (yyval.node) = new VarDecl(LOC((yyloc)),
4227- nt->theName,
4228- nt->theType,
4229- (yysemantic_stack_[(5) - (5)].expr), // init expr
4230- nt->get_annotations(),
4231- true, // global
4232- true); // external
4233+ (yyval.node) = new GlobalVarDecl(LOC((yyloc)),
4234+ nt->theName,
4235+ nt->theType,
4236+ (yysemantic_stack_[(5) - (5)].expr), // init expr
4237+ nt->get_annotations(),
4238+ true); // external
4239
4240- dynamic_cast<VarDecl*>((yyval.node))->setComment(SYMTAB((yysemantic_stack_[(5) - (1)].sval)));
4241+ static_cast<GlobalVarDecl*>((yyval.node))->setComment(SYMTAB((yysemantic_stack_[(5) - (1)].sval)));
4242 }
4243 break;
4244
4245 case 112:
4246
4247-/* Line 690 of lalr1.cc */
4248-#line 1713 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4249+/* Line 678 of lalr1.cc */
4250+#line 1710 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4251 {
4252 (yyval.varnametype) = new VarNameAndType(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL, NULL);
4253 }
4254@@ -3908,8 +3880,8 @@
4255
4256 case 113:
4257
4258-/* Line 690 of lalr1.cc */
4259-#line 1718 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4260+/* Line 678 of lalr1.cc */
4261+#line 1715 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4262 {
4263 (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
4264 static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)),
4265@@ -3920,8 +3892,8 @@
4266
4267 case 114:
4268
4269-/* Line 690 of lalr1.cc */
4270-#line 1726 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4271+/* Line 678 of lalr1.cc */
4272+#line 1723 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4273 {
4274 (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
4275 static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
4276@@ -3932,8 +3904,8 @@
4277
4278 case 115:
4279
4280-/* Line 690 of lalr1.cc */
4281-#line 1734 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4282+/* Line 678 of lalr1.cc */
4283+#line 1731 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4284 {
4285 (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
4286 static_cast<QName*>((yysemantic_stack_[(5) - (4)].expr)),
4287@@ -3944,8 +3916,8 @@
4288
4289 case 116:
4290
4291-/* Line 690 of lalr1.cc */
4292-#line 1745 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4293+/* Line 678 of lalr1.cc */
4294+#line 1742 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4295 {
4296 (yyval.node) = new AnnotationListParsenode(LOC((yyloc)), static_cast<AnnotationParsenode*>((yysemantic_stack_[(1) - (1)].node)));
4297 }
4298@@ -3953,8 +3925,8 @@
4299
4300 case 117:
4301
4302-/* Line 690 of lalr1.cc */
4303-#line 1750 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4304+/* Line 678 of lalr1.cc */
4305+#line 1747 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4306 {
4307 static_cast<AnnotationListParsenode*>((yysemantic_stack_[(2) - (1)].node))->push_back(static_cast<AnnotationParsenode*>((yysemantic_stack_[(2) - (2)].node)));
4308 (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
4309@@ -3963,8 +3935,8 @@
4310
4311 case 118:
4312
4313-/* Line 690 of lalr1.cc */
4314-#line 1759 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4315+/* Line 678 of lalr1.cc */
4316+#line 1756 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4317 {
4318 (yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))), NULL);
4319 }
4320@@ -3972,8 +3944,8 @@
4321
4322 case 119:
4323
4324-/* Line 690 of lalr1.cc */
4325-#line 1764 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4326+/* Line 678 of lalr1.cc */
4327+#line 1761 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4328 {
4329 (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
4330 new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval))),
4331@@ -3983,8 +3955,8 @@
4332
4333 case 120:
4334
4335-/* Line 690 of lalr1.cc */
4336-#line 1771 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4337+/* Line 678 of lalr1.cc */
4338+#line 1768 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4339 {
4340 (yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), true), NULL);
4341 }
4342@@ -3992,8 +3964,8 @@
4343
4344 case 121:
4345
4346-/* Line 690 of lalr1.cc */
4347-#line 1776 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4348+/* Line 678 of lalr1.cc */
4349+#line 1773 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4350 {
4351 (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
4352 new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval)), true),
4353@@ -4003,8 +3975,8 @@
4354
4355 case 122:
4356
4357-/* Line 690 of lalr1.cc */
4358-#line 1786 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4359+/* Line 678 of lalr1.cc */
4360+#line 1783 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4361 {
4362 (yyval.node) = new AnnotationLiteralListParsenode(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr));
4363 }
4364@@ -4012,8 +3984,8 @@
4365
4366 case 123:
4367
4368-/* Line 690 of lalr1.cc */
4369-#line 1791 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4370+/* Line 678 of lalr1.cc */
4371+#line 1788 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4372 {
4373 static_cast<AnnotationLiteralListParsenode*>((yysemantic_stack_[(3) - (1)].node))->push_back((yysemantic_stack_[(3) - (3)].expr));
4374 (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
4375@@ -4022,8 +3994,8 @@
4376
4377 case 124:
4378
4379-/* Line 690 of lalr1.cc */
4380-#line 1800 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4381+/* Line 678 of lalr1.cc */
4382+#line 1797 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4383 {
4384 static_cast<FunctionDecl*>((yysemantic_stack_[(2) - (2)].node))->setComment( SYMTAB((yysemantic_stack_[(2) - (1)].sval)) );
4385 (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
4386@@ -4032,8 +4004,8 @@
4387
4388 case 125:
4389
4390-/* Line 690 of lalr1.cc */
4391-#line 1806 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4392+/* Line 678 of lalr1.cc */
4393+#line 1803 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4394 {
4395 FunctionDecl* fdecl = static_cast<FunctionDecl*>((yysemantic_stack_[(3) - (3)].node));
4396
4397@@ -4046,8 +4018,8 @@
4398
4399 case 126:
4400
4401-/* Line 690 of lalr1.cc */
4402-#line 1819 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4403+/* Line 678 of lalr1.cc */
4404+#line 1816 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4405 {
4406 (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
4407 }
4408@@ -4055,8 +4027,8 @@
4409
4410 case 127:
4411
4412-/* Line 690 of lalr1.cc */
4413-#line 1824 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4414+/* Line 678 of lalr1.cc */
4415+#line 1821 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4416 {
4417 (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
4418 }
4419@@ -4064,8 +4036,8 @@
4420
4421 case 128:
4422
4423-/* Line 690 of lalr1.cc */
4424-#line 1832 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4425+/* Line 678 of lalr1.cc */
4426+#line 1829 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4427 {
4428 (yyval.node) = new FunctionDecl(LOC((yyloc)),
4429 static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
4430@@ -4080,8 +4052,8 @@
4431
4432 case 129:
4433
4434-/* Line 690 of lalr1.cc */
4435-#line 1843 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4436+/* Line 678 of lalr1.cc */
4437+#line 1840 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4438 {
4439 (yyval.node) = new FunctionDecl(LOC ((yyloc)),
4440 static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
4441@@ -4096,8 +4068,8 @@
4442
4443 case 130:
4444
4445-/* Line 690 of lalr1.cc */
4446-#line 1858 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4447+/* Line 678 of lalr1.cc */
4448+#line 1855 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4449 {
4450 (yyval.node) = new FunctionDecl(LOC ((yyloc)),
4451 static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
4452@@ -4112,8 +4084,8 @@
4453
4454 case 131:
4455
4456-/* Line 690 of lalr1.cc */
4457-#line 1870 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4458+/* Line 678 of lalr1.cc */
4459+#line 1867 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4460 {
4461 (yyval.node) = new FunctionDecl(LOC((yyloc)),
4462 static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
4463@@ -4128,8 +4100,8 @@
4464
4465 case 132:
4466
4467-/* Line 690 of lalr1.cc */
4468-#line 1885 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4469+/* Line 678 of lalr1.cc */
4470+#line 1882 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4471 {
4472 (yyval.fnsig) = new FunctionSig(NULL);
4473 }
4474@@ -4137,8 +4109,8 @@
4475
4476 case 133:
4477
4478-/* Line 690 of lalr1.cc */
4479-#line 1890 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4480+/* Line 678 of lalr1.cc */
4481+#line 1887 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4482 {
4483 (yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(3) - (2)].node)));
4484 }
4485@@ -4146,8 +4118,8 @@
4486
4487 case 134:
4488
4489-/* Line 690 of lalr1.cc */
4490-#line 1895 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4491+/* Line 678 of lalr1.cc */
4492+#line 1892 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4493 {
4494 (yyval.fnsig) = new FunctionSig(NULL, dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node)));
4495 }
4496@@ -4155,8 +4127,8 @@
4497
4498 case 135:
4499
4500-/* Line 690 of lalr1.cc */
4501-#line 1900 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4502+/* Line 678 of lalr1.cc */
4503+#line 1897 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4504 {
4505 (yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(5) - (2)].node)), dynamic_cast<SequenceType*>((yysemantic_stack_[(5) - (5)].node)));
4506 }
4507@@ -4164,8 +4136,8 @@
4508
4509 case 136:
4510
4511-/* Line 690 of lalr1.cc */
4512-#line 1908 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4513+/* Line 678 of lalr1.cc */
4514+#line 1905 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4515 {
4516 ParamList *pl = new ParamList( LOC((yyloc)) );
4517 pl->push_back( dynamic_cast<Param*>((yysemantic_stack_[(1) - (1)].node)) );
4518@@ -4175,8 +4147,8 @@
4519
4520 case 137:
4521
4522-/* Line 690 of lalr1.cc */
4523-#line 1915 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4524+/* Line 678 of lalr1.cc */
4525+#line 1912 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4526 {
4527 if ( ParamList *pl = dynamic_cast<ParamList*>((yysemantic_stack_[(3) - (1)].node)) )
4528 pl->push_back( dynamic_cast<Param*>((yysemantic_stack_[(3) - (3)].node)) );
4529@@ -4187,8 +4159,8 @@
4530
4531 case 138:
4532
4533-/* Line 690 of lalr1.cc */
4534-#line 1926 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4535+/* Line 678 of lalr1.cc */
4536+#line 1923 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4537 {
4538 (yyval.node) = new Param(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL);
4539 }
4540@@ -4196,8 +4168,8 @@
4541
4542 case 139:
4543
4544-/* Line 690 of lalr1.cc */
4545-#line 1931 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4546+/* Line 678 of lalr1.cc */
4547+#line 1928 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4548 {
4549 (yyval.node) = new Param(LOC((yyloc)),
4550 static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
4551@@ -4207,8 +4179,8 @@
4552
4553 case 140:
4554
4555-/* Line 690 of lalr1.cc */
4556-#line 1941 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4557+/* Line 678 of lalr1.cc */
4558+#line 1938 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4559 {
4560 (yyval.node) = new CollectionDecl( LOC((yyloc)),
4561 static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)),
4562@@ -4219,8 +4191,8 @@
4563
4564 case 141:
4565
4566-/* Line 690 of lalr1.cc */
4567-#line 1948 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4568+/* Line 678 of lalr1.cc */
4569+#line 1945 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4570 {
4571 (yyval.node) = new CollectionDecl( LOC((yyloc)),
4572 static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
4573@@ -4231,8 +4203,8 @@
4574
4575 case 142:
4576
4577-/* Line 690 of lalr1.cc */
4578-#line 1955 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4579+/* Line 678 of lalr1.cc */
4580+#line 1952 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4581 {
4582 (yyval.node) = new CollectionDecl( LOC((yyloc)),
4583 static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
4584@@ -4243,8 +4215,8 @@
4585
4586 case 143:
4587
4588-/* Line 690 of lalr1.cc */
4589-#line 1962 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4590+/* Line 678 of lalr1.cc */
4591+#line 1959 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4592 {
4593 (yyval.node) = new CollectionDecl( LOC((yyloc)),
4594 static_cast<QName*>((yysemantic_stack_[(6) - (4)].expr)),
4595@@ -4255,8 +4227,8 @@
4596
4597 case 144:
4598
4599-/* Line 690 of lalr1.cc */
4600-#line 1972 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4601+/* Line 678 of lalr1.cc */
4602+#line 1969 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4603 {
4604 (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
4605 }
4606@@ -4264,8 +4236,8 @@
4607
4608 case 145:
4609
4610-/* Line 690 of lalr1.cc */
4611-#line 1976 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4612+/* Line 678 of lalr1.cc */
4613+#line 1973 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4614 {
4615 (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
4616 (yysemantic_stack_[(2) - (1)].node),
4617@@ -4275,8 +4247,8 @@
4618
4619 case 146:
4620
4621-/* Line 690 of lalr1.cc */
4622-#line 1982 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4623+/* Line 678 of lalr1.cc */
4624+#line 1979 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4625 {
4626 (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
4627 }
4628@@ -4284,8 +4256,8 @@
4629
4630 case 147:
4631
4632-/* Line 690 of lalr1.cc */
4633-#line 1986 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4634+/* Line 678 of lalr1.cc */
4635+#line 1983 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4636 {
4637 (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
4638 (yysemantic_stack_[(2) - (1)].node),
4639@@ -4296,8 +4268,8 @@
4640
4641 case 148:
4642
4643-/* Line 690 of lalr1.cc */
4644-#line 1996 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4645+/* Line 678 of lalr1.cc */
4646+#line 1993 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4647 {
4648 (yyval.node) = new AST_IndexDecl(LOC((yyloc)),
4649 static_cast<QName*>((yysemantic_stack_[(8) - (3)].expr)),
4650@@ -4309,8 +4281,8 @@
4651
4652 case 149:
4653
4654-/* Line 690 of lalr1.cc */
4655-#line 2004 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4656+/* Line 678 of lalr1.cc */
4657+#line 2001 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4658 {
4659 (yyval.node) = new AST_IndexDecl(LOC((yyloc)),
4660 static_cast<QName*>((yysemantic_stack_[(9) - (4)].expr)),
4661@@ -4322,8 +4294,8 @@
4662
4663 case 150:
4664
4665-/* Line 690 of lalr1.cc */
4666-#line 2015 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4667+/* Line 678 of lalr1.cc */
4668+#line 2012 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4669 {
4670 IndexKeyList* keyList = new IndexKeyList(LOC((yyloc)));
4671 keyList->addKeySpec(dynamic_cast<IndexKeySpec*>((yysemantic_stack_[(1) - (1)].node)));
4672@@ -4333,8 +4305,8 @@
4673
4674 case 151:
4675
4676-/* Line 690 of lalr1.cc */
4677-#line 2021 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4678+/* Line 678 of lalr1.cc */
4679+#line 2018 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4680 {
4681 dynamic_cast<IndexKeyList*>((yysemantic_stack_[(3) - (1)].node))->addKeySpec(dynamic_cast<IndexKeySpec*>((yysemantic_stack_[(3) - (3)].node)));
4682 (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
4683@@ -4343,8 +4315,8 @@
4684
4685 case 152:
4686
4687-/* Line 690 of lalr1.cc */
4688-#line 2030 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4689+/* Line 678 of lalr1.cc */
4690+#line 2027 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4691 {
4692 (yyval.node) = new IndexKeySpec(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL, NULL);
4693 }
4694@@ -4352,8 +4324,8 @@
4695
4696 case 153:
4697
4698-/* Line 690 of lalr1.cc */
4699-#line 2035 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4700+/* Line 678 of lalr1.cc */
4701+#line 2032 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4702 {
4703 (yyval.node) = new IndexKeySpec(LOC((yyloc)),
4704 (yysemantic_stack_[(2) - (1)].expr),
4705@@ -4364,8 +4336,8 @@
4706
4707 case 154:
4708
4709-/* Line 690 of lalr1.cc */
4710-#line 2042 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4711+/* Line 678 of lalr1.cc */
4712+#line 2039 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4713 {
4714 (yyval.node) = new IndexKeySpec(LOC((yyloc)),
4715 (yysemantic_stack_[(2) - (1)].expr),
4716@@ -4376,8 +4348,8 @@
4717
4718 case 155:
4719
4720-/* Line 690 of lalr1.cc */
4721-#line 2049 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4722+/* Line 678 of lalr1.cc */
4723+#line 2046 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4724 {
4725 (yyval.node) = new IndexKeySpec(LOC((yyloc)),
4726 (yysemantic_stack_[(3) - (1)].expr),
4727@@ -4388,8 +4360,8 @@
4728
4729 case 156:
4730
4731-/* Line 690 of lalr1.cc */
4732-#line 2061 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4733+/* Line 678 of lalr1.cc */
4734+#line 2058 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4735 {
4736 (yyval.node) = new ICCollSimpleCheck(LOC((yyloc)),
4737 static_cast<QName*>((yysemantic_stack_[(11) - (4)].expr)),
4738@@ -4401,8 +4373,8 @@
4739
4740 case 157:
4741
4742-/* Line 690 of lalr1.cc */
4743-#line 2071 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4744+/* Line 678 of lalr1.cc */
4745+#line 2068 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4746 {
4747 (yyval.node) = new ICCollUniqueKeyCheck(LOC((yyloc)),
4748 static_cast<QName*>((yysemantic_stack_[(14) - (4)].expr)),
4749@@ -4414,8 +4386,8 @@
4750
4751 case 158:
4752
4753-/* Line 690 of lalr1.cc */
4754-#line 2081 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4755+/* Line 678 of lalr1.cc */
4756+#line 2078 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4757 {
4758 (yyval.node) = new ICCollForeachNode(LOC((yyloc)),
4759 static_cast<QName*>((yysemantic_stack_[(13) - (4)].expr)),
4760@@ -4427,8 +4399,8 @@
4761
4762 case 159:
4763
4764-/* Line 690 of lalr1.cc */
4765-#line 2092 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4766+/* Line 678 of lalr1.cc */
4767+#line 2089 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4768 {
4769 (yyval.node) = new ICForeignKey( LOC((yyloc)),
4770 static_cast<QName*>((yysemantic_stack_[(22) - (4)].expr)),
4771@@ -4443,8 +4415,8 @@
4772
4773 case 160:
4774
4775-/* Line 690 of lalr1.cc */
4776-#line 2108 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4777+/* Line 678 of lalr1.cc */
4778+#line 2105 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4779 {
4780 if ((yysemantic_stack_[(1) - (1)].expr) == NULL)
4781 {
4782@@ -4464,8 +4436,8 @@
4783
4784 case 161:
4785
4786-/* Line 690 of lalr1.cc */
4787-#line 2128 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4788+/* Line 678 of lalr1.cc */
4789+#line 2125 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4790 {
4791 (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
4792 }
4793@@ -4473,8 +4445,8 @@
4794
4795 case 162:
4796
4797-/* Line 690 of lalr1.cc */
4798-#line 2132 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4799+/* Line 678 of lalr1.cc */
4800+#line 2129 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4801 {
4802 (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
4803 }
4804@@ -4482,8 +4454,8 @@
4805
4806 case 163:
4807
4808-/* Line 690 of lalr1.cc */
4809-#line 2136 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4810+/* Line 678 of lalr1.cc */
4811+#line 2133 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4812 {
4813 (yyval.expr) = NULL;
4814 }
4815@@ -4491,8 +4463,8 @@
4816
4817 case 164:
4818
4819-/* Line 690 of lalr1.cc */
4820-#line 2144 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4821+/* Line 678 of lalr1.cc */
4822+#line 2141 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4823 {
4824 (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
4825 }
4826@@ -4500,8 +4472,8 @@
4827
4828 case 165:
4829
4830-/* Line 690 of lalr1.cc */
4831-#line 2148 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4832+/* Line 678 of lalr1.cc */
4833+#line 2145 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4834 {
4835 (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
4836 }
4837@@ -4509,8 +4481,8 @@
4838
4839 case 166:
4840
4841-/* Line 690 of lalr1.cc */
4842-#line 2152 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4843+/* Line 678 of lalr1.cc */
4844+#line 2149 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4845 {
4846 (yyval.expr) = new BlockBody(LOC((yyloc)));
4847 }
4848@@ -4518,8 +4490,8 @@
4849
4850 case 167:
4851
4852-/* Line 690 of lalr1.cc */
4853-#line 2160 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4854+/* Line 678 of lalr1.cc */
4855+#line 2157 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4856 {
4857 (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
4858 }
4859@@ -4527,8 +4499,8 @@
4860
4861 case 168:
4862
4863-/* Line 690 of lalr1.cc */
4864-#line 2165 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4865+/* Line 678 of lalr1.cc */
4866+#line 2162 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4867 {
4868 BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
4869
4870@@ -4540,8 +4512,8 @@
4871
4872 case 169:
4873
4874-/* Line 690 of lalr1.cc */
4875-#line 2177 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4876+/* Line 678 of lalr1.cc */
4877+#line 2174 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4878 {
4879 BlockBody* blk = new BlockBody(LOC((yyloc)));
4880 blk->add((yysemantic_stack_[(1) - (1)].expr));
4881@@ -4551,8 +4523,8 @@
4882
4883 case 170:
4884
4885-/* Line 690 of lalr1.cc */
4886-#line 2184 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4887+/* Line 678 of lalr1.cc */
4888+#line 2181 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4889 {
4890 BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
4891
4892@@ -4564,8 +4536,8 @@
4893
4894 case 183:
4895
4896-/* Line 690 of lalr1.cc */
4897-#line 2213 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4898+/* Line 678 of lalr1.cc */
4899+#line 2210 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4900 {
4901 (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
4902 }
4903@@ -4573,8 +4545,8 @@
4904
4905 case 184:
4906
4907-/* Line 690 of lalr1.cc */
4908-#line 2218 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4909+/* Line 678 of lalr1.cc */
4910+#line 2215 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4911 {
4912 (yyval.expr) = new BlockBody(LOC((yyloc)));
4913 }
4914@@ -4582,8 +4554,8 @@
4915
4916 case 185:
4917
4918-/* Line 690 of lalr1.cc */
4919-#line 2226 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4920+/* Line 678 of lalr1.cc */
4921+#line 2223 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4922 {
4923 if (dynamic_cast<BlockBody*>((yysemantic_stack_[(3) - (2)].expr)) == NULL)
4924 {
4925@@ -4600,8 +4572,8 @@
4926
4927 case 186:
4928
4929-/* Line 690 of lalr1.cc */
4930-#line 2243 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4931+/* Line 678 of lalr1.cc */
4932+#line 2240 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4933 {
4934 (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
4935 }
4936@@ -4609,8 +4581,8 @@
4937
4938 case 187:
4939
4940-/* Line 690 of lalr1.cc */
4941-#line 2251 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4942+/* Line 678 of lalr1.cc */
4943+#line 2248 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4944 {
4945 (yyval.expr) = (yysemantic_stack_[(2) - (1)].expr);
4946 }
4947@@ -4618,8 +4590,8 @@
4948
4949 case 188:
4950
4951-/* Line 690 of lalr1.cc */
4952-#line 2259 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4953+/* Line 678 of lalr1.cc */
4954+#line 2256 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4955 {
4956 VarDeclStmt* vdecl = static_cast<VarDeclStmt*>((yysemantic_stack_[(3) - (1)].expr));
4957 vdecl->add((yysemantic_stack_[(3) - (3)].node));
4958@@ -4629,8 +4601,8 @@
4959
4960 case 189:
4961
4962-/* Line 690 of lalr1.cc */
4963-#line 2266 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4964+/* Line 678 of lalr1.cc */
4965+#line 2263 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4966 {
4967 VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)), NULL);
4968 vdecl->add((yysemantic_stack_[(2) - (2)].node));
4969@@ -4640,10 +4612,11 @@
4970
4971 case 190:
4972
4973-/* Line 690 of lalr1.cc */
4974-#line 2273 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4975+/* Line 678 of lalr1.cc */
4976+#line 2270 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4977 {
4978- VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)), static_cast<AnnotationListParsenode*>((yysemantic_stack_[(3) - (1)].node)));
4979+ VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)),
4980+ static_cast<AnnotationListParsenode*>((yysemantic_stack_[(3) - (1)].node)));
4981 vdecl->add((yysemantic_stack_[(3) - (3)].node));
4982 (yyval.expr) = vdecl;
4983 }
4984@@ -4651,77 +4624,64 @@
4985
4986 case 191:
4987
4988-/* Line 690 of lalr1.cc */
4989-#line 2283 "/home/ceej/zo/src/src/compiler/parser/xquery_parser.y"
4990+/* Line 678 of lalr1.cc */
4991+#line 2281 "/home/markos/zorba/repo/bug-900688/src/compiler/parser/xquery_parser.y"
4992 {
4993- VarDecl* vd = new VarDecl(LOC((yyloc)),
4994- static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)),
4995- NULL, // no type
4996- NULL, // no init expr
4997- NULL, // no annotations
4998- false, // not global
4999- false);// not external
5000- vd->set_global(false);
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches