zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #19233
[Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/new-jsoniq into lp:zorba.
Commit message:
new jsoniq parser
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/154835
--
The attached diff has been truncated due to its size.
https://code.launchpad.net/~zorba-coders/zorba/new-jsoniq/+merge/154835
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2013-03-21 00:54:36 +0000
+++ ChangeLog 2013-03-21 23:58:27 +0000
@@ -18,6 +18,7 @@
DynamicContext class in C++ API.
* fn:trace outputs "empty-sequence()" if the input is the empty-sequence.
* Allow multiple default function namespaces.
+ * $array() => jn:members($array), $object() => jn:keys($object)
* Added xqxq:variable-value function.
* Added canonicalize function to modules/xml.
* Added support for xs:dateTimeStamp type from XMLSchema 1.1, bug #924754.
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2013-03-21 19:33:22 +0000
+++ include/zorba/pregenerated/diagnostic_list.h 2013-03-21 23:58:27 +0000
@@ -913,6 +913,8 @@
extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNTY0020;
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNTY0021;
+
extern ZORBA_DLL_PUBLIC JSONiqErrorCode JNDY0021;
#endif
=== modified file 'modules/org/jsoniq/www/pregenerated/errors.xq'
--- modules/org/jsoniq/www/pregenerated/errors.xq 2013-03-06 00:18:36 +0000
+++ modules/org/jsoniq/www/pregenerated/errors.xq 2013-03-21 23:58:27 +0000
@@ -157,6 +157,11 @@
declare variable $jerr:JNTY0020 as xs:QName := fn:QName($jerr:NS, "jerr:JNTY0020");
(:~
+ :array or object selector on heterogeneous sequence
+:)
+declare variable $jerr:JNTY0021 as xs:QName := fn:QName($jerr:NS, "jerr:JNTY0021");
+
+(:~
:parser error raised by jn:parse-json
:)
declare variable $jerr:JNDY0021 as xs:QName := fn:QName($jerr:NS, "jerr:JNDY0021");
\ No newline at end of file
=== modified file 'src/compiler/parser/jsoniq_parser.cpp'
--- src/compiler/parser/jsoniq_parser.cpp 2013-03-20 23:33:11 +0000
+++ src/compiler/parser/jsoniq_parser.cpp 2013-03-21 23:58:27 +0000
@@ -36,7 +36,11 @@
/* First part of user declarations. */
/* Line 293 of lalr1.cc */
+<<<<<<< TREE
#line 88 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 88 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
#include "common/common.h"
@@ -65,7 +69,11 @@
/* Line 293 of lalr1.cc */
+<<<<<<< TREE
#line 69 "/home/markos/zorba/repo/hof-merge/build-opt/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 69 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
#include "jsoniq_parser.hpp"
@@ -73,7 +81,11 @@
/* User implementation prologue. */
/* Line 299 of lalr1.cc */
+<<<<<<< TREE
#line 908 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 913 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
// HACK to trigger rchandle release: rchandles are freed when refcount == 0
// (not <= 0); but Bison never increments the refcount, so we do it manually...
@@ -85,7 +97,11 @@
}
/* Line 299 of lalr1.cc */
+<<<<<<< TREE
#line 1039 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1051 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
#include "compiler/parser/jsoniq_scanner.h"
@@ -95,7 +111,11 @@
/* Line 299 of lalr1.cc */
+<<<<<<< TREE
#line 99 "/home/markos/zorba/repo/hof-merge/build-opt/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 99 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
#ifndef YY_
# if defined YYENABLE_NLS && YYENABLE_NLS
@@ -181,7 +201,11 @@
namespace zorba {
/* Line 382 of lalr1.cc */
+<<<<<<< TREE
#line 185 "/home/markos/zorba/repo/hof-merge/build-opt/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 185 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
/* Return YYSTR after stripping away unnecessary quotes and
backslashes, so that it's suitable for yyerror. The heuristic is
@@ -282,28 +306,49 @@
case 112: /* "\"'DECIMAL'\"" */
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 906 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 911 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ delete (yyvaluep->decval); };
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 290 "/home/markos/zorba/repo/hof-merge/build-opt/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 290 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
break;
case 126: /* "\"'DOUBLE'\"" */
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 905 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 910 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ delete (yyvaluep->dval); };
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 299 "/home/markos/zorba/repo/hof-merge/build-opt/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 299 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
break;
case 151: /* "\"'INTEGER'\"" */
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 904 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 909 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ delete (yyvaluep->ival); };
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 308 "/home/markos/zorba/repo/hof-merge/build-opt/src/compiler/parser/jsoniq_parser.cpp"
break;
case 340: /* "VersionDecl" */
@@ -526,18 +571,251 @@
/* Line 480 of lalr1.cc */
#line 938 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 308 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 344: /* "VersionDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 317 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 345: /* "MainModule" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 326 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 346: /* "LibraryModule" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 335 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 347: /* "ModuleDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 344 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 348: /* "SIND_DeclList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 353 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 349: /* "SIND_Decl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 362 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 350: /* "Setter" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 371 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 351: /* "BoundarySpaceDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 380 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 352: /* "DefaultCollationDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 389 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 353: /* "BaseURIDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 398 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 354: /* "ConstructionDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 407 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 355: /* "OrderingModeDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 416 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 356: /* "EmptyOrderDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 425 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 357: /* "CopyNamespacesDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 434 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 358: /* "Import" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 443 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 359: /* "SchemaImport" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 452 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 360: /* "URILiteralList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 461 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 361: /* "SchemaPrefix" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 470 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 362: /* "ModuleImport" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 479 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 363: /* "NamespaceDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 488 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 364: /* "DefaultNamespaceDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 497 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 365: /* "VFO_DeclList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 506 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 366: /* "VFO_Decl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 515 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 367: /* "DecimalFormatDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 524 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 368: /* "DecimalFormatParamList" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ delete (yyvaluep->vstrpair); };
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 533 "/home/markos/zorba/repo/hof-merge/build-opt/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 533 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
break;
- case 365: /* "DecimalFormatParam" */
+ case 369: /* "DecimalFormatParam" */
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 938 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 943 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ delete (yyvaluep->strpair); };
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 542 "/home/markos/zorba/repo/hof-merge/build-opt/src/compiler/parser/jsoniq_parser.cpp"
break;
case 367: /* "OptionDecl" */
@@ -607,9 +885,81 @@
/* Line 480 of lalr1.cc */
#line 938 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 542 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 371: /* "OptionDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 551 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 372: /* "FTOptionDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 560 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 373: /* "CtxItemDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 569 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 374: /* "CtxItemDecl2" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 578 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 375: /* "CtxItemDecl3" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 587 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 376: /* "CtxItemDecl4" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 596 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 377: /* "VarDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 605 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 378: /* "VarNameAndType" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ delete (yyvaluep->varnametype); };
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 614 "/home/markos/zorba/repo/hof-merge/build-opt/src/compiler/parser/jsoniq_parser.cpp"
break;
case 375: /* "AnnotationList" */
@@ -679,9 +1029,81 @@
/* Line 480 of lalr1.cc */
#line 938 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 614 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 379: /* "AnnotationList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 623 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 380: /* "Annotation" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 632 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 381: /* "AnnotationLiteralList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 641 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 382: /* "FunctionDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 650 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 383: /* "FunctionDecl2" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 659 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 384: /* "FunctionDeclSimple" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 668 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 385: /* "FunctionDeclUpdating" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 677 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 386: /* "FunctionSig" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ delete (yyvaluep->fnsig); };
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 686 "/home/markos/zorba/repo/hof-merge/build-opt/src/compiler/parser/jsoniq_parser.cpp"
break;
case 383: /* "ParamList" */
@@ -2308,9 +2730,1638 @@
/* Line 480 of lalr1.cc */
#line 938 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 686 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 387: /* "ParamList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 695 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 388: /* "Param" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 704 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 389: /* "CollectionDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 713 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 391: /* "IndexDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 722 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 392: /* "IndexKeyList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 731 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 393: /* "IndexKeySpec" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 740 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 394: /* "IntegrityConstraintDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 749 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 395: /* "QueryBody" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 758 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 396: /* "StatementsAndOptionalExprTop" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 767 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 397: /* "StatementsAndOptionalExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 776 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 398: /* "StatementsAndExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 785 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 399: /* "Statements" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 794 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 400: /* "Statement" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 803 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 401: /* "BlockStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 812 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 402: /* "BlockExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 821 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 403: /* "EnclosedStatementsAndOptionalExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 830 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 404: /* "VarDeclStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 839 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 407: /* "AssignStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 848 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 408: /* "ApplyStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 857 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 409: /* "ExitStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 866 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 410: /* "WhileStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 875 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 411: /* "FlowCtlStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 884 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 412: /* "FLWORStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 893 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 413: /* "ReturnStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 902 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 414: /* "IfStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 911 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 415: /* "TryStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 920 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 416: /* "CatchListStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 929 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 417: /* "CatchStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 938 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 418: /* "Expr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 947 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 419: /* "ExprSingle" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 956 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 420: /* "ExprSimple" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 965 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 421: /* "FLWORExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 974 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 422: /* "ReturnExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 983 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 425: /* "FLWORWinCond" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 992 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 426: /* "WindowClause" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1001 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 427: /* "CountClause" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1010 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 428: /* "ForLetWinClause" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1019 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 430: /* "FLWORClauseList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1028 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 431: /* "ForClause" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1037 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 433: /* "VarInDeclList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1046 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 434: /* "VarInDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1055 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 435: /* "PositionalVar" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1064 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 436: /* "FTScoreVar" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1073 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 437: /* "LetClause" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1082 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 438: /* "VarGetsDeclList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1091 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 439: /* "VarGetsDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1100 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 440: /* "WindowVarDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1109 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 441: /* "WindowVars" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1118 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 442: /* "WindowVars3" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1127 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 443: /* "WindowVars2" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1136 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 444: /* "WhereClause" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1145 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 445: /* "GroupByClause" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1154 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 446: /* "GroupSpecList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1163 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 447: /* "GroupSpec" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1172 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 448: /* "GroupCollationSpec" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1181 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 449: /* "OrderByClause" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1190 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 450: /* "OrderSpecList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1199 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 451: /* "OrderSpec" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1208 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 452: /* "OrderModifier" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1217 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 453: /* "OrderDirSpec" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1226 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 454: /* "OrderEmptySpec" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1235 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 455: /* "OrderCollationSpec" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1244 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 456: /* "QuantifiedExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1253 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 457: /* "QVarInDeclList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1262 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 458: /* "QVarInDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1271 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 459: /* "SwitchExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1280 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 460: /* "SwitchCaseClauseList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1289 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 461: /* "SwitchCaseClause" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1298 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 462: /* "SwitchCaseOperandList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1307 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 463: /* "SwitchStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1316 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 466: /* "TypeswitchExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1325 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 467: /* "TypeswitchStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1334 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 468: /* "CaseClauseList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1343 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 469: /* "CaseClause" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1352 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 472: /* "SequenceTypeList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1361 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 473: /* "IfExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1370 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 474: /* "OrExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1379 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 475: /* "AndExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1388 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 476: /* "ComparisonExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1397 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 478: /* "FTContainsExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1406 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 479: /* "StringConcatExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1415 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 480: /* "opt_FTIgnoreOption" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1424 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 481: /* "RangeExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1433 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 482: /* "AdditiveExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1442 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 483: /* "MultiplicativeExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1451 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 484: /* "UnionExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1460 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 485: /* "IntersectExceptExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1469 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 486: /* "InstanceofExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1478 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 487: /* "TreatExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1487 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 488: /* "CastableExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1496 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 489: /* "CastExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1505 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 490: /* "SingleType" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1514 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 491: /* "UnaryExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1523 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 492: /* "SignList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1532 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 493: /* "ValueExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1541 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 494: /* "SimpleMapExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1550 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 495: /* "ValueComp" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1559 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 496: /* "NodeComp" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1568 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 497: /* "ValidateExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1577 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 498: /* "ExtensionExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1586 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 499: /* "Pragma_list" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1595 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 500: /* "Pragma" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1604 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 501: /* "PathExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1613 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 502: /* "RelativePathExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1622 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 503: /* "StepExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1631 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 504: /* "NameTest" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1640 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 505: /* "Wildcard" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1649 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 506: /* "FilterExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1658 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 507: /* "PredicateList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1667 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 508: /* "Predicate" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1676 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 509: /* "PrimaryExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1685 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 510: /* "Literal" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1694 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 511: /* "NumericLiteral" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1703 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 513: /* "VarRef" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1712 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 514: /* "ParenthesizedExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1721 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 515: /* "ContextItemExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1730 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 516: /* "OrderedExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1739 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 517: /* "UnorderedExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1748 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 518: /* "FunctionCall" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1757 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 519: /* "ArgList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1766 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 520: /* "Constructor" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1775 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 521: /* "DirectConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1784 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 522: /* "DirElemConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1793 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 523: /* "DirElemContentList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1802 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 524: /* "DirAttributeList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1811 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 525: /* "DirAttr" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1820 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 527: /* "DirAttributeValue" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1829 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 528: /* "opt_QuoteAttrContentList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1838 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 529: /* "QuoteAttrContentList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1847 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 530: /* "opt_AposAttrContentList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1856 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 531: /* "AposAttrContentList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1865 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 532: /* "QuoteAttrValueContent" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1874 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 533: /* "AposAttrValueContent" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1883 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 534: /* "DirElemContent" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1892 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 535: /* "CommonContent" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1901 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 536: /* "DirCommentConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1910 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 537: /* "DirPIConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1919 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 538: /* "CDataSection" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1928 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 539: /* "ComputedConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1937 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 540: /* "CompDocConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1946 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 541: /* "CompElemConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1955 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 542: /* "CompAttrConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1964 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 543: /* "CompTextConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1973 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 544: /* "CompCommentConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1982 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 545: /* "CompPIConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1991 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 546: /* "CompNamespaceConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2000 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 547: /* "TypeDeclaration" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2009 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 548: /* "SequenceType" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2018 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 549: /* "OccurrenceIndicator" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2027 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 550: /* "ItemType" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2036 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 551: /* "TypeList" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2045 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 552: /* "GeneralizedAtomicType" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2054 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 553: /* "SimpleType" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2063 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 554: /* "KindTest" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2072 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 555: /* "AnyKindTest" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2081 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 556: /* "DocumentTest" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2090 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 557: /* "NamespaceTest" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2099 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 558: /* "TextTest" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2108 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 559: /* "CommentTest" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2117 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 560: /* "PITest" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2126 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 561: /* "AttributeTest" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2135 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 562: /* "SchemaAttributeTest" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2144 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 563: /* "ElementTest" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2153 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 564: /* "SchemaElementTest" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2162 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 565: /* "TypeName" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2171 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 566: /* "TypeName_WITH_HOOK" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2180 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 567: /* "StringLiteral" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2189 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 572: /* "AnyFunctionTest" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2198 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 573: /* "TypedFunctionTest" */
+
+/* Line 480 of lalr1.cc */
+#line 928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2207 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 576: /* "InsertExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2216 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 577: /* "DeleteExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2225 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 578: /* "ReplaceExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2234 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 579: /* "RenameExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2243 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 580: /* "TransformExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2252 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 581: /* "VarNameList" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2261 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 582: /* "VarNameDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2270 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 583: /* "TryExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2279 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 584: /* "CatchListExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2288 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 585: /* "CatchExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2297 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 586: /* "BracedExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2306 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 587: /* "NameTestList" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ delete (yyvaluep->name_test_list); };
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 2315 "/home/markos/zorba/repo/hof-merge/build-opt/src/compiler/parser/jsoniq_parser.cpp"
break;
case 582: /* "FTSelection" */
@@ -2771,6 +4822,468 @@
/* Line 480 of lalr1.cc */
#line 2774 "/home/markos/zorba/repo/hof-merge/build-opt/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 2315 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 588: /* "FTSelection" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2324 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 591: /* "FTOr" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2333 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 592: /* "FTAnd" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2342 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 593: /* "FTMildNot" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2351 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 594: /* "FTUnaryNot" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2360 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 595: /* "FTPrimaryWithOptions" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2369 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 596: /* "opt_FTMatchOptions" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2378 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 598: /* "FTWeight" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2387 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 599: /* "FTPrimary" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2396 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 600: /* "opt_FTTimes" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2405 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 601: /* "FTExtensionSelection" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2414 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 603: /* "FTWords" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2423 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 604: /* "FTWordsValue" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2432 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 606: /* "FTAnyallOption" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2441 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 609: /* "FTPosFilter" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2450 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 610: /* "FTOrder" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2459 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 611: /* "FTWindow" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2468 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 612: /* "FTDistance" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2477 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 613: /* "FTUnit" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2486 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 614: /* "FTMatchOptions" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2495 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 615: /* "FTMatchOption" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2504 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 616: /* "FTCaseOption" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2513 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 617: /* "FTDiacriticsOption" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2522 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 618: /* "FTExtensionOption" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2531 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 619: /* "FTStemOption" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2540 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 620: /* "FTThesaurusOption" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2549 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 624: /* "FTThesaurusID" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2558 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 627: /* "FTStopWordOption" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2567 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 628: /* "FTStopWords" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2576 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 632: /* "FTStopWordsInclExcl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2585 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 633: /* "FTLanguageOption" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2594 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 634: /* "FTWildCardOption" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2603 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 635: /* "FTContent" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2612 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 636: /* "FTTimes" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2621 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 637: /* "FTRange" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2630 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 638: /* "FTScope" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2639 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 639: /* "FTBigUnit" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2648 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 640: /* "FTIgnoreOption" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2657 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 641: /* "JSONArrayConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2666 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 642: /* "JSONSimpleObjectUnion" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2675 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 643: /* "JSONAccumulatorObjectUnion" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2684 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 644: /* "JSONObjectConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2693 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 645: /* "JSONPairList" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2702 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 646: /* "JSONInsertExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2711 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 647: /* "JSONAppendExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2720 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 648: /* "JSONDeleteExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2729 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 649: /* "JSONRenameExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2738 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 650: /* "JSONReplaceExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2747 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 657: /* "QNAME" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2756 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 658: /* "FUNCTION_NAME" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2765 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 659: /* "EQNAME" */
+
+/* Line 480 of lalr1.cc */
+#line 940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2774 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
break;
default:
@@ -2861,13 +5374,21 @@
/* User initialization code. */
/* Line 565 of lalr1.cc */
+<<<<<<< TREE
#line 133 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 133 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
yylloc.begin.filename = yylloc.end.filename = &(driver.theFilename2);
}
/* Line 565 of lalr1.cc */
+<<<<<<< TREE
#line 2871 "/home/markos/zorba/repo/hof-merge/build-opt/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 2871 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
/* Initialize the stacks. The initial state will be pushed in
yynewstate, since the latter expects the semantical and the
@@ -2986,7 +5507,11 @@
case 3:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1057 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1069 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(2) - (2)].node);
}
@@ -2995,7 +5520,11 @@
case 4:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1061 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1073 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(2) - (2)].node);
}
@@ -3004,7 +5533,11 @@
case 5:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1065 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1077 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(3) - (3)].node);
}
@@ -3013,7 +5546,11 @@
case 6:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1073 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1085 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = NULL;
}
@@ -3022,7 +5559,11 @@
case 7:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1079 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1091 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = NULL; YYABORT;
}
@@ -3031,7 +5572,11 @@
case 8:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1083 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1095 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = NULL; YYABORT;
}
@@ -3040,7 +5585,11 @@
case 9:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1092 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1104 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
driver.set_expr( (yyval.node) );
@@ -3050,7 +5599,11 @@
case 10:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1098 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1110 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
MainModule* mm = dynamic_cast<MainModule*>((yysemantic_stack_[(2) - (2)].node));
mm->set_version_decl( static_cast<VersionDecl*>((yysemantic_stack_[(2) - (1)].node)) );
@@ -3062,7 +5615,11 @@
case 11:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1106 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1118 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
driver.set_expr( (yyval.node) );
@@ -3072,7 +5629,11 @@
case 12:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1112 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1124 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
LibraryModule* lm = dynamic_cast<LibraryModule*>((yysemantic_stack_[(2) - (2)].node));
lm->set_version_decl( static_cast<VersionDecl*>((yysemantic_stack_[(2) - (1)].node)) );
@@ -3084,7 +5645,11 @@
case 13:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1123 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1135 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)), "utf-8" );
}
@@ -3093,7 +5658,11 @@
case 14:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1128 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1140 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)) );
}
@@ -3102,7 +5671,11 @@
case 15:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1136 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1148 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (1)].node)), NULL);
@@ -3113,7 +5686,11 @@
case 16:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1143 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1155 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (1)].node)));
@@ -3124,7 +5701,11 @@
case 17:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1150 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1162 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
Prolog* prolog = new Prolog(LOC((yyloc)),
static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (1)].node)),
@@ -3137,7 +5718,11 @@
case 18:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1159 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1171 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new MainModule( LOC((yyloc)), static_cast<QueryBody*>((yysemantic_stack_[(1) - (1)].expr)), NULL );
}
@@ -3146,7 +5731,11 @@
case 19:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1166 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1178 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
(yylocation_stack_[(3) - (1)]).step();
@@ -3158,7 +5747,11 @@
case 20:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1174 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1186 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
(yylocation_stack_[(3) - (1)]).step();
@@ -3170,7 +5763,11 @@
case 21:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1182 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1194 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(5) - (1)].node); (yyval.node) = (yysemantic_stack_[(5) - (3)].node); (yyval.node) = (yysemantic_stack_[(5) - (5)].expr); // to prevent the Bison warning
(yylocation_stack_[(5) - (3)]).step();
@@ -3182,7 +5779,11 @@
case 22:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1190 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1202 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(5) - (1)].node); (yyval.node) = (yysemantic_stack_[(5) - (3)].node); (yyval.node) = (yysemantic_stack_[(5) - (5)].expr); // to prevent the Bison warning
(yylocation_stack_[(5) - (1)]).step();
@@ -3194,7 +5795,11 @@
case 23:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1201 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1213 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new LibraryModule(LOC((yyloc)), static_cast<ModuleDecl*>((yysemantic_stack_[(1) - (1)].node)), NULL);
}
@@ -3203,7 +5808,11 @@
case 24:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1206 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1218 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (2)].node)), NULL);
@@ -3214,7 +5823,11 @@
case 25:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1213 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1225 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (2)].node)));
@@ -3225,7 +5838,11 @@
case 26:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1220 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1232 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
Prolog* prolog = new Prolog(LOC((yyloc)),
static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (2)].node)),
@@ -3238,7 +5855,11 @@
case 27:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1232 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1244 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ModuleDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)) );
@@ -3249,7 +5870,11 @@
case 28:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1242 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1254 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
SIND_DeclList *sdl = new SIND_DeclList( LOC((yyloc)) );
sdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -3260,7 +5885,11 @@
case 29:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1249 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1261 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
((SIND_DeclList*)(yysemantic_stack_[(3) - (1)].node))->push_back( (yysemantic_stack_[(3) - (3)].node) );
(yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -3270,7 +5899,11 @@
case 30:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1256 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1268 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
// error
(yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
@@ -3283,7 +5916,11 @@
case 44:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1291 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1303 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::preserve_space);
}
@@ -3292,7 +5929,11 @@
case 45:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1296 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1308 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::strip_space);
}
@@ -3301,7 +5942,11 @@
case 46:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1304 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1316 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new DefaultCollationDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)) );
}
@@ -3310,7 +5955,11 @@
case 47:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1312 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1324 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new BaseURIDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
}
@@ -3319,7 +5968,11 @@
case 48:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1320 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1332 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_preserve);
}
@@ -3328,7 +5981,11 @@
case 49:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1325 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1337 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_strip);
}
@@ -3337,7 +5994,11 @@
case 50:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1333 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1345 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::ordered);
}
@@ -3346,7 +6007,11 @@
case 51:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1338 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1350 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::unordered);
}
@@ -3355,7 +6020,11 @@
case 52:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1346 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1358 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_greatest);
}
@@ -3364,7 +6033,11 @@
case 53:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1351 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1363 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_least);
}
@@ -3373,7 +6046,11 @@
case 54:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1359 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1371 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, true);
}
@@ -3382,7 +6059,11 @@
case 55:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1364 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1376 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, false);
}
@@ -3391,7 +6072,11 @@
case 56:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1369 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1381 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, true);
}
@@ -3400,7 +6085,11 @@
case 57:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1374 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1386 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, false);
}
@@ -3409,7 +6098,11 @@
case 60:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1387 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1399 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yyval.node); // to prevent the Bison warning
error((yylocation_stack_[(3) - (2)]), "syntax error, \"import\" should be followed by either \"schema\" or \"module\".");
@@ -3420,7 +6113,11 @@
case 61:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1397 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1409 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SchemaImport( LOC((yyloc)), NULL, SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL );
}
@@ -3429,7 +6126,11 @@
case 62:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1402 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1414 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SchemaImport(LOC((yyloc)),
dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(4) - (3)].node)),
@@ -3441,7 +6142,11 @@
case 63:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1410 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1422 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SchemaImport(LOC((yyloc)),
NULL,
@@ -3453,7 +6158,11 @@
case 64:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1418 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1430 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SchemaImport(LOC((yyloc)),
dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(6) - (3)].node)),
@@ -3465,7 +6174,11 @@
case 65:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1429 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1441 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
URILiteralList *ull = new URILiteralList( LOC((yyloc)));
ull->push_back( SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
@@ -3476,7 +6189,11 @@
case 66:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1436 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1448 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if ( URILiteralList *ull = dynamic_cast<URILiteralList*>((yysemantic_stack_[(3) - (1)].node)) )
ull->push_back( SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
@@ -3488,7 +6205,11 @@
case 67:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1447 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1459 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SchemaPrefix( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
}
@@ -3497,7 +6218,11 @@
case 68:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1452 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1464 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SchemaPrefix( LOC((yyloc)), true );
}
@@ -3506,7 +6231,11 @@
case 69:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1460 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1472 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ModuleImport(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL);
@@ -3517,7 +6246,11 @@
case 70:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1467 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1479 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ModuleImport(LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (4)].sval)), SYMTAB((yysemantic_stack_[(6) - (6)].sval)), NULL);
@@ -3528,7 +6261,11 @@
case 71:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1474 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1486 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ModuleImport(LOC((yyloc)),
SYMTAB((yysemantic_stack_[(5) - (3)].sval)),
@@ -3541,7 +6278,11 @@
case 72:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1483 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1495 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ModuleImport(LOC((yyloc)),
SYMTAB((yysemantic_stack_[(8) - (4)].sval)),
@@ -3555,7 +6296,11 @@
case 73:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1496 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1508 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new NamespaceDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(5) - (3)].sval)), SYMTAB((yysemantic_stack_[(5) - (5)].sval)) );
}
@@ -3564,7 +6309,11 @@
case 74:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1504 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1516 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
ParseConstants::ns_element_default,
@@ -3575,7 +6324,11 @@
case 75:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1511 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1523 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
ParseConstants::ns_function_default,
@@ -3586,7 +6339,11 @@
case 76:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1521 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1533 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
VFO_DeclList *vdl = new VFO_DeclList( LOC((yyloc)));
vdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -3597,7 +6354,11 @@
case 77:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1528 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1540 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
((VFO_DeclList*)(yysemantic_stack_[(3) - (1)].node))->push_back( (yysemantic_stack_[(3) - (3)].node) );
(yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -3607,7 +6368,11 @@
case 78:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1535 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1547 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
(yylocation_stack_[(3) - (1)]).step();
@@ -3619,7 +6384,11 @@
case 87:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1558 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1570 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new DecimalFormatNode(LOC((yyloc)), (yysemantic_stack_[(4) - (4)].vstrpair));
delete (yysemantic_stack_[(4) - (4)].vstrpair);
@@ -3629,7 +6398,11 @@
case 88:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1564 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1576 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new DecimalFormatNode(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), (yysemantic_stack_[(4) - (4)].vstrpair));
delete (yysemantic_stack_[(4) - (4)].vstrpair);
@@ -3639,7 +6412,11 @@
case 89:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1573 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1585 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.vstrpair) = new vector<string_pair_t>();
(yyval.vstrpair)->push_back( *(yysemantic_stack_[(1) - (1)].strpair) );
@@ -3650,7 +6427,11 @@
case 90:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1580 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1592 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yysemantic_stack_[(2) - (1)].vstrpair)->push_back( *(yysemantic_stack_[(2) - (2)].strpair) );
delete (yysemantic_stack_[(2) - (2)].strpair);
@@ -3661,7 +6442,11 @@
case 91:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1590 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1602 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
StringLiteral *sl = static_cast<StringLiteral*>((yysemantic_stack_[(3) - (3)].expr));
(yyval.strpair) = new string_pair_t( (yysemantic_stack_[(3) - (1)].strval), sl->get_strval().str() );
@@ -3672,77 +6457,121 @@
case 92:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1599 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1611 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "decimal-separator"; }
break;
case 93:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1600 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1612 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "digit"; }
break;
case 94:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1601 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1613 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "grouping-separator"; }
break;
case 95:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1602 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1614 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "infinty"; }
break;
case 96:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1603 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1615 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "minus-sign"; }
break;
case 97:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1604 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1616 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "NaN"; }
break;
case 98:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1605 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1617 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "pattern-separator"; }
break;
case 99:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1606 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1618 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "percent"; }
break;
case 100:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1607 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1619 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "per-mille"; }
break;
case 101:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1608 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1620 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "zero-digit"; }
break;
case 102:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1614 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1626 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OptionDecl(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)));
}
@@ -3751,7 +6580,11 @@
case 103:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1622 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1634 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTOptionDecl( LOC((yyloc)), dynamic_cast<FTMatchOptions*>((yysemantic_stack_[(3) - (3)].node)) );
}
@@ -3760,7 +6593,11 @@
case 104:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1630 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1642 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(4) - (4)].node);
}
@@ -3769,7 +6606,11 @@
case 105:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1638 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1650 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(3) - (3)].node));
d->theType = (yysemantic_stack_[(3) - (2)].node);
@@ -3780,7 +6621,11 @@
case 106:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1645 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1657 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -3789,7 +6634,11 @@
case 107:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1653 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1665 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(1) - (1)].node));
d->theIsExternal = false;
@@ -3800,7 +6649,11 @@
case 108:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1660 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1672 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CtxItemDecl(LOC((yyloc)), NULL);
}
@@ -3809,7 +6662,11 @@
case 109:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1665 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1677 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(2) - (2)].node);
}
@@ -3818,7 +6675,11 @@
case 110:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1673 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1685 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CtxItemDecl(LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
}
@@ -3827,7 +6688,11 @@
case 111:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1681 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1693 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(4) - (2)].varnametype)));
@@ -3845,7 +6710,11 @@
case 112:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1695 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1707 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(3) - (2)].varnametype)));
@@ -3863,7 +6732,11 @@
case 113:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1709 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1721 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(5) - (2)].varnametype)));
@@ -3881,7 +6754,11 @@
case 114:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1726 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1738 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.varnametype) = new VarNameAndType(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL, NULL);
}
@@ -3890,7 +6767,11 @@
case 115:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1731 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1743 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)),
@@ -3902,7 +6783,11 @@
case 116:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1739 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1751 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
@@ -3914,7 +6799,11 @@
case 117:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1747 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1759 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (4)].expr)),
@@ -3926,7 +6815,11 @@
case 118:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1758 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1770 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AnnotationListParsenode(LOC((yyloc)), static_cast<AnnotationParsenode*>((yysemantic_stack_[(1) - (1)].node)));
}
@@ -3935,7 +6828,11 @@
case 119:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1763 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1775 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
static_cast<AnnotationListParsenode*>((yysemantic_stack_[(2) - (1)].node))->push_back(static_cast<AnnotationParsenode*>((yysemantic_stack_[(2) - (2)].node)));
(yyval.node) = (yysemantic_stack_[(2) - (1)].node);
@@ -3945,7 +6842,11 @@
case 120:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1772 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1784 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))), NULL);
}
@@ -3954,7 +6855,11 @@
case 121:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1777 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1789 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AnnotationParsenode(LOC((yyloc)),
new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval))),
@@ -3965,7 +6870,11 @@
case 122:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1784 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1796 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), true), NULL);
}
@@ -3974,7 +6883,11 @@
case 123:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1789 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1801 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AnnotationParsenode(LOC((yyloc)),
new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval)), true),
@@ -3985,7 +6898,11 @@
case 124:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1799 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1811 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AnnotationLiteralListParsenode(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr));
}
@@ -3994,7 +6911,11 @@
case 125:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1804 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1816 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
static_cast<AnnotationLiteralListParsenode*>((yysemantic_stack_[(3) - (1)].node))->push_back((yysemantic_stack_[(3) - (3)].expr));
(yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -4004,7 +6925,11 @@
case 126:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1813 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1825 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
static_cast<FunctionDecl*>((yysemantic_stack_[(2) - (2)].node))->setComment( SYMTAB((yysemantic_stack_[(2) - (1)].sval)) );
(yyval.node) = (yysemantic_stack_[(2) - (2)].node);
@@ -4014,7 +6939,11 @@
case 127:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1819 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1831 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
FunctionDecl* fdecl = static_cast<FunctionDecl*>((yysemantic_stack_[(3) - (3)].node));
@@ -4028,7 +6957,11 @@
case 128:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1832 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1844 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -4037,7 +6970,11 @@
case 129:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1837 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1849 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -4046,7 +6983,11 @@
case 130:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1845 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1857 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FunctionDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4062,7 +7003,11 @@
case 131:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1856 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1868 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FunctionDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4078,7 +7023,11 @@
case 132:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1871 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1883 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FunctionDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4094,7 +7043,11 @@
case 133:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1883 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1895 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FunctionDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4110,7 +7063,11 @@
case 134:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1898 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1910 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.fnsig) = new FunctionSig(NULL);
}
@@ -4119,7 +7076,11 @@
case 135:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1903 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1915 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(3) - (2)].node)));
}
@@ -4128,7 +7089,11 @@
case 136:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1908 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1920 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.fnsig) = new FunctionSig(NULL, dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node)));
}
@@ -4137,7 +7102,11 @@
case 137:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1913 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1925 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(5) - (2)].node)), dynamic_cast<SequenceType*>((yysemantic_stack_[(5) - (5)].node)));
}
@@ -4146,7 +7115,11 @@
case 138:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1921 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1933 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
ParamList *pl = new ParamList( LOC((yyloc)) );
pl->push_back( dynamic_cast<Param*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -4157,7 +7130,11 @@
case 139:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1928 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if ( ParamList *pl = dynamic_cast<ParamList*>((yysemantic_stack_[(3) - (1)].node)) )
pl->push_back( dynamic_cast<Param*>((yysemantic_stack_[(3) - (3)].node)) );
@@ -4169,7 +7146,11 @@
case 140:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1939 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1951 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new Param(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL);
}
@@ -4178,7 +7159,11 @@
case 141:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1944 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1956 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new Param(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4189,7 +7174,11 @@
case 142:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1954 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1966 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CollectionDecl( LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)),
@@ -4203,7 +7192,11 @@
case 143:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1963 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1975 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CollectionDecl( LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4217,7 +7210,11 @@
case 144:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1972 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1984 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CollectionDecl( LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
@@ -4231,7 +7228,11 @@
case 145:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1981 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1993 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CollectionDecl( LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(6) - (4)].expr)),
@@ -4245,7 +7246,11 @@
case 146:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1993 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2005 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
}
@@ -4254,7 +7259,11 @@
case 147:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1997 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2009 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
(yysemantic_stack_[(2) - (1)].node),
@@ -4265,7 +7274,11 @@
case 148:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2003 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2015 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
}
@@ -4274,7 +7287,11 @@
case 149:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2007 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2019 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
(yysemantic_stack_[(2) - (1)].node),
@@ -4286,7 +7303,11 @@
case 150:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2017 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2029 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AST_IndexDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(8) - (3)].expr)),
@@ -4301,7 +7322,11 @@
case 151:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2027 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2039 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AST_IndexDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(9) - (4)].expr)),
@@ -4316,7 +7341,11 @@
case 152:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2040 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2052 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
IndexKeyList* keyList = new IndexKeyList(LOC((yyloc)));
keyList->addKeySpec(dynamic_cast<IndexKeySpec*>((yysemantic_stack_[(1) - (1)].node)));
@@ -4327,7 +7356,11 @@
case 153:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2046 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2058 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
dynamic_cast<IndexKeyList*>((yysemantic_stack_[(3) - (1)].node))->addKeySpec(dynamic_cast<IndexKeySpec*>((yysemantic_stack_[(3) - (3)].node)));
(yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -4337,7 +7370,11 @@
case 154:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2055 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2067 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new IndexKeySpec(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL, NULL);
}
@@ -4346,7 +7383,11 @@
case 155:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2060 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2072 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new IndexKeySpec(LOC((yyloc)),
(yysemantic_stack_[(2) - (1)].expr),
@@ -4358,7 +7399,11 @@
case 156:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2067 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2079 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new IndexKeySpec(LOC((yyloc)),
(yysemantic_stack_[(2) - (1)].expr),
@@ -4370,7 +7415,11 @@
case 157:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2074 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2086 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new IndexKeySpec(LOC((yyloc)),
(yysemantic_stack_[(3) - (1)].expr),
@@ -4382,7 +7431,11 @@
case 158:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2086 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2098 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ICCollSimpleCheck(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(11) - (4)].expr)),
@@ -4395,7 +7448,11 @@
case 159:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2096 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2108 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ICCollUniqueKeyCheck(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(14) - (4)].expr)),
@@ -4408,7 +7465,11 @@
case 160:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2106 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2118 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ICCollForeachNode(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(13) - (4)].expr)),
@@ -4421,7 +7482,11 @@
case 161:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2117 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2129 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ICForeignKey( LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(22) - (4)].expr)),
@@ -4437,7 +7502,11 @@
case 162:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2133 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2145 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if ((yysemantic_stack_[(1) - (1)].expr) == NULL)
{
@@ -4458,7 +7527,11 @@
case 163:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2153 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2165 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -4467,7 +7540,11 @@
case 164:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2157 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2169 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -4476,7 +7553,11 @@
case 165:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2161 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2173 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = NULL;
}
@@ -4485,7 +7566,11 @@
case 166:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2169 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2181 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -4494,7 +7579,11 @@
case 167:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2173 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2185 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -4503,7 +7592,11 @@
case 168:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2177 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2189 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new BlockBody(LOC((yyloc)));
}
@@ -4512,7 +7605,11 @@
case 169:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2185 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2197 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -4521,7 +7618,11 @@
case 170:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2190 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2202 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
@@ -4534,7 +7635,11 @@
case 171:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2202 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2214 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
BlockBody* blk = new BlockBody(LOC((yyloc)));
blk->add((yysemantic_stack_[(1) - (1)].expr));
@@ -4545,7 +7650,11 @@
case 172:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2209 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2221 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
@@ -4558,7 +7667,11 @@
case 173:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2219 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2231 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(4) - (1)].expr); // to prevent the Bison warning
(yyval.expr) = (yysemantic_stack_[(4) - (2)].expr); // to prevent the Bison warning
@@ -4574,7 +7687,11 @@
case 186:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2251 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2263 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
}
@@ -4583,7 +7700,11 @@
case 187:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2256 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2268 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new BlockBody(LOC((yyloc)));
}
@@ -4592,7 +7713,11 @@
case 188:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2264 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2276 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if (dynamic_cast<BlockBody*>((yysemantic_stack_[(3) - (2)].expr)) == NULL)
{
@@ -4610,7 +7735,11 @@
case 189:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2281 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2293 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
}
@@ -4619,7 +7748,11 @@
case 190:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2289 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2301 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(2) - (1)].expr);
}
@@ -4628,7 +7761,11 @@
case 191:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2297 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2309 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
VarDeclStmt* vdecl = static_cast<VarDeclStmt*>((yysemantic_stack_[(3) - (1)].expr));
vdecl->add((yysemantic_stack_[(3) - (3)].node));
@@ -4639,7 +7776,11 @@
case 192:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2304 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2316 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)), NULL);
vdecl->add((yysemantic_stack_[(2) - (2)].node));
@@ -4650,7 +7791,11 @@
case 193:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2311 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2323 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)),
static_cast<AnnotationListParsenode*>((yysemantic_stack_[(3) - (1)].node)));
@@ -4662,7 +7807,11 @@
case 194:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2322 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2334 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)),
@@ -4676,7 +7825,11 @@
case 195:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2331 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2343 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4690,7 +7843,11 @@
case 196:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2340 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2352 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4704,7 +7861,11 @@
case 197:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2349 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2361 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -4718,7 +7879,11 @@
case 198:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2362 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2374 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new AssignExpr(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)), (yysemantic_stack_[(5) - (4)].expr));
}
@@ -4727,7 +7892,11 @@
case 199:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2370 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2382 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ApplyExpr(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr));
}
@@ -4736,7 +7905,11 @@
case 200:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2378 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2390 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ExitExpr(LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr));
}
@@ -4745,7 +7918,11 @@
case 201:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2386 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2398 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
BlockBody* bb = dynamic_cast<BlockBody *>((yysemantic_stack_[(5) - (5)].expr));
if (bb == NULL)
@@ -4761,7 +7938,11 @@
case 202:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2401 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2413 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new FlowCtlStatement(LOC((yyloc)), FlowCtlStatement::BREAK);
}
@@ -4770,7 +7951,11 @@
case 203:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2406 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2418 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new FlowCtlStatement( LOC((yyloc)), FlowCtlStatement::CONTINUE );
}
@@ -4779,7 +7964,11 @@
case 204:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2414 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2426 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
ReturnExpr* re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
(yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4794,7 +7983,11 @@
case 205:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2428 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2440 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
exprnode* retExpr = (yysemantic_stack_[(2) - (2)].expr);
@@ -4812,7 +8005,11 @@
case 206:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2445 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2457 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
exprnode* thenExpr = (yysemantic_stack_[(8) - (6)].expr);
exprnode* elseExpr = (yysemantic_stack_[(8) - (8)].expr);
@@ -4838,7 +8035,11 @@
case 207:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2470 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2482 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new TryExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), (yysemantic_stack_[(3) - (3)].expr));
}
@@ -4847,7 +8048,11 @@
case 208:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2478 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2490 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
CatchListExpr* cle = new CatchListExpr( LOC((yyloc)) );
cle->push_back( static_cast<CatchExpr*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -4858,7 +8063,11 @@
case 209:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2485 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2497 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
if ( cle )
@@ -4870,7 +8079,11 @@
case 210:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2496 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2508 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CatchExpr(LOC((yyloc)), *(yysemantic_stack_[(3) - (2)].name_test_list), (yysemantic_stack_[(3) - (3)].expr));
delete (yysemantic_stack_[(3) - (2)].name_test_list);
@@ -4880,7 +8093,11 @@
case 211:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2506 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2518 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -4889,7 +8106,11 @@
case 212:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2511 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2523 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
Expr* expr = dynamic_cast<Expr*>((yysemantic_stack_[(3) - (1)].expr));
if ( !expr )
@@ -4905,7 +8126,11 @@
case 213:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2524 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2536 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(3) - (1)].expr); // to prevent the Bison warning
(yyval.expr) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
@@ -4923,7 +8148,11 @@
case 232:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2571 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2583 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
ReturnExpr *re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
(yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4938,7 +8167,11 @@
case 233:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2585 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2597 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ReturnExpr( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr) );
}
@@ -4947,7 +8180,11 @@
case 234:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2593 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2605 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.strval) = parser::the_sliding;
}
@@ -4956,7 +8193,11 @@
case 235:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2598 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2610 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.strval) = parser::the_tumbling;
}
@@ -4965,7 +8206,11 @@
case 236:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2606 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2618 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.strval) = parser::the_start;
}
@@ -4974,7 +8219,11 @@
case 237:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2611 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2623 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.strval) = parser::the_end;
}
@@ -4983,7 +8232,11 @@
case 238:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2616 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2628 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.strval) = parser::the_only_end;
}
@@ -4992,7 +8245,11 @@
case 239:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2624 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2636 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FLWORWinCond(LOC((yyloc)),
dynamic_cast<WindowVars*>((yysemantic_stack_[(4) - (2)].node)),
@@ -5005,7 +8262,11 @@
case 240:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2633 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2645 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FLWORWinCond(LOC((yyloc)),
NULL,
@@ -5018,7 +8279,11 @@
case 241:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2645 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2657 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new WindowClause (LOC ((yyloc)),
((yysemantic_stack_[(5) - (2)].strval) == parser::the_tumbling ?
@@ -5033,7 +8298,11 @@
case 242:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2655 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2667 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new WindowClause (LOC ((yyloc)),
((yysemantic_stack_[(4) - (2)].strval) == parser::the_tumbling ?
@@ -5047,7 +8316,11 @@
case 243:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2668 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2680 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CountClause(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
}
@@ -5056,7 +8329,11 @@
case 252:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2692 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2704 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
FLWORClauseList *fcl = new FLWORClauseList( LOC((yyloc)) );
fcl->push_back( dynamic_cast<FLWORClause*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5067,7 +8344,11 @@
case 253:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2699 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2711 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
FLWORClauseList *fcl = dynamic_cast<FLWORClauseList*>((yysemantic_stack_[(2) - (1)].node));
fcl->push_back( dynamic_cast<FLWORClause*>((yysemantic_stack_[(2) - (2)].node)) );
@@ -5078,7 +8359,11 @@
case 254:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2709 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2721 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ForClause(LOC((yyloc)), dynamic_cast<VarInDeclList*>((yysemantic_stack_[(3) - (3)].node)));
}
@@ -5087,7 +8372,11 @@
case 255:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2715 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2727 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
error((yylocation_stack_[(3) - (2)]), "syntax error, unexpected qualified name \""
@@ -5100,7 +8389,11 @@
case 256:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2724 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2736 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = NULL; // to prevent the Bison warning
error((yylocation_stack_[(2) - (2)]), ""); // the error message is already set in the driver's parseError member
@@ -5108,10 +8401,26 @@
}
break;
+<<<<<<< TREE
case 257:
/* Line 690 of lalr1.cc */
#line 2734 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+ case 258:
+
+/* Line 690 of lalr1.cc */
+#line 2746 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ // this adds on shift-reduce conflict (probably with FTRange expression)
+ }
+ break;
+
+ case 259:
+
+/* Line 690 of lalr1.cc */
+#line 2754 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
VarInDeclList* vdl = new VarInDeclList( LOC((yyloc)) );
vdl->push_back( dynamic_cast<VarInDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5119,10 +8428,14 @@
}
break;
- case 258:
+ case 260:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2741 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2761 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if ( VarInDeclList* vdl = dynamic_cast<VarInDeclList*>((yysemantic_stack_[(4) - (1)].node)) )
vdl->push_back( dynamic_cast<VarInDecl*>((yysemantic_stack_[(4) - (4)].node)) );
@@ -5130,10 +8443,14 @@
}
break;
- case 259:
+ case 261:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2749 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2769 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(3) - (1)].node); // to prevent the Bison warning
error((yylocation_stack_[(3) - (3)]), "syntax error, unexpected QName \""
@@ -5143,10 +8460,14 @@
}
break;
- case 260:
+ case 262:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2761 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2781 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)),
@@ -5158,6 +8479,7 @@
}
break;
+<<<<<<< TREE
case 261:
/* Line 690 of lalr1.cc */
@@ -5188,17 +8510,23 @@
}
break;
+=======
+>>>>>>> MERGE-SOURCE
case 263:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2791 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2791 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
- static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
- dynamic_cast<SequenceType *>((yysemantic_stack_[(6) - (2)].node)),
- NULL,
- NULL,
- (yysemantic_stack_[(6) - (6)].expr),
+ static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
+ NULL,
+ NULL,
+ NULL,
+ (yysemantic_stack_[(5) - (5)].expr),
true);
}
break;
@@ -5206,7 +8534,41 @@
case 264:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2801 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2801 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = new VarInDecl(LOC((yyloc)),
+ static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
+ dynamic_cast<SequenceType *>((yysemantic_stack_[(4) - (2)].node)),
+ NULL,
+ NULL,
+ (yysemantic_stack_[(4) - (4)].expr),
+ false);
+ }
+ break;
+
+ case 265:
+
+/* Line 690 of lalr1.cc */
+#line 2811 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = new VarInDecl(LOC((yyloc)),
+ static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
+ dynamic_cast<SequenceType *>((yysemantic_stack_[(6) - (2)].node)),
+ NULL,
+ NULL,
+ (yysemantic_stack_[(6) - (6)].expr),
+ true);
+ }
+ break;
+
+ case 266:
+
+/* Line 690 of lalr1.cc */
+#line 2821 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5218,10 +8580,14 @@
}
break;
- case 265:
+ case 267:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2811 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2831 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5233,10 +8599,14 @@
}
break;
- case 266:
+ case 268:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2821 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2841 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5248,10 +8618,14 @@
}
break;
- case 267:
+ case 269:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2831 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2851 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(7) - (1)].expr)),
@@ -5263,10 +8637,14 @@
}
break;
- case 268:
+ case 270:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2842 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2862 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5277,10 +8655,14 @@
}
break;
- case 269:
+ case 271:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2851 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2871 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5292,10 +8674,14 @@
}
break;
- case 270:
+ case 272:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2861 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2881 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5307,10 +8693,14 @@
}
break;
- case 271:
+ case 273:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2871 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2891 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5322,37 +8712,53 @@
}
break;
- case 272:
+ case 274:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2887 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2907 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new PositionalVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
}
break;
- case 273:
+ case 275:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2896 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2916 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTScoreVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
}
break;
- case 274:
+ case 276:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2905 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2925 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new LetClause( LOC((yyloc)), dynamic_cast<VarGetsDeclList*>((yysemantic_stack_[(2) - (2)].node)) );
}
break;
- case 275:
+ case 277:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2913 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2933 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
VarGetsDeclList *vgdl = new VarGetsDeclList( LOC((yyloc)) );
vgdl->push_back( dynamic_cast<VarGetsDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5360,10 +8766,14 @@
}
break;
- case 276:
+ case 278:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2919 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2939 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if( VarGetsDeclList *vgdl = dynamic_cast<VarGetsDeclList*>((yysemantic_stack_[(3) - (1)].node)) )
vgdl->push_back( dynamic_cast<VarGetsDecl*>((yysemantic_stack_[(3) - (3)].node)) );
@@ -5371,10 +8781,14 @@
}
break;
- case 277:
+ case 279:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2931 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2951 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarGetsDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -5384,10 +8798,14 @@
}
break;
- case 278:
+ case 280:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2939 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2959 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarGetsDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5397,10 +8815,14 @@
}
break;
- case 279:
+ case 281:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2949 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2969 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarGetsDecl(LOC ((yyloc)),
dynamic_cast<FTScoreVar*>((yysemantic_stack_[(3) - (1)].node))->get_var_name(),
@@ -5410,10 +8832,14 @@
}
break;
- case 280:
+ case 282:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2957 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2977 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarGetsDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -5423,10 +8849,14 @@
}
break;
- case 281:
+ case 283:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2969 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2989 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new WindowVarDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -5434,10 +8864,14 @@
}
break;
- case 282:
+ case 284:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2975 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2995 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new WindowVarDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5446,93 +8880,133 @@
}
break;
- case 284:
+ case 286:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2988 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3008 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new WindowVars(LOC((yyloc)), NULL, static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL, NULL);
}
break;
- case 285:
+ case 287:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2992 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3012 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(3) - (3)].node);
dynamic_cast<WindowVars *>((yyval.node))->set_curr(static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)));
}
break;
- case 286:
+ case 288:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3000 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3020 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new WindowVars(LOC((yyloc)), dynamic_cast<PositionalVar*>((yysemantic_stack_[(1) - (1)].node)), NULL, NULL, NULL);
}
break;
- case 287:
+ case 289:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3004 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3024 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(2) - (2)].node);
dynamic_cast<WindowVars *>((yyval.node))->set_posvar(dynamic_cast<PositionalVar*>((yysemantic_stack_[(2) - (1)].node)));
}
break;
- case 289:
+ case 291:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3013 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3033 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)), static_cast<QName*>((yysemantic_stack_[(6) - (6)].expr)));
}
break;
- case 290:
+ case 292:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3017 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3037 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, NULL, static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
}
break;
- case 291:
+ case 293:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3021 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3041 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new WindowVars(LOC((yyloc)), NULL, NULL, static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL);
}
break;
- case 292:
+ case 294:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3031 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3051 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new WhereClause(LOC ((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
}
break;
- case 293:
+ case 295:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3039 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3059 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new GroupByClause(LOC((yyloc)), dynamic_cast<GroupSpecList*>((yysemantic_stack_[(3) - (3)].node)));
}
break;
- case 294:
+ case 296:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3046 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3066 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
GroupSpecList* gsl = new GroupSpecList(LOC((yyloc)));
gsl->push_back(static_cast<GroupSpec*>((yysemantic_stack_[(1) - (1)].node)));
@@ -5540,10 +9014,14 @@
}
break;
- case 295:
+ case 297:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3052 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3072 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
GroupSpecList* gsl = static_cast<GroupSpecList*>((yysemantic_stack_[(3) - (1)].node));
gsl->push_back(static_cast<GroupSpec*>((yysemantic_stack_[(3) - (3)].node)));
@@ -5551,28 +9029,40 @@
}
break;
- case 296:
+ case 298:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3062 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3082 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new GroupSpec(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL, NULL, NULL);
}
break;
- case 297:
+ case 299:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3066 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3086 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new GroupSpec(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)), NULL, (yysemantic_stack_[(4) - (4)].expr), NULL);
}
break;
- case 298:
+ case 300:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3070 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3090 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new GroupSpec(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5582,10 +9072,14 @@
}
break;
- case 299:
+ case 301:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3078 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3098 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new GroupSpec(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -5595,10 +9089,14 @@
}
break;
- case 300:
+ case 302:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3086 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3106 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new GroupSpec(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5608,10 +9106,14 @@
}
break;
- case 301:
+ case 303:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3094 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3114 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new GroupSpec(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -5621,19 +9123,27 @@
}
break;
- case 302:
+ case 304:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3106 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3126 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new GroupCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
}
break;
- case 303:
+ case 305:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3114 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3134 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderByClause(
LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(3) - (3)].node))
@@ -5641,10 +9151,14 @@
}
break;
- case 304:
+ case 306:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3120 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3140 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderByClause(
LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(4) - (4)].node)), true
@@ -5652,10 +9166,14 @@
}
break;
- case 305:
+ case 307:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3130 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3150 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
OrderSpecList *osl = new OrderSpecList( LOC((yyloc)) );
osl->push_back( dynamic_cast<OrderSpec*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5663,10 +9181,14 @@
}
break;
- case 306:
+ case 308:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3136 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3156 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if ( OrderSpecList* osl = dynamic_cast<OrderSpecList*>((yysemantic_stack_[(3) - (1)].node)) )
osl->push_back( dynamic_cast<OrderSpec*>((yysemantic_stack_[(3) - (3)].node)) );
@@ -5674,19 +9196,27 @@
}
break;
- case 307:
+ case 309:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3146 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3166 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderSpec( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL );
}
break;
- case 308:
+ case 310:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3150 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3170 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderSpec(
LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr), dynamic_cast<OrderModifierPN*>((yysemantic_stack_[(2) - (2)].node))
@@ -5694,10 +9224,14 @@
}
break;
- case 309:
+ case 311:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3160 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3180 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderModifierPN(
LOC((yyloc)), dynamic_cast<OrderDirSpec*>((yysemantic_stack_[(1) - (1)].node)), NULL, NULL
@@ -5705,10 +9239,14 @@
}
break;
- case 310:
+ case 312:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3166 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3186 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderModifierPN(
LOC((yyloc)), NULL, dynamic_cast<OrderEmptySpec*>((yysemantic_stack_[(1) - (1)].node)), NULL
@@ -5716,10 +9254,14 @@
}
break;
- case 311:
+ case 313:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3172 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3192 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderModifierPN(
LOC((yyloc)), NULL, NULL, dynamic_cast<OrderCollationSpec*>((yysemantic_stack_[(1) - (1)].node))
@@ -5727,10 +9269,14 @@
}
break;
- case 312:
+ case 314:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3178 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3198 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderModifierPN(
LOC((yyloc)),
@@ -5741,10 +9287,14 @@
}
break;
- case 313:
+ case 315:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3187 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3207 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderModifierPN(
LOC((yyloc)),
@@ -5755,10 +9305,14 @@
}
break;
- case 314:
+ case 316:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3196 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3216 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderModifierPN(
LOC((yyloc)),
@@ -5769,10 +9323,14 @@
}
break;
- case 315:
+ case 317:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3205 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3225 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderModifierPN(
LOC((yyloc)),
@@ -5783,28 +9341,40 @@
}
break;
- case 316:
+ case 318:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3218 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3238 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_ascending );
}
break;
- case 317:
+ case 319:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3222 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3242 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_descending );
}
break;
- case 318:
+ case 320:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3230 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3250 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderEmptySpec(
LOC((yyloc)), StaticContextConsts::empty_greatest
@@ -5812,10 +9382,14 @@
}
break;
- case 319:
+ case 321:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3236 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3256 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderEmptySpec(
LOC((yyloc)), StaticContextConsts::empty_least
@@ -5823,19 +9397,27 @@
}
break;
- case 320:
+ case 322:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3246 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3266 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
}
break;
- case 321:
+ case 323:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3254 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3274 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new QuantifiedExpr(
LOC((yyloc)),
@@ -5846,10 +9428,14 @@
}
break;
- case 322:
+ case 324:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3263 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3283 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new QuantifiedExpr(
LOC((yyloc)),
@@ -5860,10 +9446,14 @@
}
break;
- case 323:
+ case 325:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3276 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3296 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
QVarInDeclList *qvidl = new QVarInDeclList( LOC((yyloc)) );
qvidl->push_back( dynamic_cast<QVarInDecl*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -5872,10 +9462,14 @@
}
break;
- case 324:
+ case 326:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3283 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3303 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
QVarInDeclList *qvidl = dynamic_cast<QVarInDeclList*>((yysemantic_stack_[(4) - (1)].node));
qvidl->push_back( dynamic_cast<QVarInDecl*>((yysemantic_stack_[(4) - (4)].node)) );
@@ -5883,19 +9477,27 @@
}
break;
- case 325:
+ case 327:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3295 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3315 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new QVarInDecl(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), (yysemantic_stack_[(3) - (3)].expr));
}
break;
- case 326:
+ case 328:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3299 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3319 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new QVarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5904,6 +9506,7 @@
}
break;
+<<<<<<< TREE
case 327:
/* Line 690 of lalr1.cc */
@@ -5924,30 +9527,64 @@
}
break;
+=======
+>>>>>>> MERGE-SOURCE
case 329:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3324 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3331 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- SwitchCaseClauseList* scc_list_p = static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
- scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(2) - (2)].node)));
- (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+ (yyval.expr) = new SwitchExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(8) - (5)].node)), (yysemantic_stack_[(8) - (8)].expr));
}
break;
case 330:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3333 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3338 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new SwitchCaseClause(LOC((yyloc)), dynamic_cast<SwitchCaseOperandList*>((yysemantic_stack_[(3) - (1)].node)), (yysemantic_stack_[(3) - (3)].expr));
+ SwitchCaseClauseList* scc_list_p = new SwitchCaseClauseList(LOC((yyloc)));
+ scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(1) - (1)].node)));
+ (yyval.node) = scc_list_p;
}
break;
case 331:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3340 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3344 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ SwitchCaseClauseList* scc_list_p = static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
+ scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(2) - (2)].node)));
+ (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+ }
+ break;
+
+ case 332:
+
+/* Line 690 of lalr1.cc */
+#line 3353 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = new SwitchCaseClause(LOC((yyloc)), dynamic_cast<SwitchCaseOperandList*>((yysemantic_stack_[(3) - (1)].node)), (yysemantic_stack_[(3) - (3)].expr));
+ }
+ break;
+
+ case 333:
+
+/* Line 690 of lalr1.cc */
+#line 3360 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
SwitchCaseOperandList* sco_list_p = new SwitchCaseOperandList(LOC((yyloc)));
sco_list_p->push_back((yysemantic_stack_[(2) - (2)].expr));
@@ -5955,10 +9592,14 @@
}
break;
- case 332:
+ case 334:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3346 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3366 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
SwitchCaseOperandList* sco_list_p = static_cast<SwitchCaseOperandList*>((yysemantic_stack_[(3) - (1)].node));
sco_list_p->push_back((yysemantic_stack_[(3) - (3)].expr));
@@ -5966,6 +9607,7 @@
}
break;
+<<<<<<< TREE
case 333:
/* Line 690 of lalr1.cc */
@@ -5986,55 +9628,72 @@
}
break;
+=======
+>>>>>>> MERGE-SOURCE
case 335:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3370 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3377 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- SwitchCaseClauseList* scc_list_p = static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
- scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(2) - (2)].node)));
- (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+ (yyval.expr) = new SwitchExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(8) - (5)].node)), (yysemantic_stack_[(8) - (8)].expr));
}
break;
case 336:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3379 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3384 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new SwitchCaseClause(LOC((yyloc)), dynamic_cast<SwitchCaseOperandList*>((yysemantic_stack_[(3) - (1)].node)), (yysemantic_stack_[(3) - (3)].expr));
+ SwitchCaseClauseList* scc_list_p = new SwitchCaseClauseList(LOC((yyloc)));
+ scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(1) - (1)].node)));
+ (yyval.node) = scc_list_p;
}
break;
case 337:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3388 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3390 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
- (yysemantic_stack_[(8) - (3)].expr),
- static_cast<CaseClauseList*>((yysemantic_stack_[(8) - (5)].node)),
- (yysemantic_stack_[(8) - (8)].expr));
+ SwitchCaseClauseList* scc_list_p = static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
+ scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(2) - (2)].node)));
+ (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
}
break;
case 338:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3395 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3399 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
- (yysemantic_stack_[(10) - (3)].expr),
- static_cast<CaseClauseList*>((yysemantic_stack_[(10) - (5)].node)),
- static_cast<QName*>((yysemantic_stack_[(10) - (8)].expr)),
- (yysemantic_stack_[(10) - (10)].expr));
+ (yyval.node) = new SwitchCaseClause(LOC((yyloc)), dynamic_cast<SwitchCaseOperandList*>((yysemantic_stack_[(3) - (1)].node)), (yysemantic_stack_[(3) - (3)].expr));
}
break;
case 339:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3406 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3408 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
(yysemantic_stack_[(8) - (3)].expr),
@@ -6046,7 +9705,11 @@
case 340:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3413 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3415 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
(yysemantic_stack_[(10) - (3)].expr),
@@ -6059,97 +9722,158 @@
case 341:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3425 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3426 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- CaseClauseList* cc_list_p = new CaseClauseList(LOC ((yyloc)));
- cc_list_p->push_back(static_cast<CaseClause*>((yysemantic_stack_[(1) - (1)].node)));
- (yyval.node) = cc_list_p;
+ (yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
+ (yysemantic_stack_[(8) - (3)].expr),
+ static_cast<CaseClauseList*>((yysemantic_stack_[(8) - (5)].node)),
+ (yysemantic_stack_[(8) - (8)].expr));
}
break;
case 342:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3431 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3433 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- CaseClauseList* cc_list_p = dynamic_cast<CaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
- cc_list_p->push_back(static_cast<CaseClause*>((yysemantic_stack_[(2) - (2)].node)));
- (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+ (yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
+ (yysemantic_stack_[(10) - (3)].expr),
+ static_cast<CaseClauseList*>((yysemantic_stack_[(10) - (5)].node)),
+ static_cast<QName*>((yysemantic_stack_[(10) - (8)].expr)),
+ (yysemantic_stack_[(10) - (10)].expr));
}
break;
case 343:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3443 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3445 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new CaseClause(LOC ((yyloc)),
- static_cast<SequenceTypeList*>((yysemantic_stack_[(4) - (2)].node)),
- (yysemantic_stack_[(4) - (4)].expr));
+ CaseClauseList* cc_list_p = new CaseClauseList(LOC ((yyloc)));
+ cc_list_p->push_back(static_cast<CaseClause*>((yysemantic_stack_[(1) - (1)].node)));
+ (yyval.node) = cc_list_p;
}
break;
case 344:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3449 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3451 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new CaseClause(LOC ((yyloc)),
- static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
- static_cast<SequenceTypeList*>((yysemantic_stack_[(7) - (5)].node)),
- (yysemantic_stack_[(7) - (7)].expr));
- }
+ CaseClauseList* cc_list_p = dynamic_cast<CaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
+ cc_list_p->push_back(static_cast<CaseClause*>((yysemantic_stack_[(2) - (2)].node)));
+ (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+ }
break;
case 345:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3460 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3463 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- CaseClauseList* cc_list_p = new CaseClauseList(LOC ((yyloc)));
- cc_list_p->push_back(static_cast<CaseClause*>((yysemantic_stack_[(1) - (1)].node)));
- (yyval.node) = cc_list_p;
+ (yyval.node) = new CaseClause(LOC ((yyloc)),
+ static_cast<SequenceTypeList*>((yysemantic_stack_[(4) - (2)].node)),
+ (yysemantic_stack_[(4) - (4)].expr));
}
break;
case 346:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3466 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3469 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- CaseClauseList* cc_list_p = static_cast<CaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
- cc_list_p->push_back(static_cast<CaseClause*>((yysemantic_stack_[(2) - (2)].node)));
- (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
- }
+ (yyval.node) = new CaseClause(LOC ((yyloc)),
+ static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
+ static_cast<SequenceTypeList*>((yysemantic_stack_[(7) - (5)].node)),
+ (yysemantic_stack_[(7) - (7)].expr));
+ }
break;
case 347:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3477 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3480 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new CaseClause(LOC ((yyloc)),
- static_cast<SequenceTypeList*>((yysemantic_stack_[(4) - (2)].node)),
- (yysemantic_stack_[(4) - (4)].expr));
+ CaseClauseList* cc_list_p = new CaseClauseList(LOC ((yyloc)));
+ cc_list_p->push_back(static_cast<CaseClause*>((yysemantic_stack_[(1) - (1)].node)));
+ (yyval.node) = cc_list_p;
}
break;
case 348:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3483 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3486 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new CaseClause(LOC ((yyloc)),
- static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
- static_cast<SequenceTypeList*>((yysemantic_stack_[(7) - (5)].node)),
- (yysemantic_stack_[(7) - (7)].expr));
- }
+ CaseClauseList* cc_list_p = static_cast<CaseClauseList*>((yysemantic_stack_[(2) - (1)].node));
+ cc_list_p->push_back(static_cast<CaseClause*>((yysemantic_stack_[(2) - (2)].node)));
+ (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+ }
break;
case 349:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3494 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3497 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = new CaseClause(LOC ((yyloc)),
+ static_cast<SequenceTypeList*>((yysemantic_stack_[(4) - (2)].node)),
+ (yysemantic_stack_[(4) - (4)].expr));
+ }
+ break;
+
+ case 350:
+
+/* Line 690 of lalr1.cc */
+#line 3503 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = new CaseClause(LOC ((yyloc)),
+ static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
+ static_cast<SequenceTypeList*>((yysemantic_stack_[(7) - (5)].node)),
+ (yysemantic_stack_[(7) - (7)].expr));
+ }
+ break;
+
+ case 351:
+
+/* Line 690 of lalr1.cc */
+#line 3514 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
SequenceTypeList* seqList = new SequenceTypeList(LOC((yyloc)));
seqList->push_back(static_cast<SequenceType*>((yysemantic_stack_[(1) - (1)].node)));
@@ -6157,10 +9881,14 @@
}
break;
- case 350:
+ case 352:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3500 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3520 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
SequenceTypeList* seqList = static_cast<SequenceTypeList*>((yysemantic_stack_[(3) - (1)].node));
seqList->push_back(static_cast<SequenceType*>((yysemantic_stack_[(3) - (3)].node)));
@@ -6168,15 +9896,20 @@
}
break;
- case 351:
+ case 353:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3511 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3531 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new IfExpr(LOC ((yyloc)), (yysemantic_stack_[(8) - (3)].expr), (yysemantic_stack_[(8) - (6)].expr), (yysemantic_stack_[(8) - (8)].expr));
}
break;
+<<<<<<< TREE
case 352:
/* Line 690 of lalr1.cc */
@@ -6195,28 +9928,42 @@
}
break;
+=======
+>>>>>>> MERGE-SOURCE
case 354:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3533 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3540 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
- }
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
break;
case 355:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3537 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3544 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new AndExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
- }
+ (yyval.expr) = new OrExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
+ }
break;
case 356:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3545 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3553 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6225,7 +9972,29 @@
case 357:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3549 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3557 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = new AndExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
+ }
+ break;
+
+ case 358:
+
+/* Line 690 of lalr1.cc */
+#line 3565 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+ case 359:
+
+/* Line 690 of lalr1.cc */
+#line 3569 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
/* ::= "eq" | "ne" | "lt" | "le" | "gt" | "ge" */
(yyval.expr) = new ComparisonExpr(
@@ -6237,10 +10006,14 @@
}
break;
- case 358:
+ case 360:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3559 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3579 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
/* ::= "is" | "<<" | ">>" */
(yyval.expr) = new ComparisonExpr(
@@ -6249,10 +10022,14 @@
}
break;
- case 359:
+ case 361:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3566 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3586 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ComparisonExpr(
LOC((yyloc)),
@@ -6263,10 +10040,14 @@
}
break;
- case 360:
+ case 362:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3575 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3595 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ComparisonExpr(
LOC((yyloc)),
@@ -6277,20 +10058,28 @@
}
break;
- case 361:
+ case 363:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3584 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3604 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
/* this call is needed */
driver.lexer->interpretAsLessThan();
}
break;
- case 362:
+ case 364:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3589 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3609 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ComparisonExpr(
LOC((yyloc)),
@@ -6301,10 +10090,14 @@
}
break;
- case 363:
+ case 365:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3598 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3618 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ComparisonExpr(
LOC((yyloc)),
@@ -6315,10 +10108,14 @@
}
break;
- case 364:
+ case 366:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3607 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3627 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ComparisonExpr(
LOC((yyloc)),
@@ -6329,10 +10126,14 @@
}
break;
- case 365:
+ case 367:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3616 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3636 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ComparisonExpr(
LOC((yyloc)),
@@ -6343,19 +10144,27 @@
}
break;
- case 366:
+ case 368:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3629 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3649 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
break;
- case 367:
+ case 369:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3633 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3653 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new FTContainsExpr(
LOC((yyloc)),
@@ -6366,6 +10175,7 @@
}
break;
+<<<<<<< TREE
case 368:
/* Line 690 of lalr1.cc */
@@ -6384,46 +10194,68 @@
}
break;
+=======
+>>>>>>> MERGE-SOURCE
case 370:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3656 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3665 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = NULL;
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
break;
case 371:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3660 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3669 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ (yyval.expr) = new StringConcatExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
}
break;
case 372:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3667 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3676 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ (yyval.node) = NULL;
}
break;
case 373:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3671 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3680 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new RangeExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
break;
case 374:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3680 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3687 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6432,59 +10264,79 @@
case 375:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3684 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3691 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new AdditiveExpr( LOC((yyloc)), ParseConstants::op_plus, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
+ (yyval.expr) = new RangeExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
}
break;
case 376:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3688 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3700 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new AdditiveExpr( LOC((yyloc)), ParseConstants::op_minus, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
break;
case 377:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3696 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3704 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ (yyval.expr) = new AdditiveExpr( LOC((yyloc)), ParseConstants::op_plus, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
}
break;
case 378:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3700 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3708 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new MultiplicativeExpr(
- LOC((yyloc)), ParseConstants::op_mul, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
- );
+ (yyval.expr) = new AdditiveExpr( LOC((yyloc)), ParseConstants::op_minus, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
}
break;
case 379:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3706 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3716 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new MultiplicativeExpr(
- LOC((yyloc)), ParseConstants::op_div, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
- );
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
break;
case 380:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3712 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3720 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new MultiplicativeExpr(
- LOC((yyloc)), ParseConstants::op_idiv, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
+ LOC((yyloc)), ParseConstants::op_mul, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
);
}
break;
@@ -6492,10 +10344,14 @@
case 381:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3718 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3726 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new MultiplicativeExpr(
- LOC((yyloc)), ParseConstants::op_mod, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
+ LOC((yyloc)), ParseConstants::op_div, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
);
}
break;
@@ -6503,77 +10359,111 @@
case 382:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3728 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3732 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ (yyval.expr) = new MultiplicativeExpr(
+ LOC((yyloc)), ParseConstants::op_idiv, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
+ );
}
break;
case 383:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3732 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3738 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
+ (yyval.expr) = new MultiplicativeExpr(
+ LOC((yyloc)), ParseConstants::op_mod, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
+ );
}
break;
case 384:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3736 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3748 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
break;
case 385:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3744 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3752 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
}
break;
case 386:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3748 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3756 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new IntersectExceptExpr(
- LOC((yyloc)), ParseConstants::op_intersect, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
- );
+ (yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
}
break;
case 387:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3754 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3764 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new IntersectExceptExpr(
- LOC((yyloc)), ParseConstants::op_except, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
- );
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
break;
case 388:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3764 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3768 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ (yyval.expr) = new IntersectExceptExpr(
+ LOC((yyloc)), ParseConstants::op_intersect, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
+ );
}
break;
case 389:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3768 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3774 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new InstanceofExpr(
- LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node))
+ (yyval.expr) = new IntersectExceptExpr(
+ LOC((yyloc)), ParseConstants::op_except, (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)
);
}
break;
@@ -6581,7 +10471,11 @@
case 390:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3778 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3784 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6590,9 +10484,13 @@
case 391:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3782 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3788 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new TreatExpr(
+ (yyval.expr) = new InstanceofExpr(
LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node))
);
}
@@ -6601,7 +10499,11 @@
case 392:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3792 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3798 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6610,10 +10512,14 @@
case 393:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3796 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3802 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new CastableExpr(
- LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SingleType*>((yysemantic_stack_[(4) - (4)].node))
+ (yyval.expr) = new TreatExpr(
+ LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node))
);
}
break;
@@ -6621,7 +10527,11 @@
case 394:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3806 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3812 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6630,9 +10540,13 @@
case 395:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3810 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3816 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new CastExpr(
+ (yyval.expr) = new CastableExpr(
LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SingleType*>((yysemantic_stack_[(4) - (4)].node))
);
}
@@ -6641,70 +10555,122 @@
case 396:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3820 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3826 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new SingleType(LOC((yyloc)), dynamic_cast<SimpleType*>((yysemantic_stack_[(1) - (1)].node)), false);
- }
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
break;
case 397:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3824 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3830 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new SingleType(LOC((yyloc)), dynamic_cast<SimpleType*>((yysemantic_stack_[(2) - (1)].node)), true);
- }
+ (yyval.expr) = new CastExpr(
+ LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SingleType*>((yysemantic_stack_[(4) - (4)].node))
+ );
+ }
break;
case 398:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3833 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3840 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
- }
+ (yyval.node) = new SingleType(LOC((yyloc)), dynamic_cast<SimpleType*>((yysemantic_stack_[(1) - (1)].node)), false);
+ }
break;
case 399:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3837 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3844 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new UnaryExpr( LOC((yyloc)), dynamic_cast<SignList*>((yysemantic_stack_[(2) - (1)].node)), (yysemantic_stack_[(2) - (2)].expr) );
- }
+ (yyval.node) = new SingleType(LOC((yyloc)), dynamic_cast<SimpleType*>((yysemantic_stack_[(2) - (1)].node)), true);
+ }
break;
case 400:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3845 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3853 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new SignList( LOC((yyloc)), true );
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
break;
case 401:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3849 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3857 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new SignList( LOC((yyloc)), false );
+ (yyval.expr) = new UnaryExpr( LOC((yyloc)), dynamic_cast<SignList*>((yysemantic_stack_[(2) - (1)].node)), (yysemantic_stack_[(2) - (2)].expr) );
}
break;
case 402:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3853 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3865 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+ (yyval.node) = new SignList( LOC((yyloc)), true );
}
break;
case 403:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3857 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3869 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = new SignList( LOC((yyloc)), false );
+ }
+ break;
+
+ case 404:
+
+/* Line 690 of lalr1.cc */
+#line 3873 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+ }
+ break;
+
+ case 405:
+
+/* Line 690 of lalr1.cc */
+#line 3877 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if ( SignList *sl = dynamic_cast<SignList*>((yysemantic_stack_[(2) - (1)].node)) )
sl->negate();
@@ -6712,6 +10678,7 @@
}
break;
+<<<<<<< TREE
case 404:
/* Line 690 of lalr1.cc */
@@ -6730,10 +10697,16 @@
}
break;
+=======
+>>>>>>> MERGE-SOURCE
case 406:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3875 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3887 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6742,133 +10715,211 @@
case 407:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3882 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3891 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+ case 408:
+
+/* Line 690 of lalr1.cc */
+#line 3895 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+ case 409:
+
+/* Line 690 of lalr1.cc */
+#line 3902 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
break;
- case 408:
+ case 410:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3887 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3907 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new SimpleMapExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
}
break;
- case 409:
+ case 411:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3895 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3915 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_eq );
}
break;
- case 410:
+ case 412:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3899 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3919 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ne );
}
break;
- case 411:
+ case 413:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3903 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3923 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_lt );
}
break;
- case 412:
+ case 414:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3907 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3927 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_le );
}
break;
- case 413:
+ case 415:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3911 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_gt );
}
break;
- case 414:
+ case 416:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3915 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3935 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ge );
}
break;
- case 415:
+ case 417:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3923 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3943 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new NodeComp( LOC((yyloc)), ParseConstants::op_is );
}
break;
- case 416:
+ case 418:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3927 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3947 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new NodeComp( LOC((yyloc)), ParseConstants::op_precedes );
}
break;
- case 417:
+ case 419:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3931 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3951 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new NodeComp( LOC((yyloc)), ParseConstants::op_follows );
}
break;
- case 418:
+ case 420:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3939 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3959 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(4) - (3)].expr) );
}
break;
- case 419:
+ case 421:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3943 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3963 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ValidateExpr( LOC((yyloc)), "lax", (yysemantic_stack_[(5) - (4)].expr) );
}
break;
- case 420:
+ case 422:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3947 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3967 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(5) - (4)].expr) );
}
break;
- case 421:
+ case 423:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3951 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3971 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ValidateExpr(
LOC((yyloc)), dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (3)].node))->get_name(), (yysemantic_stack_[(6) - (5)].expr)
@@ -6877,10 +10928,14 @@
}
break;
- case 422:
+ case 424:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3962 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3982 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ExtensionExpr(
LOC((yyloc)), dynamic_cast<PragmaList*>((yysemantic_stack_[(3) - (1)].node)), NULL
@@ -6888,10 +10943,14 @@
}
break;
- case 423:
+ case 425:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3968 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3988 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ExtensionExpr(
LOC((yyloc)), dynamic_cast<PragmaList*>((yysemantic_stack_[(4) - (1)].node)), (yysemantic_stack_[(4) - (3)].expr)
@@ -6899,10 +10958,14 @@
}
break;
- case 424:
+ case 426:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3978 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3998 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
PragmaList *pl = new PragmaList( LOC((yyloc)) );
pl->push_back( dynamic_cast<Pragma*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -6910,10 +10973,14 @@
}
break;
- case 425:
+ case 427:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3984 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4004 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if ( PragmaList *pl = dynamic_cast<PragmaList*>((yysemantic_stack_[(2) - (1)].node)) )
pl->push_back( dynamic_cast<Pragma*>((yysemantic_stack_[(2) - (2)].node)) );
@@ -6921,37 +10988,53 @@
}
break;
- case 426:
+ case 428:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3994 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4014 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new Pragma( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
}
break;
- case 427:
+ case 429:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3998 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4018 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new Pragma( LOC((yyloc)), new QName( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) ), "" );
}
break;
- case 428:
+ case 430:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4002 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4022 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new Pragma( LOC((yyloc)), new QName( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)), true ), "" );
}
break;
- case 429:
+ case 431:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4065 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4085 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
RelativePathExpr* rpe = dynamic_cast<RelativePathExpr*>((yysemantic_stack_[(1) - (1)].expr));
(yyval.expr) = (!rpe ?
@@ -6960,10 +11043,14 @@
}
break;
- case 430:
+ case 432:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4087 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4107 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
AxisStep* as = dynamic_cast<AxisStep*>((yysemantic_stack_[(1) - (1)].expr));
(yyval.expr) = (as ?
@@ -6975,6 +11062,7 @@
}
break;
+<<<<<<< TREE
case 431:
/* Line 690 of lalr1.cc */
@@ -6993,185 +11081,276 @@
}
break;
+=======
+>>>>>>> MERGE-SOURCE
case 433:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4283 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4135 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new NameTest( LOC((yyloc)), dynamic_cast<Wildcard*>((yysemantic_stack_[(1) - (1)].node)) );
- }
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
break;
case 434:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4293 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4299 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new Wildcard(LOC((yyloc)), "", "", ParseConstants::wild_all, false);
- }
+ (yyval.node) = new NameTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
+ }
break;
case 435:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4297 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4303 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, false);
- }
+ (yyval.node) = new NameTest( LOC((yyloc)), dynamic_cast<Wildcard*>((yysemantic_stack_[(1) - (1)].node)) );
+ }
break;
case 436:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4301 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4313 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, true);
+ (yyval.node) = new Wildcard(LOC((yyloc)), "", "", ParseConstants::wild_all, false);
}
break;
case 437:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4305 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4317 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new Wildcard(LOC((yyloc)), "", SYMTAB((yysemantic_stack_[(1) - (1)].sval)), ParseConstants::wild_prefix, false);
+ (yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, false);
}
break;
case 438:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4314 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4321 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
- }
+ (yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, true);
+ }
break;
case 439:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4318 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4325 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new FilterExpr(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr), dynamic_cast<PredicateList*>((yysemantic_stack_[(2) - (2)].node)));
- }
+ (yyval.node) = new Wildcard(LOC((yyloc)), "", SYMTAB((yysemantic_stack_[(1) - (1)].sval)), ParseConstants::wild_prefix, false);
+ }
break;
case 440:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4322 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4334 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new DynamicFunctionInvocation(LOC ((yyloc)), (yysemantic_stack_[(3) - (1)].expr), false);
+=======
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+>>>>>>> MERGE-SOURCE
}
break;
case 441:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4326 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4338 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new DynamicFunctionInvocation(LOC ((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<ArgList*>((yysemantic_stack_[(4) - (3)].node)), false);
+=======
+ (yyval.expr) = new FilterExpr(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr), dynamic_cast<PredicateList*>((yysemantic_stack_[(2) - (2)].node)));
+>>>>>>> MERGE-SOURCE
}
break;
case 442:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4334 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4342 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- PredicateList *pl = new PredicateList( LOC((yyloc)) );
- pl->push_back( dynamic_cast<exprnode*>((yysemantic_stack_[(1) - (1)].expr)) );
- (yyval.node) = pl;
- }
+ (yyval.expr) = new DynamicFunctionInvocation(LOC ((yyloc)), (yysemantic_stack_[(3) - (1)].expr));
+ }
break;
case 443:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4340 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4346 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- if ( PredicateList *pl = dynamic_cast<PredicateList*>((yysemantic_stack_[(2) - (1)].node)) )
- pl->push_back( dynamic_cast<exprnode*>((yysemantic_stack_[(2) - (2)].expr)) );
- (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
- }
+ (yyval.expr) = new DynamicFunctionInvocation(LOC ((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<ArgList*>((yysemantic_stack_[(4) - (3)].node)));
+ }
break;
case 444:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4350 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4350 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
- }
+ StringLiteral* sl = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
+ (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), sl);
+ }
break;
case 445:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4358 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4355 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
- }
+ (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
+ }
break;
case 446:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4362 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4359 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
- }
+ (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
+ }
break;
case 447:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4366 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4363 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
- }
+ (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
+ }
break;
case 448:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4370 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4367 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
- }
+ (yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr));
+ }
break;
case 449:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4374 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4376 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ PredicateList *pl = new PredicateList( LOC((yyloc)) );
+ pl->push_back( dynamic_cast<exprnode*>((yysemantic_stack_[(1) - (1)].expr)) );
+ (yyval.node) = pl;
}
break;
case 450:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4378 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4382 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ if ( PredicateList *pl = dynamic_cast<PredicateList*>((yysemantic_stack_[(2) - (1)].node)) )
+ pl->push_back( dynamic_cast<exprnode*>((yysemantic_stack_[(2) - (2)].expr)) );
+ (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
}
break;
case 451:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4382 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4392 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
}
break;
case 452:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4386 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4400 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7180,7 +11359,11 @@
case 453:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4390 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4404 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7189,7 +11372,11 @@
case 454:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4394 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4408 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7198,7 +11385,11 @@
case 455:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4399 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4412 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7207,7 +11398,11 @@
case 456:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4403 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4416 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7216,7 +11411,11 @@
case 457:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4407 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4420 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7225,7 +11424,11 @@
case 458:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4411 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4424 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7234,37 +11437,129 @@
case 459:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4415 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4428 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
StringLiteral* sl = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
ArgList *al = new ArgList( LOC((yyloc)) );
al->push_back(sl);
(yyval.expr) = new DynamicFunctionInvocation(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), al, false);
+=======
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+>>>>>>> MERGE-SOURCE
}
break;
case 460:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4426 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4432 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
break;
case 461:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4430 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4436 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
break;
case 462:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4438 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4441 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+ case 463:
+
+/* Line 690 of lalr1.cc */
+#line 4445 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+ case 464:
+
+/* Line 690 of lalr1.cc */
+#line 4449 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+ case 465:
+
+/* Line 690 of lalr1.cc */
+#line 4453 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+ case 466:
+
+/* Line 690 of lalr1.cc */
+#line 4461 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+ case 467:
+
+/* Line 690 of lalr1.cc */
+#line 4465 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+ case 468:
+
+/* Line 690 of lalr1.cc */
+#line 4469 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+ case 469:
+
+/* Line 690 of lalr1.cc */
+#line 4473 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = new NullLiteral(LOC((yyloc)));
+ }
+ break;
+
+ case 470:
+
+/* Line 690 of lalr1.cc */
+#line 4481 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = NumericLiteral::new_literal(
LOC((yyloc)), ParseConstants::num_decimal, *(yysemantic_stack_[(1) - (1)].decval)
@@ -7273,10 +11568,14 @@
}
break;
- case 463:
+ case 471:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4445 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4488 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = NumericLiteral::new_literal(
LOC((yyloc)), ParseConstants::num_integer, *(yysemantic_stack_[(1) - (1)].ival)
@@ -7285,10 +11584,14 @@
}
break;
- case 464:
+ case 472:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4452 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4495 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = NumericLiteral::new_literal(
LOC((yyloc)), ParseConstants::num_double, *(yysemantic_stack_[(1) - (1)].dval)
@@ -7297,73 +11600,126 @@
}
break;
+<<<<<<< TREE
case 465:
/* Line 690 of lalr1.cc */
#line 4463 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+ case 473:
+
+/* Line 690 of lalr1.cc */
+#line 4505 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = new BooleanLiteral(LOC((yyloc)), true);
+ }
+ break;
+
+ case 474:
+
+/* Line 690 of lalr1.cc */
+#line 4509 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = new BooleanLiteral(LOC((yyloc)), false);
+ }
+ break;
+
+ case 475:
+
+/* Line 690 of lalr1.cc */
+#line 4517 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new VarRef(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)));
}
break;
- case 466:
+ case 476:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4471 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4525 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), NULL);
}
break;
- case 467:
+ case 477:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4475 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4529 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
}
break;
- case 468:
+ case 478:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4483 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4537 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ContextItemExpr( LOC((yyloc)) );
}
break;
- case 469:
+ case 479:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4491 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4545 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new OrderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
}
break;
- case 470:
+ case 480:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4499 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4553 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new UnorderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
}
break;
- case 471:
+ case 481:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4553 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4607 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new FunctionCall( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), NULL );
}
break;
- case 472:
+ case 482:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4557 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4611 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
ArgList* argList = dynamic_cast<ArgList*>((yysemantic_stack_[(4) - (3)].node));
@@ -7383,10 +11739,14 @@
}
break;
- case 473:
+ case 483:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4579 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4621 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
ArgList *al = new ArgList( LOC((yyloc)) );
al->push_back(new ArgumentPlaceholder(LOC((yyloc))));
@@ -7394,10 +11754,14 @@
}
break;
- case 474:
+ case 484:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4585 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4627 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if ( ArgList *al = dynamic_cast<ArgList*>((yysemantic_stack_[(3) - (1)].node)) )
al->push_back( new ArgumentPlaceholder(LOC((yyloc))) );
@@ -7405,6 +11769,7 @@
}
break;
+<<<<<<< TREE
case 475:
/* Line 690 of lalr1.cc */
@@ -7516,6 +11881,57 @@
/* Line 690 of lalr1.cc */
#line 4667 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+ case 485:
+
+/* Line 690 of lalr1.cc */
+#line 4637 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+ case 486:
+
+/* Line 690 of lalr1.cc */
+#line 4641 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+ case 487:
+
+/* Line 690 of lalr1.cc */
+#line 4649 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+ case 488:
+
+/* Line 690 of lalr1.cc */
+#line 4653 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+ case 489:
+
+/* Line 690 of lalr1.cc */
+#line 4657 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+ case 490:
+
+/* Line 690 of lalr1.cc */
+#line 4665 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DirElemConstructor(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -7525,10 +11941,18 @@
}
break;
+<<<<<<< TREE
case 487:
+=======
+ case 491:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4675 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4673 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if (static_cast<QName*>((yysemantic_stack_[(8) - (2)].expr))->get_qname() != static_cast<QName*>((yysemantic_stack_[(8) - (6)].expr))->get_qname())
{
@@ -7547,10 +11971,18 @@
}
break;
+<<<<<<< TREE
case 488:
+=======
+ case 492:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4692 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4690 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DirElemConstructor(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -7560,10 +11992,18 @@
}
break;
+<<<<<<< TREE
case 489:
+=======
+ case 493:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4700 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4698 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if (static_cast<QName*>((yysemantic_stack_[(9) - (2)].expr))->get_qname() != static_cast<QName*>((yysemantic_stack_[(9) - (7)].expr))->get_qname())
{
@@ -7582,10 +12022,18 @@
}
break;
+<<<<<<< TREE
case 490:
+=======
+ case 494:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4719 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4717 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if (static_cast<QName*>((yysemantic_stack_[(9) - (2)].expr))->get_qname() != static_cast<QName*>((yysemantic_stack_[(9) - (7)].expr))->get_qname())
{
@@ -7604,10 +12052,18 @@
}
break;
+<<<<<<< TREE
case 491:
+=======
+ case 495:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4738 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4736 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if (static_cast<QName*>((yysemantic_stack_[(10) - (2)].expr))->get_qname() != static_cast<QName*>((yysemantic_stack_[(10) - (8)].expr))->get_qname())
{
@@ -7626,10 +12082,18 @@
}
break;
+<<<<<<< TREE
case 492:
+=======
+ case 496:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4760 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4758 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
DirElemContentList *decl = new DirElemContentList( LOC((yyloc)) );
decl->push_back( dynamic_cast<DirElemContent*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -7637,10 +12101,18 @@
}
break;
+<<<<<<< TREE
case 493:
+=======
+ case 497:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4766 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4764 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
DirElemContentList *decl = dynamic_cast<DirElemContentList*>((yysemantic_stack_[(2) - (1)].node));
if ( decl )
@@ -7649,10 +12121,18 @@
}
break;
+<<<<<<< TREE
case 494:
+=======
+ case 498:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4777 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4775 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
DirAttributeList *dal = new DirAttributeList( LOC((yyloc)) );
dal->push_back( dynamic_cast<DirAttr*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7660,10 +12140,18 @@
}
break;
+<<<<<<< TREE
case 495:
+=======
+ case 499:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4783 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4781 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
DirAttributeList *dal = dynamic_cast<DirAttributeList*>((yysemantic_stack_[(2) - (1)].node));
if ( dal )
@@ -7672,10 +12160,18 @@
}
break;
+<<<<<<< TREE
case 496:
+=======
+ case 500:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4794 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4792 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new DirAttr(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -7683,48 +12179,88 @@
}
break;
+<<<<<<< TREE
case 499:
+=======
+ case 503:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4809 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4807 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new DirAttributeValue(LOC((yyloc)),
dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(3) - (2)].node)));
}
break;
+<<<<<<< TREE
case 500:
+=======
+ case 504:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4814 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4812 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new DirAttributeValue( LOC((yyloc)),
dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(3) - (2)].node)));
}
break;
+<<<<<<< TREE
case 501:
+=======
+ case 505:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4823 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4821 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new QuoteAttrContentList( LOC((yyloc)) );
}
break;
+<<<<<<< TREE
case 502:
+=======
+ case 506:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4827 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4825 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
break;
+<<<<<<< TREE
case 503:
+=======
+ case 507:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4834 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4832 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
qacl->push_back( new QuoteAttrValueContent( LOC((yyloc)), "\"" ) );
@@ -7732,10 +12268,18 @@
}
break;
+<<<<<<< TREE
case 504:
+=======
+ case 508:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4840 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4838 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
qacl->push_back( dynamic_cast<QuoteAttrValueContent*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7743,10 +12287,18 @@
}
break;
+<<<<<<< TREE
case 505:
+=======
+ case 509:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4846 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4844 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
QuoteAttrContentList* qacl = dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
if ( qacl )
@@ -7755,10 +12307,18 @@
}
break;
+<<<<<<< TREE
case 506:
+=======
+ case 510:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4853 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4851 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
QuoteAttrContentList *qacl = dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
if ( qacl )
@@ -7767,28 +12327,52 @@
}
break;
+<<<<<<< TREE
case 507:
+=======
+ case 511:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4864 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4862 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AposAttrContentList( LOC((yyloc)) );
}
break;
+<<<<<<< TREE
case 508:
+=======
+ case 512:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4868 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4866 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
break;
+<<<<<<< TREE
case 509:
+=======
+ case 513:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4875 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4873 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
AposAttrContentList *aacl = new AposAttrContentList( LOC((yyloc)) );
aacl->push_back( new AposAttrValueContent( LOC((yyloc)),"'") );
@@ -7796,10 +12380,18 @@
}
break;
+<<<<<<< TREE
case 510:
+=======
+ case 514:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4881 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4879 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
AposAttrContentList *aacl = new AposAttrContentList( LOC((yyloc)) );
aacl->push_back( dynamic_cast<AposAttrValueContent*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -7807,10 +12399,18 @@
}
break;
+<<<<<<< TREE
case 511:
+=======
+ case 515:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4887 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4885 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
if (aacl)
@@ -7819,10 +12419,18 @@
}
break;
+<<<<<<< TREE
case 512:
+=======
+ case 516:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4894 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4892 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
if ( aacl )
@@ -7831,161 +12439,298 @@
}
break;
+<<<<<<< TREE
case 513:
+=======
+ case 517:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4905 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4903 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new QuoteAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
}
break;
+<<<<<<< TREE
case 514:
+=======
+ case 518:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4909 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4907 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new QuoteAttrValueContent(LOC((yyloc)), dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr)));
}
break;
+<<<<<<< TREE
case 515:
+=======
+ case 519:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4917 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4915 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AposAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
}
break;
+<<<<<<< TREE
case 516:
+=======
+ case 520:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4921 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4919 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AposAttrValueContent(LOC((yyloc)), dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr)));
}
break;
+<<<<<<< TREE
case 517:
+=======
+ case 521:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4929 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4927 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DirElemContent( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr) );
}
break;
+<<<<<<< TREE
case 518:
+=======
+ case 522:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4933 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DirElemContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
}
break;
+<<<<<<< TREE
case 519:
+=======
+ case 523:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4937 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4935 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
rchandle<CDataSection> cdata_h = dynamic_cast<CDataSection*>((yysemantic_stack_[(1) - (1)].expr));
(yyval.expr) = new DirElemContent( LOC((yyloc)), cdata_h );
}
break;
+<<<<<<< TREE
case 520:
+=======
+ case 524:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4942 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
rchandle<CommonContent> cont_h = dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr));
(yyval.expr) = new DirElemContent( LOC((yyloc)), cont_h );
}
break;
+<<<<<<< TREE
case 521:
+=======
+ case 525:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4951 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4949 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_charref, SYMTAB((yysemantic_stack_[(1) - (1)].sval)));
}
break;
+<<<<<<< TREE
case 522:
+=======
+ case 526:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4955 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4953 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_escape_lbrace);
}
break;
+<<<<<<< TREE
case 523:
+=======
+ case 527:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4959 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4957 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_escape_rbrace);
}
break;
+<<<<<<< TREE
case 524:
+=======
+ case 528:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4963 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4961 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CommonContent(LOC((yyloc)), new EnclosedExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr)));
}
break;
+<<<<<<< TREE
case 525:
+=======
+ case 529:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4971 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4969 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DirCommentConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
}
break;
+<<<<<<< TREE
case 526:
+=======
+ case 530:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4976 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4974 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DirCommentConstructor( LOC((yyloc)), "" );
}
break;
+<<<<<<< TREE
case 527:
+=======
+ case 531:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4984 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4982 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DirPIConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
}
break;
+<<<<<<< TREE
case 528:
+=======
+ case 532:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4989 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4987 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DirPIConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
}
break;
+<<<<<<< TREE
case 529:
+=======
+ case 533:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4997 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4995 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CDataSection( LOC((yyloc)),SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
}
break;
+<<<<<<< TREE
case 530:
/* Line 690 of lalr1.cc */
@@ -8022,10 +12767,16 @@
}
break;
+=======
+>>>>>>> MERGE-SOURCE
case 534:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5025 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5003 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -8034,33 +12785,65 @@
case 535:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5030 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+=======
+#line 5008 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+ case 536:
+
+/* Line 690 of lalr1.cc */
+#line 5013 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+>>>>>>> MERGE-SOURCE
}
break;
case 537:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5041 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5018 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new CompDocConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
+=======
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+>>>>>>> MERGE-SOURCE
}
break;
case 538:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5049 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5023 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new CompElemConstructor(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval))), (yysemantic_stack_[(3) - (2)].expr));
+=======
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+>>>>>>> MERGE-SOURCE
}
break;
case 539:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5053 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
{
(yyval.expr) = new CompElemConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
@@ -8073,181 +12856,347 @@
#line 5070 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
{
(yyval.expr) = new CompAttrConstructor( LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval))), (yysemantic_stack_[(3) - (2)].expr) );
+=======
+#line 5028 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+>>>>>>> MERGE-SOURCE
}
break;
case 541:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5074 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5039 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new CompAttrConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
+=======
+ (yyval.expr) = new CompDocConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
+>>>>>>> MERGE-SOURCE
}
break;
case 542:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5082 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5047 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new CompTextConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
+=======
+ (yyval.expr) = new CompElemConstructor(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval))), (yysemantic_stack_[(3) - (2)].expr));
+>>>>>>> MERGE-SOURCE
}
break;
case 543:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5090 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5051 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new CompCommentConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
}
+=======
+ (yyval.expr) = new CompElemConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
+ }
+>>>>>>> MERGE-SOURCE
break;
case 544:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5098 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5068 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new CompPIConstructor(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)), (yysemantic_stack_[(3) - (2)].expr));
}
+=======
+ (yyval.expr) = new CompAttrConstructor( LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval))), (yysemantic_stack_[(3) - (2)].expr) );
+ }
+>>>>>>> MERGE-SOURCE
break;
case 545:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5102 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5072 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new CompPIConstructor(LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr));
}
+=======
+ (yyval.expr) = new CompAttrConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
+ }
+>>>>>>> MERGE-SOURCE
break;
case 546:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5110 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5080 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new CompNamespaceConstructor(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)), (yysemantic_stack_[(3) - (2)].expr));
}
+=======
+ (yyval.expr) = new CompTextConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
+ }
+>>>>>>> MERGE-SOURCE
break;
case 547:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5114 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5088 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new CompNamespaceConstructor(LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr));
}
+=======
+ (yyval.expr) = new CompCommentConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
+ }
+>>>>>>> MERGE-SOURCE
break;
case 548:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5122 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5096 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = (yysemantic_stack_[(2) - (2)].node);
}
+=======
+ (yyval.expr) = new CompPIConstructor(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)), (yysemantic_stack_[(3) - (2)].expr));
+ }
+>>>>>>> MERGE-SOURCE
break;
case 549:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5130 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5100 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new SequenceType( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL );
}
+=======
+ (yyval.expr) = new CompPIConstructor(LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr));
+ }
+>>>>>>> MERGE-SOURCE
break;
case 550:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5134 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5108 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new SequenceType(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].node), dynamic_cast<OccurrenceIndicator*>((yysemantic_stack_[(2) - (2)].node)));
}
+=======
+ (yyval.expr) = new CompNamespaceConstructor(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)), (yysemantic_stack_[(3) - (2)].expr));
+ }
+>>>>>>> MERGE-SOURCE
break;
case 551:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5138 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5112 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new SequenceType( LOC((yyloc)), NULL, NULL );
}
+=======
+ (yyval.expr) = new CompNamespaceConstructor(LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr));
+ }
+>>>>>>> MERGE-SOURCE
break;
case 552:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5173 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5120 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new OccurrenceIndicator(
LOC((yyloc)), ParseConstants::occurs_optionally
);
}
+=======
+ (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
+ }
+>>>>>>> MERGE-SOURCE
break;
case 553:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5179 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5128 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new OccurrenceIndicator(
LOC((yyloc)), ParseConstants::occurs_zero_or_more
);
+=======
+ (yyval.node) = new SequenceType( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL );
+>>>>>>> MERGE-SOURCE
}
break;
case 554:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5185 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5132 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new OccurrenceIndicator(
LOC((yyloc)), ParseConstants::occurs_one_or_more
);
+=======
+ (yyval.node) = new SequenceType(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].node), dynamic_cast<OccurrenceIndicator*>((yysemantic_stack_[(2) - (2)].node)));
+>>>>>>> MERGE-SOURCE
}
break;
case 555:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5195 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5136 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ (yyval.node) = new SequenceType( LOC((yyloc)), NULL, NULL );
}
break;
case 556:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5199 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5171 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+=======
+ (yyval.node) = new OccurrenceIndicator(
+ LOC((yyloc)), ParseConstants::occurs_optionally
+ );
+>>>>>>> MERGE-SOURCE
}
break;
case 557:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5203 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5177 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new ItemType( LOC((yyloc)), true );
+=======
+ (yyval.node) = new OccurrenceIndicator(
+ LOC((yyloc)), ParseConstants::occurs_zero_or_more
+ );
+>>>>>>> MERGE-SOURCE
}
break;
case 558:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5207 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5183 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new StructuredItemType(LOC((yyloc)));
}
+=======
+ (yyval.node) = new OccurrenceIndicator(
+ LOC((yyloc)), ParseConstants::occurs_one_or_more
+ );
+ }
+>>>>>>> MERGE-SOURCE
break;
case 559:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5211 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5193 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8256,7 +13205,11 @@
case 560:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5215 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5197 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8265,92 +13218,161 @@
case 561:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5219 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5201 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
+=======
+ (yyval.node) = new ItemType( LOC((yyloc)), true );
+ }
+>>>>>>> MERGE-SOURCE
break;
case 562:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5226 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5205 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
TypeList* aTypeList = new TypeList(LOC ((yyloc)));
aTypeList->push_back(dynamic_cast<SequenceType *>((yysemantic_stack_[(1) - (1)].node)));
(yyval.node) = aTypeList;
}
+=======
+ (yyval.node) = new StructuredItemType(LOC((yyloc)));
+ }
+>>>>>>> MERGE-SOURCE
break;
case 563:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5232 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5209 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
TypeList* aTypeList = dynamic_cast<TypeList *>((yysemantic_stack_[(3) - (1)].node));
aTypeList->push_back(dynamic_cast<SequenceType *>((yysemantic_stack_[(3) - (3)].node)));
(yyval.node) = (yysemantic_stack_[(3) - (1)].node);
}
+=======
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+>>>>>>> MERGE-SOURCE
break;
case 564:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5242 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5213 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new GeneralizedAtomicType( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
}
+=======
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+>>>>>>> MERGE-SOURCE
break;
case 565:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5250 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5217 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new SimpleType( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
}
+=======
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+>>>>>>> MERGE-SOURCE
break;
case 566:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5258 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5224 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
- }
+ TypeList* aTypeList = new TypeList(LOC ((yyloc)));
+ aTypeList->push_back(dynamic_cast<SequenceType *>((yysemantic_stack_[(1) - (1)].node)));
+ (yyval.node) = aTypeList;
+ }
break;
case 567:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5262 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5230 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
- }
+ TypeList* aTypeList = dynamic_cast<TypeList *>((yysemantic_stack_[(3) - (1)].node));
+ aTypeList->push_back(dynamic_cast<SequenceType *>((yysemantic_stack_[(3) - (3)].node)));
+ (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
+ }
break;
case 568:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5266 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5240 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ (yyval.node) = new GeneralizedAtomicType( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
}
break;
case 569:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5270 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5248 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ (yyval.node) = new SimpleType( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
}
break;
case 570:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5274 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5256 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8359,7 +13381,11 @@
case 571:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5278 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5260 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8368,7 +13394,11 @@
case 572:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5282 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5264 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8377,7 +13407,11 @@
case 573:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5286 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5268 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8386,7 +13420,11 @@
case 574:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5290 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5272 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8395,7 +13433,11 @@
case 575:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5294 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5276 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8404,273 +13446,530 @@
case 576:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5302 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5280 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new AnyKindTest( LOC((yyloc)) );
+=======
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+>>>>>>> MERGE-SOURCE
}
break;
case 577:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5310 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5284 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new DocumentTest(LOC((yyloc)));
}
+=======
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+>>>>>>> MERGE-SOURCE
break;
case 578:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5314 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5288 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new DocumentTest(LOC((yyloc)), dynamic_cast<ElementTest*>((yysemantic_stack_[(4) - (3)].node)));
}
+=======
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+>>>>>>> MERGE-SOURCE
break;
case 579:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5318 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5292 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new DocumentTest(LOC((yyloc)), dynamic_cast<SchemaElementTest*>((yysemantic_stack_[(4) - (3)].node)));
}
+=======
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+>>>>>>> MERGE-SOURCE
break;
case 580:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5326 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5300 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new NamespaceTest(LOC((yyloc)));
}
+=======
+ (yyval.node) = new AnyKindTest( LOC((yyloc)) );
+ }
+>>>>>>> MERGE-SOURCE
break;
case 581:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5333 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5308 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new TextTest(LOC((yyloc)));
}
+=======
+ (yyval.node) = new DocumentTest(LOC((yyloc)));
+ }
+>>>>>>> MERGE-SOURCE
break;
case 582:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5341 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5312 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new CommentTest(LOC((yyloc)));
}
+=======
+ (yyval.node) = new DocumentTest(LOC((yyloc)), dynamic_cast<ElementTest*>((yysemantic_stack_[(4) - (3)].node)));
+ }
+>>>>>>> MERGE-SOURCE
break;
case 583:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5349 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5316 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new PITest( LOC((yyloc)), "" );
}
+=======
+ (yyval.node) = new DocumentTest(LOC((yyloc)), dynamic_cast<SchemaElementTest*>((yysemantic_stack_[(4) - (3)].node)));
+ }
+>>>>>>> MERGE-SOURCE
break;
case 584:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5353 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5324 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
}
+=======
+ (yyval.node) = new NamespaceTest(LOC((yyloc)));
+ }
+>>>>>>> MERGE-SOURCE
break;
case 585:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5357 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5331 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
}
+=======
+ (yyval.node) = new TextTest(LOC((yyloc)));
+ }
+>>>>>>> MERGE-SOURCE
break;
case 586:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5365 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5339 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
}
+=======
+ (yyval.node) = new CommentTest(LOC((yyloc)));
+ }
+>>>>>>> MERGE-SOURCE
break;
case 587:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5369 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5347 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new AttributeTest(
LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL
);
+=======
+ (yyval.node) = new PITest( LOC((yyloc)), "" );
+>>>>>>> MERGE-SOURCE
}
break;
case 588:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5375 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5351 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new AttributeTest(
LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)), dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node))
);
+=======
+ (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
+>>>>>>> MERGE-SOURCE
}
break;
case 589:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5381 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5355 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
+=======
+ (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
+>>>>>>> MERGE-SOURCE
}
break;
case 590:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5385 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5363 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new AttributeTest(
LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node))
);
+=======
+ (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
+>>>>>>> MERGE-SOURCE
}
break;
case 591:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5395 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5367 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new SchemaAttributeTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
+=======
+ (yyval.node) = new AttributeTest(
+ LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL
+ );
+>>>>>>> MERGE-SOURCE
}
break;
case 592:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5403 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5373 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new ElementTest( LOC((yyloc)), NULL, NULL, true );
+=======
+ (yyval.node) = new AttributeTest(
+ LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)), dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node))
+ );
+>>>>>>> MERGE-SOURCE
}
break;
case 593:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5407 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5379 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new ElementTest(
LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL, true
);
+=======
+ (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
+>>>>>>> MERGE-SOURCE
}
break;
case 594:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5413 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5383 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new ElementTest(
LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)),
dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)),
false
);
+=======
+ (yyval.node) = new AttributeTest(
+ LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node))
+ );
+>>>>>>> MERGE-SOURCE
}
break;
case 595:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5422 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5393 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new ElementTest(
LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)),
dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)),
true
);
+=======
+ (yyval.node) = new SchemaAttributeTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
+>>>>>>> MERGE-SOURCE
}
break;
case 596:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5431 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5401 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new ElementTest(
LOC((yyloc)), NULL, NULL, true
);
+=======
+ (yyval.node) = new ElementTest( LOC((yyloc)), NULL, NULL, true );
+>>>>>>> MERGE-SOURCE
}
break;
case 597:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5437 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5405 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new ElementTest(
LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), false
);
}
+=======
+ (yyval.node) = new ElementTest(
+ LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL, true
+ );
+ }
+>>>>>>> MERGE-SOURCE
break;
case 598:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5443 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5411 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new ElementTest(
LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), true
);
}
+=======
+ (yyval.node) = new ElementTest(
+ LOC((yyloc)),
+ static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)),
+ dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)),
+ false
+ );
+ }
+>>>>>>> MERGE-SOURCE
break;
case 599:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5453 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5420 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new SchemaElementTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
}
+=======
+ (yyval.node) = new ElementTest(
+ LOC((yyloc)),
+ static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)),
+ dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)),
+ true
+ );
+ }
+>>>>>>> MERGE-SOURCE
break;
case 600:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5470 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5429 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
}
+=======
+ (yyval.node) = new ElementTest(
+ LOC((yyloc)), NULL, NULL, true
+ );
+ }
+>>>>>>> MERGE-SOURCE
break;
case 601:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5477 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5435 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (1)].expr)), true );
}
+=======
+ (yyval.node) = new ElementTest(
+ LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), false
+ );
+ }
+>>>>>>> MERGE-SOURCE
break;
case 602:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5492 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5441 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
}
+=======
+ (yyval.node) = new ElementTest(
+ LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), true
+ );
+ }
+>>>>>>> MERGE-SOURCE
break;
case 603:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5519 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -8690,127 +13989,216 @@
/* Line 690 of lalr1.cc */
#line 5531 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5451 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new AnyFunctionTest(LOC((yyloc)));
- }
+ (yyval.node) = new SchemaElementTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
+ }
break;
case 606:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5539 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5468 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new TypedFunctionTest(LOC ((yyloc)), dynamic_cast<SequenceType *>((yysemantic_stack_[(5) - (5)].node)));
+ (yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
}
break;
case 607:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5543 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5475 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new TypedFunctionTest(LOC ((yyloc)),
- dynamic_cast<TypeList *>((yysemantic_stack_[(6) - (3)].node)),
- dynamic_cast<SequenceType *>((yysemantic_stack_[(6) - (6)].node)));
+ (yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (1)].expr)), true );
}
break;
case 608:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5554 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5490 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = (yysemantic_stack_[(3) - (2)].node);
+ (yyval.expr) = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
}
break;
case 609:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5571 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5526 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new RevalidationDecl(
- LOC((yyloc)), StaticContextConsts::strict_validation
- );
- }
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
break;
case 610:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5577 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5530 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new RevalidationDecl(
- LOC((yyloc)), StaticContextConsts::lax_validation
- );
- }
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
break;
case 611:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5583 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
- {
- (yyval.node) = new RevalidationDecl(
- LOC((yyloc)), StaticContextConsts::skip_validation
- );
- }
- break;
-
+=======
+#line 5538 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
+ {
+ (yyval.expr) = new LiteralFunctionItem(LOC ((yyloc)), dynamic_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), (yysemantic_stack_[(3) - (3)].ival));
+ }
+ break;
+
+<<<<<<< TREE
+=======
+ case 610:
+
+/* Line 690 of lalr1.cc */
+#line 5546 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = new InlineFunction(LOC((yyloc)),
+ &*(yysemantic_stack_[(3) - (2)].fnsig)->theParams,
+ &*(yysemantic_stack_[(3) - (2)].fnsig)->theReturnType,
+ (yysemantic_stack_[(3) - (3)].expr));
+ delete (yysemantic_stack_[(3) - (2)].fnsig);
+ }
+ break;
+
+ case 611:
+
+/* Line 690 of lalr1.cc */
+#line 5558 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 612:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5593 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5562 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::INTO, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
}
+=======
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+>>>>>>> MERGE-SOURCE
break;
case 613:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5597 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5570 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new InsertExpr(
LOC((yyloc)), store::UpdateConsts::AS_FIRST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
);
}
+=======
+ (yyval.node) = new AnyFunctionTest(LOC((yyloc)));
+ }
+>>>>>>> MERGE-SOURCE
break;
case 614:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5603 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5578 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new InsertExpr(
LOC((yyloc)), store::UpdateConsts::AS_LAST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
);
+=======
+ (yyval.node) = new TypedFunctionTest(LOC ((yyloc)), dynamic_cast<SequenceType *>((yysemantic_stack_[(5) - (5)].node)));
+>>>>>>> MERGE-SOURCE
}
break;
case 615:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5609 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5582 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::AFTER, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
+=======
+ (yyval.node) = new TypedFunctionTest(LOC ((yyloc)),
+ dynamic_cast<TypeList *>((yysemantic_stack_[(6) - (3)].node)),
+ dynamic_cast<SequenceType *>((yysemantic_stack_[(6) - (6)].node)));
+>>>>>>> MERGE-SOURCE
}
break;
case 616:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5613 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5593 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new InsertExpr(
LOC ((yyloc)), store::UpdateConsts::BEFORE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
);
+=======
+ (yyval.node) = (yysemantic_stack_[(3) - (2)].node);
+>>>>>>> MERGE-SOURCE
}
break;
case 617:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5619 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
{
(yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::INTO, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
@@ -8832,9 +14220,12 @@
/* Line 690 of lalr1.cc */
#line 5629 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5610 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.expr) = new InsertExpr(
- LOC((yyloc)), store::UpdateConsts::AS_LAST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
+ (yyval.node) = new RevalidationDecl(
+ LOC((yyloc)), StaticContextConsts::strict_validation
);
}
break;
@@ -8842,29 +14233,66 @@
case 620:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5635 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
- {
- (yyval.expr) = new InsertExpr(
- LOC ((yyloc)),
- store::UpdateConsts::AFTER, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
- );
- }
- break;
-
+=======
+#line 5616 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
+ {
+ (yyval.node) = new RevalidationDecl(
+ LOC((yyloc)), StaticContextConsts::lax_validation
+ );
+ }
+ break;
+
+<<<<<<< TREE
+=======
+ case 619:
+
+/* Line 690 of lalr1.cc */
+#line 5622 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = new RevalidationDecl(
+ LOC((yyloc)), StaticContextConsts::skip_validation
+ );
+ }
+ break;
+
+ case 620:
+
+/* Line 690 of lalr1.cc */
+#line 5632 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::INTO, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 621:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5642 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5636 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.expr) = new InsertExpr(
LOC ((yyloc)), store::UpdateConsts::BEFORE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
);
+=======
+ (yyval.expr) = new InsertExpr(
+ LOC((yyloc)), store::UpdateConsts::AS_FIRST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
+ );
+>>>>>>> MERGE-SOURCE
}
break;
case 622:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5652 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
{
(yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
@@ -8884,6 +14312,112 @@
/* Line 690 of lalr1.cc */
#line 5665 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5642 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = new InsertExpr(
+ LOC((yyloc)), store::UpdateConsts::AS_LAST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
+ );
+ }
+ break;
+
+ case 623:
+
+/* Line 690 of lalr1.cc */
+#line 5648 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::AFTER, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
+ }
+ break;
+
+ case 624:
+
+/* Line 690 of lalr1.cc */
+#line 5652 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = new InsertExpr(
+ LOC ((yyloc)), store::UpdateConsts::BEFORE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
+ );
+ }
+ break;
+
+ case 625:
+
+/* Line 690 of lalr1.cc */
+#line 5658 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::INTO, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
+ }
+ break;
+
+ case 626:
+
+/* Line 690 of lalr1.cc */
+#line 5662 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = new InsertExpr(
+ LOC((yyloc)), store::UpdateConsts::AS_FIRST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
+ );
+ }
+ break;
+
+ case 627:
+
+/* Line 690 of lalr1.cc */
+#line 5668 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = new InsertExpr(
+ LOC((yyloc)), store::UpdateConsts::AS_LAST_INTO, (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (7)].expr)
+ );
+ }
+ break;
+
+ case 628:
+
+/* Line 690 of lalr1.cc */
+#line 5674 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = new InsertExpr(
+ LOC ((yyloc)),
+ store::UpdateConsts::AFTER, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
+ );
+ }
+ break;
+
+ case 629:
+
+/* Line 690 of lalr1.cc */
+#line 5681 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = new InsertExpr(
+ LOC ((yyloc)), store::UpdateConsts::BEFORE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
+ );
+ }
+ break;
+
+ case 630:
+
+/* Line 690 of lalr1.cc */
+#line 5691 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
+ }
+ break;
+
+ case 631:
+
+/* Line 690 of lalr1.cc */
+#line 5696 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
+ }
+ break;
+
+ case 632:
+
+/* Line 690 of lalr1.cc */
+#line 5704 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ReplaceExpr(
LOC((yyloc)), store::UpdateConsts::NODE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
@@ -8891,10 +14425,18 @@
}
break;
+<<<<<<< TREE
case 625:
+=======
+ case 633:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5671 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5710 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ReplaceExpr(
LOC((yyloc)), store::UpdateConsts::VALUE_OF_NODE, (yysemantic_stack_[(7) - (5)].expr), (yysemantic_stack_[(7) - (7)].expr)
@@ -8902,29 +14444,53 @@
}
break;
+<<<<<<< TREE
case 626:
+=======
+ case 634:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5681 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5720 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new RenameExpr( LOC ((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
}
break;
+<<<<<<< TREE
case 627:
+=======
+ case 635:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5703 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5742 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
CopyVarList *cvl = dynamic_cast<CopyVarList*>((yysemantic_stack_[(7) - (3)].expr));
(yyval.expr) = new TransformExpr( LOC((yyloc)), cvl, (yysemantic_stack_[(7) - (5)].expr), (yysemantic_stack_[(7) - (7)].expr) );
}
break;
+<<<<<<< TREE
case 628:
+=======
+ case 636:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5712 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5751 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
CopyVarList* lList = new CopyVarList(LOC((yyloc)));
lList->push_back (dynamic_cast<VarBinding*> ((yysemantic_stack_[(1) - (1)].expr)));
@@ -8932,10 +14498,18 @@
}
break;
+<<<<<<< TREE
case 629:
+=======
+ case 637:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5718 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5757 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
CopyVarList* lList = dynamic_cast<CopyVarList*>((yysemantic_stack_[(4) - (1)].expr));
VarBinding* lBinding = dynamic_cast<VarBinding*>((yysemantic_stack_[(4) - (4)].expr));
@@ -8944,28 +14518,52 @@
}
break;
+<<<<<<< TREE
case 630:
+=======
+ case 638:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5731 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5770 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new VarBinding(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), (yysemantic_stack_[(3) - (3)].expr));
}
break;
+<<<<<<< TREE
case 631:
+=======
+ case 639:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5745 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5784 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new TryExpr( LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
}
break;
+<<<<<<< TREE
case 632:
+=======
+ case 640:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5752 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5791 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
CatchListExpr *cle = new CatchListExpr( LOC((yyloc)) );
cle->push_back( static_cast<CatchExpr*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -8973,10 +14571,18 @@
}
break;
+<<<<<<< TREE
case 633:
+=======
+ case 641:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5758 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5797 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
if ( cle )
@@ -8985,9 +14591,33 @@
}
break;
+<<<<<<< TREE
case 634:
-
-/* Line 690 of lalr1.cc */
+=======
+ case 642:
+
+/* Line 690 of lalr1.cc */
+#line 5807 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = new CatchExpr(LOC((yyloc)), *(yysemantic_stack_[(3) - (2)].name_test_list), (yysemantic_stack_[(3) - (3)].expr));
+ delete (yysemantic_stack_[(3) - (2)].name_test_list);
+ }
+ break;
+
+ case 643:
+
+/* Line 690 of lalr1.cc */
+#line 5816 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
+ }
+ break;
+
+ case 644:
+>>>>>>> MERGE-SOURCE
+
+/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5768 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
{
(yyval.expr) = new CatchExpr(LOC((yyloc)), *(yysemantic_stack_[(3) - (2)].name_test_list), (yysemantic_stack_[(3) - (3)].expr));
@@ -9008,6 +14638,9 @@
/* Line 690 of lalr1.cc */
#line 5785 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5824 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
CatchExpr::NameTestList *ntl = new CatchExpr::NameTestList;
ntl->push_back( static_cast<NameTest*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -9015,10 +14648,18 @@
}
break;
+<<<<<<< TREE
case 637:
+=======
+ case 645:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5791 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5830 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
CatchExpr::NameTestList *ntl =
static_cast<CatchExpr::NameTestList*>((yysemantic_stack_[(3) - (1)].name_test_list));
@@ -9027,102 +14668,185 @@
}
break;
+<<<<<<< TREE
case 638:
+=======
+ case 646:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5809 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5848 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTSelection( LOC((yyloc)), (yysemantic_stack_[(2) - (1)].node), (yysemantic_stack_[(2) - (2)].pos_filter_list) );
delete (yysemantic_stack_[(2) - (2)].pos_filter_list);
}
break;
+<<<<<<< TREE
case 639:
+=======
+ case 647:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5817 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5856 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.pos_filter_list) = NULL;
}
break;
+<<<<<<< TREE
case 640:
+=======
+ case 648:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5821 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5860 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.pos_filter_list) = (yysemantic_stack_[(1) - (1)].pos_filter_list);
}
break;
+<<<<<<< TREE
case 641:
+=======
+ case 649:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5828 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5867 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.pos_filter_list) = new FTSelection::pos_filter_list_t;
(yyval.pos_filter_list)->push_back( dynamic_cast<FTPosFilter*>((yysemantic_stack_[(1) - (1)].node)) );
}
break;
+<<<<<<< TREE
case 642:
+=======
+ case 650:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5833 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5872 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yysemantic_stack_[(2) - (1)].pos_filter_list)->push_back( dynamic_cast<FTPosFilter*>((yysemantic_stack_[(2) - (2)].node)) );
(yyval.pos_filter_list) = (yysemantic_stack_[(2) - (1)].pos_filter_list);
}
break;
+<<<<<<< TREE
case 643:
-
-/* Line 690 of lalr1.cc */
+=======
+ case 651:
+
+/* Line 690 of lalr1.cc */
+#line 5880 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+ case 652:
+
+/* Line 690 of lalr1.cc */
+#line 5884 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = new FTOr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
+ }
+ break;
+
+ case 653:
+>>>>>>> MERGE-SOURCE
+
+/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5841 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5891 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
break;
- case 644:
+ case 654:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5845 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5895 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTOr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
}
break;
- case 645:
+ case 655:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5852 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5902 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
break;
- case 646:
+ case 656:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5856 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5906 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTAnd( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].node), (yysemantic_stack_[(3) - (3)].node) );
}
break;
- case 647:
+ case 657:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5863 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5913 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
break;
- case 648:
+ case 658:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5867 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = new FTMildNot( LOC((yyloc)), (yysemantic_stack_[(4) - (1)].node), (yysemantic_stack_[(4) - (4)].node) );
@@ -9142,6 +14866,9 @@
/* Line 690 of lalr1.cc */
#line 5878 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5917 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTUnaryNot(
LOC((yyloc)), dynamic_cast<FTPrimaryWithOptions*>((yysemantic_stack_[(2) - (2)].node))
@@ -9149,10 +14876,18 @@
}
break;
+<<<<<<< TREE
case 651:
+=======
+ case 659:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5887 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5926 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTPrimaryWithOptions(
LOC((yyloc)),
@@ -9163,6 +14898,7 @@
}
break;
+<<<<<<< TREE
case 652:
/* Line 690 of lalr1.cc */
@@ -9239,9 +14975,12 @@
}
break;
+=======
+>>>>>>> MERGE-SOURCE
case 660:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5949 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = NULL;
@@ -9261,18 +15000,39 @@
/* Line 690 of lalr1.cc */
#line 5961 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
- {
- (yyval.node) = new FTExtensionSelection(
- LOC((yyloc)),
- dynamic_cast<PragmaList*>((yysemantic_stack_[(4) - (1)].node)),
- dynamic_cast<FTSelection*>((yysemantic_stack_[(4) - (3)].node))
- );
- }
- break;
-
+=======
+#line 5938 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
+ {
+ (yyval.node) = NULL;
+ }
+ break;
+
+<<<<<<< TREE
+=======
+ case 661:
+
+/* Line 690 of lalr1.cc */
+#line 5942 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+ case 662:
+
+/* Line 690 of lalr1.cc */
+#line 5949 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = NULL;
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 663:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5972 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = NULL;
@@ -9292,33 +15052,40 @@
/* Line 690 of lalr1.cc */
#line 5984 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5953 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new FTWords(
- LOC((yyloc)),
- dynamic_cast<FTWordsValue*>((yysemantic_stack_[(2) - (1)].node)),
- dynamic_cast<FTAnyallOption*>((yysemantic_stack_[(2) - (2)].node))
- );
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
break;
case 666:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5996 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5961 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new FTWordsValue(
- LOC((yyloc)), static_cast<StringLiteral*>((yysemantic_stack_[(1) - (1)].expr)), NULL
- );
+ (yyval.node) = new FTWeight( LOC((yyloc)), dynamic_cast<exprnode*>((yysemantic_stack_[(4) - (3)].expr)) );
}
break;
case 667:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6002 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5969 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new FTWordsValue(
- LOC((yyloc)), NULL, dynamic_cast<exprnode*>((yysemantic_stack_[(3) - (2)].expr))
+ (yyval.node) = new FTWordsTimes(
+ LOC((yyloc)),
+ dynamic_cast<FTWords*>((yysemantic_stack_[(2) - (1)].node)),
+ dynamic_cast<FTTimes*>((yysemantic_stack_[(2) - (2)].node))
);
}
break;
@@ -9326,16 +15093,45 @@
case 668:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6011 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
- {
- (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::any );
- }
- break;
-
+=======
+#line 5977 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
+ {
+ (yyval.node) = (yysemantic_stack_[(3) - (2)].node);
+ }
+ break;
+
+<<<<<<< TREE
+=======
+ case 667:
+
+/* Line 690 of lalr1.cc */
+#line 5981 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+ case 668:
+
+/* Line 690 of lalr1.cc */
+#line 5988 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = NULL;
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 669:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6015 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5992 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -9344,70 +15140,142 @@
case 670:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6023 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6000 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
+=======
+ (yyval.node) = new FTExtensionSelection(
+ LOC((yyloc)),
+ dynamic_cast<PragmaList*>((yysemantic_stack_[(4) - (1)].node)),
+ dynamic_cast<FTSelection*>((yysemantic_stack_[(4) - (3)].node))
+ );
+>>>>>>> MERGE-SOURCE
}
break;
case 671:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6027 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6011 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
+=======
+ (yyval.node) = NULL;
+>>>>>>> MERGE-SOURCE
}
break;
case 672:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6031 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6015 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::phrase );
+=======
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+>>>>>>> MERGE-SOURCE
}
break;
case 673:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6038 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6023 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.ft_anyall_value) = ft_anyall_mode::any;
+=======
+ (yyval.node) = new FTWords(
+ LOC((yyloc)),
+ dynamic_cast<FTWordsValue*>((yysemantic_stack_[(2) - (1)].node)),
+ dynamic_cast<FTAnyallOption*>((yysemantic_stack_[(2) - (2)].node))
+ );
+>>>>>>> MERGE-SOURCE
}
break;
case 674:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6042 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6035 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.ft_anyall_value) = ft_anyall_mode::any_word;
+=======
+ (yyval.node) = new FTWordsValue(
+ LOC((yyloc)), static_cast<StringLiteral*>((yysemantic_stack_[(1) - (1)].expr)), NULL
+ );
+>>>>>>> MERGE-SOURCE
}
break;
case 675:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6049 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6041 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.ft_anyall_value) = ft_anyall_mode::all;
+=======
+ (yyval.node) = new FTWordsValue(
+ LOC((yyloc)), NULL, dynamic_cast<exprnode*>((yysemantic_stack_[(3) - (2)].expr))
+ );
+>>>>>>> MERGE-SOURCE
}
break;
case 676:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6053 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6050 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
+<<<<<<< TREE
(yyval.ft_anyall_value) = ft_anyall_mode::all_words;
+=======
+ (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::any );
+>>>>>>> MERGE-SOURCE
}
break;
case 677:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6061 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6054 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -9416,24 +15284,33 @@
case 678:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6065 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6062 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ (yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
}
break;
case 679:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6069 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6066 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ (yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
}
break;
case 680:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6073 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -9453,143 +15330,216 @@
/* Line 690 of lalr1.cc */
#line 6085 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6070 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new FTOrder( LOC((yyloc)) );
+ (yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::phrase );
}
break;
case 683:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6093 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6077 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new FTWindow(
- LOC((yyloc)),
- static_cast<AdditiveExpr*>((yysemantic_stack_[(3) - (2)].expr)),
- static_cast<FTUnit*>((yysemantic_stack_[(3) - (3)].node))
- );
+ (yyval.ft_anyall_value) = ft_anyall_mode::any;
}
break;
case 684:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6105 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6081 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new FTDistance(
- LOC((yyloc)),
- dynamic_cast<FTRange*>((yysemantic_stack_[(3) - (2)].node)),
- dynamic_cast<FTUnit*>((yysemantic_stack_[(3) - (3)].node))
- );
+ (yyval.ft_anyall_value) = ft_anyall_mode::any_word;
}
break;
case 685:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6117 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6088 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::words );
+ (yyval.ft_anyall_value) = ft_anyall_mode::all;
}
break;
case 686:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6121 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6092 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::sentences );
+ (yyval.ft_anyall_value) = ft_anyall_mode::all_words;
}
break;
case 687:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6125 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6100 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::paragraphs );
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
break;
case 688:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6133 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6104 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- FTMatchOptions *mo = new FTMatchOptions( LOC((yyloc)) );
- mo->push_back( dynamic_cast<FTMatchOption*>((yysemantic_stack_[(2) - (2)].node)) );
- (yyval.node) = mo;
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
break;
case 689:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6139 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
- {
- FTMatchOptions *mo = dynamic_cast<FTMatchOptions*>((yysemantic_stack_[(3) - (1)].node));
- mo->push_back( dynamic_cast<FTMatchOption*>((yysemantic_stack_[(3) - (3)].node)) );
- (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
- }
- break;
-
+=======
+#line 6108 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+<<<<<<< TREE
+=======
+ case 688:
+
+/* Line 690 of lalr1.cc */
+#line 6112 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+ case 689:
+
+/* Line 690 of lalr1.cc */
+#line 6116 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 690:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6149 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6124 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ (yyval.node) = new FTOrder( LOC((yyloc)) );
}
break;
case 691:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6153 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6132 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ (yyval.node) = new FTWindow(
+ LOC((yyloc)),
+ static_cast<AdditiveExpr*>((yysemantic_stack_[(3) - (2)].expr)),
+ static_cast<FTUnit*>((yysemantic_stack_[(3) - (3)].node))
+ );
}
break;
case 692:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6157 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6144 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ (yyval.node) = new FTDistance(
+ LOC((yyloc)),
+ dynamic_cast<FTRange*>((yysemantic_stack_[(3) - (2)].node)),
+ dynamic_cast<FTUnit*>((yysemantic_stack_[(3) - (3)].node))
+ );
}
break;
case 693:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6161 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6156 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::words );
}
break;
case 694:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6165 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6160 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::sentences );
}
break;
case 695:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6169 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6164 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
- (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ (yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::paragraphs );
}
break;
case 696:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6173 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -9609,42 +15559,171 @@
/* Line 690 of lalr1.cc */
#line 6185 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6172 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ FTMatchOptions *mo = new FTMatchOptions( LOC((yyloc)) );
+ mo->push_back( dynamic_cast<FTMatchOption*>((yysemantic_stack_[(2) - (2)].node)) );
+ (yyval.node) = mo;
+ }
+ break;
+
+ case 697:
+
+/* Line 690 of lalr1.cc */
+#line 6178 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ FTMatchOptions *mo = dynamic_cast<FTMatchOptions*>((yysemantic_stack_[(3) - (1)].node));
+ mo->push_back( dynamic_cast<FTMatchOption*>((yysemantic_stack_[(3) - (3)].node)) );
+ (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
+ }
+ break;
+
+ case 698:
+
+/* Line 690 of lalr1.cc */
+#line 6188 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+ case 699:
+
+/* Line 690 of lalr1.cc */
+#line 6192 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+ case 700:
+
+/* Line 690 of lalr1.cc */
+#line 6196 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+ case 701:
+
+/* Line 690 of lalr1.cc */
+#line 6200 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+ case 702:
+
+/* Line 690 of lalr1.cc */
+#line 6204 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+ case 703:
+
+/* Line 690 of lalr1.cc */
+#line 6208 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+ case 704:
+
+/* Line 690 of lalr1.cc */
+#line 6212 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+ case 705:
+
+/* Line 690 of lalr1.cc */
+#line 6216 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+ case 706:
+
+/* Line 690 of lalr1.cc */
+#line 6224 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::sensitive );
}
break;
+<<<<<<< TREE
case 699:
+=======
+ case 707:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6189 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6228 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::insensitive );
}
break;
+<<<<<<< TREE
case 700:
+=======
+ case 708:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6193 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6232 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::lower );
}
break;
+<<<<<<< TREE
case 701:
+=======
+ case 709:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6197 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6236 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::upper );
}
break;
+<<<<<<< TREE
case 702:
+=======
+ case 710:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6205 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6244 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTDiacriticsOption(
LOC((yyloc)), ft_diacritics_mode::sensitive
@@ -9652,10 +15731,18 @@
}
break;
+<<<<<<< TREE
case 703:
+=======
+ case 711:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6211 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6250 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTDiacriticsOption(
LOC((yyloc)), ft_diacritics_mode::insensitive
@@ -9663,10 +15750,18 @@
}
break;
+<<<<<<< TREE
case 704:
+=======
+ case 712:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6221 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6260 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTExtensionOption(
LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)), SYMTAB((yysemantic_stack_[(3) - (3)].sval))
@@ -9674,28 +15769,52 @@
}
break;
+<<<<<<< TREE
case 705:
+=======
+ case 713:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6231 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6270 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::stemming );
}
break;
+<<<<<<< TREE
case 706:
+=======
+ case 714:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6235 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6274 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::no_stemming );
}
break;
+<<<<<<< TREE
case 707:
+=======
+ case 715:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6243 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6282 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
FTThesaurusOption::thesaurus_id_list_t *til = NULL;
if ( (yysemantic_stack_[(2) - (2)].node) ) {
@@ -9707,10 +15826,18 @@
}
break;
+<<<<<<< TREE
case 708:
+=======
+ case 716:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6253 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6292 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
FTThesaurusOption::thesaurus_id_list_t *til = (yysemantic_stack_[(5) - (4)].thesaurus_id_list);
if ( (yysemantic_stack_[(5) - (3)].node) ) {
@@ -9723,18 +15850,49 @@
}
break;
+<<<<<<< TREE
case 709:
+=======
+ case 717:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6264 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6303 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTThesaurusOption( LOC((yyloc)), NULL, false, true );
}
break;
+<<<<<<< TREE
case 710:
-
-/* Line 690 of lalr1.cc */
+=======
+ case 718:
+
+/* Line 690 of lalr1.cc */
+#line 6310 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+ case 719:
+
+/* Line 690 of lalr1.cc */
+#line 6314 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = NULL;
+ }
+ break;
+
+ case 720:
+>>>>>>> MERGE-SOURCE
+
+/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6271 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -9754,44 +15912,79 @@
/* Line 690 of lalr1.cc */
#line 6282 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6321 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.thesaurus_id_list) = NULL;
}
break;
+<<<<<<< TREE
case 713:
+=======
+ case 721:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6286 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6325 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.thesaurus_id_list) = (yysemantic_stack_[(2) - (2)].thesaurus_id_list);
}
break;
+<<<<<<< TREE
case 714:
+=======
+ case 722:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6293 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6332 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.thesaurus_id_list) = new FTThesaurusOption::thesaurus_id_list_t;
(yyval.thesaurus_id_list)->push_back( dynamic_cast<FTThesaurusID*>((yysemantic_stack_[(1) - (1)].node)) );
}
break;
+<<<<<<< TREE
case 715:
+=======
+ case 723:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6298 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6337 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yysemantic_stack_[(3) - (1)].thesaurus_id_list)->push_back( dynamic_cast<FTThesaurusID*>((yysemantic_stack_[(3) - (3)].node)) );
(yyval.thesaurus_id_list) = (yysemantic_stack_[(3) - (1)].thesaurus_id_list);
}
break;
+<<<<<<< TREE
case 716:
+=======
+ case 724:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6307 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6346 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTThesaurusID(
LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (2)].sval)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)), dynamic_cast<FTRange*>((yysemantic_stack_[(4) - (4)].node))
@@ -9799,27 +15992,66 @@
}
break;
+<<<<<<< TREE
case 717:
+=======
+ case 725:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6316 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6355 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.sval) = 0;
}
break;
+<<<<<<< TREE
case 718:
+=======
+ case 726:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6320 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6359 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.sval) = (yysemantic_stack_[(2) - (2)].sval);
}
break;
+<<<<<<< TREE
case 719:
-
-/* Line 690 of lalr1.cc */
+=======
+ case 727:
+
+/* Line 690 of lalr1.cc */
+#line 6366 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = NULL;
+ }
+ break;
+
+ case 728:
+
+/* Line 690 of lalr1.cc */
+#line 6370 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
+ }
+ break;
+
+ case 729:
+>>>>>>> MERGE-SOURCE
+
+/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6327 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = NULL;
@@ -9839,6 +16071,9 @@
/* Line 690 of lalr1.cc */
#line 6339 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6378 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTStopWordOption(
LOC((yyloc)),
@@ -9849,10 +16084,18 @@
}
break;
+<<<<<<< TREE
case 722:
+=======
+ case 730:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6348 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6387 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTStopWordOption(
LOC((yyloc)), NULL, (yysemantic_stack_[(4) - (4)].incl_excl_list), ft_stop_words_mode::with_default
@@ -9861,10 +16104,18 @@
}
break;
+<<<<<<< TREE
case 723:
+=======
+ case 731:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6355 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6394 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTStopWordOption(
LOC((yyloc)), NULL, NULL, ft_stop_words_mode::without
@@ -9872,28 +16123,52 @@
}
break;
+<<<<<<< TREE
case 724:
+=======
+ case 732:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6365 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6404 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTStopWords( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)), NULL );
}
break;
+<<<<<<< TREE
case 725:
+=======
+ case 733:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6369 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6408 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTStopWords( LOC((yyloc)), "", (yysemantic_stack_[(3) - (2)].strlist) );
}
break;
+<<<<<<< TREE
case 726:
+=======
+ case 734:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6376 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6415 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
string_list_t *sl = new string_list_t;
sl->push_back( SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
@@ -9901,10 +16176,18 @@
}
break;
+<<<<<<< TREE
case 727:
+=======
+ case 735:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6382 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6421 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if ( (yysemantic_stack_[(3) - (1)].strlist) )
(yysemantic_stack_[(3) - (1)].strlist)->push_back( SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
@@ -9912,38 +16195,70 @@
}
break;
+<<<<<<< TREE
case 728:
+=======
+ case 736:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6391 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6430 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.incl_excl_list) = NULL;
}
break;
+<<<<<<< TREE
case 729:
+=======
+ case 737:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6395 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6434 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.incl_excl_list) = (yysemantic_stack_[(1) - (1)].incl_excl_list);
}
break;
+<<<<<<< TREE
case 730:
+=======
+ case 738:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6402 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6441 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.incl_excl_list) = new FTStopWordOption::incl_excl_list_t;
(yyval.incl_excl_list)->push_back( dynamic_cast<FTStopWordsInclExcl*>((yysemantic_stack_[(1) - (1)].node)) );
}
break;
+<<<<<<< TREE
case 731:
+=======
+ case 739:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6407 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6446 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
FTStopWordOption::incl_excl_list_t *iel = (yysemantic_stack_[(2) - (1)].incl_excl_list);
if ( !iel )
@@ -9953,10 +16268,18 @@
}
break;
+<<<<<<< TREE
case 732:
+=======
+ case 740:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6419 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6458 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTStopWordsInclExcl(
LOC((yyloc)),
@@ -9966,10 +16289,18 @@
}
break;
+<<<<<<< TREE
case 733:
+=======
+ case 741:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6427 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6466 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTStopWordsInclExcl(
LOC((yyloc)),
@@ -9979,109 +16310,205 @@
}
break;
+<<<<<<< TREE
case 734:
+=======
+ case 742:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6439 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6478 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTLanguageOption( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
}
break;
+<<<<<<< TREE
case 735:
+=======
+ case 743:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6447 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6486 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::with );
}
break;
+<<<<<<< TREE
case 736:
+=======
+ case 744:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6451 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6490 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::without );
}
break;
+<<<<<<< TREE
case 737:
+=======
+ case 745:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6459 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6498 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_start );
}
break;
+<<<<<<< TREE
case 738:
+=======
+ case 746:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6463 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6502 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_end );
}
break;
+<<<<<<< TREE
case 739:
+=======
+ case 747:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6467 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6506 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::entire );
}
break;
+<<<<<<< TREE
case 740:
+=======
+ case 748:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6475 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6514 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTTimes( LOC((yyloc)), dynamic_cast<FTRange*>((yysemantic_stack_[(3) - (2)].node)) );
}
break;
+<<<<<<< TREE
case 741:
+=======
+ case 749:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6483 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6522 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::exactly, (yysemantic_stack_[(2) - (2)].expr) );
}
break;
+<<<<<<< TREE
case 742:
+=======
+ case 750:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6487 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6526 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::at_least, (yysemantic_stack_[(3) - (3)].expr) );
}
break;
+<<<<<<< TREE
case 743:
+=======
+ case 751:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6491 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6530 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::at_most, (yysemantic_stack_[(3) - (3)].expr) );
}
break;
+<<<<<<< TREE
case 744:
+=======
+ case 752:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6495 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6534 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::from_to, (yysemantic_stack_[(4) - (2)].expr), (yysemantic_stack_[(4) - (4)].expr) );
}
break;
+<<<<<<< TREE
case 745:
+=======
+ case 753:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6503 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6542 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTScope(
LOC((yyloc)),
@@ -10091,10 +16518,18 @@
}
break;
+<<<<<<< TREE
case 746:
+=======
+ case 754:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6511 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6550 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTScope(
LOC((yyloc)),
@@ -10104,105 +16539,204 @@
}
break;
+<<<<<<< TREE
case 747:
+=======
+ case 755:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6523 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6562 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::sentence );
}
break;
+<<<<<<< TREE
case 748:
+=======
+ case 756:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6527 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6566 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::paragraph );
}
break;
+<<<<<<< TREE
case 749:
+=======
+ case 757:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6535 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6574 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTIgnoreOption( LOC((yyloc)), static_cast<UnionExpr*>((yysemantic_stack_[(3) - (3)].expr)) );
}
break;
+<<<<<<< TREE
case 750:
+=======
+ case 758:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6549 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6588 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), NULL );
}
break;
+<<<<<<< TREE
case 751:
+=======
+ case 759:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6553 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6592 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
}
break;
+<<<<<<< TREE
case 752:
+=======
+ case 760:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6560 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6599 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
// TODO: fill in with the correct constructor
(yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), NULL, false);
}
break;
+<<<<<<< TREE
case 753:
+=======
+ case 761:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6565 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6604 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
// TODO: fill in with the correct constructor
(yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), false);
}
break;
+<<<<<<< TREE
case 754:
+=======
+ case 762:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6573 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6612 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
// TODO: fill in with the correct constructor
(yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), NULL, true);
}
break;
+<<<<<<< TREE
case 755:
+=======
+ case 763:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6578 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6617 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
// TODO: fill in with the correct constructor
(yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), true);
}
break;
+<<<<<<< TREE
case 756:
+=======
+ case 764:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6587 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6626 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new JSONDirectObjectConstructor(LOC((yyloc)),
dynamic_cast<JSONPairList*>((yysemantic_stack_[(3) - (2)].node)));
}
break;
+<<<<<<< TREE
case 757:
/* Line 690 of lalr1.cc */
#line 6595 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+ case 765:
+
+/* Line 690 of lalr1.cc */
+#line 6634 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ StringLiteral* sl = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)) );
+ JSONPairList* jpl = new JSONPairList(LOC((yyloc)));
+ jpl->push_back(new JSONPairConstructor(LOC((yyloc)), sl, (yysemantic_stack_[(3) - (3)].expr)));
+ (yyval.node) = jpl;
+ }
+ break;
+
+ case 766:
+
+/* Line 690 of lalr1.cc */
+#line 6641 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
JSONPairList* jpl = new JSONPairList(LOC((yyloc)));
jpl->push_back(new JSONPairConstructor(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr)));
@@ -10210,10 +16744,18 @@
}
break;
+<<<<<<< TREE
case 758:
+=======
+ case 767:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6601 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6647 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (1)].node));
assert(jpl);
@@ -10222,10 +16764,30 @@
}
break;
+<<<<<<< TREE
case 759:
/* Line 690 of lalr1.cc */
#line 6611 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+ case 768:
+
+/* Line 690 of lalr1.cc */
+#line 6654 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (1)].node));
+ assert(jpl);
+ StringLiteral* sl = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(5) - (3)].sval)) );
+ jpl->push_back(new JSONPairConstructor(LOC((yyloc)), sl, (yysemantic_stack_[(5) - (5)].expr)));
+ (yyval.node) = jpl;
+ }
+ break;
+
+ case 769:
+
+/* Line 690 of lalr1.cc */
+#line 6665 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new JSONObjectInsertExpr(LOC((yyloc)),
(yysemantic_stack_[(5) - (3)].expr),
@@ -10233,10 +16795,18 @@
}
break;
+<<<<<<< TREE
case 760:
+=======
+ case 770:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6617 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6671 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (3)].node));
(yyval.expr) = new JSONObjectInsertExpr(
@@ -10248,28 +16818,52 @@
}
break;
+<<<<<<< TREE
case 761:
+=======
+ case 771:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6627 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6681 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new JSONArrayInsertExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), (yysemantic_stack_[(8) - (5)].expr), (yysemantic_stack_[(8) - (8)].expr));
}
break;
+<<<<<<< TREE
case 762:
+=======
+ case 772:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6634 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6688 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new JSONArrayAppendExpr(LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr));
}
break;
+<<<<<<< TREE
case 763:
+=======
+ case 773:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6641 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6695 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(3) - (3)].expr));
@@ -10293,10 +16887,18 @@
}
break;
+<<<<<<< TREE
case 764:
+=======
+ case 774:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6666 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6720 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(5) - (3)].expr));
@@ -10323,10 +16925,18 @@
}
break;
+<<<<<<< TREE
case 765:
+=======
+ case 775:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6694 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6748 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(7) - (5)].expr));
@@ -10353,6 +16963,7 @@
}
break;
+<<<<<<< TREE
case 766:
/* Line 690 of lalr1.cc */
@@ -10384,33 +16995,90 @@
/* Line 690 of lalr1.cc */
#line 6737 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+ case 776:
+
+/* Line 690 of lalr1.cc */
+#line 6776 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+ case 777:
+
+/* Line 690 of lalr1.cc */
+#line 6780 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+ case 778:
+
+/* Line 690 of lalr1.cc */
+#line 6784 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+ case 779:
+
+/* Line 690 of lalr1.cc */
+#line 6792 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonItem);
}
break;
+<<<<<<< TREE
case 770:
+=======
+ case 780:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6744 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6799 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonObject);
}
break;
+<<<<<<< TREE
case 771:
+=======
+ case 781:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6751 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6806 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonArray);
}
break;
+<<<<<<< TREE
case 774:
+=======
+ case 784:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6768 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6823 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
auto_ptr<QName> lQName( static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
zstring const &tmp = lQName->get_qname();
@@ -10422,1525 +17090,3262 @@
}
break;
+<<<<<<< TREE
case 776:
+=======
+ case 786:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6781 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6836 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("attribute"))); }
break;
+<<<<<<< TREE
case 777:
+=======
+ case 787:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6782 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6837 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("comment"))); }
break;
+<<<<<<< TREE
case 778:
+=======
+ case 788:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6783 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6838 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("document-node"))); }
break;
+<<<<<<< TREE
case 779:
+=======
+ case 789:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6784 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6839 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("namespace-node"))); }
break;
+<<<<<<< TREE
case 780:
+=======
+ case 790:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6785 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6840 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("element"))); }
break;
+<<<<<<< TREE
case 781:
+=======
+ case 791:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6786 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6841 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("item"))); }
break;
+<<<<<<< TREE
case 782:
+=======
+ case 792:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6787 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6842 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("if"))); }
break;
+<<<<<<< TREE
case 783:
+=======
+ case 793:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6788 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6843 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("node"))); }
break;
+<<<<<<< TREE
case 784:
+=======
+ case 794:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6789 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6844 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("processing-instruction"))); }
break;
+<<<<<<< TREE
case 785:
+=======
+ case 795:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6790 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6845 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema-attribute"))); }
break;
+<<<<<<< TREE
case 786:
+=======
+ case 796:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6791 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6846 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema-element"))); }
break;
+<<<<<<< TREE
case 787:
+=======
+ case 797:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6792 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6847 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("text"))); }
break;
+<<<<<<< TREE
case 788:
+=======
+ case 798:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6793 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6848 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("typeswitch"))); }
break;
+<<<<<<< TREE
case 789:
+=======
+ case 799:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6794 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6849 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("switch"))); }
break;
+<<<<<<< TREE
case 790:
+=======
+ case 800:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6795 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6850 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("empty-sequence"))); }
break;
+<<<<<<< TREE
case 791:
+=======
+ case 801:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6796 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6851 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("while"))); }
break;
+<<<<<<< TREE
case 793:
+=======
+ case 803:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6801 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6856 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))); }
break;
+<<<<<<< TREE
case 794:
+=======
+ case 804:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6802 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6857 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("xquery"))); }
break;
+<<<<<<< TREE
case 795:
+=======
+ case 805:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6803 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6858 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("empty"))); }
break;
+<<<<<<< TREE
case 796:
+=======
+ case 806:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6804 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6859 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("boundary-space"))); }
break;
+<<<<<<< TREE
case 797:
+=======
+ case 807:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6805 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6860 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ft-option"))); }
break;
+<<<<<<< TREE
case 798:
+=======
+ case 808:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6806 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6861 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("base-uri"))); }
break;
+<<<<<<< TREE
case 799:
+=======
+ case 809:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6807 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6862 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lax"))); }
break;
+<<<<<<< TREE
case 800:
+=======
+ case 810:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6808 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6863 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("strict"))); }
break;
+<<<<<<< TREE
case 801:
+=======
+ case 811:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6809 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6864 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("idiv"))); }
break;
+<<<<<<< TREE
case 802:
+=======
+ case 812:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6810 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6865 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("document"))); }
break;
+<<<<<<< TREE
case 803:
+=======
+ case 813:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6811 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6866 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ftnot"))); }
break;
+<<<<<<< TREE
case 804:
+=======
+ case 814:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6812 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6867 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("not"))); }
break;
+<<<<<<< TREE
case 805:
+=======
+ case 815:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6813 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6868 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sensitive"))); }
break;
+<<<<<<< TREE
case 806:
+=======
+ case 816:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6814 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6869 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("insensitive"))); }
break;
+<<<<<<< TREE
case 807:
+=======
+ case 817:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6815 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6870 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("diacritics"))); }
break;
+<<<<<<< TREE
case 808:
+=======
+ case 818:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6816 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6871 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("without"))); }
break;
+<<<<<<< TREE
case 809:
+=======
+ case 819:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6817 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6872 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stemming"))); }
break;
+<<<<<<< TREE
case 810:
+=======
+ case 820:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6818 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6873 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("thesaurus"))); }
break;
+<<<<<<< TREE
case 811:
+=======
+ case 821:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6819 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6874 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stop"))); }
break;
+<<<<<<< TREE
case 812:
+=======
+ case 822:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6820 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6875 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("wildcards"))); }
break;
+<<<<<<< TREE
case 813:
+=======
+ case 823:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6821 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6876 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("entire"))); }
break;
+<<<<<<< TREE
case 814:
+=======
+ case 824:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6822 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6877 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("content"))); }
break;
+<<<<<<< TREE
case 815:
+=======
+ case 825:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6823 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6878 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("word"))); }
break;
+<<<<<<< TREE
case 816:
+=======
+ case 826:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6824 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6879 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("start"))); }
break;
+<<<<<<< TREE
case 817:
+=======
+ case 827:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6825 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6880 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("end"))); }
break;
+<<<<<<< TREE
case 818:
+=======
+ case 828:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6826 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6881 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("most"))); }
break;
+<<<<<<< TREE
case 819:
+=======
+ case 829:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6827 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6882 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("skip"))); }
break;
+<<<<<<< TREE
case 820:
+=======
+ case 830:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6828 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6883 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("copy"))); }
break;
+<<<<<<< TREE
case 821:
+=======
+ case 831:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6829 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6884 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("general"))); }
break;
+<<<<<<< TREE
case 822:
+=======
+ case 832:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6830 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6885 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("value"))); }
break;
+<<<<<<< TREE
case 823:
+=======
+ case 833:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6831 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6886 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("eq"))); }
break;
+<<<<<<< TREE
case 824:
+=======
+ case 834:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6832 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6887 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ne"))); }
break;
+<<<<<<< TREE
case 825:
+=======
+ case 835:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6833 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6888 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lt"))); }
break;
+<<<<<<< TREE
case 826:
+=======
+ case 836:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6834 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6889 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("le"))); }
break;
+<<<<<<< TREE
case 827:
+=======
+ case 837:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6835 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6890 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("gt"))); }
break;
+<<<<<<< TREE
case 828:
+=======
+ case 838:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6836 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6891 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ge"))); }
break;
+<<<<<<< TREE
case 829:
+=======
+ case 839:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6837 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6892 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("at"))); }
break;
+<<<<<<< TREE
case 830:
+=======
+ case 840:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6838 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6893 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("context"))); }
break;
+<<<<<<< TREE
case 831:
+=======
+ case 841:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6839 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6894 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("variable"))); }
break;
+<<<<<<< TREE
case 832:
+=======
+ case 842:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6840 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6895 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("return"))); }
break;
+<<<<<<< TREE
case 833:
+=======
+ case 843:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6841 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6896 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("for"))); }
break;
+<<<<<<< TREE
case 834:
+=======
+ case 844:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6842 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6897 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("allowing"))); }
break;
+<<<<<<< TREE
case 835:
+=======
+ case 845:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6843 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6898 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sliding"))); }
break;
+<<<<<<< TREE
case 836:
+=======
+ case 846:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6844 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6899 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("tumbling"))); }
break;
+<<<<<<< TREE
case 837:
+=======
+ case 847:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6845 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6900 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("previous"))); }
break;
+<<<<<<< TREE
case 838:
+=======
+ case 848:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6846 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6901 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("next"))); }
break;
+<<<<<<< TREE
case 839:
+=======
+ case 849:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6847 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6902 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("only"))); }
break;
+<<<<<<< TREE
case 840:
+=======
+ case 850:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6848 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6903 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("when"))); }
break;
+<<<<<<< TREE
case 841:
+=======
+ case 851:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6849 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6904 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("count"))); }
break;
+<<<<<<< TREE
case 842:
+=======
+ case 852:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6850 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6905 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("in"))); }
break;
+<<<<<<< TREE
case 843:
+=======
+ case 853:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6851 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6906 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("let"))); }
break;
+<<<<<<< TREE
case 844:
+=======
+ case 854:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6852 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6907 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("where"))); }
break;
+<<<<<<< TREE
case 845:
+=======
+ case 855:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6853 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6908 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("by"))); }
break;
+<<<<<<< TREE
case 846:
+=======
+ case 856:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6854 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6909 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("group"))); }
break;
+<<<<<<< TREE
case 847:
+=======
+ case 857:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6855 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6910 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("order"))); }
break;
+<<<<<<< TREE
case 848:
+=======
+ case 858:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6856 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6911 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stable"))); }
break;
+<<<<<<< TREE
case 849:
+=======
+ case 859:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6857 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6912 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ascending"))); }
break;
+<<<<<<< TREE
case 850:
+=======
+ case 860:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6858 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6913 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descending"))); }
break;
+<<<<<<< TREE
case 851:
+=======
+ case 861:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6859 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6914 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("greatest"))); }
break;
+<<<<<<< TREE
case 852:
+=======
+ case 862:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6860 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6915 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("least"))); }
break;
+<<<<<<< TREE
case 853:
+=======
+ case 863:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6861 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6916 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("collation"))); }
break;
+<<<<<<< TREE
case 854:
+=======
+ case 864:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6862 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6917 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("some"))); }
break;
+<<<<<<< TREE
case 855:
+=======
+ case 865:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6863 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6918 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("every"))); }
break;
+<<<<<<< TREE
case 856:
+=======
+ case 866:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6864 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6919 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("satisfies"))); }
break;
+<<<<<<< TREE
case 857:
+=======
+ case 867:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6865 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6920 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("case"))); }
break;
+<<<<<<< TREE
case 858:
+=======
+ case 868:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6866 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6921 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("as"))); }
break;
+<<<<<<< TREE
case 859:
+=======
+ case 869:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6867 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6922 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("then"))); }
break;
+<<<<<<< TREE
case 860:
+=======
+ case 870:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6868 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6923 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("else"))); }
break;
+<<<<<<< TREE
case 861:
+=======
+ case 871:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6869 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6924 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("or"))); }
break;
+<<<<<<< TREE
case 862:
+=======
+ case 872:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6870 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6925 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("and"))); }
break;
+<<<<<<< TREE
case 863:
+=======
+ case 873:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6871 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6926 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("instance"))); }
break;
+<<<<<<< TREE
case 864:
+=======
+ case 874:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6872 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6927 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("of"))); }
break;
+<<<<<<< TREE
case 865:
+=======
+ case 875:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6873 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6928 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("castable"))); }
break;
+<<<<<<< TREE
case 866:
+=======
+ case 876:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6874 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6929 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("to"))); }
break;
+<<<<<<< TREE
case 867:
+=======
+ case 877:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6875 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6930 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("div"))); }
break;
+<<<<<<< TREE
case 868:
+=======
+ case 878:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6876 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6931 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("mod"))); }
break;
+<<<<<<< TREE
case 869:
+=======
+ case 879:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6877 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6932 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("union"))); }
break;
+<<<<<<< TREE
case 870:
+=======
+ case 880:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6878 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6933 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("intersect"))); }
break;
+<<<<<<< TREE
case 871:
+=======
+ case 881:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6879 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6934 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("except"))); }
break;
+<<<<<<< TREE
case 872:
+=======
+ case 882:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6880 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6935 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("validate"))); }
break;
+<<<<<<< TREE
case 873:
+=======
+ case 883:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6881 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6936 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("type"))); }
break;
+<<<<<<< TREE
case 874:
+=======
+ case 884:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6882 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6937 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("cast"))); }
break;
+<<<<<<< TREE
case 875:
+=======
+ case 885:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6883 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6938 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("treat"))); }
break;
+<<<<<<< TREE
case 876:
+=======
+ case 886:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6884 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6939 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("is"))); }
break;
+<<<<<<< TREE
case 877:
+=======
+ case 887:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6885 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6940 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preserve"))); }
break;
+<<<<<<< TREE
case 878:
+=======
+ case 888:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6886 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6941 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("strip"))); }
break;
+<<<<<<< TREE
case 879:
+=======
+ case 889:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6887 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6942 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("namespace"))); }
break;
+<<<<<<< TREE
case 880:
+=======
+ case 890:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6888 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6943 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("external"))); }
break;
+<<<<<<< TREE
case 881:
+=======
+ case 891:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6889 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6944 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("encoding"))); }
break;
+<<<<<<< TREE
case 882:
+=======
+ case 892:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6890 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6945 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("no-preserve"))); }
break;
+<<<<<<< TREE
case 883:
+=======
+ case 893:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6891 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6946 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("inherit"))); }
break;
+<<<<<<< TREE
case 884:
+=======
+ case 894:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6892 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6947 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("no-inherit"))); }
break;
+<<<<<<< TREE
case 885:
+=======
+ case 895:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6893 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6948 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("declare"))); }
break;
+<<<<<<< TREE
case 886:
+=======
+ case 896:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6894 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6949 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("construction"))); }
break;
+<<<<<<< TREE
case 887:
+=======
+ case 897:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6895 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6950 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ordering"))); }
break;
+<<<<<<< TREE
case 888:
+=======
+ case 898:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6896 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6951 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("default"))); }
break;
+<<<<<<< TREE
case 889:
+=======
+ case 899:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6897 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6952 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("copy-namespaces"))); }
break;
+<<<<<<< TREE
case 890:
+=======
+ case 900:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6898 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6953 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("option"))); }
break;
+<<<<<<< TREE
case 891:
+=======
+ case 901:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6899 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6954 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("version"))); }
break;
+<<<<<<< TREE
case 892:
+=======
+ case 902:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6900 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6955 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("import"))); }
break;
+<<<<<<< TREE
case 893:
+=======
+ case 903:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6901 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6956 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema"))); }
break;
+<<<<<<< TREE
case 894:
+=======
+ case 904:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6902 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6957 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("module"))); }
break;
+<<<<<<< TREE
case 895:
+=======
+ case 905:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6903 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6958 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("function"))); }
break;
+<<<<<<< TREE
case 896:
+=======
+ case 906:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6904 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6959 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("score"))); }
break;
+<<<<<<< TREE
case 897:
+=======
+ case 907:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6905 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6960 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("contains"))); }
break;
+<<<<<<< TREE
case 898:
+=======
+ case 908:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6906 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6961 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("weight"))); }
break;
+<<<<<<< TREE
case 899:
+=======
+ case 909:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6907 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6962 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("window"))); }
break;
+<<<<<<< TREE
case 900:
+=======
+ case 910:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6908 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6963 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("distance"))); }
break;
+<<<<<<< TREE
case 901:
+=======
+ case 911:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6909 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6964 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("occurs"))); }
break;
+<<<<<<< TREE
case 902:
+=======
+ case 912:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6910 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6965 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("times"))); }
break;
+<<<<<<< TREE
case 903:
+=======
+ case 913:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6911 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6966 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("same"))); }
break;
+<<<<<<< TREE
case 904:
+=======
+ case 914:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6912 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6967 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("different"))); }
break;
+<<<<<<< TREE
case 905:
+=======
+ case 915:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6913 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6968 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lowercase"))); }
break;
+<<<<<<< TREE
case 906:
+=======
+ case 916:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6914 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6969 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("uppercase"))); }
break;
+<<<<<<< TREE
case 907:
+=======
+ case 917:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6915 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6970 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("relationship"))); }
break;
+<<<<<<< TREE
case 908:
+=======
+ case 918:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6916 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6971 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("levels"))); }
break;
+<<<<<<< TREE
case 909:
+=======
+ case 919:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6917 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6972 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("language"))); }
break;
+<<<<<<< TREE
case 910:
+=======
+ case 920:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6918 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6973 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("any"))); }
break;
+<<<<<<< TREE
case 911:
+=======
+ case 921:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6919 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6974 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("all"))); }
break;
+<<<<<<< TREE
case 912:
+=======
+ case 922:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6920 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6975 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("exactly"))); }
break;
+<<<<<<< TREE
case 913:
+=======
+ case 923:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6921 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6976 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("from"))); }
break;
+<<<<<<< TREE
case 914:
+=======
+ case 924:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6922 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6977 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("words"))); }
break;
+<<<<<<< TREE
case 915:
+=======
+ case 925:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6923 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6978 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sentences"))); }
break;
+<<<<<<< TREE
case 916:
+=======
+ case 926:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6924 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6979 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sentence"))); }
break;
+<<<<<<< TREE
case 917:
+=======
+ case 927:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6925 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6980 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("phrase"))); }
break;
+<<<<<<< TREE
case 918:
+=======
+ case 928:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6926 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6981 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("paragraph"))); }
break;
+<<<<<<< TREE
case 919:
+=======
+ case 929:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6927 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6982 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("paragraphs"))); }
break;
+<<<<<<< TREE
case 920:
+=======
+ case 930:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6928 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6983 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("replace"))); }
break;
+<<<<<<< TREE
case 921:
+=======
+ case 931:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6929 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6984 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("modify"))); }
break;
+<<<<<<< TREE
case 922:
+=======
+ case 932:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6930 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6985 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("first"))); }
break;
+<<<<<<< TREE
case 923:
+=======
+ case 933:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6931 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6986 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("insert"))); }
break;
+<<<<<<< TREE
case 924:
+=======
+ case 934:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6932 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6987 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("before"))); }
break;
+<<<<<<< TREE
case 925:
+=======
+ case 935:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6933 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6988 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("after"))); }
break;
+<<<<<<< TREE
case 926:
+=======
+ case 936:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6934 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6989 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("revalidation"))); }
break;
+<<<<<<< TREE
case 927:
+=======
+ case 937:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6935 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6990 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("with"))); }
break;
+<<<<<<< TREE
case 928:
+=======
+ case 938:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6936 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6991 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("nodes"))); }
break;
+<<<<<<< TREE
case 929:
+=======
+ case 939:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6937 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6992 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("rename"))); }
break;
+<<<<<<< TREE
case 930:
+=======
+ case 940:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6938 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6993 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("last"))); }
break;
+<<<<<<< TREE
case 931:
+=======
+ case 941:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6939 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6994 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("delete"))); }
break;
+<<<<<<< TREE
case 932:
+=======
+ case 942:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6940 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6995 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("into"))); }
break;
+<<<<<<< TREE
case 933:
+=======
+ case 943:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6941 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6996 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("simple"))); }
break;
+<<<<<<< TREE
case 934:
+=======
+ case 944:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6942 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6997 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sequential"))); }
break;
+<<<<<<< TREE
case 935:
+=======
+ case 945:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6943 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6998 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("updating"))); }
break;
+<<<<<<< TREE
case 936:
+=======
+ case 946:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6944 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6999 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ordered"))); }
break;
+<<<<<<< TREE
case 937:
+=======
+ case 947:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6945 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7000 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("unordered"))); }
break;
+<<<<<<< TREE
case 938:
+=======
+ case 948:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6946 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7001 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("returning"))); }
break;
+<<<<<<< TREE
case 939:
+=======
+ case 949:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6947 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7002 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("exit"))); }
break;
+<<<<<<< TREE
case 940:
+=======
+ case 950:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6948 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7003 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("loop"))); }
break;
+<<<<<<< TREE
case 941:
+=======
+ case 951:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6949 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7004 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("break"))); }
break;
+<<<<<<< TREE
case 942:
+=======
+ case 952:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6950 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7005 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("continue"))); }
break;
+<<<<<<< TREE
case 943:
+=======
+ case 953:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6951 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7006 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("try"))); }
break;
+<<<<<<< TREE
case 944:
+=======
+ case 954:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6952 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7007 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("catch"))); }
break;
+<<<<<<< TREE
case 945:
+=======
+ case 955:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6953 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7008 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("using"))); }
break;
+<<<<<<< TREE
case 946:
+=======
+ case 956:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6954 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7009 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("set"))); }
break;
+<<<<<<< TREE
case 947:
+=======
+ case 957:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6955 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7010 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("index"))); }
break;
+<<<<<<< TREE
case 948:
+=======
+ case 958:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6956 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7011 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("unique"))); }
break;
+<<<<<<< TREE
case 949:
+=======
+ case 959:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6957 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7012 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("non"))); }
break;
+<<<<<<< TREE
case 950:
+=======
+ case 960:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6958 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7013 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("on"))); }
break;
+<<<<<<< TREE
case 951:
+=======
+ case 961:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6959 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7014 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("range"))); }
break;
+<<<<<<< TREE
case 952:
+=======
+ case 962:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6960 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7015 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("equality"))); }
break;
+<<<<<<< TREE
case 953:
+=======
+ case 963:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6961 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7016 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("manually"))); }
break;
+<<<<<<< TREE
case 954:
+=======
+ case 964:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6962 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7017 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("automatically"))); }
break;
+<<<<<<< TREE
case 955:
+=======
+ case 965:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6963 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7018 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("maintained"))); }
break;
+<<<<<<< TREE
case 956:
+=======
+ case 966:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6964 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7019 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("decimal-format"))); }
break;
+<<<<<<< TREE
case 957:
+=======
+ case 967:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6965 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7020 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("decimal-separator"))); }
break;
+<<<<<<< TREE
case 958:
+=======
+ case 968:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6966 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7021 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("grouping-separator"))); }
break;
+<<<<<<< TREE
case 959:
+=======
+ case 969:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6967 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7022 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("infinity"))); }
break;
+<<<<<<< TREE
case 960:
+=======
+ case 970:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6968 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7023 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("minus-sign"))); }
break;
+<<<<<<< TREE
case 961:
+=======
+ case 971:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6969 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7024 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("NaN"))); }
break;
+<<<<<<< TREE
case 962:
+=======
+ case 972:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6970 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7025 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("percent"))); }
break;
+<<<<<<< TREE
case 963:
+=======
+ case 973:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6971 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7026 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("per-mille"))); }
break;
+<<<<<<< TREE
case 964:
+=======
+ case 974:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6972 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7027 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("zero-digit"))); }
break;
+<<<<<<< TREE
case 965:
+=======
+ case 975:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6973 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7028 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("digit"))); }
break;
+<<<<<<< TREE
case 966:
+=======
+ case 976:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6974 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7029 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("pattern-separator"))); }
break;
+<<<<<<< TREE
case 967:
+=======
+ case 977:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6975 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7030 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("collection"))); }
break;
+<<<<<<< TREE
case 968:
+=======
+ case 978:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6976 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7031 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("const"))); }
break;
+<<<<<<< TREE
case 969:
+=======
+ case 979:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6977 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7032 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("append-only"))); }
break;
+<<<<<<< TREE
case 970:
+=======
+ case 980:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6978 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7033 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("queue"))); }
break;
+<<<<<<< TREE
case 971:
+=======
+ case 981:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6979 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7034 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("mutable"))); }
break;
+<<<<<<< TREE
case 972:
+=======
+ case 982:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6980 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7035 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("read-only"))); }
break;
+<<<<<<< TREE
case 973:
+=======
+ case 983:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6981 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7036 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("integrity"))); }
break;
+<<<<<<< TREE
case 974:
+=======
+ case 984:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6982 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7037 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("constraint"))); }
break;
+<<<<<<< TREE
case 975:
+=======
+ case 985:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6983 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7038 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("check"))); }
break;
+<<<<<<< TREE
case 976:
+=======
+ case 986:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6984 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7039 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("key"))); }
break;
+<<<<<<< TREE
case 977:
+=======
+ case 987:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6985 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7040 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("foreach"))); }
break;
+<<<<<<< TREE
case 978:
+=======
+ case 988:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6986 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7041 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("foreign"))); }
break;
+<<<<<<< TREE
case 979:
+=======
+ case 989:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6987 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7042 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("keys"))); }
break;
+<<<<<<< TREE
case 980:
+=======
+ case 990:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6988 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7043 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ancestor"))); }
break;
+<<<<<<< TREE
case 981:
+=======
+ case 991:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6989 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7044 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("child"))); }
break;
+<<<<<<< TREE
case 982:
+=======
+ case 992:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6990 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7045 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descendant"))); }
break;
+<<<<<<< TREE
case 983:
+=======
+ case 993:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6991 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7046 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("parent"))); }
break;
+<<<<<<< TREE
case 984:
+=======
+ case 994:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6992 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7047 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preceding"))); }
break;
+<<<<<<< TREE
case 985:
+=======
+ case 995:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6993 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7048 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("self"))); }
break;
+<<<<<<< TREE
case 986:
+=======
+ case 996:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6994 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7049 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("following"))); }
break;
+<<<<<<< TREE
case 987:
+=======
+ case 997:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6995 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7050 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ancestor-or-self"))); }
break;
+<<<<<<< TREE
case 988:
+=======
+ case 998:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6996 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7051 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descendant-or-self"))); }
break;
+<<<<<<< TREE
case 989:
+=======
+ case 999:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6997 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7052 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("following-sibling"))); }
break;
+<<<<<<< TREE
case 990:
+=======
+ case 1000:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6998 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7053 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preceding-sibling"))); }
break;
+<<<<<<< TREE
case 991:
+=======
+ case 1001:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6999 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7054 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("json"))); }
break;
+<<<<<<< TREE
case 992:
+=======
+ case 1002:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7000 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7055 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("append"))); }
break;
+<<<<<<< TREE
case 993:
+=======
+ case 1003:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7001 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7056 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("position"))); }
break;
+<<<<<<< TREE
case 994:
/* Line 690 of lalr1.cc */
@@ -11952,34 +20357,68 @@
/* Line 690 of lalr1.cc */
#line 7003 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+ case 1004:
+
+/* Line 690 of lalr1.cc */
+#line 7058 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("array"))); }
break;
+<<<<<<< TREE
case 996:
+=======
+ case 1005:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7004 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7059 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("object"))); }
break;
+<<<<<<< TREE
case 997:
+=======
+ case 1006:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7005 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7060 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("structured-item"))); }
break;
+<<<<<<< TREE
case 998:
+=======
+ case 1007:
+>>>>>>> MERGE-SOURCE
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7010 "/home/markos/zorba/repo/hof-merge/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7065 "/home/colea/xquery_bzr/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), true); }
break;
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 11983 "/home/markos/zorba/repo/hof-merge/build-opt/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 12046 "/home/colea/xquery_bzr/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
default:
break;
}
@@ -12253,10 +20692,15 @@
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
+<<<<<<< TREE
const short int jsoniq_parser::yypact_ninf_ = -1462;
+=======
+ const short int jsoniq_parser::yypact_ninf_ = -1458;
+>>>>>>> MERGE-SOURCE
const short int
jsoniq_parser::yypact_[] =
{
+<<<<<<< TREE
5297, 6811, 6811, 6811, 6811, -1462, -1462, 125, 431, -1462,
771, 80, -1462, -1462, -1462, 438, -1462, -1462, -1462, 465,
-1462, 484, 706, 537, 633, 724, -1462, -7, -1462, -1462,
@@ -12437,6 +20881,189 @@
14844, -1462, -1462, 11341, 8925, 14844, 1134, 11341, 1138, 1234,
11945, -1462, 11945, 8925, -1462, 1231, 1150, 14844, 1217, 1315,
14844, 1154, 11945, -1462
+=======
+ 6668, 8197, 8197, 8197, 8197, -1458, -1458, 175, 213, -1458,
+ 1760, 294, -1458, -1458, -1458, 56, -1458, -1458, -1458, 332,
+ -1458, 487, 597, 439, 516, 875, -1458, -38, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, 560, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, 588, -1458, 591, -1458, 640, 693, -1458,
+ 406, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, 594, -1458, -1458, -1458, -1458, -1458, -1458, -1458, 746,
+ -1458, -1458, -1458, -1458, -1458, 16006, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, 761, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, 4535, 10027, 10332, 16006, -1458,
+ -1458, 758, -1458, -1458, -1458, -1458, 793, -1458, -1458, -1458,
+ 6055, -1458, 6363, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, 797, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, 151, 595, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, 142, -1458, 159, -1458,
+ 88, -57, -1458, -1458, -1458, -1458, -1458, -1458, 781, -1458,
+ 769, 771, 708, -1458, -1458, 840, 877, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, 692,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ 10637, 10942, -1458, 717, -1458, -1458, -1458, -1458, 6975, 8502,
+ 1041, -1458, 8807, -1458, -1458, 431, 83, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, 91, -1458, -1458, -1458, -1458, -1458, -1458, 629, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, 8197, -1458, -1458,
+ -1458, -1458, 293, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, 167, -1458, 870, -1458, -1458, -1458, 417, -1458, 674,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, 900, 976, -1458,
+ 943, 819, 973, 20, 465, 818, 341, -1458, 1024, 874,
+ 975, 977, 12162, -1458, 884, -1458, -1458, 715, -1458, -1458,
+ -1458, -1458, 49, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, 935, 925, -1458, -1458,
+ -1458, -1458, -1458, 898, -1458, 8197, 903, 904, 905, 8197,
+ 558, 558, 1057, 438, 647, 704, 16298, 16006, 495, 1044,
+ 16006, 939, 974, 788, 6055, 751, 846, 16006, 16006, 786,
+ 684, 42, -1458, -1458, -1458, 6055, 8197, 8197, 12467, 31,
+ 948, 12467, 1103, 112, 72, 16006, 986, 965, 999, -1458,
+ 12467, 16006, 8197, 12467, 12467, 16006, 8197, 955, 956, 12467,
+ 16006, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, 970, -1458, 16006, -1458, -1458, 930, 7282,
+ 994, 319, 995, 935, 963, 967, 969, 16006, 4843, -1458,
+ 968, 158, -1458, 578, -1458, 100, 1086, 12467, 12467, 133,
+ -1458, -1458, -1458, 1112, 12467, 914, -1458, 1101, 12467, 12467,
+ 13077, 12467, 12467, 5151, 12467, 13077, 12467, 896, 907, 16006,
+ 941, 947, 12467, 12467, 7587, 890, -1458, 54, -1458, 39,
+ 12467, 8502, -1458, -1458, -1458, -1458, -1458, 1760, 875, 93,
+ 94, 1140, 9112, 2956, 9417, 3282, 746, -1458, -1458, 328,
+ 746, -1458, 12467, 3912, -1458, 1025, -1458, -38, 984, 972,
+ 983, 8197, 12467, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, 16006, -1458, 857, 858, 16006, 1036, 12772, 12772,
+ 12772, -1458, 12772, 12772, -1458, 12772, -1458, 12772, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, 12772, 12772, 1085, 12772, 12772,
+ 12772, 12772, 12772, 12772, 12772, 12772, 12772, 12772, 12772, 12772,
+ 923, 1064, 1065, 1066, -1458, -1458, -1458, 13077, 11247, -1458,
+ 5453, 12467, 11552, 1009, -1458, 1016, 11857, -1458, -1458, -1458,
+ -1458, -3, -1458, 208, -1458, -1458, -1458, -1458, -1458, -1458,
+ 1059, 1061, 439, 1142, -1458, -1458, 16298, 964, 626, 16006,
+ 1011, 1013, 964, 1057, 1050, 1048, -1458, -1458, -1458, 137,
+ 932, 1088, 881, 16006, 1042, 12467, 1067, 16006, 16006, -1458,
+ 1054, 1006, 1007, 191, 16006, 1098, 229, -1458, 8197, -1458,
+ 107, -1458, 6055, 1099, 1150, 6055, 1057, 1104, 98, 16006,
+ 12467, -38, 217, 134, -1458, 379, 1017, 118, 138, 1049,
+ -1458, 1020, 8197, 8197, 321, 709, 12467, 255, -1458, -1458,
+ 12467, 5151, -1458, 12467, 12467, 12467, 12467, -1458, 12467, -1458,
+ 12467, -1458, 16006, 1086, -1458, 241, 334, 359, -1458, -1458,
+ -1458, 361, -1458, 27, -1458, -1458, 49, 285, 429, 23,
+ -13, 1113, 569, 957, 980, 979, -5, -1458, 1068, -1458,
+ -1458, 1019, 161, 7282, 362, 4227, 890, -1458, -1458, -1458,
+ 982, -1458, 431, 610, 1179, 705, -1458, -1458, 96, -1458,
+ -1458, -1458, 99, -1458, 51, -1458, -1458, -1458, -1458, -1458,
+ 3597, -1458, -1458, -1458, 16006, 1045, 12467, 1102, -1458, -1458,
+ -1458, 1109, -1458, 28, -1458, -1458, 1109, 16006, 7, 976,
+ -1458, -1458, -1458, -1458, -1458, 12772, -1458, -1458, -1458, 59,
+ -1458, 465, 465, 652, 818, 818, 818, 818, 341, 341,
+ -1458, -1458, 14546, 14546, 16006, 16006, -1458, -1458, 387, -1458,
+ -1458, -1458, -1458, -1458, 168, -1458, -1458, 274, -1458, -1458,
+ -1458, 407, 558, -1458, -1458, 651, 676, 582, -1458, 439,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ 964, -1458, 1089, 14838, 1080, 12467, -1458, -1458, -1458, 1131,
+ 1057, 1057, 964, -1458, 53, 1057, 756, 16006, 752, 755,
+ 1200, -1458, -1458, 940, 547, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, 137, 89, 1000, 729,
+ 12467, -1458, 16006, 1137, 933, 1057, -1458, -1458, 1079, 1131,
+ 14546, 1118, 1143, 1055, 1040, 1110, 1057, 1083, 1114, 1148,
+ 1057, 14546, 12467, -14, -1458, -1458, -1458, 1092, 1130, 12467,
+ 12467, 1106, -1458, 1149, 1154, 8197, -1458, 1071, 1073, 1097,
+ 12467, 1119, 1070, 12467, -1458, 1141, 1144, -1458, 190, 195,
+ 221, 1229, -1458, 440, -1458, 605, 1111, -1458, -1458, 1238,
+ -1458, 760, 12467, 12467, 12467, 798, 12467, 12467, 12467, 12467,
+ 12467, 12467, 12467, 12467, 12467, 13077, 1151, 12467, 12467, -1458,
+ 9722, 348, 1022, -1458, -1458, -1458, -1458, -1458, -1458, -6,
+ -1458, -1458, 12467, 106, 116, 51, 9417, 3282, 9417, 1188,
+ -1458, -1458, 12467, 843, 1161, -1458, 16006, 1164, -1458, 15714,
+ 1152, 1158, 12467, -18, 1133, 30, 551, 1021, -1458, -1458,
+ 844, 7, -1458, 12467, 59, 805, 730, -1458, 993, 658,
+ 1029, 1030, -1458, -1458, 846, -1458, 1012, 716, 1127, 1136,
+ 1138, 1139, 1145, 1146, 1153, 1155, 1156, 1159, 1160, 14838,
+ 1162, 1163, 1165, 1166, -1458, 1167, -1458, 728, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458,
+ -1458, 1170, -1458, -1458, -1458, -1458, 12467, -1458, -1458, -1458,
+ -1458, -1458, -1458, -1458, -1458, -1458, 820, -1458, 1271, 861,
+ -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, -1458, 1015,
+ -1458, -1458, 1277, -1458, -1458, -1458, -1458, -1458, 609, 1279,
+ -1458, 778, -1458, -1458, -1458, 1127, 1136, 1138, 1145, 1146,
+ 1153, 1155, 1156, 1159, 1163, 1165, 1166, -1458, 728, 728,
+ 13077, 1027, 1001, -1458, 1131, 89, 1094, 1135, 8197, -1458,
+ -1458, -1458, 14546, -1458, 8197, 1057, 1219, -1458, -1458, -1458,
+ 1057, 1219, -1458, -1458, 12467, 1186, 8197, 16006, -1458, -1458,
+ 12467, 12467, 871, -1458, 36, 872, -1458, 13670, 886, -1458,
+ 887, -1458, 1147, -1458, -1458, 8197, -1458, 12467, -1458, -1458,
+ 12467, 12467, 1132, 1149, 1232, -1458, 1197, -1458, 649, -1458,
+ -1458, 1328, -1458, -1458, 8197, 16006, -1458, 682, -1458, -1458,
+ -1458, 8197, 1168, 1100, 1105, -1458, -1458, -1458, 1107, 1108,
+ -1458, -1458, -1458, 1241, -1458, -1458, -1458, -1458, 1115, 277,
+ 16006, 1171, -1458, 1178, 1182, 1183, 1187, -1458, 870, 633,
+ 4227, 1022, -1458, 7892, 4227, -1458, -1458, 1179, 494, -1458,
+ -1458, -1458, 1161, -1458, 1057, -1458, 926, -1458, 286, 1236,
+ -1458, 12467, 615, 1102, 16006, -1458, 522, 16006, -1458, 12467,
+ 1198, 12467, 1221, 12467, 25, 1199, 12467, 1202, -1458, 1233,
+ 1243, 12467, 16006, 889, 1282, -1458, -1458, -1458, 413, 1169,
+ -1458,
Follow ups
-
[Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
From: noreply, 2013-03-24
-
[Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
From: Zorba Build Bot, 2013-03-23
-
Re: [Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
From: Zorba Build Bot, 2013-03-23
-
[Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
From: Zorba Build Bot, 2013-03-23
-
[Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
From: Matthias Brantner, 2013-03-23
-
[Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
From: Zorba Build Bot, 2013-03-22
-
Re: [Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
From: Zorba Build Bot, 2013-03-22
-
[Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
From: Zorba Build Bot, 2013-03-22
-
[Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
From: Markos Zaharioudakis, 2013-03-22
-
[Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
From: Zorba Build Bot, 2013-03-22
-
Re: [Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
From: Zorba Build Bot, 2013-03-22
-
[Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
From: Zorba Build Bot, 2013-03-22
-
[Merge] lp:~zorba-coders/zorba/new-jsoniq into lp:zorba
From: Markos Zaharioudakis, 2013-03-22
