zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #19872
[Merge] lp:~zorba-coders/zorba/bug-1130998 into lp:zorba
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1130998 into lp:zorba.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1130998/+merge/156700
Charref flex rule changed so nul-charref is not permitted
--
The attached diff has been truncated due to its size.
https://code.launchpad.net/~zorba-coders/zorba/bug-1130998/+merge/156700
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/parser/jsoniq_parser.cpp'
--- src/compiler/parser/jsoniq_parser.cpp 2013-03-27 17:32:54 +0000
+++ src/compiler/parser/jsoniq_parser.cpp 2013-04-02 21:43:28 +0000
@@ -36,7 +36,11 @@
/* First part of user declarations. */
/* Line 293 of lalr1.cc */
+<<<<<<< TREE
#line 88 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 88 "/home/kuraru/development/zorba_base/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/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 69 "/home/kuraru/development/zorba_base/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 917 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 916 "/home/kuraru/development/zorba_base/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 1053 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1052 "/home/kuraru/development/zorba_base/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/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 99 "/home/kuraru/development/zorba_base/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/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 185 "/home/kuraru/development/zorba_base/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 915 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 914 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ delete (yyvaluep->decval); };
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 290 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 290 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
break;
case 127: /* "\"'DOUBLE'\"" */
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 914 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 913 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ delete (yyvaluep->dval); };
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 299 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 299 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
break;
case 152: /* "\"'INTEGER'\"" */
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 913 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 912 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ delete (yyvaluep->ival); };
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 308 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
break;
case 346: /* "VersionDecl" */
@@ -526,18 +571,251 @@
/* Line 480 of lalr1.cc */
#line 947 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 308 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 345: /* "VersionDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 317 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 346: /* "MainModule" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 326 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 347: /* "LibraryModule" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 335 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 348: /* "ModuleDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 344 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 349: /* "SIND_DeclList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 353 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 350: /* "SIND_Decl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 362 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 351: /* "Setter" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 371 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 352: /* "BoundarySpaceDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 380 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 353: /* "DefaultCollationDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 389 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 354: /* "BaseURIDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 398 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 355: /* "ConstructionDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 407 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 356: /* "OrderingModeDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 416 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 357: /* "EmptyOrderDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 425 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 358: /* "CopyNamespacesDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 434 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 359: /* "Import" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 443 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 360: /* "SchemaImport" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 452 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 361: /* "URILiteralList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 461 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 362: /* "SchemaPrefix" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 470 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 363: /* "ModuleImport" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 479 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 364: /* "NamespaceDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 488 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 365: /* "DefaultNamespaceDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 497 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 366: /* "VFO_DeclList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 506 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 367: /* "VFO_Decl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 515 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 368: /* "DecimalFormatDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 524 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 369: /* "DecimalFormatParamList" */
+
+/* Line 480 of lalr1.cc */
+#line 946 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ delete (yyvaluep->vstrpair); };
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 533 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 533 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
break;
case 371: /* "DecimalFormatParam" */
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 947 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 946 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ delete (yyvaluep->strpair); };
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 542 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
break;
case 373: /* "OptionDecl" */
@@ -607,9 +885,81 @@
/* Line 480 of lalr1.cc */
#line 947 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 542 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 372: /* "OptionDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 551 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 373: /* "FTOptionDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 560 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 374: /* "CtxItemDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 569 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 375: /* "CtxItemDecl2" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 578 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 376: /* "CtxItemDecl3" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 587 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 377: /* "CtxItemDecl4" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 596 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 378: /* "VarDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 605 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 379: /* "VarNameAndType" */
+
+/* Line 480 of lalr1.cc */
+#line 946 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ delete (yyvaluep->varnametype); };
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 614 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
break;
case 381: /* "AnnotationList" */
@@ -679,9 +1029,81 @@
/* Line 480 of lalr1.cc */
#line 947 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 614 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 380: /* "AnnotationList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 623 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 381: /* "Annotation" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 632 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 382: /* "AnnotationLiteralList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 641 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 383: /* "FunctionDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 650 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 384: /* "FunctionDecl2" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 659 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 385: /* "FunctionDeclSimple" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 668 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 386: /* "FunctionDeclUpdating" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 677 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 387: /* "FunctionSig" */
+
+/* Line 480 of lalr1.cc */
+#line 946 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ delete (yyvaluep->fnsig); };
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 686 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
break;
case 389: /* "ParamList" */
@@ -2308,9 +2730,1638 @@
/* Line 480 of lalr1.cc */
#line 947 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 686 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 388: /* "ParamList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 695 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 389: /* "Param" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 704 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 390: /* "CollectionDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 713 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 392: /* "IndexDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 722 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 393: /* "IndexKeyList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 731 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 394: /* "IndexKeySpec" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 740 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 395: /* "IntegrityConstraintDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 749 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 396: /* "QueryBody" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 758 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 397: /* "StatementsAndOptionalExprTop" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 767 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 398: /* "StatementsAndOptionalExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 776 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 399: /* "StatementsAndExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 785 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 400: /* "Statements" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 794 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 401: /* "Statement" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 803 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 402: /* "BlockStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 812 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 403: /* "BlockExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 821 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 404: /* "EnclosedStatementsAndOptionalExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 830 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 405: /* "VarDeclStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 839 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 408: /* "AssignStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 848 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 409: /* "ApplyStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 857 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 410: /* "ExitStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 866 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 411: /* "WhileStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 875 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 412: /* "FlowCtlStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 884 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 413: /* "FLWORStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 893 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 414: /* "ReturnStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 902 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 415: /* "IfStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 911 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 416: /* "TryStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 920 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 417: /* "CatchListStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 929 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 418: /* "CatchStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 938 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 420: /* "Expr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 947 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 421: /* "ExprSingle" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 956 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 422: /* "ExprSimple" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 965 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 423: /* "FLWORExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 974 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 424: /* "ReturnExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 983 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 427: /* "FLWORWinCond" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 992 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 428: /* "WindowClause" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1001 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 429: /* "CountClause" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1010 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 430: /* "ForLetWinClause" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1019 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 432: /* "FLWORClauseList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1028 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 433: /* "ForClause" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1037 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 435: /* "VarInDeclList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1046 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 436: /* "VarInDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1055 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 437: /* "PositionalVar" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1064 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 438: /* "FTScoreVar" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1073 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 439: /* "LetClause" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1082 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 440: /* "VarGetsDeclList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1091 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 441: /* "VarGetsDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1100 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 442: /* "WindowVarDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1109 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 443: /* "WindowVars" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1118 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 444: /* "WindowVars3" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1127 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 445: /* "WindowVars2" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1136 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 446: /* "WhereClause" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1145 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 447: /* "GroupByClause" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1154 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 448: /* "GroupSpecList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1163 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 449: /* "GroupSpec" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1172 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 450: /* "GroupCollationSpec" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1181 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 451: /* "OrderByClause" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1190 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 452: /* "OrderSpecList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1199 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 453: /* "OrderSpec" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1208 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 454: /* "OrderModifier" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1217 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 455: /* "OrderDirSpec" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1226 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 456: /* "OrderEmptySpec" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1235 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 457: /* "OrderCollationSpec" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1244 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 458: /* "QuantifiedExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1253 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 459: /* "QVarInDeclList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1262 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 460: /* "QVarInDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1271 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 461: /* "SwitchExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1280 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 462: /* "SwitchCaseClauseList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1289 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 463: /* "SwitchCaseClause" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1298 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 464: /* "SwitchCaseOperandList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1307 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 465: /* "SwitchStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1316 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 468: /* "TypeswitchExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1325 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 469: /* "TypeswitchStatement" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1334 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 470: /* "CaseClauseList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1343 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 471: /* "CaseClause" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1352 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 474: /* "SequenceTypeList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1361 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 475: /* "IfExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1370 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 476: /* "OrExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1379 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 477: /* "AndExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1388 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 478: /* "NotExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1397 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 479: /* "ComparisonExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1406 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 480: /* "FTContainsExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1415 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 481: /* "StringConcatExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1424 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 482: /* "opt_FTIgnoreOption" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1433 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 483: /* "RangeExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1442 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 484: /* "AdditiveExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1451 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 485: /* "MultiplicativeExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1460 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 486: /* "UnionExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1469 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 487: /* "IntersectExceptExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1478 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 488: /* "InstanceofExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1487 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 489: /* "TreatExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1496 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 490: /* "CastableExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1505 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 491: /* "CastExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1514 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 492: /* "SingleType" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1523 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 493: /* "UnaryExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1532 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 494: /* "SignList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1541 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 495: /* "ValueExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1550 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 496: /* "SimpleMapExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1559 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 497: /* "ValueComp" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1568 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 498: /* "ValidateExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1577 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 499: /* "ExtensionExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1586 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 500: /* "Pragma_list" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1595 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 501: /* "Pragma" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1604 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 502: /* "PathExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1613 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 503: /* "RelativePathExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1622 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 504: /* "StepExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1631 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 505: /* "NameTest" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1640 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 506: /* "Wildcard" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1649 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 507: /* "FilterExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1658 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 508: /* "PredicateList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1667 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 509: /* "Predicate" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1676 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 510: /* "PrimaryExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1685 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 511: /* "Literal" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1694 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 512: /* "NumericLiteral" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1703 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 514: /* "VarRef" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1712 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 515: /* "ParenthesizedExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1721 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 516: /* "ContextItemExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1730 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 517: /* "OrderedExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1739 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 518: /* "UnorderedExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1748 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 519: /* "FunctionCall" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1757 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 520: /* "ArgList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1766 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 524: /* "Constructor" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1775 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 525: /* "DirectConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1784 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 526: /* "DirElemConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1793 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 527: /* "DirElemContentList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1802 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 528: /* "DirAttributeList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1811 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 529: /* "DirAttr" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1820 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 531: /* "DirAttributeValue" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1829 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 532: /* "opt_QuoteAttrContentList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1838 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 533: /* "QuoteAttrContentList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1847 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 534: /* "opt_AposAttrContentList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1856 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 535: /* "AposAttrContentList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1865 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 536: /* "QuoteAttrValueContent" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1874 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 537: /* "AposAttrValueContent" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1883 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 538: /* "DirElemContent" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1892 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 539: /* "CommonContent" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1901 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 540: /* "DirCommentConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1910 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 541: /* "DirPIConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1919 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 542: /* "CDataSection" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1928 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 543: /* "ComputedConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1937 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 544: /* "CompDocConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1946 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 545: /* "CompElemConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1955 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 546: /* "CompAttrConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1964 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 547: /* "CompTextConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1973 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 548: /* "CompCommentConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1982 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 549: /* "CompPIConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 1991 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 550: /* "CompNamespaceConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2000 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 551: /* "TypeDeclaration" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2009 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 552: /* "SequenceType" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2018 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 553: /* "OccurrenceIndicator" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2027 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 554: /* "ItemType" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2036 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 555: /* "TypeList" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2045 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 556: /* "GeneralizedAtomicType" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2054 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 557: /* "SimpleType" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2063 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 558: /* "KindTest" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2072 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 559: /* "AnyKindTest" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2081 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 560: /* "DocumentTest" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2090 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 561: /* "NamespaceTest" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2099 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 562: /* "TextTest" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2108 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 563: /* "CommentTest" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2117 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 564: /* "PITest" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2126 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 565: /* "AttributeTest" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2135 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 566: /* "SchemaAttributeTest" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2144 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 567: /* "ElementTest" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2153 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 568: /* "SchemaElementTest" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2162 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 569: /* "TypeName" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2171 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 570: /* "TypeName_WITH_HOOK" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2180 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 571: /* "StringLiteral" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2189 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 573: /* "AnyFunctionTest" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2198 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 574: /* "TypedFunctionTest" */
+
+/* Line 480 of lalr1.cc */
+#line 931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2207 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 577: /* "InsertExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2216 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 578: /* "DeleteExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2225 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 579: /* "ReplaceExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2234 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 580: /* "RenameExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2243 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 581: /* "TransformExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2252 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 582: /* "VarNameList" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2261 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 583: /* "VarNameDecl" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2270 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 584: /* "TryExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2279 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 585: /* "CatchListExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2288 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 586: /* "CatchExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2297 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 587: /* "BracedExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2306 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 588: /* "NameTestList" */
+
+/* Line 480 of lalr1.cc */
+#line 946 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ delete (yyvaluep->name_test_list); };
/* Line 480 of lalr1.cc */
+<<<<<<< TREE
#line 2315 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
break;
case 590: /* "FTSelection" */
@@ -2771,6 +4822,468 @@
/* Line 480 of lalr1.cc */
#line 2774 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 2315 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 589: /* "FTSelection" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2324 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 592: /* "FTOr" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2333 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 593: /* "FTAnd" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2342 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 594: /* "FTMildNot" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2351 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 595: /* "FTUnaryNot" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2360 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 596: /* "FTPrimaryWithOptions" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2369 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 597: /* "opt_FTMatchOptions" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2378 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 599: /* "FTWeight" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2387 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 600: /* "FTPrimary" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2396 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 601: /* "opt_FTTimes" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2405 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 602: /* "FTExtensionSelection" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2414 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 604: /* "FTWords" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2423 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 605: /* "FTWordsValue" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2432 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 607: /* "FTAnyallOption" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2441 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 610: /* "FTPosFilter" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2450 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 611: /* "FTOrder" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2459 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 612: /* "FTWindow" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2468 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 613: /* "FTDistance" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2477 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 614: /* "FTUnit" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2486 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 615: /* "FTMatchOptions" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2495 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 616: /* "FTMatchOption" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2504 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 617: /* "FTCaseOption" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2513 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 618: /* "FTDiacriticsOption" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2522 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 619: /* "FTExtensionOption" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2531 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 620: /* "FTStemOption" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2540 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 621: /* "FTThesaurusOption" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2549 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 625: /* "FTThesaurusID" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2558 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 628: /* "FTStopWordOption" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2567 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 629: /* "FTStopWords" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2576 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 633: /* "FTStopWordsInclExcl" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2585 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 634: /* "FTLanguageOption" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2594 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 635: /* "FTWildCardOption" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2603 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 636: /* "FTContent" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2612 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 637: /* "FTTimes" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2621 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 638: /* "FTRange" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2630 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 639: /* "FTScope" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2639 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 640: /* "FTBigUnit" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2648 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 641: /* "FTIgnoreOption" */
+
+/* Line 480 of lalr1.cc */
+#line 934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2657 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 642: /* "JSONArrayConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 937 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2666 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 643: /* "JSONSimpleObjectUnion" */
+
+/* Line 480 of lalr1.cc */
+#line 937 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2675 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 644: /* "JSONAccumulatorObjectUnion" */
+
+/* Line 480 of lalr1.cc */
+#line 937 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2684 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 645: /* "JSONObjectConstructor" */
+
+/* Line 480 of lalr1.cc */
+#line 937 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2693 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 646: /* "JSONPairList" */
+
+/* Line 480 of lalr1.cc */
+#line 937 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2702 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 647: /* "JSONInsertExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 937 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2711 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 648: /* "JSONAppendExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 937 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2720 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 649: /* "JSONDeleteExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 937 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2729 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 650: /* "JSONRenameExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 937 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2738 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 651: /* "JSONReplaceExpr" */
+
+/* Line 480 of lalr1.cc */
+#line 937 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2747 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 658: /* "QNAME" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2756 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 659: /* "FUNCTION_NAME" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2765 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+ break;
+ case 660: /* "EQNAME" */
+
+/* Line 480 of lalr1.cc */
+#line 943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ { release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc */
+#line 2774 "/home/kuraru/development/zorba_base/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/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 133 "/home/kuraru/development/zorba_base/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/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 2871 "/home/kuraru/development/zorba_base/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 1071 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1070 "/home/kuraru/development/zorba_base/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 1075 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1074 "/home/kuraru/development/zorba_base/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 1079 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1078 "/home/kuraru/development/zorba_base/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 1087 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1086 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = NULL;
}
@@ -3022,7 +5559,11 @@
case 7:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1093 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1092 "/home/kuraru/development/zorba_base/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 1097 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1096 "/home/kuraru/development/zorba_base/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 1106 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1105 "/home/kuraru/development/zorba_base/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 1112 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1111 "/home/kuraru/development/zorba_base/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 1120 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1119 "/home/kuraru/development/zorba_base/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 1126 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1125 "/home/kuraru/development/zorba_base/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 1137 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1136 "/home/kuraru/development/zorba_base/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 1142 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1141 "/home/kuraru/development/zorba_base/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 1146 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1145 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)), "utf-8", VersionDecl::jsoniq );
}
@@ -3111,7 +5684,11 @@
case 16:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1151 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1150 "/home/kuraru/development/zorba_base/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)), VersionDecl::jsoniq );
@@ -3121,7 +5698,11 @@
case 17:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1160 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1159 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (1)].node)), NULL);
@@ -3132,7 +5713,11 @@
case 18:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1167 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1166 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (1)].node)));
@@ -3143,7 +5728,11 @@
case 19:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1174 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1173 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
Prolog* prolog = new Prolog(LOC((yyloc)),
static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (1)].node)),
@@ -3156,7 +5745,11 @@
case 20:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1183 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1182 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new MainModule( LOC((yyloc)), static_cast<QueryBody*>((yysemantic_stack_[(1) - (1)].expr)), NULL );
}
@@ -3165,7 +5758,11 @@
case 21:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1190 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1189 "/home/kuraru/development/zorba_base/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();
@@ -3177,7 +5774,11 @@
case 22:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1198 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1197 "/home/kuraru/development/zorba_base/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();
@@ -3189,7 +5790,11 @@
case 23:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1206 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1205 "/home/kuraru/development/zorba_base/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();
@@ -3201,7 +5806,11 @@
case 24:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1214 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1213 "/home/kuraru/development/zorba_base/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();
@@ -3213,7 +5822,11 @@
case 25:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1225 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1224 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new LibraryModule(LOC((yyloc)), static_cast<ModuleDecl*>((yysemantic_stack_[(1) - (1)].node)), NULL);
}
@@ -3222,7 +5835,11 @@
case 26:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1230 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1229 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (2)].node)), NULL);
@@ -3233,7 +5850,11 @@
case 27:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1237 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1236 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (2)].node)));
@@ -3244,7 +5865,11 @@
case 28:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1244 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1243 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
Prolog* prolog = new Prolog(LOC((yyloc)),
static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (2)].node)),
@@ -3257,7 +5882,11 @@
case 29:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1256 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1255 "/home/kuraru/development/zorba_base/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)) );
@@ -3268,7 +5897,11 @@
case 30:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1266 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1265 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
SIND_DeclList *sdl = new SIND_DeclList( LOC((yyloc)) );
sdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -3279,7 +5912,11 @@
case 31:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1273 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1272 "/home/kuraru/development/zorba_base/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);
@@ -3289,7 +5926,11 @@
case 32:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1280 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1279 "/home/kuraru/development/zorba_base/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
@@ -3302,7 +5943,11 @@
case 46:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1315 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1314 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::preserve_space);
}
@@ -3311,7 +5956,11 @@
case 47:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1320 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1319 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::strip_space);
}
@@ -3320,7 +5969,11 @@
case 48:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1328 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1327 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new DefaultCollationDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)) );
}
@@ -3329,7 +5982,11 @@
case 49:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1336 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1335 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new BaseURIDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
}
@@ -3338,7 +5995,11 @@
case 50:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1344 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1343 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_preserve);
}
@@ -3347,7 +6008,11 @@
case 51:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1349 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1348 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_strip);
}
@@ -3356,7 +6021,11 @@
case 52:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1357 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1356 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::ordered);
}
@@ -3365,7 +6034,11 @@
case 53:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1362 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1361 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::unordered);
}
@@ -3374,7 +6047,11 @@
case 54:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1370 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1369 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_greatest);
}
@@ -3383,7 +6060,11 @@
case 55:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1375 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1374 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_least);
}
@@ -3392,7 +6073,11 @@
case 56:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1383 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1382 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, true);
}
@@ -3401,7 +6086,11 @@
case 57:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1388 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1387 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, false);
}
@@ -3410,7 +6099,11 @@
case 58:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1393 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1392 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, true);
}
@@ -3419,7 +6112,11 @@
case 59:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1398 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1397 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, false);
}
@@ -3428,7 +6125,11 @@
case 62:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1411 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1410 "/home/kuraru/development/zorba_base/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\".");
@@ -3439,7 +6140,11 @@
case 63:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1421 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1420 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SchemaImport( LOC((yyloc)), NULL, SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL );
}
@@ -3448,7 +6153,11 @@
case 64:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1426 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1425 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SchemaImport(LOC((yyloc)),
dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(4) - (3)].node)),
@@ -3460,7 +6169,11 @@
case 65:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1434 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1433 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SchemaImport(LOC((yyloc)),
NULL,
@@ -3472,7 +6185,11 @@
case 66:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1442 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1441 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SchemaImport(LOC((yyloc)),
dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(6) - (3)].node)),
@@ -3484,7 +6201,11 @@
case 67:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1453 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1452 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
URILiteralList *ull = new URILiteralList( LOC((yyloc)));
ull->push_back( SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
@@ -3495,7 +6216,11 @@
case 68:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1460 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1459 "/home/kuraru/development/zorba_base/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)) );
@@ -3507,7 +6232,11 @@
case 69:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1471 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1470 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SchemaPrefix( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
}
@@ -3516,7 +6245,11 @@
case 70:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1476 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1475 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SchemaPrefix( LOC((yyloc)), true );
}
@@ -3525,7 +6258,11 @@
case 71:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1484 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1483 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ModuleImport(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL);
@@ -3536,7 +6273,11 @@
case 72:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1491 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1490 "/home/kuraru/development/zorba_base/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);
@@ -3547,7 +6288,11 @@
case 73:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1498 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1497 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ModuleImport(LOC((yyloc)),
SYMTAB((yysemantic_stack_[(5) - (3)].sval)),
@@ -3560,7 +6305,11 @@
case 74:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1507 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1506 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ModuleImport(LOC((yyloc)),
SYMTAB((yysemantic_stack_[(8) - (4)].sval)),
@@ -3574,7 +6323,11 @@
case 75:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1520 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1519 "/home/kuraru/development/zorba_base/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)) );
}
@@ -3583,7 +6336,11 @@
case 76:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1528 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1527 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
ParseConstants::ns_element_default,
@@ -3594,7 +6351,11 @@
case 77:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1535 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1534 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
ParseConstants::ns_function_default,
@@ -3605,7 +6366,11 @@
case 78:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1545 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1544 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
VFO_DeclList *vdl = new VFO_DeclList( LOC((yyloc)));
vdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -3616,7 +6381,11 @@
case 79:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1552 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1551 "/home/kuraru/development/zorba_base/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);
@@ -3626,7 +6395,11 @@
case 80:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1559 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1558 "/home/kuraru/development/zorba_base/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();
@@ -3638,7 +6411,11 @@
case 89:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1582 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1581 "/home/kuraru/development/zorba_base/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);
@@ -3648,7 +6425,11 @@
case 90:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1588 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1587 "/home/kuraru/development/zorba_base/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);
@@ -3658,7 +6439,11 @@
case 91:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1597 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1596 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.vstrpair) = new vector<string_pair_t>();
(yyval.vstrpair)->push_back( *(yysemantic_stack_[(1) - (1)].strpair) );
@@ -3669,7 +6454,11 @@
case 92:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1604 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1603 "/home/kuraru/development/zorba_base/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);
@@ -3680,7 +6469,11 @@
case 93:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1614 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1613 "/home/kuraru/development/zorba_base/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() );
@@ -3691,77 +6484,121 @@
case 94:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1623 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1622 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "decimal-separator"; }
break;
case 95:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1624 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1623 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "digit"; }
break;
case 96:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1625 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1624 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "grouping-separator"; }
break;
case 97:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1626 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1625 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "infinty"; }
break;
case 98:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1627 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1626 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "minus-sign"; }
break;
case 99:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1628 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1627 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "NaN"; }
break;
case 100:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1629 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1628 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "pattern-separator"; }
break;
case 101:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1630 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1629 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "percent"; }
break;
case 102:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1631 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1630 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "per-mille"; }
break;
case 103:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1632 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1631 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.strval) = "zero-digit"; }
break;
case 104:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1638 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1637 "/home/kuraru/development/zorba_base/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)));
}
@@ -3770,7 +6607,11 @@
case 105:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1646 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1645 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTOptionDecl( LOC((yyloc)), dynamic_cast<FTMatchOptions*>((yysemantic_stack_[(3) - (3)].node)) );
}
@@ -3779,7 +6620,11 @@
case 106:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1654 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1653 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(4) - (4)].node);
}
@@ -3788,7 +6633,11 @@
case 107:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1662 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1661 "/home/kuraru/development/zorba_base/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);
@@ -3799,7 +6648,11 @@
case 108:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1669 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1668 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -3808,7 +6661,11 @@
case 109:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1677 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1676 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(1) - (1)].node));
d->theIsExternal = false;
@@ -3819,7 +6676,11 @@
case 110:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1684 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1683 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CtxItemDecl(LOC((yyloc)), NULL);
}
@@ -3828,7 +6689,11 @@
case 111:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1689 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1688 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(2) - (2)].node);
}
@@ -3837,7 +6702,11 @@
case 112:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1697 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1696 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CtxItemDecl(LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
}
@@ -3846,7 +6715,11 @@
case 113:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1705 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1704 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(4) - (2)].varnametype)));
@@ -3864,7 +6737,11 @@
case 114:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1719 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1718 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(3) - (2)].varnametype)));
@@ -3882,7 +6759,11 @@
case 115:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1733 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1732 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(5) - (2)].varnametype)));
@@ -3900,7 +6781,11 @@
case 116:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1750 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1749 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.varnametype) = new VarNameAndType(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL, NULL);
}
@@ -3909,7 +6794,11 @@
case 117:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1755 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1754 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)),
@@ -3921,7 +6810,11 @@
case 118:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1763 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1762 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
@@ -3933,7 +6826,11 @@
case 119:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1771 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1770 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (4)].expr)),
@@ -3945,7 +6842,11 @@
case 120:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1782 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1781 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AnnotationListParsenode(LOC((yyloc)), static_cast<AnnotationParsenode*>((yysemantic_stack_[(1) - (1)].node)));
}
@@ -3954,7 +6855,11 @@
case 121:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1787 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1786 "/home/kuraru/development/zorba_base/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);
@@ -3964,7 +6869,11 @@
case 122:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1796 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1795 "/home/kuraru/development/zorba_base/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);
}
@@ -3973,7 +6882,11 @@
case 123:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1801 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1800 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AnnotationParsenode(LOC((yyloc)),
new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval))),
@@ -3984,7 +6897,11 @@
case 124:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1808 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1807 "/home/kuraru/development/zorba_base/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);
}
@@ -3993,7 +6910,11 @@
case 125:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1813 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1812 "/home/kuraru/development/zorba_base/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),
@@ -4004,7 +6925,11 @@
case 126:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1823 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1822 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AnnotationLiteralListParsenode(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr));
}
@@ -4013,7 +6938,11 @@
case 127:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1828 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1827 "/home/kuraru/development/zorba_base/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);
@@ -4023,7 +6952,11 @@
case 128:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1837 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1836 "/home/kuraru/development/zorba_base/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);
@@ -4033,7 +6966,11 @@
case 129:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1843 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1842 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
FunctionDecl* fdecl = static_cast<FunctionDecl*>((yysemantic_stack_[(3) - (3)].node));
@@ -4047,7 +6984,11 @@
case 130:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1856 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1855 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -4056,7 +6997,11 @@
case 131:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1861 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1860 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -4065,7 +7010,11 @@
case 132:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1869 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1868 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FunctionDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4081,7 +7030,11 @@
case 133:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1880 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1879 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FunctionDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4097,7 +7050,11 @@
case 134:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1895 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1894 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FunctionDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4113,7 +7070,11 @@
case 135:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1907 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1906 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FunctionDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4129,7 +7090,11 @@
case 136:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1922 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1921 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.fnsig) = new FunctionSig(NULL);
}
@@ -4138,7 +7103,11 @@
case 137:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1927 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1926 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(3) - (2)].node)));
}
@@ -4147,7 +7116,11 @@
case 138:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1931 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.fnsig) = new FunctionSig(NULL, dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node)));
}
@@ -4156,7 +7129,11 @@
case 139:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1937 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1936 "/home/kuraru/development/zorba_base/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)));
}
@@ -4165,7 +7142,11 @@
case 140:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1945 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1944 "/home/kuraru/development/zorba_base/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)) );
@@ -4176,7 +7157,11 @@
case 141:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1952 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1951 "/home/kuraru/development/zorba_base/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)) );
@@ -4188,7 +7173,11 @@
case 142:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1963 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1962 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new Param(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL);
}
@@ -4197,7 +7186,11 @@
case 143:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1968 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1967 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new Param(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4208,7 +7201,11 @@
case 144:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1978 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1977 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CollectionDecl( LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)),
@@ -4222,7 +7219,11 @@
case 145:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1987 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1986 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CollectionDecl( LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4236,7 +7237,11 @@
case 146:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 1996 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 1995 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CollectionDecl( LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
@@ -4250,7 +7255,11 @@
case 147:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2005 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2004 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CollectionDecl( LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(6) - (4)].expr)),
@@ -4264,7 +7273,11 @@
case 148:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2017 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2016 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
}
@@ -4273,7 +7286,11 @@
case 149:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2021 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2020 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
(yysemantic_stack_[(2) - (1)].node),
@@ -4284,7 +7301,11 @@
case 150:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2027 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2026 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
}
@@ -4293,7 +7314,11 @@
case 151:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2031 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2030 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
(yysemantic_stack_[(2) - (1)].node),
@@ -4305,7 +7330,11 @@
case 152:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2041 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2040 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AST_IndexDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(8) - (3)].expr)),
@@ -4320,7 +7349,11 @@
case 153:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2051 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2050 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AST_IndexDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(9) - (4)].expr)),
@@ -4335,7 +7368,11 @@
case 154:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2064 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2063 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
IndexKeyList* keyList = new IndexKeyList(LOC((yyloc)));
keyList->addKeySpec(dynamic_cast<IndexKeySpec*>((yysemantic_stack_[(1) - (1)].node)));
@@ -4346,7 +7383,11 @@
case 155:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2070 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2069 "/home/kuraru/development/zorba_base/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);
@@ -4356,7 +7397,11 @@
case 156:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2079 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2078 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new IndexKeySpec(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL, NULL);
}
@@ -4365,7 +7410,11 @@
case 157:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2084 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2083 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new IndexKeySpec(LOC((yyloc)),
(yysemantic_stack_[(2) - (1)].expr),
@@ -4377,7 +7426,11 @@
case 158:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2091 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2090 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new IndexKeySpec(LOC((yyloc)),
(yysemantic_stack_[(2) - (1)].expr),
@@ -4389,7 +7442,11 @@
case 159:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2098 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2097 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new IndexKeySpec(LOC((yyloc)),
(yysemantic_stack_[(3) - (1)].expr),
@@ -4401,7 +7458,11 @@
case 160:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2110 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2109 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ICCollSimpleCheck(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(11) - (4)].expr)),
@@ -4414,7 +7475,11 @@
case 161:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2120 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2119 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ICCollUniqueKeyCheck(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(14) - (4)].expr)),
@@ -4427,7 +7492,11 @@
case 162:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2130 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2129 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ICCollForeachNode(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(13) - (4)].expr)),
@@ -4440,7 +7509,11 @@
case 163:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2141 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2140 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ICForeignKey( LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(22) - (4)].expr)),
@@ -4456,7 +7529,11 @@
case 164:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2157 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2156 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if ((yysemantic_stack_[(1) - (1)].expr) == NULL)
{
@@ -4477,7 +7554,11 @@
case 165:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2177 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2176 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -4486,7 +7567,11 @@
case 166:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2181 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2180 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -4495,7 +7580,11 @@
case 167:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2185 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2184 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = NULL;
}
@@ -4504,7 +7593,11 @@
case 168:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2193 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2192 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -4513,7 +7606,11 @@
case 169:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2197 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2196 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -4522,7 +7619,11 @@
case 170:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2201 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2200 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new BlockBody(LOC((yyloc)));
}
@@ -4531,7 +7632,11 @@
case 171:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2209 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2208 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -4540,7 +7645,11 @@
case 172:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2214 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2213 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
@@ -4553,7 +7662,11 @@
case 173:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2226 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2225 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
BlockBody* blk = new BlockBody(LOC((yyloc)));
blk->add((yysemantic_stack_[(1) - (1)].expr));
@@ -4564,7 +7677,11 @@
case 174:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2233 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2232 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
@@ -4577,7 +7694,11 @@
case 175:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2243 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2242 "/home/kuraru/development/zorba_base/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
@@ -4593,7 +7714,11 @@
case 189:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2276 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2275 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
}
@@ -4602,7 +7727,11 @@
case 190:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2284 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2283 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
BlockBody* block = dynamic_cast<BlockBody*>((yysemantic_stack_[(3) - (2)].expr));
if ((yysemantic_stack_[(3) - (2)].expr) == NULL || (block != NULL && block->isEmpty()))
@@ -4625,7 +7754,11 @@
case 191:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2306 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2305 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
}
@@ -4634,7 +7767,11 @@
case 192:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2314 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2313 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(2) - (1)].expr);
}
@@ -4643,7 +7780,11 @@
case 193:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2322 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2321 "/home/kuraru/development/zorba_base/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));
@@ -4654,7 +7795,11 @@
case 194:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2329 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2328 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)), NULL);
vdecl->add((yysemantic_stack_[(2) - (2)].node));
@@ -4665,7 +7810,11 @@
case 195:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2336 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2335 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)),
static_cast<AnnotationListParsenode*>((yysemantic_stack_[(3) - (1)].node)));
@@ -4677,7 +7826,11 @@
case 196:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2347 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2346 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)),
@@ -4691,7 +7844,11 @@
case 197:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2356 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2355 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4705,7 +7862,11 @@
case 198:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2365 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2364 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4719,7 +7880,11 @@
case 199:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2374 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2373 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -4733,7 +7898,11 @@
case 200:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2387 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2386 "/home/kuraru/development/zorba_base/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));
}
@@ -4742,7 +7911,11 @@
case 201:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2395 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2394 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ApplyExpr(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr));
}
@@ -4751,7 +7924,11 @@
case 202:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2403 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2402 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ExitExpr(LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr));
}
@@ -4760,7 +7937,11 @@
case 203:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2411 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2410 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
BlockBody* bb = dynamic_cast<BlockBody *>((yysemantic_stack_[(5) - (5)].expr));
if (bb == NULL)
@@ -4776,7 +7957,11 @@
case 204:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2426 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2425 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new FlowCtlStatement(LOC((yyloc)), FlowCtlStatement::BREAK);
}
@@ -4785,7 +7970,11 @@
case 205:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2431 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2430 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new FlowCtlStatement( LOC((yyloc)), FlowCtlStatement::CONTINUE );
}
@@ -4794,7 +7983,11 @@
case 206:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2439 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2438 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
ReturnExpr* re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
(yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4809,7 +8002,11 @@
case 207:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2453 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2452 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
exprnode* retExpr = (yysemantic_stack_[(2) - (2)].expr);
@@ -4827,7 +8024,11 @@
case 208:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2470 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2469 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
exprnode* thenExpr = (yysemantic_stack_[(8) - (6)].expr);
exprnode* elseExpr = (yysemantic_stack_[(8) - (8)].expr);
@@ -4853,7 +8054,11 @@
case 209:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2495 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2494 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new TryExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), (yysemantic_stack_[(3) - (3)].expr));
}
@@ -4862,7 +8067,11 @@
case 210:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2503 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2502 "/home/kuraru/development/zorba_base/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)) );
@@ -4873,7 +8082,11 @@
case 211:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2510 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2509 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
if ( cle )
@@ -4885,7 +8098,11 @@
case 212:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2521 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2520 "/home/kuraru/development/zorba_base/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);
@@ -4895,7 +8112,11 @@
case 213:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2530 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2529 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new BlockBody(LOC((yyloc)));
}
@@ -4904,7 +8125,11 @@
case 214:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2537 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2536 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -4913,7 +8138,11 @@
case 215:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2542 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2541 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
Expr* expr = dynamic_cast<Expr*>((yysemantic_stack_[(3) - (1)].expr));
if ( !expr )
@@ -4929,7 +8158,11 @@
case 216:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2555 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2554 "/home/kuraru/development/zorba_base/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
@@ -4947,7 +8180,11 @@
case 235:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2602 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2601 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
ReturnExpr *re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
(yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4962,7 +8199,11 @@
case 236:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2616 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2615 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ReturnExpr( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr) );
}
@@ -4971,7 +8212,11 @@
case 237:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2624 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2623 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.strval) = parser::the_sliding;
}
@@ -4980,7 +8225,11 @@
case 238:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2629 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2628 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.strval) = parser::the_tumbling;
}
@@ -4989,7 +8238,11 @@
case 239:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2637 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2636 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.strval) = parser::the_start;
}
@@ -4998,7 +8251,11 @@
case 240:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2642 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2641 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.strval) = parser::the_end;
}
@@ -5007,7 +8264,11 @@
case 241:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2647 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2646 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.strval) = parser::the_only_end;
}
@@ -5016,7 +8277,11 @@
case 242:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2655 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2654 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FLWORWinCond(LOC((yyloc)),
dynamic_cast<WindowVars*>((yysemantic_stack_[(4) - (2)].node)),
@@ -5029,7 +8294,11 @@
case 243:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2664 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2663 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FLWORWinCond(LOC((yyloc)),
NULL,
@@ -5042,7 +8311,11 @@
case 244:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2676 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2675 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new WindowClause (LOC ((yyloc)),
((yysemantic_stack_[(5) - (2)].strval) == parser::the_tumbling ?
@@ -5057,7 +8330,11 @@
case 245:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2686 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2685 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new WindowClause (LOC ((yyloc)),
((yysemantic_stack_[(4) - (2)].strval) == parser::the_tumbling ?
@@ -5071,7 +8348,11 @@
case 246:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2699 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2698 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CountClause(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
}
@@ -5080,7 +8361,11 @@
case 255:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2723 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2722 "/home/kuraru/development/zorba_base/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)) );
@@ -5091,7 +8376,11 @@
case 256:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2730 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2729 "/home/kuraru/development/zorba_base/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)) );
@@ -5102,7 +8391,11 @@
case 257:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2740 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2739 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ForClause(LOC((yyloc)), dynamic_cast<VarInDeclList*>((yysemantic_stack_[(3) - (3)].node)));
}
@@ -5111,7 +8404,11 @@
case 258:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2746 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2745 "/home/kuraru/development/zorba_base/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 \""
@@ -5124,7 +8421,11 @@
case 259:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2755 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2754 "/home/kuraru/development/zorba_base/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
@@ -5135,7 +8436,11 @@
case 261:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2765 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2764 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
// this adds on shift-reduce conflict (probably with FTRange expression)
}
@@ -5144,7 +8449,11 @@
case 262:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2773 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2772 "/home/kuraru/development/zorba_base/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)) );
@@ -5155,7 +8464,11 @@
case 263:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2780 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2779 "/home/kuraru/development/zorba_base/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)) );
@@ -5166,7 +8479,11 @@
case 264:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2788 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2787 "/home/kuraru/development/zorba_base/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 \""
@@ -5179,7 +8496,11 @@
case 265:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2800 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2799 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)),
@@ -5194,7 +8515,11 @@
case 266:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2810 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2809 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5209,7 +8534,11 @@
case 267:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2820 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2819 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5224,7 +8553,11 @@
case 268:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2830 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2829 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5239,7 +8572,11 @@
case 269:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2840 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2839 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5254,7 +8591,11 @@
case 270:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2850 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2849 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5269,7 +8610,11 @@
case 271:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2860 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2859 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5284,7 +8629,11 @@
case 272:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2870 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2869 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(7) - (1)].expr)),
@@ -5299,7 +8648,11 @@
case 273:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2881 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2880 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5313,7 +8666,11 @@
case 274:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2890 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2889 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5328,7 +8685,11 @@
case 275:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2900 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2899 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (1)].expr)),
@@ -5343,7 +8704,11 @@
case 276:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2910 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2909 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarInDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(6) - (1)].expr)),
@@ -5358,7 +8723,11 @@
case 277:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2926 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2925 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new PositionalVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
}
@@ -5367,7 +8736,11 @@
case 278:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2934 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTScoreVar(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)));
}
@@ -5376,7 +8749,11 @@
case 279:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2944 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2943 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new LetClause( LOC((yyloc)), dynamic_cast<VarGetsDeclList*>((yysemantic_stack_[(2) - (2)].node)) );
}
@@ -5385,7 +8762,11 @@
case 280:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2952 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2951 "/home/kuraru/development/zorba_base/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)) );
@@ -5396,7 +8777,11 @@
case 281:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2958 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2957 "/home/kuraru/development/zorba_base/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)) );
@@ -5407,7 +8792,11 @@
case 282:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2970 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2969 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarGetsDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -5420,7 +8809,11 @@
case 283:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2978 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2977 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarGetsDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5433,7 +8826,11 @@
case 284:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2988 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2987 "/home/kuraru/development/zorba_base/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(),
@@ -5446,7 +8843,11 @@
case 285:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 2996 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 2995 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new VarGetsDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -5459,7 +8860,11 @@
case 286:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3008 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3007 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new WindowVarDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -5470,7 +8875,11 @@
case 287:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3014 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3013 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new WindowVarDecl(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5482,7 +8891,11 @@
case 289:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3027 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3026 "/home/kuraru/development/zorba_base/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);
}
@@ -5491,7 +8904,11 @@
case 290:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3031 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3030 "/home/kuraru/development/zorba_base/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)));
@@ -5501,7 +8918,11 @@
case 291:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3039 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3038 "/home/kuraru/development/zorba_base/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);
}
@@ -5510,7 +8931,11 @@
case 292:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3043 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3042 "/home/kuraru/development/zorba_base/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)));
@@ -5520,7 +8945,11 @@
case 294:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3052 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3051 "/home/kuraru/development/zorba_base/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)));
}
@@ -5529,7 +8958,11 @@
case 295:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3056 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3055 "/home/kuraru/development/zorba_base/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)));
}
@@ -5538,7 +8971,11 @@
case 296:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3060 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3059 "/home/kuraru/development/zorba_base/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);
}
@@ -5547,7 +8984,11 @@
case 297:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3070 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3069 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new WhereClause(LOC ((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
}
@@ -5556,7 +8997,11 @@
case 298:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3078 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3077 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new GroupByClause(LOC((yyloc)), dynamic_cast<GroupSpecList*>((yysemantic_stack_[(3) - (3)].node)));
}
@@ -5565,7 +9010,11 @@
case 299:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3085 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3084 "/home/kuraru/development/zorba_base/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)));
@@ -5576,7 +9025,11 @@
case 300:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3091 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3090 "/home/kuraru/development/zorba_base/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)));
@@ -5587,7 +9040,11 @@
case 301:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3101 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3100 "/home/kuraru/development/zorba_base/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);
}
@@ -5596,7 +9053,11 @@
case 302:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3105 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3104 "/home/kuraru/development/zorba_base/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);
}
@@ -5605,7 +9066,11 @@
case 303:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3109 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3108 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new GroupSpec(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5618,7 +9083,11 @@
case 304:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3117 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3116 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new GroupSpec(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -5631,7 +9100,11 @@
case 305:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3125 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3124 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new GroupSpec(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -5644,7 +9117,11 @@
case 306:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3133 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3132 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new GroupSpec(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -5657,7 +9134,11 @@
case 307:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3145 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3144 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new GroupCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
}
@@ -5666,7 +9147,11 @@
case 308:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3153 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3152 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderByClause(
LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(3) - (3)].node))
@@ -5677,7 +9162,11 @@
case 309:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3159 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3158 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderByClause(
LOC((yyloc)), dynamic_cast<OrderSpecList*>((yysemantic_stack_[(4) - (4)].node)), true
@@ -5688,7 +9177,11 @@
case 310:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3169 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3168 "/home/kuraru/development/zorba_base/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)) );
@@ -5699,7 +9192,11 @@
case 311:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3175 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3174 "/home/kuraru/development/zorba_base/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)) );
@@ -5710,7 +9207,11 @@
case 312:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3185 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3184 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderSpec( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL );
}
@@ -5719,7 +9220,11 @@
case 313:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3189 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3188 "/home/kuraru/development/zorba_base/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))
@@ -5730,7 +9235,11 @@
case 314:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3199 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3198 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderModifierPN(
LOC((yyloc)), dynamic_cast<OrderDirSpec*>((yysemantic_stack_[(1) - (1)].node)), NULL, NULL
@@ -5741,7 +9250,11 @@
case 315:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3205 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3204 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderModifierPN(
LOC((yyloc)), NULL, dynamic_cast<OrderEmptySpec*>((yysemantic_stack_[(1) - (1)].node)), NULL
@@ -5752,7 +9265,11 @@
case 316:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3211 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3210 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderModifierPN(
LOC((yyloc)), NULL, NULL, dynamic_cast<OrderCollationSpec*>((yysemantic_stack_[(1) - (1)].node))
@@ -5763,7 +9280,11 @@
case 317:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3217 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3216 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderModifierPN(
LOC((yyloc)),
@@ -5777,7 +9298,11 @@
case 318:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3226 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3225 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderModifierPN(
LOC((yyloc)),
@@ -5791,7 +9316,11 @@
case 319:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3235 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3234 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderModifierPN(
LOC((yyloc)),
@@ -5805,7 +9334,11 @@
case 320:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3244 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3243 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderModifierPN(
LOC((yyloc)),
@@ -5819,7 +9352,11 @@
case 321:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3257 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3256 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_ascending );
}
@@ -5828,7 +9365,11 @@
case 322:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3261 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3260 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderDirSpec( LOC((yyloc)), ParseConstants::dir_descending );
}
@@ -5837,7 +9378,11 @@
case 323:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3269 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3268 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderEmptySpec(
LOC((yyloc)), StaticContextConsts::empty_greatest
@@ -5848,7 +9393,11 @@
case 324:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3275 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3274 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderEmptySpec(
LOC((yyloc)), StaticContextConsts::empty_least
@@ -5859,7 +9408,11 @@
case 325:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3285 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3284 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OrderCollationSpec( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
}
@@ -5868,7 +9421,11 @@
case 326:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3293 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3292 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new QuantifiedExpr(
LOC((yyloc)),
@@ -5882,7 +9439,11 @@
case 327:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3302 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3301 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new QuantifiedExpr(
LOC((yyloc)),
@@ -5896,7 +9457,11 @@
case 328:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3315 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3314 "/home/kuraru/development/zorba_base/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)) );
@@ -5908,7 +9473,11 @@
case 329:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3322 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3321 "/home/kuraru/development/zorba_base/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)) );
@@ -5919,7 +9488,11 @@
case 330:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3334 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3333 "/home/kuraru/development/zorba_base/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));
}
@@ -5928,7 +9501,11 @@
case 331:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3338 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3337 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new QVarInDecl(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (1)].expr)),
@@ -5940,7 +9517,11 @@
case 332:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3350 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3349 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new SwitchExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(8) - (5)].node)), (yysemantic_stack_[(8) - (8)].expr));
}
@@ -5949,7 +9530,11 @@
case 333:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3357 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3356 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
SwitchCaseClauseList* scc_list_p = new SwitchCaseClauseList(LOC((yyloc)));
scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(1) - (1)].node)));
@@ -5960,7 +9545,11 @@
case 334:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3363 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3362 "/home/kuraru/development/zorba_base/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)));
@@ -5971,7 +9560,11 @@
case 335:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3372 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3371 "/home/kuraru/development/zorba_base/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));
}
@@ -5980,7 +9573,11 @@
case 336:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3379 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3378 "/home/kuraru/development/zorba_base/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));
@@ -5991,7 +9588,11 @@
case 337:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3385 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3384 "/home/kuraru/development/zorba_base/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));
@@ -6002,7 +9603,11 @@
case 338:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3396 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3395 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new SwitchExpr(LOC((yyloc)), (yysemantic_stack_[(8) - (3)].expr), static_cast<SwitchCaseClauseList*>((yysemantic_stack_[(8) - (5)].node)), (yysemantic_stack_[(8) - (8)].expr));
}
@@ -6011,7 +9616,11 @@
case 339:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3403 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3402 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
SwitchCaseClauseList* scc_list_p = new SwitchCaseClauseList(LOC((yyloc)));
scc_list_p->push_back(static_cast<SwitchCaseClause*>((yysemantic_stack_[(1) - (1)].node)));
@@ -6022,7 +9631,11 @@
case 340:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3409 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3408 "/home/kuraru/development/zorba_base/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)));
@@ -6033,7 +9646,11 @@
case 341:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3418 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3417 "/home/kuraru/development/zorba_base/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));
}
@@ -6042,7 +9659,11 @@
case 342:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3427 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3426 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
(yysemantic_stack_[(8) - (3)].expr),
@@ -6054,7 +9675,11 @@
case 343:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3434 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3433 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
(yysemantic_stack_[(10) - (3)].expr),
@@ -6067,7 +9692,11 @@
case 344:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3445 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3444 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new TypeswitchExpr(LOC((yyloc)),
(yysemantic_stack_[(8) - (3)].expr),
@@ -6079,7 +9708,11 @@
case 345:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3452 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3451 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new TypeswitchExpr(LOC ((yyloc)),
(yysemantic_stack_[(10) - (3)].expr),
@@ -6092,7 +9725,11 @@
case 346:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3464 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3463 "/home/kuraru/development/zorba_base/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)));
@@ -6103,7 +9740,11 @@
case 347:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3470 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3469 "/home/kuraru/development/zorba_base/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)));
@@ -6114,7 +9755,11 @@
case 348:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3482 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3481 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CaseClause(LOC ((yyloc)),
static_cast<SequenceTypeList*>((yysemantic_stack_[(4) - (2)].node)),
@@ -6125,7 +9770,11 @@
case 349:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3488 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3487 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CaseClause(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
@@ -6137,7 +9786,11 @@
case 350:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3499 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3498 "/home/kuraru/development/zorba_base/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)));
@@ -6148,7 +9801,11 @@
case 351:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3505 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3504 "/home/kuraru/development/zorba_base/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)));
@@ -6159,7 +9816,11 @@
case 352:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3516 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3515 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CaseClause(LOC ((yyloc)),
static_cast<SequenceTypeList*>((yysemantic_stack_[(4) - (2)].node)),
@@ -6170,7 +9831,11 @@
case 353:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3522 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3521 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CaseClause(LOC ((yyloc)),
static_cast<QName*>((yysemantic_stack_[(7) - (3)].expr)),
@@ -6182,7 +9847,11 @@
case 354:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3533 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3532 "/home/kuraru/development/zorba_base/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)));
@@ -6193,7 +9862,11 @@
case 355:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3539 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3538 "/home/kuraru/development/zorba_base/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)));
@@ -6204,7 +9877,11 @@
case 356:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3550 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3549 "/home/kuraru/development/zorba_base/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));
}
@@ -6213,7 +9890,11 @@
case 357:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3559 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3558 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6222,7 +9903,11 @@
case 358:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3563 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3562 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new OrExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
}
@@ -6231,7 +9916,11 @@
case 359:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3572 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3571 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6240,7 +9929,11 @@
case 360:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3576 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3575 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new AndExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
}
@@ -6249,7 +9942,11 @@
case 361:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3583 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3582 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6258,7 +9955,11 @@
case 362:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3587 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3586 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ComparisonExpr(
LOC((yyloc)),
@@ -6272,7 +9973,11 @@
case 363:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3600 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3599 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6281,7 +9986,11 @@
case 364:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3604 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3603 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
/* ::= "eq" | "ne" | "lt" | "le" | "gt" | "ge" */
(yyval.expr) = new ComparisonExpr(
@@ -6296,7 +10005,11 @@
case 365:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3684 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3683 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6305,7 +10018,11 @@
case 366:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3688 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3687 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new FTContainsExpr(
LOC((yyloc)),
@@ -6319,7 +10036,11 @@
case 367:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3700 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3699 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6328,7 +10049,11 @@
case 368:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3704 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3703 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new StringConcatExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
}
@@ -6337,7 +10062,11 @@
case 369:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3711 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3710 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = NULL;
}
@@ -6346,7 +10075,11 @@
case 370:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3715 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3714 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -6355,7 +10088,11 @@
case 371:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3722 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3721 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6364,7 +10101,11 @@
case 372:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3726 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3725 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new RangeExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
}
@@ -6373,7 +10114,11 @@
case 373:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3735 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3734 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6382,7 +10127,11 @@
case 374:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3739 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3738 "/home/kuraru/development/zorba_base/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) );
}
@@ -6391,7 +10140,11 @@
case 375:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3743 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3742 "/home/kuraru/development/zorba_base/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) );
}
@@ -6400,7 +10153,11 @@
case 376:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3751 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3750 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6409,7 +10166,11 @@
case 377:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3755 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3754 "/home/kuraru/development/zorba_base/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)
@@ -6420,7 +10181,11 @@
case 378:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3761 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3760 "/home/kuraru/development/zorba_base/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)
@@ -6431,7 +10196,11 @@
case 379:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3767 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3766 "/home/kuraru/development/zorba_base/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)
@@ -6442,7 +10211,11 @@
case 380:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3773 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3772 "/home/kuraru/development/zorba_base/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)
@@ -6453,7 +10226,11 @@
case 381:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3783 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3782 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6462,7 +10239,11 @@
case 382:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3787 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3786 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
}
@@ -6471,7 +10252,11 @@
case 383:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3791 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3790 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new UnionExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr) );
}
@@ -6480,7 +10265,11 @@
case 384:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3799 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3798 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6489,7 +10278,11 @@
case 385:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3803 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3802 "/home/kuraru/development/zorba_base/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)
@@ -6500,7 +10293,11 @@
case 386:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3809 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3808 "/home/kuraru/development/zorba_base/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)
@@ -6511,7 +10308,11 @@
case 387:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3819 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3818 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6520,7 +10321,11 @@
case 388:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3823 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3822 "/home/kuraru/development/zorba_base/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))
@@ -6531,7 +10336,11 @@
case 389:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3833 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3832 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6540,7 +10349,11 @@
case 390:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3837 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3836 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new TreatExpr(
LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node))
@@ -6551,7 +10364,11 @@
case 391:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3847 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3846 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6560,7 +10377,11 @@
case 392:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3851 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3850 "/home/kuraru/development/zorba_base/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))
@@ -6571,7 +10392,11 @@
case 393:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3861 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3860 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6580,7 +10405,11 @@
case 394:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3865 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3864 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CastExpr(
LOC((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<SingleType*>((yysemantic_stack_[(4) - (4)].node))
@@ -6591,7 +10420,11 @@
case 395:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3875 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3874 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SingleType(LOC((yyloc)), dynamic_cast<SimpleType*>((yysemantic_stack_[(1) - (1)].node)), false);
}
@@ -6600,7 +10433,11 @@
case 396:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3879 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3878 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SingleType(LOC((yyloc)), dynamic_cast<SimpleType*>((yysemantic_stack_[(2) - (1)].node)), true);
}
@@ -6609,7 +10446,11 @@
case 397:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3888 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3887 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6618,7 +10459,11 @@
case 398:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3892 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3891 "/home/kuraru/development/zorba_base/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) );
}
@@ -6627,7 +10472,11 @@
case 399:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3900 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3899 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SignList( LOC((yyloc)), true );
}
@@ -6636,7 +10485,11 @@
case 400:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3904 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3903 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SignList( LOC((yyloc)), false );
}
@@ -6645,7 +10498,11 @@
case 401:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3908 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3907 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(2) - (1)].node);
}
@@ -6654,7 +10511,11 @@
case 402:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3912 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3911 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if ( SignList *sl = dynamic_cast<SignList*>((yysemantic_stack_[(2) - (1)].node)) )
sl->negate();
@@ -6665,7 +10526,11 @@
case 403:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3922 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3921 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6674,7 +10539,11 @@
case 404:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3926 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3925 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6683,7 +10552,11 @@
case 405:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3930 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3929 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6692,7 +10565,11 @@
case 406:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3937 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3936 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6701,7 +10578,11 @@
case 407:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3942 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3941 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new SimpleMapExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
}
@@ -6710,7 +10591,11 @@
case 408:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3950 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3949 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_eq );
}
@@ -6719,7 +10604,11 @@
case 409:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3954 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3953 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ne );
}
@@ -6728,7 +10617,11 @@
case 410:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3958 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3957 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_lt );
}
@@ -6737,7 +10630,11 @@
case 411:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3962 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3961 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_le );
}
@@ -6746,7 +10643,11 @@
case 412:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3966 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3965 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_gt );
}
@@ -6755,7 +10656,11 @@
case 413:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3970 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3969 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ValueComp( LOC((yyloc)), ParseConstants::op_val_ge );
}
@@ -6764,7 +10669,11 @@
case 414:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3994 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3993 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(4) - (3)].expr) );
}
@@ -6773,7 +10682,11 @@
case 415:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 3998 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 3997 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ValidateExpr( LOC((yyloc)), "lax", (yysemantic_stack_[(5) - (4)].expr) );
}
@@ -6782,7 +10695,11 @@
case 416:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4002 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4001 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ValidateExpr( LOC((yyloc)), "strict", (yysemantic_stack_[(5) - (4)].expr) );
}
@@ -6791,7 +10708,11 @@
case 417:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4006 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4005 "/home/kuraru/development/zorba_base/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)
@@ -6803,7 +10724,11 @@
case 418:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4017 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4016 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ExtensionExpr(
LOC((yyloc)), dynamic_cast<PragmaList*>((yysemantic_stack_[(3) - (1)].node)), NULL
@@ -6814,7 +10739,11 @@
case 419:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4023 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4022 "/home/kuraru/development/zorba_base/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)
@@ -6825,7 +10754,11 @@
case 420:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4033 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4032 "/home/kuraru/development/zorba_base/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)) );
@@ -6836,7 +10769,11 @@
case 421:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4039 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4038 "/home/kuraru/development/zorba_base/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)) );
@@ -6847,7 +10784,11 @@
case 422:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4049 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4048 "/home/kuraru/development/zorba_base/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)) );
}
@@ -6856,7 +10797,11 @@
case 423:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4053 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4052 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new Pragma( LOC((yyloc)), new QName( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) ), "" );
}
@@ -6865,7 +10810,11 @@
case 424:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4057 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4056 "/home/kuraru/development/zorba_base/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 ), "" );
}
@@ -6874,7 +10823,11 @@
case 425:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4120 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4119 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
RelativePathExpr* rpe = dynamic_cast<RelativePathExpr*>((yysemantic_stack_[(1) - (1)].expr));
(yyval.expr) = (!rpe ?
@@ -6886,7 +10839,11 @@
case 426:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4142 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4141 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
AxisStep* as = dynamic_cast<AxisStep*>((yysemantic_stack_[(1) - (1)].expr));
(yyval.expr) = (as ?
@@ -6901,7 +10858,11 @@
case 427:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4170 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4169 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6910,7 +10871,11 @@
case 428:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4334 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4333 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new NameTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
}
@@ -6919,7 +10884,11 @@
case 429:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4338 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4337 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new NameTest( LOC((yyloc)), dynamic_cast<Wildcard*>((yysemantic_stack_[(1) - (1)].node)) );
}
@@ -6928,7 +10897,11 @@
case 430:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4348 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4347 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new Wildcard(LOC((yyloc)), "", "", ParseConstants::wild_all, false);
}
@@ -6937,7 +10910,11 @@
case 431:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4352 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4351 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, false);
}
@@ -6946,7 +10923,11 @@
case 432:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4356 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4355 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new Wildcard(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), "", ParseConstants::wild_elem, true);
}
@@ -6955,7 +10936,11 @@
case 433:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4360 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4359 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new Wildcard(LOC((yyloc)), "", SYMTAB((yysemantic_stack_[(1) - (1)].sval)), ParseConstants::wild_prefix, false);
}
@@ -6964,7 +10949,11 @@
case 434:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4369 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4368 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -6973,7 +10962,11 @@
case 435:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4373 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4372 "/home/kuraru/development/zorba_base/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)));
}
@@ -6982,7 +10975,11 @@
case 436:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4377 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4376 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DynamicFunctionInvocation(LOC ((yyloc)), (yysemantic_stack_[(3) - (1)].expr), false);
}
@@ -6991,7 +10988,11 @@
case 437:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4381 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4380 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DynamicFunctionInvocation(LOC ((yyloc)), (yysemantic_stack_[(4) - (1)].expr), dynamic_cast<ArgList*>((yysemantic_stack_[(4) - (3)].node)), false);
}
@@ -7000,7 +11001,11 @@
case 438:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4385 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4384 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
StringLiteral* sl = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
(yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), sl);
@@ -7010,7 +11015,11 @@
case 439:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4390 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4389 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
}
@@ -7019,7 +11028,11 @@
case 440:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4394 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4393 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
}
@@ -7028,7 +11041,11 @@
case 441:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4398 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4397 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new JSONObjectLookup(LOC((yyloc)), (yysemantic_stack_[(3) - (1)].expr), (yysemantic_stack_[(3) - (3)].expr));
}
@@ -7037,7 +11054,11 @@
case 442:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4407 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4406 "/home/kuraru/development/zorba_base/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)) );
@@ -7048,7 +11069,11 @@
case 443:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4413 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4412 "/home/kuraru/development/zorba_base/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)) );
@@ -7059,7 +11084,11 @@
case 444:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4423 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4422 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
}
@@ -7068,7 +11097,11 @@
case 445:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4431 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4430 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7077,7 +11110,11 @@
case 446:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4435 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4434 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7086,7 +11123,11 @@
case 447:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4439 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4438 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7095,7 +11136,11 @@
case 448:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4443 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4442 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7104,7 +11149,11 @@
case 449:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4447 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4446 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7113,7 +11162,11 @@
case 450:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4451 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4450 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7122,7 +11175,11 @@
case 451:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4455 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4454 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7131,7 +11188,11 @@
case 452:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4459 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4458 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7140,7 +11201,11 @@
case 453:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4463 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4462 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7149,7 +11214,11 @@
case 454:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4467 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4466 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7158,7 +11227,11 @@
case 455:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4472 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4471 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7167,7 +11240,11 @@
case 456:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4476 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4475 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7176,7 +11253,11 @@
case 457:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4480 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4479 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7185,7 +11266,11 @@
case 458:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4484 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4483 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7194,7 +11279,11 @@
case 459:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4492 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4491 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7203,7 +11292,11 @@
case 460:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4496 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4495 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7212,7 +11305,11 @@
case 461:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4500 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4499 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7221,7 +11318,11 @@
case 462:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4504 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4503 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new NullLiteral(LOC((yyloc)));
}
@@ -7230,7 +11331,11 @@
case 463:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4512 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4511 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = NumericLiteral::new_literal(
LOC((yyloc)), ParseConstants::num_decimal, *(yysemantic_stack_[(1) - (1)].decval)
@@ -7242,7 +11347,11 @@
case 464:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4519 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4518 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = NumericLiteral::new_literal(
LOC((yyloc)), ParseConstants::num_integer, *(yysemantic_stack_[(1) - (1)].ival)
@@ -7254,7 +11363,11 @@
case 465:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4526 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4525 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = NumericLiteral::new_literal(
LOC((yyloc)), ParseConstants::num_double, *(yysemantic_stack_[(1) - (1)].dval)
@@ -7266,7 +11379,11 @@
case 466:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4536 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4535 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new BooleanLiteral(LOC((yyloc)), true);
}
@@ -7275,7 +11392,11 @@
case 467:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4540 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4539 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new BooleanLiteral(LOC((yyloc)), false);
}
@@ -7284,7 +11405,11 @@
case 468:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4548 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4547 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new VarRef(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)));
}
@@ -7293,7 +11418,11 @@
case 469:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4556 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4555 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), NULL);
}
@@ -7302,7 +11431,11 @@
case 470:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4560 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4559 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ParenthesizedExpr( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
}
@@ -7311,7 +11444,11 @@
case 471:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4568 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4567 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new ContextItemExpr( LOC((yyloc)) );
}
@@ -7320,6 +11457,7 @@
case 472:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4572 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.expr) = new ContextItemExpr( LOC((yyloc)) );
@@ -7330,6 +11468,9 @@
/* Line 690 of lalr1.cc */
#line 4580 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4575 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new OrderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
}
@@ -7338,7 +11479,11 @@
case 474:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4588 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4583 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new UnorderedExpr( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
}
@@ -7347,7 +11492,11 @@
case 475:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4642 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4637 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new FunctionCall( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (1)].expr)), NULL );
}
@@ -7356,7 +11505,11 @@
case 476:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4646 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4641 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
ArgList* argList = dynamic_cast<ArgList*>((yysemantic_stack_[(4) - (3)].node));
@@ -7379,7 +11532,11 @@
case 477:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4668 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4663 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
ArgList *al = new ArgList( LOC((yyloc)) );
al->push_back(new ArgumentPlaceholder(LOC((yyloc))));
@@ -7390,7 +11547,11 @@
case 478:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4674 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4669 "/home/kuraru/development/zorba_base/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))) );
@@ -7401,7 +11562,11 @@
case 479:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4680 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4675 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
ArgList *al = new ArgList( LOC((yyloc)) );
al->push_back( (yysemantic_stack_[(1) - (1)].expr) );
@@ -7412,7 +11577,11 @@
case 480:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4686 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4681 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
if ( ArgList *al = dynamic_cast<ArgList*>((yysemantic_stack_[(3) - (1)].node)) )
al->push_back( (yysemantic_stack_[(3) - (3)].expr) );
@@ -7420,10 +11589,26 @@
}
break;
+<<<<<<< TREE
+=======
+ case 480:
+
+/* Line 690 of lalr1.cc */
+#line 4691 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 481:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4696 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4695 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7432,6 +11617,7 @@
case 482:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4700 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
@@ -7442,6 +11628,9 @@
/* Line 690 of lalr1.cc */
#line 4708 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4703 "/home/kuraru/development/zorba_base/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));
}
@@ -7450,7 +11639,11 @@
case 484:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4716 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4711 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new InlineFunction(LOC((yyloc)),
&*(yysemantic_stack_[(3) - (2)].fnsig)->theParams,
@@ -7460,10 +11653,26 @@
}
break;
+<<<<<<< TREE
+=======
+ case 484:
+
+/* Line 690 of lalr1.cc */
+#line 4723 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 485:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4728 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4727 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7472,7 +11681,11 @@
case 486:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4732 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4735 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7481,7 +11694,11 @@
case 487:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4740 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4739 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7490,7 +11707,11 @@
case 488:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4744 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4743 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7499,6 +11720,7 @@
case 489:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4748 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
@@ -7509,6 +11731,9 @@
/* Line 690 of lalr1.cc */
#line 4756 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4751 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DirElemConstructor(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -7521,7 +11746,11 @@
case 491:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4764 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4759 "/home/kuraru/development/zorba_base/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())
{
@@ -7543,7 +11772,11 @@
case 492:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4781 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4776 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DirElemConstructor(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -7556,7 +11789,11 @@
case 493:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4789 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4784 "/home/kuraru/development/zorba_base/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())
{
@@ -7578,7 +11815,11 @@
case 494:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4808 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4803 "/home/kuraru/development/zorba_base/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())
{
@@ -7600,7 +11841,11 @@
case 495:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4827 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4822 "/home/kuraru/development/zorba_base/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())
{
@@ -7622,7 +11867,11 @@
case 496:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4849 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4844 "/home/kuraru/development/zorba_base/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)) );
@@ -7633,7 +11882,11 @@
case 497:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4855 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4850 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
DirElemContentList *decl = dynamic_cast<DirElemContentList*>((yysemantic_stack_[(2) - (1)].node));
if ( decl )
@@ -7645,7 +11898,11 @@
case 498:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4866 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4861 "/home/kuraru/development/zorba_base/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)) );
@@ -7656,7 +11913,11 @@
case 499:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4872 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4867 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
DirAttributeList *dal = dynamic_cast<DirAttributeList*>((yysemantic_stack_[(2) - (1)].node));
if ( dal )
@@ -7668,7 +11929,11 @@
case 500:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4883 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4878 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new DirAttr(LOC((yyloc)),
static_cast<QName*>((yysemantic_stack_[(6) - (2)].expr)),
@@ -7679,7 +11944,11 @@
case 503:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4898 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4893 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new DirAttributeValue(LOC((yyloc)),
dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(3) - (2)].node)));
@@ -7689,7 +11958,11 @@
case 504:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4903 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4898 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new DirAttributeValue( LOC((yyloc)),
dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(3) - (2)].node)));
@@ -7699,15 +11972,32 @@
case 505:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4912 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4907 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new QuoteAttrContentList( LOC((yyloc)) );
}
break;
+<<<<<<< TREE
+=======
+ case 505:
+
+/* Line 690 of lalr1.cc */
+#line 4911 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 506:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4916 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -7718,6 +12008,9 @@
/* Line 690 of lalr1.cc */
#line 4923 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4918 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
QuoteAttrContentList *qacl = new QuoteAttrContentList( LOC((yyloc)) );
qacl->push_back( new QuoteAttrValueContent( LOC((yyloc)), "\"" ) );
@@ -7728,7 +12021,11 @@
case 508:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4929 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4924 "/home/kuraru/development/zorba_base/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)) );
@@ -7739,7 +12036,11 @@
case 509:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4935 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4930 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
QuoteAttrContentList* qacl = dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
if ( qacl )
@@ -7751,7 +12052,11 @@
case 510:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4942 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4937 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
QuoteAttrContentList *qacl = dynamic_cast<QuoteAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
if ( qacl )
@@ -7763,15 +12068,32 @@
case 511:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4953 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4948 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AposAttrContentList( LOC((yyloc)) );
}
break;
+<<<<<<< TREE
+=======
+ case 511:
+
+/* Line 690 of lalr1.cc */
+#line 4952 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 512:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4957 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -7782,6 +12104,9 @@
/* Line 690 of lalr1.cc */
#line 4964 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4959 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
AposAttrContentList *aacl = new AposAttrContentList( LOC((yyloc)) );
aacl->push_back( new AposAttrValueContent( LOC((yyloc)),"'") );
@@ -7792,7 +12117,11 @@
case 514:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4970 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4965 "/home/kuraru/development/zorba_base/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)) );
@@ -7803,7 +12132,11 @@
case 515:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4976 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4971 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
if (aacl)
@@ -7815,7 +12148,11 @@
case 516:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4983 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4978 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
AposAttrContentList *aacl = dynamic_cast<AposAttrContentList*>((yysemantic_stack_[(2) - (1)].node));
if ( aacl )
@@ -7827,7 +12164,11 @@
case 517:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4994 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4989 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new QuoteAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
}
@@ -7836,7 +12177,11 @@
case 518:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 4998 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 4993 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new QuoteAttrValueContent(LOC((yyloc)), dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr)));
}
@@ -7845,7 +12190,11 @@
case 519:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5006 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5001 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AposAttrValueContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
}
@@ -7854,7 +12203,11 @@
case 520:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5010 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5005 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AposAttrValueContent(LOC((yyloc)), dynamic_cast<CommonContent*>((yysemantic_stack_[(1) - (1)].expr)));
}
@@ -7863,7 +12216,11 @@
case 521:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5018 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5013 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DirElemContent( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr) );
}
@@ -7872,7 +12229,11 @@
case 522:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5022 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5017 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DirElemContent( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
}
@@ -7881,7 +12242,11 @@
case 523:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5026 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5021 "/home/kuraru/development/zorba_base/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 );
@@ -7891,7 +12256,11 @@
case 524:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5031 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5026 "/home/kuraru/development/zorba_base/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 );
@@ -7901,7 +12270,11 @@
case 525:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5040 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5035 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_charref, SYMTAB((yysemantic_stack_[(1) - (1)].sval)));
}
@@ -7910,7 +12283,11 @@
case 526:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5044 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5039 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_escape_lbrace);
}
@@ -7919,7 +12296,11 @@
case 527:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5048 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5043 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CommonContent(LOC((yyloc)), ParseConstants::cont_escape_rbrace);
}
@@ -7928,7 +12309,11 @@
case 528:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5052 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5047 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CommonContent(LOC((yyloc)), new EnclosedExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr)));
}
@@ -7937,7 +12322,11 @@
case 529:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5060 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5055 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DirCommentConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
}
@@ -7946,7 +12335,11 @@
case 530:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5065 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5060 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DirCommentConstructor( LOC((yyloc)), "" );
}
@@ -7955,7 +12348,11 @@
case 531:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5073 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5068 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DirPIConstructor( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
}
@@ -7964,7 +12361,11 @@
case 532:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5078 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5073 "/home/kuraru/development/zorba_base/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)) );
}
@@ -7973,16 +12374,36 @@
case 533:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5086 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5081 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CDataSection( LOC((yyloc)),SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
}
break;
+<<<<<<< TREE
+=======
+ case 533:
+
+/* Line 690 of lalr1.cc */
+#line 5089 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 534:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5094 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5094 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -7991,7 +12412,11 @@
case 535:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5099 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5099 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -8000,7 +12425,11 @@
case 536:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5104 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5104 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -8009,7 +12438,11 @@
case 537:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5109 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5109 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
}
@@ -8018,6 +12451,7 @@
case 538:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5114 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
@@ -8037,6 +12471,18 @@
/* Line 690 of lalr1.cc */
#line 5130 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5114 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
+ }
+ break;
+
+ case 540:
+
+/* Line 690 of lalr1.cc */
+#line 5125 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CompDocConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
}
@@ -8045,7 +12491,11 @@
case 542:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5138 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5133 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CompElemConstructor(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval))), (yysemantic_stack_[(3) - (2)].expr));
}
@@ -8054,7 +12504,11 @@
case 543:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5142 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5137 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CompElemConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
}
@@ -8063,7 +12517,11 @@
case 544:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5159 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5154 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CompAttrConstructor( LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval))), (yysemantic_stack_[(3) - (2)].expr) );
}
@@ -8072,7 +12530,11 @@
case 545:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5163 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5158 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CompAttrConstructor( LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr) );
}
@@ -8081,7 +12543,11 @@
case 546:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5171 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5166 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CompTextConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
}
@@ -8090,7 +12556,11 @@
case 547:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5179 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5174 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CompCommentConstructor( LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr) );
}
@@ -8099,7 +12569,11 @@
case 548:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5187 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5182 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CompPIConstructor(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)), (yysemantic_stack_[(3) - (2)].expr));
}
@@ -8108,7 +12582,11 @@
case 549:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5191 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5186 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CompPIConstructor(LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr));
}
@@ -8117,7 +12595,11 @@
case 550:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5199 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5194 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CompNamespaceConstructor(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)), (yysemantic_stack_[(3) - (2)].expr));
}
@@ -8126,15 +12608,32 @@
case 551:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5203 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5198 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new CompNamespaceConstructor(LOC((yyloc)), (yysemantic_stack_[(7) - (3)].expr), (yysemantic_stack_[(7) - (6)].expr));
}
break;
+<<<<<<< TREE
+=======
+ case 551:
+
+/* Line 690 of lalr1.cc */
+#line 5206 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 552:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5211 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(2) - (2)].node);
@@ -8145,6 +12644,9 @@
/* Line 690 of lalr1.cc */
#line 5219 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5214 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SequenceType( LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL );
}
@@ -8153,16 +12655,36 @@
case 554:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5223 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5218 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SequenceType(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].node), dynamic_cast<OccurrenceIndicator*>((yysemantic_stack_[(2) - (2)].node)));
}
break;
+<<<<<<< TREE
+=======
+ case 554:
+
+/* Line 690 of lalr1.cc */
+#line 5222 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = new SequenceType( LOC((yyloc)), NULL, NULL );
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 555:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5227 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5227 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SequenceType( LOC((yyloc)), NULL, NULL );
}
@@ -8171,6 +12693,7 @@
case 556:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5232 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = new SequenceType( LOC((yyloc)), NULL, NULL );
@@ -8181,6 +12704,9 @@
/* Line 690 of lalr1.cc */
#line 5267 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5262 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OccurrenceIndicator(
LOC((yyloc)), ParseConstants::occurs_optionally
@@ -8191,7 +12717,11 @@
case 558:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5273 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5268 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OccurrenceIndicator(
LOC((yyloc)), ParseConstants::occurs_zero_or_more
@@ -8202,7 +12732,11 @@
case 559:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5279 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5274 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new OccurrenceIndicator(
LOC((yyloc)), ParseConstants::occurs_one_or_more
@@ -8210,10 +12744,26 @@
}
break;
+<<<<<<< TREE
+=======
+ case 559:
+
+/* Line 690 of lalr1.cc */
+#line 5284 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 560:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5289 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5288 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8222,7 +12772,11 @@
case 561:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5293 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5292 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8231,7 +12785,11 @@
case 562:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5297 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5297 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ItemType( LOC((yyloc)), true );
}
@@ -8240,7 +12798,11 @@
case 563:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5302 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5301 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ItemType( LOC((yyloc)), true );
}
@@ -8249,7 +12811,11 @@
case 564:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5306 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5306 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new StructuredItemType(LOC((yyloc)));
}
@@ -8258,7 +12824,11 @@
case 565:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5311 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5310 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new StructuredItemType(LOC((yyloc)));
}
@@ -8267,7 +12837,11 @@
case 566:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5315 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5314 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8276,7 +12850,11 @@
case 567:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5319 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5318 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8285,6 +12863,7 @@
case 568:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5323 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -8295,6 +12874,9 @@
/* Line 690 of lalr1.cc */
#line 5330 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5325 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
TypeList* aTypeList = new TypeList(LOC ((yyloc)));
aTypeList->push_back(dynamic_cast<SequenceType *>((yysemantic_stack_[(1) - (1)].node)));
@@ -8305,7 +12887,11 @@
case 570:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5336 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5331 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
TypeList* aTypeList = dynamic_cast<TypeList *>((yysemantic_stack_[(3) - (1)].node));
aTypeList->push_back(dynamic_cast<SequenceType *>((yysemantic_stack_[(3) - (3)].node)));
@@ -8316,7 +12902,11 @@
case 571:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5346 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5341 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new GeneralizedAtomicType( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
}
@@ -8325,16 +12915,36 @@
case 572:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5354 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5349 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SimpleType( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
}
break;
+<<<<<<< TREE
+=======
+ case 572:
+
+/* Line 690 of lalr1.cc */
+#line 5357 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 573:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5362 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5361 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8343,7 +12953,11 @@
case 574:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5366 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5365 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8352,7 +12966,11 @@
case 575:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5370 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5369 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8361,7 +12979,11 @@
case 576:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5374 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5373 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8370,7 +12992,11 @@
case 577:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5378 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5377 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8379,7 +13005,11 @@
case 578:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5382 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5381 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8388,7 +13018,11 @@
case 579:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5386 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5385 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8397,7 +13031,11 @@
case 580:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5390 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5389 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8406,7 +13044,11 @@
case 581:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5394 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5393 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8415,6 +13057,7 @@
case 582:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5398 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -8425,6 +13068,9 @@
/* Line 690 of lalr1.cc */
#line 5406 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5401 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AnyKindTest( LOC((yyloc)) );
}
@@ -8433,7 +13079,11 @@
case 584:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5414 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5409 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new DocumentTest(LOC((yyloc)));
}
@@ -8442,7 +13092,11 @@
case 585:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5418 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5413 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new DocumentTest(LOC((yyloc)), dynamic_cast<ElementTest*>((yysemantic_stack_[(4) - (3)].node)));
}
@@ -8451,7 +13105,11 @@
case 586:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5422 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5417 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new DocumentTest(LOC((yyloc)), dynamic_cast<SchemaElementTest*>((yysemantic_stack_[(4) - (3)].node)));
}
@@ -8460,7 +13118,11 @@
case 587:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5430 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5425 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new NamespaceTest(LOC((yyloc)));
}
@@ -8469,7 +13131,11 @@
case 588:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5437 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5432 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new TextTest(LOC((yyloc)));
}
@@ -8478,7 +13144,11 @@
case 589:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5445 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5440 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new CommentTest(LOC((yyloc)));
}
@@ -8487,16 +13157,36 @@
case 590:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5453 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5448 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new PITest( LOC((yyloc)), "" );
}
break;
+<<<<<<< TREE
+=======
+ case 590:
+
+/* Line 690 of lalr1.cc */
+#line 5452 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 591:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5457 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5456 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
}
@@ -8505,7 +13195,11 @@
case 592:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5461 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5464 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new PITest( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)) );
}
@@ -8514,6 +13208,7 @@
case 593:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5469 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
@@ -8524,6 +13219,9 @@
/* Line 690 of lalr1.cc */
#line 5473 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5468 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AttributeTest(
LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL
@@ -8534,7 +13232,11 @@
case 595:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5479 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5474 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AttributeTest(
LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(6) - (3)].expr)), dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node))
@@ -8542,9 +13244,22 @@
}
break;
+<<<<<<< TREE
+=======
+ case 595:
+
+/* Line 690 of lalr1.cc */
+#line 5480 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 596:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5485 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = new AttributeTest( LOC((yyloc)), NULL, NULL );
@@ -8555,6 +13270,9 @@
/* Line 690 of lalr1.cc */
#line 5489 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5484 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AttributeTest(
LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node))
@@ -8565,7 +13283,11 @@
case 598:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5499 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5494 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SchemaAttributeTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
}
@@ -8574,7 +13296,11 @@
case 599:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5507 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5502 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ElementTest( LOC((yyloc)), NULL, NULL, true );
}
@@ -8583,7 +13309,11 @@
case 600:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5511 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5506 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ElementTest(
LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), NULL, true
@@ -8594,7 +13324,11 @@
case 601:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5517 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5512 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ElementTest(
LOC((yyloc)),
@@ -8608,7 +13342,11 @@
case 602:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5526 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5521 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ElementTest(
LOC((yyloc)),
@@ -8622,7 +13360,11 @@
case 603:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5535 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5530 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ElementTest(
LOC((yyloc)), NULL, NULL, true
@@ -8633,7 +13375,11 @@
case 604:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5541 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5536 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ElementTest(
LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), false
@@ -8644,7 +13390,11 @@
case 605:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5547 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5542 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new ElementTest(
LOC((yyloc)), NULL, dynamic_cast<TypeName*>((yysemantic_stack_[(6) - (5)].node)), true
@@ -8655,7 +13405,11 @@
case 606:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5557 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5552 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new SchemaElementTest( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)) );
}
@@ -8664,7 +13418,11 @@
case 607:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5574 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5569 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(1) - (1)].expr)) );
}
@@ -8673,7 +13431,11 @@
case 608:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5581 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5576 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new TypeName( LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (1)].expr)), true );
}
@@ -8682,16 +13444,36 @@
case 609:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5596 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5591 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
}
break;
+<<<<<<< TREE
+=======
+ case 609:
+
+/* Line 690 of lalr1.cc */
+#line 5618 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 610:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5623 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5622 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -8700,6 +13482,7 @@
case 611:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5627 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -8710,6 +13493,9 @@
/* Line 690 of lalr1.cc */
#line 5635 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5630 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new AnyFunctionTest(LOC((yyloc)));
}
@@ -8718,7 +13504,11 @@
case 613:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5643 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5638 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new TypedFunctionTest(LOC ((yyloc)), dynamic_cast<SequenceType *>((yysemantic_stack_[(5) - (5)].node)));
}
@@ -8727,7 +13517,11 @@
case 614:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5647 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5642 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new TypedFunctionTest(LOC ((yyloc)),
dynamic_cast<TypeList *>((yysemantic_stack_[(6) - (3)].node)),
@@ -8738,7 +13532,11 @@
case 615:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5658 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5653 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(3) - (2)].node);
}
@@ -8747,7 +13545,11 @@
case 616:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5675 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5670 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new RevalidationDecl(
LOC((yyloc)), StaticContextConsts::strict_validation
@@ -8758,7 +13560,11 @@
case 617:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5681 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5676 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new RevalidationDecl(
LOC((yyloc)), StaticContextConsts::lax_validation
@@ -8769,7 +13575,11 @@
case 618:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5687 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5682 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new RevalidationDecl(
LOC((yyloc)), StaticContextConsts::skip_validation
@@ -8777,10 +13587,26 @@
}
break;
+<<<<<<< TREE
+=======
+ case 618:
+
+/* Line 690 of lalr1.cc */
+#line 5692 "/home/kuraru/development/zorba_base/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 619:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5697 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5696 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::INTO, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
}
@@ -8789,6 +13615,7 @@
case 620:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5701 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.expr) = new InsertExpr(
@@ -8801,6 +13628,9 @@
/* Line 690 of lalr1.cc */
#line 5707 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5702 "/home/kuraru/development/zorba_base/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)
@@ -8811,16 +13641,38 @@
case 622:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5713 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5708 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::AFTER, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
}
break;
+<<<<<<< TREE
+=======
+ case 622:
+
+/* Line 690 of lalr1.cc */
+#line 5712 "/home/kuraru/development/zorba_base/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;
+
+>>>>>>> MERGE-SOURCE
case 623:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5717 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5718 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new InsertExpr(
LOC ((yyloc)), store::UpdateConsts::BEFORE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
@@ -8831,7 +13683,11 @@
case 624:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5723 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5722 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new InsertExpr( LOC((yyloc)), store::UpdateConsts::INTO, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
}
@@ -8840,6 +13696,7 @@
case 625:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5727 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.expr) = new InsertExpr(
@@ -8852,6 +13709,9 @@
/* Line 690 of lalr1.cc */
#line 5733 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5728 "/home/kuraru/development/zorba_base/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)
@@ -8862,7 +13722,11 @@
case 627:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5739 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5734 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new InsertExpr(
LOC ((yyloc)),
@@ -8871,10 +13735,28 @@
}
break;
+<<<<<<< TREE
+=======
+ case 627:
+
+/* Line 690 of lalr1.cc */
+#line 5741 "/home/kuraru/development/zorba_base/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;
+
+>>>>>>> MERGE-SOURCE
case 628:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5746 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5751 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new InsertExpr(
LOC ((yyloc)), store::UpdateConsts::BEFORE, (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr)
@@ -8885,7 +13767,11 @@
case 629:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5756 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5756 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
}
@@ -8894,6 +13780,7 @@
case 630:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5761 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.expr) = new DeleteExpr( LOC ((yyloc)), (yysemantic_stack_[(3) - (3)].expr) );
@@ -8904,6 +13791,9 @@
/* Line 690 of lalr1.cc */
#line 5769 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5764 "/home/kuraru/development/zorba_base/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)
@@ -8914,7 +13804,11 @@
case 632:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5775 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5770 "/home/kuraru/development/zorba_base/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)
@@ -8925,7 +13819,11 @@
case 633:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5785 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5780 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new RenameExpr( LOC ((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
}
@@ -8934,7 +13832,11 @@
case 634:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5807 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5802 "/home/kuraru/development/zorba_base/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) );
@@ -8944,7 +13846,11 @@
case 635:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5816 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5811 "/home/kuraru/development/zorba_base/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)));
@@ -8955,7 +13861,11 @@
case 636:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5822 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5817 "/home/kuraru/development/zorba_base/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));
@@ -8967,7 +13877,11 @@
case 637:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5835 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5830 "/home/kuraru/development/zorba_base/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));
}
@@ -8976,7 +13890,11 @@
case 638:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5849 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5844 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new TryExpr( LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr) );
}
@@ -8985,7 +13903,11 @@
case 639:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5856 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5851 "/home/kuraru/development/zorba_base/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)) );
@@ -8996,7 +13918,11 @@
case 640:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5862 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5857 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
if ( cle )
@@ -9005,10 +13931,27 @@
}
break;
+<<<<<<< TREE
+=======
+ case 640:
+
+/* Line 690 of lalr1.cc */
+#line 5867 "/home/kuraru/development/zorba_base/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;
+
+>>>>>>> MERGE-SOURCE
case 641:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5872 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5876 "/home/kuraru/development/zorba_base/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);
@@ -9018,6 +13961,7 @@
case 642:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5881 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
@@ -9028,6 +13972,9 @@
/* Line 690 of lalr1.cc */
#line 5889 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5884 "/home/kuraru/development/zorba_base/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)) );
@@ -9038,7 +13985,11 @@
case 644:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5895 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5890 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
CatchExpr::NameTestList *ntl =
static_cast<CatchExpr::NameTestList*>((yysemantic_stack_[(3) - (1)].name_test_list));
@@ -9050,7 +14001,11 @@
case 645:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5913 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5908 "/home/kuraru/development/zorba_base/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);
@@ -9060,7 +14015,11 @@
case 646:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5921 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5916 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.pos_filter_list) = NULL;
}
@@ -9069,7 +14028,11 @@
case 647:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5925 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5920 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.pos_filter_list) = (yysemantic_stack_[(1) - (1)].pos_filter_list);
}
@@ -9078,7 +14041,11 @@
case 648:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5932 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5927 "/home/kuraru/development/zorba_base/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)) );
@@ -9088,16 +14055,33 @@
case 649:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5937 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5932 "/home/kuraru/development/zorba_base/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 649:
+
+/* Line 690 of lalr1.cc */
+#line 5940 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 650:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5945 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -9108,14 +14092,30 @@
/* Line 690 of lalr1.cc */
#line 5949 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5944 "/home/kuraru/development/zorba_base/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;
+<<<<<<< TREE
+=======
+ case 651:
+
+/* Line 690 of lalr1.cc */
+#line 5951 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 652:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5956 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -9126,14 +14126,30 @@
/* Line 690 of lalr1.cc */
#line 5960 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5955 "/home/kuraru/development/zorba_base/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;
+<<<<<<< TREE
+=======
+ case 653:
+
+/* Line 690 of lalr1.cc */
+#line 5962 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 654:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5967 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -9144,14 +14160,30 @@
/* Line 690 of lalr1.cc */
#line 5971 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5966 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTMildNot( LOC((yyloc)), (yysemantic_stack_[(4) - (1)].node), (yysemantic_stack_[(4) - (4)].node) );
}
break;
+<<<<<<< TREE
+=======
+ case 655:
+
+/* Line 690 of lalr1.cc */
+#line 5973 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 656:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5978 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -9162,6 +14194,9 @@
/* Line 690 of lalr1.cc */
#line 5982 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5977 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTUnaryNot(
LOC((yyloc)), dynamic_cast<FTPrimaryWithOptions*>((yysemantic_stack_[(2) - (2)].node))
@@ -9172,7 +14207,11 @@
case 658:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 5991 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 5986 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTPrimaryWithOptions(
LOC((yyloc)),
@@ -9183,10 +14222,26 @@
}
break;
+<<<<<<< TREE
+=======
+ case 658:
+
+/* Line 690 of lalr1.cc */
+#line 5998 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = NULL;
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 659:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6003 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6002 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = NULL;
}
@@ -9195,7 +14250,11 @@
case 660:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6007 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6009 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -9204,7 +14263,11 @@
case 661:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6014 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6013 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = NULL;
}
@@ -9213,6 +14276,7 @@
case 662:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6018 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -9223,6 +14287,9 @@
/* Line 690 of lalr1.cc */
#line 6026 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6021 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTWeight( LOC((yyloc)), dynamic_cast<exprnode*>((yysemantic_stack_[(4) - (3)].expr)) );
}
@@ -9231,7 +14298,11 @@
case 664:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6034 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6029 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTWordsTimes(
LOC((yyloc)),
@@ -9244,16 +14315,36 @@
case 665:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6042 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6037 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(3) - (2)].node);
}
break;
+<<<<<<< TREE
+=======
+ case 665:
+
+/* Line 690 of lalr1.cc */
+#line 6041 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 666:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6046 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6048 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -9262,7 +14353,11 @@
case 667:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6053 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6052 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = NULL;
}
@@ -9271,6 +14366,7 @@
case 668:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6057 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -9281,6 +14377,9 @@
/* Line 690 of lalr1.cc */
#line 6065 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6060 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTExtensionSelection(
LOC((yyloc)),
@@ -9290,10 +14389,26 @@
}
break;
+<<<<<<< TREE
+=======
+ case 669:
+
+/* Line 690 of lalr1.cc */
+#line 6071 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = NULL;
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 670:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6076 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6075 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = NULL;
}
@@ -9302,6 +14417,7 @@
case 671:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6080 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -9312,6 +14428,9 @@
/* Line 690 of lalr1.cc */
#line 6088 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6083 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTWords(
LOC((yyloc)),
@@ -9324,7 +14443,11 @@
case 673:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6100 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6095 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTWordsValue(
LOC((yyloc)), static_cast<StringLiteral*>((yysemantic_stack_[(1) - (1)].expr)), NULL
@@ -9335,7 +14458,11 @@
case 674:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6106 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6101 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTWordsValue(
LOC((yyloc)), NULL, dynamic_cast<exprnode*>((yysemantic_stack_[(3) - (2)].expr))
@@ -9346,16 +14473,36 @@
case 675:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6115 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6110 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::any );
}
break;
+<<<<<<< TREE
+=======
+ case 675:
+
+/* Line 690 of lalr1.cc */
+#line 6114 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 676:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6119 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6122 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -9364,7 +14511,11 @@
case 677:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6127 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6126 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
}
@@ -9373,6 +14524,7 @@
case 678:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6131 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = new FTAnyallOption( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].ft_anyall_value) );
@@ -9383,6 +14535,9 @@
/* Line 690 of lalr1.cc */
#line 6135 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6130 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTAnyallOption( LOC((yyloc)), ft_anyall_mode::phrase );
}
@@ -9391,7 +14546,11 @@
case 680:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6142 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6137 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.ft_anyall_value) = ft_anyall_mode::any;
}
@@ -9400,7 +14559,11 @@
case 681:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6146 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6141 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.ft_anyall_value) = ft_anyall_mode::any_word;
}
@@ -9409,7 +14572,11 @@
case 682:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6153 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6148 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.ft_anyall_value) = ft_anyall_mode::all;
}
@@ -9418,16 +14585,36 @@
case 683:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6157 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6152 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.ft_anyall_value) = ft_anyall_mode::all_words;
}
break;
+<<<<<<< TREE
+=======
+ case 683:
+
+/* Line 690 of lalr1.cc */
+#line 6160 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 684:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6165 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6164 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -9436,7 +14623,11 @@
case 685:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6169 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6168 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -9445,7 +14636,11 @@
case 686:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6173 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6172 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -9454,7 +14649,11 @@
case 687:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6177 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6176 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -9463,6 +14662,7 @@
case 688:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6181 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -9473,6 +14673,9 @@
/* Line 690 of lalr1.cc */
#line 6189 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6184 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTOrder( LOC((yyloc)) );
}
@@ -9481,7 +14684,11 @@
case 690:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6197 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6192 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTWindow(
LOC((yyloc)),
@@ -9494,7 +14701,11 @@
case 691:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6209 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6204 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTDistance(
LOC((yyloc)),
@@ -9507,7 +14718,11 @@
case 692:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6221 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6216 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::words );
}
@@ -9516,7 +14731,11 @@
case 693:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6225 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6220 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::sentences );
}
@@ -9525,7 +14744,11 @@
case 694:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6229 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6224 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTUnit( LOC((yyloc)), ft_unit::paragraphs );
}
@@ -9534,7 +14757,11 @@
case 695:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6237 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6232 "/home/kuraru/development/zorba_base/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)) );
@@ -9545,7 +14772,11 @@
case 696:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6243 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6238 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
FTMatchOptions *mo = dynamic_cast<FTMatchOptions*>((yysemantic_stack_[(3) - (1)].node));
mo->push_back( dynamic_cast<FTMatchOption*>((yysemantic_stack_[(3) - (3)].node)) );
@@ -9553,10 +14784,26 @@
}
break;
+<<<<<<< TREE
+=======
+ case 696:
+
+/* Line 690 of lalr1.cc */
+#line 6248 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 697:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6253 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6252 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -9565,7 +14812,11 @@
case 698:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6257 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6256 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -9574,7 +14825,11 @@
case 699:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6261 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6260 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -9583,7 +14838,11 @@
case 700:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6265 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6264 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -9592,7 +14851,11 @@
case 701:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6269 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6268 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -9601,7 +14864,11 @@
case 702:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6273 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6272 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -9610,7 +14877,11 @@
case 703:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6277 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6276 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -9619,6 +14890,7 @@
case 704:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6281 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
@@ -9629,6 +14901,9 @@
/* Line 690 of lalr1.cc */
#line 6289 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6284 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::sensitive );
}
@@ -9637,7 +14912,11 @@
case 706:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6293 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6288 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::insensitive );
}
@@ -9646,7 +14925,11 @@
case 707:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6297 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6292 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::lower );
}
@@ -9655,7 +14938,11 @@
case 708:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6301 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6296 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTCaseOption( LOC((yyloc)), ft_case_mode::upper );
}
@@ -9664,7 +14951,11 @@
case 709:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6309 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6304 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTDiacriticsOption(
LOC((yyloc)), ft_diacritics_mode::sensitive
@@ -9675,7 +14966,11 @@
case 710:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6315 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6310 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTDiacriticsOption(
LOC((yyloc)), ft_diacritics_mode::insensitive
@@ -9686,7 +14981,11 @@
case 711:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6325 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6320 "/home/kuraru/development/zorba_base/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))
@@ -9697,7 +14996,11 @@
case 712:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6335 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6330 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::stemming );
}
@@ -9706,7 +15009,11 @@
case 713:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6339 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6334 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTStemOption( LOC((yyloc)), ft_stem_mode::no_stemming );
}
@@ -9715,7 +15022,11 @@
case 714:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6347 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6342 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
FTThesaurusOption::thesaurus_id_list_t *til = NULL;
if ( (yysemantic_stack_[(2) - (2)].node) ) {
@@ -9730,7 +15041,11 @@
case 715:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6357 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6352 "/home/kuraru/development/zorba_base/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) ) {
@@ -9746,16 +15061,36 @@
case 716:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6368 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6363 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTThesaurusOption( LOC((yyloc)), NULL, false, true );
}
break;
+<<<<<<< TREE
+=======
+ case 716:
+
+/* Line 690 of lalr1.cc */
+#line 6370 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 717:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6375 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6374 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -9764,6 +15099,7 @@
case 718:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6379 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = NULL;
@@ -9774,6 +15110,9 @@
/* Line 690 of lalr1.cc */
#line 6386 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6381 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.thesaurus_id_list) = NULL;
}
@@ -9782,7 +15121,11 @@
case 720:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6390 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6385 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.thesaurus_id_list) = (yysemantic_stack_[(2) - (2)].thesaurus_id_list);
}
@@ -9791,7 +15134,11 @@
case 721:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6397 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6392 "/home/kuraru/development/zorba_base/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)) );
@@ -9801,7 +15148,11 @@
case 722:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6402 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6397 "/home/kuraru/development/zorba_base/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);
@@ -9811,7 +15162,11 @@
case 723:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6411 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6406 "/home/kuraru/development/zorba_base/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))
@@ -9822,7 +15177,11 @@
case 724:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6420 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6415 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.sval) = 0;
}
@@ -9831,16 +15190,36 @@
case 725:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6424 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6419 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.sval) = (yysemantic_stack_[(2) - (2)].sval);
}
break;
+<<<<<<< TREE
+=======
+ case 725:
+
+/* Line 690 of lalr1.cc */
+#line 6426 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = NULL;
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 726:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6431 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6430 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = NULL;
}
@@ -9849,6 +15228,7 @@
case 727:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6435 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = (yysemantic_stack_[(2) - (1)].node);
@@ -9859,6 +15239,9 @@
/* Line 690 of lalr1.cc */
#line 6443 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6438 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTStopWordOption(
LOC((yyloc)),
@@ -9872,7 +15255,11 @@
case 729:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6452 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6447 "/home/kuraru/development/zorba_base/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
@@ -9884,7 +15271,11 @@
case 730:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6459 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6454 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTStopWordOption(
LOC((yyloc)), NULL, NULL, ft_stop_words_mode::without
@@ -9895,7 +15286,11 @@
case 731:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6469 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6464 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTStopWords( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)), NULL );
}
@@ -9904,7 +15299,11 @@
case 732:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6473 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6468 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTStopWords( LOC((yyloc)), "", (yysemantic_stack_[(3) - (2)].strlist) );
}
@@ -9913,7 +15312,11 @@
case 733:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6480 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6475 "/home/kuraru/development/zorba_base/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)) );
@@ -9924,7 +15327,11 @@
case 734:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6486 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6481 "/home/kuraru/development/zorba_base/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)) );
@@ -9935,7 +15342,11 @@
case 735:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6495 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6490 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.incl_excl_list) = NULL;
}
@@ -9944,7 +15355,11 @@
case 736:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6499 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6494 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.incl_excl_list) = (yysemantic_stack_[(1) - (1)].incl_excl_list);
}
@@ -9953,7 +15368,11 @@
case 737:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6506 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6501 "/home/kuraru/development/zorba_base/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)) );
@@ -9963,7 +15382,11 @@
case 738:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6511 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6506 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
FTStopWordOption::incl_excl_list_t *iel = (yysemantic_stack_[(2) - (1)].incl_excl_list);
if ( !iel )
@@ -9976,7 +15399,11 @@
case 739:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6523 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6518 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTStopWordsInclExcl(
LOC((yyloc)),
@@ -9989,7 +15416,11 @@
case 740:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6531 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6526 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTStopWordsInclExcl(
LOC((yyloc)),
@@ -10002,7 +15433,11 @@
case 741:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6543 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6538 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTLanguageOption( LOC((yyloc)), SYMTAB((yysemantic_stack_[(2) - (2)].sval)) );
}
@@ -10011,7 +15446,11 @@
case 742:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6551 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6546 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::with );
}
@@ -10020,7 +15459,11 @@
case 743:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6555 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6550 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTWildCardOption( LOC((yyloc)), ft_wild_card_mode::without );
}
@@ -10029,7 +15472,11 @@
case 744:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6563 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6558 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_start );
}
@@ -10038,7 +15485,11 @@
case 745:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6567 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6562 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::at_end );
}
@@ -10047,7 +15498,11 @@
case 746:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6571 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6566 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTContent( LOC((yyloc)), ft_content_mode::entire );
}
@@ -10056,7 +15511,11 @@
case 747:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6579 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6574 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTTimes( LOC((yyloc)), dynamic_cast<FTRange*>((yysemantic_stack_[(3) - (2)].node)) );
}
@@ -10065,7 +15524,11 @@
case 748:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6587 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6582 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::exactly, (yysemantic_stack_[(2) - (2)].expr) );
}
@@ -10074,7 +15537,11 @@
case 749:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6591 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6586 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::at_least, (yysemantic_stack_[(3) - (3)].expr) );
}
@@ -10083,7 +15550,11 @@
case 750:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6595 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6590 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTRange( LOC((yyloc)), ft_range_mode::at_most, (yysemantic_stack_[(3) - (3)].expr) );
}
@@ -10092,7 +15563,11 @@
case 751:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6599 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6594 "/home/kuraru/development/zorba_base/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) );
}
@@ -10101,7 +15576,11 @@
case 752:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6607 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6602 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTScope(
LOC((yyloc)),
@@ -10114,7 +15593,11 @@
case 753:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6615 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6610 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTScope(
LOC((yyloc)),
@@ -10127,7 +15610,11 @@
case 754:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6627 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6622 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::sentence );
}
@@ -10136,7 +15623,11 @@
case 755:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6631 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6626 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTBigUnit( LOC((yyloc)), ft_big_unit::paragraph );
}
@@ -10145,7 +15636,11 @@
case 756:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6639 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6634 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new FTIgnoreOption( LOC((yyloc)), static_cast<UnionExpr*>((yysemantic_stack_[(3) - (3)].expr)) );
}
@@ -10154,7 +15649,11 @@
case 757:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6653 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6648 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), NULL );
}
@@ -10163,7 +15662,11 @@
case 758:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6657 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6652 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new JSONArrayConstructor( LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr) );
}
@@ -10172,7 +15675,11 @@
case 759:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6664 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6659 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
// TODO: fill in with the correct constructor
(yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), NULL, false);
@@ -10182,7 +15689,11 @@
case 760:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6669 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6664 "/home/kuraru/development/zorba_base/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);
@@ -10192,7 +15703,11 @@
case 761:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6677 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6672 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
// TODO: fill in with the correct constructor
(yyval.expr) = new JSONObjectConstructor(LOC((yyloc)), NULL, true);
@@ -10202,7 +15717,11 @@
case 762:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6682 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6677 "/home/kuraru/development/zorba_base/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);
@@ -10212,7 +15731,11 @@
case 763:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6691 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6686 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new JSONDirectObjectConstructor(LOC((yyloc)),
dynamic_cast<JSONPairList*>((yysemantic_stack_[(3) - (2)].node)));
@@ -10222,7 +15745,11 @@
case 764:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6703 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6694 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
StringLiteral* sl = new StringLiteral( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (1)].sval)) );
JSONPairList* jpl = new JSONPairList(LOC((yyloc)));
@@ -10234,7 +15761,11 @@
case 765:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6710 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6701 "/home/kuraru/development/zorba_base/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)));
@@ -10245,7 +15776,11 @@
case 766:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6716 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6707 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (1)].node));
assert(jpl);
@@ -10257,7 +15792,11 @@
case 767:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6723 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6714 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (1)].node));
assert(jpl);
@@ -10270,7 +15809,11 @@
case 768:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6734 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6725 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new JSONObjectInsertExpr(LOC((yyloc)),
(yysemantic_stack_[(5) - (3)].expr),
@@ -10281,7 +15824,11 @@
case 769:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6740 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6731 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(5) - (3)].node));
(yyval.expr) = new JSONObjectInsertExpr(
@@ -10296,7 +15843,11 @@
case 770:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6750 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6741 "/home/kuraru/development/zorba_base/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));
}
@@ -10305,7 +15856,11 @@
case 771:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6755 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6746 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new JSONObjectInsertExpr(LOC((yyloc)),
(yysemantic_stack_[(4) - (2)].expr),
@@ -10316,7 +15871,11 @@
case 772:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6761 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6752 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
JSONPairList* jpl = dynamic_cast<JSONPairList*>((yysemantic_stack_[(4) - (2)].node));
(yyval.expr) = new JSONObjectInsertExpr(
@@ -10331,7 +15890,11 @@
case 773:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6771 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6762 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new JSONArrayInsertExpr(LOC((yyloc)), (yysemantic_stack_[(7) - (2)].expr), (yysemantic_stack_[(7) - (4)].expr), (yysemantic_stack_[(7) - (7)].expr));
}
@@ -10340,7 +15903,11 @@
case 774:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6778 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6769 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new JSONArrayAppendExpr(LOC((yyloc)), (yysemantic_stack_[(5) - (3)].expr), (yysemantic_stack_[(5) - (5)].expr));
}
@@ -10349,7 +15916,11 @@
case 775:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6782 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6773 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.expr) = new JSONArrayAppendExpr(LOC((yyloc)), (yysemantic_stack_[(4) - (2)].expr), (yysemantic_stack_[(4) - (4)].expr));
}
@@ -10358,7 +15929,11 @@
case 776:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6789 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6780 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(3) - (3)].expr));
@@ -10385,7 +15960,11 @@
case 777:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6811 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6802 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(2) - (2)].expr));
@@ -10412,7 +15991,11 @@
case 778:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6836 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6827 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(5) - (3)].expr));
@@ -10442,7 +16025,11 @@
case 779:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6861 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6852 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(4) - (2)].expr));
@@ -10472,7 +16059,11 @@
case 780:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6889 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6880 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(7) - (5)].expr));
@@ -10502,7 +16093,11 @@
case 781:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6914 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6905 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
rchandle<DynamicFunctionInvocation> lDynamicFunctionInvocation =
dynamic_cast<DynamicFunctionInvocation*>((yysemantic_stack_[(6) - (4)].expr));
@@ -10529,10 +16124,26 @@
}
break;
+<<<<<<< TREE
+=======
+ case 781:
+
+/* Line 690 of lalr1.cc */
+#line 6933 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
+ }
+ break;
+
+>>>>>>> MERGE-SOURCE
case 782:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6942 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6937 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -10541,7 +16152,11 @@
case 783:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6946 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6941 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -10550,7 +16165,11 @@
case 784:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6950 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6948 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = (yysemantic_stack_[(1) - (1)].node);
}
@@ -10559,7 +16178,11 @@
case 785:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6957 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6953 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonItem);
}
@@ -10568,7 +16191,11 @@
case 786:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6962 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6960 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonItem);
}
@@ -10577,7 +16204,11 @@
case 787:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6969 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6965 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonObject);
}
@@ -10586,7 +16217,11 @@
case 788:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6974 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6972 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{
(yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonObject);
}
@@ -10595,6 +16230,7 @@
case 789:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 6981 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
{
(yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonArray);
@@ -10614,6 +16250,18 @@
/* Line 690 of lalr1.cc */
#line 7003 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 6977 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+ {
+ (yyval.node) = new JSON_Test(LOC((yyloc)), store::StoreConsts::jsonArray);
+ }
+ break;
+
+ case 792:
+
+/* Line 690 of lalr1.cc */
+#line 6994 "/home/kuraru/development/zorba_base/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();
@@ -10628,1484 +16276,2332 @@
case 795:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7016 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7007 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("attribute"))); }
break;
case 796:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7017 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7008 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("comment"))); }
break;
case 797:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7018 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7009 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("document-node"))); }
break;
case 798:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7019 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7010 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("namespace-node"))); }
break;
case 799:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7020 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7011 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("element"))); }
break;
case 800:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7022 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7013 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("if"))); }
break;
case 801:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7023 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7014 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("node"))); }
break;
case 802:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7024 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7015 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("processing-instruction"))); }
break;
case 803:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7025 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7016 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema-attribute"))); }
break;
case 804:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7026 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7017 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema-element"))); }
break;
case 805:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7027 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7018 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("text"))); }
break;
case 806:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7028 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7019 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("typeswitch"))); }
break;
case 807:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7029 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7020 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("switch"))); }
break;
case 808:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7030 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7021 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("empty-sequence"))); }
break;
case 809:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7031 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7022 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("while"))); }
break;
case 811:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7036 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7027 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))); }
break;
case 812:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7037 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7028 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("xquery"))); }
break;
case 813:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7038 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7029 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("empty"))); }
break;
case 814:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7039 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7030 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("boundary-space"))); }
break;
case 815:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7040 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7031 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ft-option"))); }
break;
case 816:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7041 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7032 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("base-uri"))); }
break;
case 817:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7042 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7033 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lax"))); }
break;
case 818:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7043 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7034 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("strict"))); }
break;
case 819:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7044 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7035 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("idiv"))); }
break;
case 820:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7045 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7036 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("document"))); }
break;
case 821:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7046 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7037 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ftnot"))); }
break;
case 822:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7047 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7038 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("not"))); }
break;
case 823:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7048 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7039 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sensitive"))); }
break;
case 824:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7049 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7040 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("insensitive"))); }
break;
case 825:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7050 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7041 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("diacritics"))); }
break;
case 826:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7051 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7042 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("without"))); }
break;
case 827:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7052 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7043 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stemming"))); }
break;
case 828:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7053 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7044 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("thesaurus"))); }
break;
case 829:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7054 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7045 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stop"))); }
break;
case 830:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7055 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7046 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("wildcards"))); }
break;
case 831:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7056 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7047 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("entire"))); }
break;
case 832:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7057 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7048 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("content"))); }
break;
case 833:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7058 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7049 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("word"))); }
break;
case 834:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7059 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7050 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("start"))); }
break;
case 835:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7060 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7051 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("end"))); }
break;
case 836:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7061 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7052 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("most"))); }
break;
case 837:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7062 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7053 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("skip"))); }
break;
case 838:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7063 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7054 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("copy"))); }
break;
case 839:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7064 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7055 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("general"))); }
break;
case 840:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7065 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7056 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("value"))); }
break;
case 841:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7066 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7057 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("eq"))); }
break;
case 842:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7067 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7058 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ne"))); }
break;
case 843:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7068 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7059 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lt"))); }
break;
case 844:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7069 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7060 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("le"))); }
break;
case 845:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7070 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7061 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("gt"))); }
break;
case 846:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7071 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7062 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ge"))); }
break;
case 847:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7072 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7063 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("at"))); }
break;
case 848:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7073 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7064 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("context"))); }
break;
case 849:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7074 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7065 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("variable"))); }
break;
case 850:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7075 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7066 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("return"))); }
break;
case 851:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7076 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7067 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("for"))); }
break;
case 852:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7077 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7068 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("allowing"))); }
break;
case 853:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7078 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7069 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sliding"))); }
break;
case 854:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7079 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7070 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("tumbling"))); }
break;
case 855:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7080 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7071 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("previous"))); }
break;
case 856:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7081 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7072 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("next"))); }
break;
case 857:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7082 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7073 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("only"))); }
break;
case 858:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7083 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7074 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("when"))); }
break;
case 859:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7084 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7075 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("count"))); }
break;
case 860:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7085 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7076 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("in"))); }
break;
case 861:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7086 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7077 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("let"))); }
break;
case 862:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7087 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7078 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("where"))); }
break;
case 863:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7088 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7079 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("by"))); }
break;
case 864:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7089 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7080 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("group"))); }
break;
case 865:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7090 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7081 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("order"))); }
break;
case 866:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7091 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7082 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("stable"))); }
break;
case 867:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7092 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7083 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ascending"))); }
break;
case 868:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7093 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7084 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descending"))); }
break;
case 869:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7094 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7085 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("greatest"))); }
break;
case 870:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7095 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7086 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("least"))); }
break;
case 871:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7096 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7087 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("collation"))); }
break;
case 872:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7097 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7088 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("some"))); }
break;
case 873:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7098 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7089 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("every"))); }
break;
case 874:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7099 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7090 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("satisfies"))); }
break;
case 875:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7100 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7091 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("case"))); }
break;
case 876:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7101 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7092 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("as"))); }
break;
case 877:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7102 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7093 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("then"))); }
break;
case 878:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7103 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7094 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("else"))); }
break;
case 879:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7104 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7095 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("or"))); }
break;
case 880:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7105 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7096 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("and"))); }
break;
case 881:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7106 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7097 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("instance"))); }
break;
case 882:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7107 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7098 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("of"))); }
break;
case 883:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7108 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7099 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("castable"))); }
break;
case 884:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7109 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7100 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("to"))); }
break;
case 885:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7110 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7101 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("div"))); }
break;
case 886:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7111 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7102 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("mod"))); }
break;
case 887:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7112 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7103 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("union"))); }
break;
case 888:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7113 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7104 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("intersect"))); }
break;
case 889:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7114 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7105 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("except"))); }
break;
case 890:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7115 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7106 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("validate"))); }
break;
case 891:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7116 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7107 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("type"))); }
break;
case 892:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7117 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7108 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("cast"))); }
break;
case 893:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7118 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7109 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("treat"))); }
break;
case 894:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7119 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7110 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("is"))); }
break;
case 895:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7120 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7111 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preserve"))); }
break;
case 896:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7121 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7112 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("strip"))); }
break;
case 897:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7122 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7113 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("namespace"))); }
break;
case 898:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7123 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7114 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("external"))); }
break;
case 899:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7124 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7115 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("encoding"))); }
break;
case 900:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7125 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7116 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("no-preserve"))); }
break;
case 901:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7126 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7117 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("inherit"))); }
break;
case 902:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7127 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7118 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("no-inherit"))); }
break;
case 903:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7128 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7119 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("declare"))); }
break;
case 904:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7129 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7120 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("construction"))); }
break;
case 905:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7130 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7121 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ordering"))); }
break;
case 906:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7131 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7122 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("default"))); }
break;
case 907:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7132 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7123 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("copy-namespaces"))); }
break;
case 908:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7133 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7124 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("option"))); }
break;
case 909:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7134 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7125 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("version"))); }
break;
case 910:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7135 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7126 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("import"))); }
break;
case 911:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7136 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7127 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("schema"))); }
break;
case 912:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7137 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7128 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("module"))); }
break;
case 913:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7138 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7129 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("function"))); }
break;
case 914:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7139 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7130 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("score"))); }
break;
case 915:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7140 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7131 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("contains"))); }
break;
case 916:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7141 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7132 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("weight"))); }
break;
case 917:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7142 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7133 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("window"))); }
break;
case 918:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7143 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7134 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("distance"))); }
break;
case 919:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7144 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7135 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("occurs"))); }
break;
case 920:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7145 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7136 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("times"))); }
break;
case 921:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7146 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7137 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("same"))); }
break;
case 922:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7147 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7138 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("different"))); }
break;
case 923:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7148 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7139 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("lowercase"))); }
break;
case 924:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7149 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7140 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("uppercase"))); }
break;
case 925:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7150 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7141 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("relationship"))); }
break;
case 926:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7151 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7142 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("levels"))); }
break;
case 927:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7152 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7143 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("language"))); }
break;
case 928:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7153 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7144 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("any"))); }
break;
case 929:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7154 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7145 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("all"))); }
break;
case 930:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7155 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7146 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("exactly"))); }
break;
case 931:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7156 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7147 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("from"))); }
break;
case 932:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7157 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7148 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("words"))); }
break;
case 933:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7158 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7149 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sentences"))); }
break;
case 934:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7159 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7150 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sentence"))); }
break;
case 935:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7160 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7151 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("phrase"))); }
break;
case 936:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7161 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7152 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("paragraph"))); }
break;
case 937:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7162 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7153 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("paragraphs"))); }
break;
case 938:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7164 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7155 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("modify"))); }
break;
case 939:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7165 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7156 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("first"))); }
break;
case 940:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7167 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7158 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("before"))); }
break;
case 941:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7168 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7159 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("after"))); }
break;
case 942:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7169 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7160 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("revalidation"))); }
break;
case 943:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7170 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7161 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("with"))); }
break;
case 944:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7171 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7162 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("nodes"))); }
break;
case 945:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7173 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7164 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("last"))); }
break;
case 946:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7175 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7166 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("into"))); }
break;
case 947:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7176 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7167 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("simple"))); }
break;
case 948:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7177 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7168 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("sequential"))); }
break;
case 949:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7178 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7169 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("updating"))); }
break;
case 950:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7179 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7170 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ordered"))); }
break;
case 951:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7180 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7171 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("unordered"))); }
break;
case 952:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7181 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7172 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("returning"))); }
break;
case 953:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7182 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7173 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("exit"))); }
break;
case 954:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7183 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7174 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("loop"))); }
break;
case 955:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7184 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7175 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("break"))); }
break;
case 956:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7185 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7176 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("continue"))); }
break;
case 957:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7186 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7177 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("try"))); }
break;
case 958:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7187 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7178 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("catch"))); }
break;
case 959:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7188 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7179 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("using"))); }
break;
case 960:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7189 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7180 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("set"))); }
break;
case 961:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7190 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7181 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("index"))); }
break;
case 962:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7191 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7182 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("unique"))); }
break;
case 963:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7192 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7183 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("non"))); }
break;
case 964:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7193 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7184 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("on"))); }
break;
case 965:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7194 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7185 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("range"))); }
break;
case 966:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7195 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7186 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("equality"))); }
break;
case 967:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7196 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7187 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("manually"))); }
break;
case 968:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7197 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7188 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("automatically"))); }
break;
case 969:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7198 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7189 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("maintained"))); }
break;
case 970:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7199 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7190 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("decimal-format"))); }
break;
case 971:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7200 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7191 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("decimal-separator"))); }
break;
case 972:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7201 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7192 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("grouping-separator"))); }
break;
case 973:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7202 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7193 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("infinity"))); }
break;
case 974:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7203 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7194 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("minus-sign"))); }
break;
case 975:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7204 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7195 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("NaN"))); }
break;
case 976:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7205 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7196 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("percent"))); }
break;
case 977:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7206 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7197 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("per-mille"))); }
break;
case 978:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7207 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7198 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("zero-digit"))); }
break;
case 979:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7208 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7199 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("digit"))); }
break;
case 980:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7209 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7200 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("pattern-separator"))); }
break;
case 981:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7210 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7201 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("collection"))); }
break;
case 982:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7211 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7202 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("const"))); }
break;
case 983:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7212 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7203 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("append-only"))); }
break;
case 984:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7213 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7204 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("queue"))); }
break;
case 985:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7214 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7205 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("mutable"))); }
break;
case 986:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7215 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7206 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("read-only"))); }
break;
case 987:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7216 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7207 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("integrity"))); }
break;
case 988:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7217 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7208 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("constraint"))); }
break;
case 989:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7218 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7209 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("check"))); }
break;
case 990:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7219 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7210 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("key"))); }
break;
case 991:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7220 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7211 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("foreach"))); }
break;
case 992:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7221 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7212 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("foreign"))); }
break;
case 993:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7222 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7213 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("keys"))); }
break;
case 994:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7223 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7214 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ancestor"))); }
break;
case 995:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7224 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7215 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("child"))); }
break;
case 996:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7225 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7216 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descendant"))); }
break;
case 997:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7226 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7217 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("parent"))); }
break;
case 998:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7227 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7218 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preceding"))); }
break;
case 999:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7228 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7219 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("self"))); }
break;
case 1000:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7229 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7220 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("following"))); }
break;
case 1001:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7230 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7221 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("ancestor-or-self"))); }
break;
case 1002:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7231 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7222 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("descendant-or-self"))); }
break;
case 1003:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7232 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7223 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("following-sibling"))); }
break;
case 1004:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7233 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7224 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("preceding-sibling"))); }
break;
case 1005:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7236 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7227 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
{ (yyval.expr) = new QName(LOC((yyloc)), SYMTAB(SYMTAB_PUT("position"))); }
break;
case 1006:
/* Line 690 of lalr1.cc */
+<<<<<<< TREE
#line 7245 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7236 "/home/kuraru/development/zorba_base/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 12109 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 12100 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
default:
break;
}
@@ -17981,11 +24477,19 @@
} // zorba
/* Line 1136 of lalr1.cc */
+<<<<<<< TREE
#line 17985 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.cpp"
+=======
+#line 17966 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.cpp"
+>>>>>>> MERGE-SOURCE
/* Line 1138 of lalr1.cc */
+<<<<<<< TREE
#line 7249 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 7240 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
namespace zorba {
=== modified file 'src/compiler/parser/jsoniq_parser.hpp'
--- src/compiler/parser/jsoniq_parser.hpp 2013-03-27 17:10:46 +0000
+++ src/compiler/parser/jsoniq_parser.hpp 2013-04-02 21:43:28 +0000
@@ -38,7 +38,11 @@
/* "%code requires" blocks. */
/* Line 35 of lalr1.cc */
+<<<<<<< TREE
#line 35 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 35 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
/*
@@ -85,7 +89,11 @@
/* Line 35 of lalr1.cc */
+<<<<<<< TREE
#line 89 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.hpp"
+=======
+#line 89 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.hpp"
+>>>>>>> MERGE-SOURCE
#include <string>
@@ -115,7 +123,11 @@
namespace zorba {
/* Line 35 of lalr1.cc */
+<<<<<<< TREE
#line 119 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.hpp"
+=======
+#line 119 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.hpp"
+>>>>>>> MERGE-SOURCE
/// A Bison parser.
class jsoniq_parser
@@ -127,7 +139,11 @@
{
/* Line 35 of lalr1.cc */
+<<<<<<< TREE
#line 148 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_parser.y"
+=======
+#line 148 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_parser.y"
+>>>>>>> MERGE-SOURCE
zorba::parsenode *node;
zorba::exprnode *expr;
@@ -151,7 +167,11 @@
/* Line 35 of lalr1.cc */
+<<<<<<< TREE
#line 155 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.hpp"
+=======
+#line 155 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.hpp"
+>>>>>>> MERGE-SOURCE
};
#else
typedef YYSTYPE semantic_type;
@@ -679,7 +699,11 @@
} // zorba
/* Line 35 of lalr1.cc */
+<<<<<<< TREE
#line 683 "/home/colea/xquery_bzr/feature-empty_object/build/src/compiler/parser/jsoniq_parser.hpp"
+=======
+#line 682 "/home/kuraru/development/zorba_base/BUILD/src/compiler/parser/jsoniq_parser.hpp"
+>>>>>>> MERGE-SOURCE
=== modified file 'src/compiler/parser/jsoniq_scanner.cpp'
--- src/compiler/parser/jsoniq_scanner.cpp 2013-03-27 17:10:46 +0000
+++ src/compiler/parser/jsoniq_scanner.cpp 2013-04-02 21:43:28 +0000
@@ -3324,7 +3324,11 @@
#define yymore() yymore_used_but_not_detected
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
+<<<<<<< TREE
#line 1 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 1 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
/*
* Copyright 2006-2008 The FLWOR Foundation.
*
@@ -3340,7 +3344,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+<<<<<<< TREE
#line 17 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 17 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
#if defined (WIN32)
@@ -3623,18 +3631,30 @@
+<<<<<<< TREE
#line 403 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 395 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
typedef zorba::jsoniq_parser::token token;
/*______________________________________________________________________
|
| Override Flex's starting state here.
|______________________________________________________________________*/
+<<<<<<< TREE
#line 412 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 404 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
#define YY_USER_INIT \
{ \
BEGIN MODE_SHEBANG; \
}
+<<<<<<< TREE
#line 3638 "jsoniq_scanner.yy.cpp"
+=======
+#line 3608 "jsoniq_scanner.yy.cpp"
+>>>>>>> MERGE-SOURCE
#define INITIAL 0
#define MODE_SHEBANG 1
@@ -3816,7 +3836,11 @@
register int yy_act;
/* %% [7.0] user's declarations go here */
+<<<<<<< TREE
#line 419 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 411 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
@@ -3827,7 +3851,11 @@
| Accepts the "#!/path/interpreter" unix script shebang string
|______________________________________________________________________*/
+<<<<<<< TREE
#line 3831 "jsoniq_scanner.yy.cpp"
+=======
+#line 3801 "jsoniq_scanner.yy.cpp"
+>>>>>>> MERGE-SOURCE
if ( !(yy_init) )
{
@@ -3939,13 +3967,21 @@
case 1:
/* rule 1 can match eol */
YY_RULE_SETUP
+<<<<<<< TREE
#line 430 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 422 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::SHEBANG; }
YY_BREAK
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
+<<<<<<< TREE
#line 431 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 423 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ BEGIN INITIAL; yyless(0); }
YY_BREAK
@@ -3959,112 +3995,196 @@
case 3:
YY_RULE_SETUP
+<<<<<<< TREE
#line 445 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 437 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::LPAR; }
YY_BREAK
case 4:
YY_RULE_SETUP
+<<<<<<< TREE
#line 446 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 438 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::SEMI; }
YY_BREAK
case 5:
YY_RULE_SETUP
+<<<<<<< TREE
#line 447 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 439 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::COMMA; }
YY_BREAK
case 6:
YY_RULE_SETUP
+<<<<<<< TREE
#line 448 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 440 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::MINUS; }
YY_BREAK
case 7:
YY_RULE_SETUP
+<<<<<<< TREE
#line 449 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 441 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::PLUS; }
YY_BREAK
case 8:
YY_RULE_SETUP
+<<<<<<< TREE
#line 450 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 442 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::SLASH; }
YY_BREAK
case 9:
YY_RULE_SETUP
+<<<<<<< TREE
#line 451 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 443 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::SLASH_SLASH; }
YY_BREAK
case 10:
YY_RULE_SETUP
+<<<<<<< TREE
#line 452 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 444 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::BANG; }
YY_BREAK
case 11:
YY_RULE_SETUP
+<<<<<<< TREE
#line 453 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 445 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::AT_SIGN; }
YY_BREAK
case 12:
YY_RULE_SETUP
+<<<<<<< TREE
#line 454 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 446 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::RPAR; }
YY_BREAK
case 13:
YY_RULE_SETUP
+<<<<<<< TREE
#line 455 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 447 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::STAR; }
YY_BREAK
case 14:
YY_RULE_SETUP
+<<<<<<< TREE
#line 456 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 448 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::DOT_DOT; }
YY_BREAK
case 15:
YY_RULE_SETUP
+<<<<<<< TREE
#line 457 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 449 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::DOT; }
YY_BREAK
case 16:
YY_RULE_SETUP
+<<<<<<< TREE
#line 458 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 450 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::HOOK; }
YY_BREAK
case 17:
YY_RULE_SETUP
+<<<<<<< TREE
#line 459 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 451 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::DOLLAR; }
YY_BREAK
case 18:
YY_RULE_SETUP
+<<<<<<< TREE
#line 460 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
{ return token::DOLLAR_DOLLAR; }
YY_BREAK
case 19:
YY_RULE_SETUP
#line 461 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 452 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::HASH; }
YY_BREAK
case 20:
YY_RULE_SETUP
+<<<<<<< TREE
#line 462 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 453 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::COLON; }
YY_BREAK
case 21:
YY_RULE_SETUP
+<<<<<<< TREE
#line 463 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 454 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::DOUBLE_COLON; }
YY_BREAK
case 22:
YY_RULE_SETUP
+<<<<<<< TREE
#line 464 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 455 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::PERCENTAGE; }
YY_BREAK
case 23:
YY_RULE_SETUP
+<<<<<<< TREE
#line 465 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 456 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::CONCAT; }
YY_BREAK
case 24:
YY_RULE_SETUP
+<<<<<<< TREE
#line 467 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 458 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{
std::string lDocComment = theDriver->theDocComment.str();
yylval->sval = getDriver()->symtab.put_commentcontent(lDocComment.c_str(), lDocComment.length());
@@ -4074,7 +4194,11 @@
YY_BREAK
case 25:
YY_RULE_SETUP
+<<<<<<< TREE
#line 474 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 465 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{
std::string lDocComment = theDriver->theDocComment.str();
yylval->sval = getDriver()->symtab.put_commentcontent(lDocComment.c_str(), lDocComment.length());
@@ -4085,434 +4209,778 @@
/* Tokens with state transitions */
case 26:
YY_RULE_SETUP
+<<<<<<< TREE
#line 482 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 473 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ PUSH_STATE(MODE_ELEM_COMP_CONSTR); }
YY_BREAK
case 27:
YY_RULE_SETUP
+<<<<<<< TREE
#line 483 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 474 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ PUSH_STATE(MODE_ATTR_COMP_CONSTR); }
YY_BREAK
case 28:
YY_RULE_SETUP
+<<<<<<< TREE
#line 484 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 475 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ PUSH_STATE(MODE_PI_COMP_CONSTR); }
YY_BREAK
case 29:
YY_RULE_SETUP
+<<<<<<< TREE
#line 485 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 476 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ PUSH_STATE(MODE_NS_COMP_CONSTR); }
YY_BREAK
case 30:
YY_RULE_SETUP
+<<<<<<< TREE
#line 488 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 479 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::IF; }
YY_BREAK
case 31:
YY_RULE_SETUP
+<<<<<<< TREE
#line 489 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 480 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::RETURNING; }
YY_BREAK
case 32:
YY_RULE_SETUP
+<<<<<<< TREE
#line 491 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 482 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::EXIT; }
YY_BREAK
case 33:
YY_RULE_SETUP
+<<<<<<< TREE
#line 492 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 483 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::WITH; }
YY_BREAK
case 34:
YY_RULE_SETUP
+<<<<<<< TREE
#line 493 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 484 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::BREAK; }
YY_BREAK
case 35:
YY_RULE_SETUP
+<<<<<<< TREE
#line 494 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 485 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::LOOP; }
YY_BREAK
case 36:
YY_RULE_SETUP
+<<<<<<< TREE
#line 495 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 486 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::CONTINUE; }
YY_BREAK
case 37:
YY_RULE_SETUP
+<<<<<<< TREE
#line 496 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 487 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::WHILE; }
YY_BREAK
case 38:
YY_RULE_SETUP
+<<<<<<< TREE
#line 497 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 488 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::SET; }
YY_BREAK
case 39:
YY_RULE_SETUP
+<<<<<<< TREE
#line 498 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 489 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::VALIDATE; }
YY_BREAK
case 40:
YY_RULE_SETUP
+<<<<<<< TREE
#line 499 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 490 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::TYPE; }
YY_BREAK
case 41:
YY_RULE_SETUP
+<<<<<<< TREE
#line 500 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 491 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::SWITCH; }
YY_BREAK
case 42:
YY_RULE_SETUP
+<<<<<<< TREE
#line 501 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 492 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::TYPESWITCH; }
YY_BREAK
case 43:
YY_RULE_SETUP
+<<<<<<< TREE
#line 502 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 493 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::DOCUMENT; }
YY_BREAK
case 44:
YY_RULE_SETUP
+<<<<<<< TREE
#line 503 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 494 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::TEXT; }
YY_BREAK
case 45:
YY_RULE_SETUP
+<<<<<<< TREE
#line 504 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 495 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::COMMENT; }
YY_BREAK
case 46:
YY_RULE_SETUP
+<<<<<<< TREE
#line 505 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 496 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::FUNCTION; }
YY_BREAK
case 47:
YY_RULE_SETUP
+<<<<<<< TREE
#line 506 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 497 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::SIMPLE; }
YY_BREAK
case 48:
YY_RULE_SETUP
+<<<<<<< TREE
#line 507 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 498 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::UPDATING; }
YY_BREAK
case 49:
YY_RULE_SETUP
+<<<<<<< TREE
#line 508 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 499 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::SEQUENTIAL; }
YY_BREAK
case 50:
YY_RULE_SETUP
+<<<<<<< TREE
#line 509 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 500 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::ORDERED;}
YY_BREAK
case 51:
YY_RULE_SETUP
+<<<<<<< TREE
#line 510 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 501 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::UNORDERED; }
YY_BREAK
case 52:
YY_RULE_SETUP
+<<<<<<< TREE
#line 511 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 502 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::SCHEMA_ELEMENT; }
YY_BREAK
case 53:
YY_RULE_SETUP
+<<<<<<< TREE
#line 512 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 503 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::SCHEMA_ATTRIBUTE; }
YY_BREAK
case 54:
YY_RULE_SETUP
+<<<<<<< TREE
#line 513 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 504 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::NODE; }
YY_BREAK
case 55:
YY_RULE_SETUP
+<<<<<<< TREE
#line 514 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 505 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::DOCUMENT_NODE; }
YY_BREAK
case 56:
YY_RULE_SETUP
+<<<<<<< TREE
#line 515 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 506 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::NS_NODE; }
YY_BREAK
case 57:
YY_RULE_SETUP
+<<<<<<< TREE
#line 516 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 507 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::CONSTRUCTION; }
YY_BREAK
case 58:
YY_RULE_SETUP
+<<<<<<< TREE
#line 517 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 508 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::DEFAULT; }
YY_BREAK
case 59:
YY_RULE_SETUP
+<<<<<<< TREE
#line 518 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 509 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::ORDER; }
YY_BREAK
case 60:
YY_RULE_SETUP
+<<<<<<< TREE
#line 519 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 510 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::COLLATION; }
YY_BREAK
case 61:
YY_RULE_SETUP
+<<<<<<< TREE
#line 520 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 511 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::BASE_URI; }
YY_BREAK
case 62:
YY_RULE_SETUP
+<<<<<<< TREE
#line 521 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 512 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::IMPORT; }
YY_BREAK
case 63:
YY_RULE_SETUP
+<<<<<<< TREE
#line 522 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 513 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::SCHEMA; }
YY_BREAK
case 64:
YY_RULE_SETUP
+<<<<<<< TREE
#line 523 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 514 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::COPY_NAMESPACES; }
YY_BREAK
case 65:
YY_RULE_SETUP
+<<<<<<< TREE
#line 524 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 515 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::FOR; }
YY_BREAK
case 66:
YY_RULE_SETUP
+<<<<<<< TREE
#line 525 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 516 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::LET; }
YY_BREAK
case 67:
YY_RULE_SETUP
+<<<<<<< TREE
#line 526 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 517 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::ALLOWING; }
YY_BREAK
case 68:
YY_RULE_SETUP
+<<<<<<< TREE
#line 527 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 518 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::SLIDING; }
YY_BREAK
case 69:
YY_RULE_SETUP
+<<<<<<< TREE
#line 528 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 519 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::TUMBLING; }
YY_BREAK
case 70:
YY_RULE_SETUP
+<<<<<<< TREE
#line 529 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 520 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::PREVIOUS; }
YY_BREAK
case 71:
YY_RULE_SETUP
+<<<<<<< TREE
#line 530 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 521 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::NEXT; }
YY_BREAK
case 72:
YY_RULE_SETUP
+<<<<<<< TREE
#line 531 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 522 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::ONLY; }
YY_BREAK
case 73:
YY_RULE_SETUP
+<<<<<<< TREE
#line 532 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 523 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::WHEN; }
YY_BREAK
case 74:
YY_RULE_SETUP
+<<<<<<< TREE
#line 533 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 524 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::COUNT; }
YY_BREAK
case 75:
YY_RULE_SETUP
+<<<<<<< TREE
#line 534 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 525 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::USING; }
YY_BREAK
case 76:
YY_RULE_SETUP
+<<<<<<< TREE
#line 535 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 526 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::SOME; }
YY_BREAK
case 77:
YY_RULE_SETUP
+<<<<<<< TREE
#line 536 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 527 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::EVERY; }
YY_BREAK
case 78:
YY_RULE_SETUP
+<<<<<<< TREE
#line 537 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 528 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::CONTEXT; }
YY_BREAK
case 79:
YY_RULE_SETUP
+<<<<<<< TREE
#line 538 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 529 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::VARIABLE; }
YY_BREAK
case 80:
YY_RULE_SETUP
+<<<<<<< TREE
#line 539 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 530 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::BOUNDARY_SPACE; }
YY_BREAK
case 81:
YY_RULE_SETUP
+<<<<<<< TREE
#line 540 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 531 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::ORDERING; }
YY_BREAK
case 82:
YY_RULE_SETUP
+<<<<<<< TREE
#line 541 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 532 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::XQUERY; }
YY_BREAK
case 83:
YY_RULE_SETUP
+<<<<<<< TREE
#line 542 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 533 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::JSONIQ; }
YY_BREAK
case 84:
YY_RULE_SETUP
+<<<<<<< TREE
#line 543 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 534 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::VERSION; }
YY_BREAK
case 85:
YY_RULE_SETUP
+<<<<<<< TREE
#line 544 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 535 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::OPTION; }
YY_BREAK
case 86:
YY_RULE_SETUP
+<<<<<<< TREE
#line 545 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 536 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::AT; }
YY_BREAK
case 87:
YY_RULE_SETUP
+<<<<<<< TREE
#line 546 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 537 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::REVALIDATION; }
YY_BREAK
case 88:
YY_RULE_SETUP
+<<<<<<< TREE
#line 547 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 538 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::AS; }
YY_BREAK
case 89:
YY_RULE_SETUP
+<<<<<<< TREE
#line 548 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 539 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::TRY; }
YY_BREAK
/* Axes */
case 90:
YY_RULE_SETUP
+<<<<<<< TREE
#line 551 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 542 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::ANCESTOR_OR_SELF; }
YY_BREAK
case 91:
YY_RULE_SETUP
+<<<<<<< TREE
#line 552 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 543 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::ANCESTOR; }
YY_BREAK
case 92:
YY_RULE_SETUP
+<<<<<<< TREE
#line 553 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 544 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::CHILD; }
YY_BREAK
case 93:
YY_RULE_SETUP
+<<<<<<< TREE
#line 554 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 545 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::DESCENDANT_OR_SELF; }
YY_BREAK
case 94:
YY_RULE_SETUP
+<<<<<<< TREE
#line 555 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 546 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::DESCENDANT; }
YY_BREAK
case 95:
YY_RULE_SETUP
+<<<<<<< TREE
#line 556 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 547 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::FOLLOWING_SIBLING; }
YY_BREAK
case 96:
YY_RULE_SETUP
+<<<<<<< TREE
#line 557 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 548 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::FOLLOWING; }
YY_BREAK
case 97:
YY_RULE_SETUP
+<<<<<<< TREE
#line 558 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 549 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::PARENT; }
YY_BREAK
case 98:
YY_RULE_SETUP
+<<<<<<< TREE
#line 559 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 550 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::PRECEDING_SIBLING; }
YY_BREAK
case 99:
YY_RULE_SETUP
+<<<<<<< TREE
#line 560 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 551 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::PRECEDING; }
YY_BREAK
case 100:
YY_RULE_SETUP
+<<<<<<< TREE
#line 561 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 552 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::SELF;}
YY_BREAK
/* Decimal format */
case 101:
YY_RULE_SETUP
+<<<<<<< TREE
#line 564 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 555 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::DECIMAL_FORMAT; }
YY_BREAK
case 102:
YY_RULE_SETUP
+<<<<<<< TREE
#line 565 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 556 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::DECIMAL_SEPARATOR; }
YY_BREAK
case 103:
YY_RULE_SETUP
+<<<<<<< TREE
#line 566 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 557 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::GROUPING_SEPARATOR; }
YY_BREAK
case 104:
YY_RULE_SETUP
+<<<<<<< TREE
#line 567 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 558 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::INFINITY_VALUE; }
YY_BREAK
case 105:
YY_RULE_SETUP
+<<<<<<< TREE
#line 568 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 559 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::MINUS_SIGN; }
YY_BREAK
case 106:
YY_RULE_SETUP
+<<<<<<< TREE
#line 569 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 560 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::NaN; }
YY_BREAK
case 107:
YY_RULE_SETUP
+<<<<<<< TREE
#line 570 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 561 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::PERCENT; }
YY_BREAK
case 108:
YY_RULE_SETUP
+<<<<<<< TREE
#line 571 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 562 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::PER_MILLE; }
YY_BREAK
case 109:
YY_RULE_SETUP
+<<<<<<< TREE
#line 572 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 563 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::ZERO_DIGIT; }
YY_BREAK
case 110:
YY_RULE_SETUP
+<<<<<<< TREE
#line 573 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 564 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::DIGIT; }
YY_BREAK
case 111:
YY_RULE_SETUP
+<<<<<<< TREE
#line 574 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 565 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::PATTERN_SEPARATOR; }
YY_BREAK
/*______________________________________________________________________
@@ -4521,117 +4989,209 @@
|______________________________________________________________________*/
case 112:
YY_RULE_SETUP
+<<<<<<< TREE
#line 581 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 572 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::COLLECTION; }
YY_BREAK
case 113:
YY_RULE_SETUP
+<<<<<<< TREE
#line 582 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 573 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::CONSTOPT; }
YY_BREAK
case 114:
YY_RULE_SETUP
+<<<<<<< TREE
#line 583 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 574 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::APPEND_ONLY; }
YY_BREAK
case 115:
YY_RULE_SETUP
+<<<<<<< TREE
#line 584 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 575 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::QUEUE; }
YY_BREAK
case 116:
YY_RULE_SETUP
+<<<<<<< TREE
#line 585 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 576 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::MUTABLE; }
YY_BREAK
case 117:
YY_RULE_SETUP
+<<<<<<< TREE
#line 586 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 577 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::READ_ONLY; }
YY_BREAK
case 118:
YY_RULE_SETUP
+<<<<<<< TREE
#line 588 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 579 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::INDEX; }
YY_BREAK
case 119:
YY_RULE_SETUP
+<<<<<<< TREE
#line 589 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 580 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::UNIQUE; }
YY_BREAK
case 120:
YY_RULE_SETUP
+<<<<<<< TREE
#line 590 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 581 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::NON; }
YY_BREAK
case 121:
YY_RULE_SETUP
+<<<<<<< TREE
#line 591 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 582 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::MANUALLY; }
YY_BREAK
case 122:
YY_RULE_SETUP
+<<<<<<< TREE
#line 592 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 583 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::AUTOMATICALLY; }
YY_BREAK
case 123:
YY_RULE_SETUP
+<<<<<<< TREE
#line 593 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 584 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::MAINTAINED; }
YY_BREAK
case 124:
YY_RULE_SETUP
+<<<<<<< TREE
#line 594 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 585 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::RANGE; }
YY_BREAK
case 125:
YY_RULE_SETUP
+<<<<<<< TREE
#line 595 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 586 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::EQUALITY; }
YY_BREAK
case 126:
YY_RULE_SETUP
+<<<<<<< TREE
#line 596 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 587 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::ON; }
YY_BREAK
case 127:
YY_RULE_SETUP
+<<<<<<< TREE
#line 597 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 588 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::GENERAL; }
YY_BREAK
case 128:
YY_RULE_SETUP
+<<<<<<< TREE
#line 599 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 590 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::INTEGRITY; }
YY_BREAK
case 129:
YY_RULE_SETUP
+<<<<<<< TREE
#line 600 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 591 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::CONSTRAINT; }
YY_BREAK
case 130:
YY_RULE_SETUP
+<<<<<<< TREE
#line 601 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 592 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::CHECK; }
YY_BREAK
case 131:
YY_RULE_SETUP
+<<<<<<< TREE
#line 602 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 593 "/home/kuraru/development/zorba_base/src/compiler/parser/jsoniq_scanner.l"
+>>>>>>> MERGE-SOURCE
{ return token::KEY; }
YY_BREAK
case 132:
YY_RULE_SETUP
+<<<<<<< TREE
#line 603 "/home/colea/xquery_bzr/feature-empty_object/src/compiler/parser/jsoniq_scanner.l"
+=======
+#line 594 "/home/kuraru/development
Follow ups
