Merge lp:~zorba-coders/zorba/hof-next into lp:zorba

[Markos Zaharioudakis]

1. Fixed problem with function items associated with contextual builtin functions
2. Fixed casting to xs:idrefs, xs:entities, and xs:nmtokens"

1. Fixed problem with function items associated with contextual builtin functions
2. Fixed casting to xs:idrefs, xs:entities, and xs:nmtokens"

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-next-2013-04-15T13-40-26.669Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/hof-next into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job hof-next-2013-04-15T13-40-26.669Z is finished. The
  final status was:

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

  Not commiting changes.

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-next-2013-04-15T14-23-55.986Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/hof-next into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job hof-next-2013-04-15T14-23-55.986Z is finished. The
  final status was:

  919 tests did not succeed - changes not commited.

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-next-2013-04-15T21-24-58.908Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/hof-next into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job hof-next-2013-04-15T21-24-58.908Z is finished. The
  final status was:

  4 tests did not succeed - changes not commited.

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-next-2013-04-16T07-47-54.403Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/hof-next into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job hof-next-2013-04-16T07-47-54.403Z is finished. The
  final status was:

  3 tests did not succeed - changes not commited.

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-next-2013-04-16T08-44-52.794Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job hof-next-2013-04-16T08-44-52.794Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

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

[lp:~zorba-coders/zorba/hof-next]

11343. By Markos Zaharioudakis on 2013-04-16

optimization: no need for function-lookup to compute and copy the focus vars if the target function is not contextual

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-next-2013-04-16T09-53-07.572Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job hof-next-2013-04-16T09-53-07.572Z is finished. The final status was:

All tests succeeded!

=== modified file 'modules/xqxq/xqxq.xq.src/xqxq.cpp'
--- modules/xqxq/xqxq.xq.src/xqxq.cpp	2013-03-25 19:01:32 +0000
+++ modules/xqxq/xqxq.xq.src/xqxq.cpp	2013-04-16 09:23:27 +0000
@@ -820,12 +820,12 @@
 
   XQuery_t lQuery = getQuery(aDctx, lQueryID);
 
-  if(lQuery->isUpdating())
+  if (lQuery->isUpdating())
   {
     throwError("QueryIsUpdating", "Executing Query shouldn't be updating.");
   }
      
-  if(lQuery->isSequential())
+  if (lQuery->isSequential())
   {
     throwError("QueryIsSequential", "Executing Query shouldn't be sequential.");
   }
@@ -848,7 +848,7 @@
   
   XQuery_t lQuery = getQuery(aDctx, lQueryID);
     
-  if(lQuery->isSequential())
+  if (lQuery->isSequential())
   {
     throwError("QueryIsSequential", "Executing Query shouldn't be sequential.");   
   }

=== modified file 'modules/xqxq/xqxq.xq.src/xqxq.h'
--- modules/xqxq/xqxq.xq.src/xqxq.h	2013-03-22 00:09:14 +0000
+++ modules/xqxq/xqxq.xq.src/xqxq.h	2013-04-16 09:23:27 +0000
@@ -406,7 +406,7 @@
   protected:
     Iterator_t theIterator;
 
-    String theQueryID;
+    String     theQueryID;
 
   public:
     EvaluateIterator(Iterator_t& aIter, String aQueryID)
@@ -428,6 +428,8 @@
   };
 
   typedef zorba::SmartPtr<EvaluateIterator> EvaluateIterator_t;
+
+protected:
   EvaluateIterator_t theIter; 
 
 public:

=== modified file 'src/compiler/codegen/plan_visitor.cpp'
--- src/compiler/codegen/plan_visitor.cpp	2013-03-27 09:32:22 +0000
+++ src/compiler/codegen/plan_visitor.cpp	2013-04-16 09:23:27 +0000
@@ -470,12 +470,10 @@
 
   FunctionItemInfo* fnInfo = v.get_dynamic_fn_info();
   fnInfo->theCCB = theCCB;
-  fnInfo->theMustDeleteCCB = false;
   fnInfo->theLoc = qloc;
 
-  if (v.is_inline())
   {
-    for (csize i = 0; i < v.get_subst_vars_values().size(); ++i)
+    for (csize i = 0; i < v.get_subst_vars().size(); ++i)
     {      
       if (!v.get_is_global_var()[i])     
         fnInfo->theScopedVarsIterators.push_back(pop_itstack());
@@ -2473,8 +2471,8 @@
 
   if (v.is_sequential())
   {
-    ulong numArgs = v.num_args();
-    for (ulong i = 0; i < numArgs; ++i)
+    csize numArgs = v.num_args();
+    for (csize i = 0; i < numArgs; ++i)
     {
       if (v.get_arg(i)->is_sequential())
       {

=== modified file 'src/compiler/expression/expr_put.cpp'
--- src/compiler/expression/expr_put.cpp	2013-03-26 21:26:20 +0000
+++ src/compiler/expression/expr_put.cpp	2013-04-16 09:23:27 +0000
@@ -533,37 +533,31 @@
 
 std::ostream& function_item_expr::put(std::ostream& os) const
 {
-  os << indent << "funtion_item_expr " << expr_addr(this) << inc_indent;
-
-  if (!is_inline())
-  {
-    os << " " << theFunctionItemInfo->theQName->getStringValue()
-       << "#" << theFunctionItemInfo->theArity;
-    os << dec_indent << endl;
-    return os;
-  }
-  else
-  {
-    os << " " << theFunctionItemInfo->theQName->getStringValue()
-       << "#" << theFunctionItemInfo->theArity << " [\n";
-
-    for (ulong i = 0; i < theFunctionItemInfo->theScopedVarsValues.size(); i++)
-    {
-      os << indent << "using $"
-         << theFunctionItemInfo->theScopedVarsNames[i]->getStringValue()
-         << (theFunctionItemInfo->theIsGlobalVar[i] ? " global=1" : "") << " := [";
-      os << endl << inc_indent;
-      if (theFunctionItemInfo->theScopedVarsValues[i])
-        theFunctionItemInfo->theScopedVarsValues[i]->put(os);
-      os << dec_indent << indent << "]" << endl;
-    }
-
-    if (theFunctionItemInfo->theFunction != NULL &&
-        static_cast<user_function*>(theFunctionItemInfo->theFunction.getp())->getBody() != NULL)
-      static_cast<user_function*>(theFunctionItemInfo->theFunction.getp())->getBody()->put(os);
-
-    END_PUT();
-  }
+  os << indent << "funtion_item_expr " << expr_addr(this) << 
+    " fiInfo" << expr_addr(theFunctionItemInfo.getp()) << inc_indent;
+
+  os << " " << theFunctionItemInfo->theQName->getStringValue()
+     << "#" << theFunctionItemInfo->theArity << " [\n";
+
+  for (ulong i = 0; i < theFunctionItemInfo->theScopedVarsValues.size(); i++)
+  {
+    os << indent << "using $"
+       << theFunctionItemInfo->theScopedVarsNames[i]->getStringValue()
+       << expr_addr(theFunctionItemInfo->theSubstVarsValues[i])
+       << (theFunctionItemInfo->theIsGlobalVar[i] ? " global=1" : "") << " := [";
+    os << endl << inc_indent;
+
+    if (theFunctionItemInfo->theScopedVarsValues[i])
+      theFunctionItemInfo->theScopedVarsValues[i]->put(os);
+
+    os << dec_indent << indent << "]" << endl;
+  }
+
+  if (theFunctionItemInfo->theFunction != NULL &&
+      static_cast<user_function*>(theFunctionItemInfo->theFunction.getp())->getBody() != NULL)
+    static_cast<user_function*>(theFunctionItemInfo->theFunction.getp())->getBody()->put(os);
+
+  END_PUT();
 }
 
 

=== modified file 'src/compiler/expression/function_item_expr.cpp'
--- src/compiler/expression/function_item_expr.cpp	2013-03-27 09:00:05 +0000
+++ src/compiler/expression/function_item_expr.cpp	2013-04-16 09:23:27 +0000
@@ -135,6 +135,7 @@
 
 function_item_expr::~function_item_expr()
 {
+  //std::cerr << "Deallocating function_item_expr: " << this << std::endl;
 }
 
 
@@ -155,10 +156,10 @@
 }
 
 
-void function_item_expr::set_function(user_function* udf)
+  void function_item_expr::set_function(user_function* udf, csize arity)
 {
   theFunctionItemInfo->theFunction = udf;
-  theFunctionItemInfo->theArity = udf->getArity();
+  theFunctionItemInfo->theArity = arity;
   theFunctionItemInfo->theQName = udf->getName();
   // compute_scripting_kind();
 }

=== modified file 'src/compiler/expression/function_item_expr.h'
--- src/compiler/expression/function_item_expr.h	2013-03-27 09:00:05 +0000
+++ src/compiler/expression/function_item_expr.h	2013-04-16 09:23:27 +0000
@@ -163,7 +163,7 @@
       const store::Item_t& name,
       int isGlobal);
 
-  const std::vector<var_expr*>& get_subst_vars_values() const
+  const std::vector<var_expr*>& get_subst_vars() const
   {
     return theFunctionItemInfo->theSubstVarsValues;
   }
@@ -178,7 +178,7 @@
     return theFunctionItemInfo->theIsGlobalVar;
   }
 
-  void set_function(user_function* udf);
+  void set_function(user_function* udf, csize arity);
 
   function* get_function() const { return theFunctionItemInfo->theFunction; }
 
@@ -190,6 +190,8 @@
   
   bool needs_context_item() const { return theFunctionItemInfo->theNeedsContextItem; }
 
+  void set_needs_ctx_item(bool v) { theFunctionItemInfo->theNeedsContextItem = v; }
+
   bool is_coercion() const { return theFunctionItemInfo->theIsCoercion; }
 
   void compute_scripting_kind();

=== modified file 'src/compiler/parser/jsoniq_parser.cpp'
--- src/compiler/parser/jsoniq_parser.cpp	2013-04-10 02:24:08 +0000
+++ src/compiler/parser/jsoniq_parser.cpp	2013-04-16 09:23:27 +0000
@@ -36,7 +36,7 @@
 /* First part of user declarations.  */
 
 /* Line 293 of lalr1.cc  */
-#line 88 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 88 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 
 
 #include "common/common.h"
@@ -65,7 +65,7 @@
 
 
 /* Line 293 of lalr1.cc  */
-#line 69 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 69 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 
 
 #include "jsoniq_parser.hpp"
@@ -73,7 +73,7 @@
 /* User implementation prologue.  */
 
 /* Line 299 of lalr1.cc  */
-#line 917 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 917 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 
 // HACK to trigger rchandle release: rchandles are freed when refcount == 0
 // (not <= 0); but Bison never increments the refcount, so we do it manually...
@@ -85,7 +85,7 @@
 }
 
 /* Line 299 of lalr1.cc  */
-#line 1053 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1053 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 
 #include "compiler/parser/jsoniq_scanner.h"
 
@@ -95,7 +95,7 @@
 
 
 /* Line 299 of lalr1.cc  */
-#line 99 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 99 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 
 #ifndef YY_
 # if defined YYENABLE_NLS && YYENABLE_NLS
@@ -181,7 +181,7 @@
 namespace zorba {
 
 /* Line 382 of lalr1.cc  */
-#line 185 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 185 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 
   /* Return YYSTR after stripping away unnecessary quotes and
      backslashes, so that it's suitable for yyerror.  The heuristic is
@@ -282,2495 +282,2495 @@
         case 112: /* "\"'DECIMAL'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 915 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 915 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->decval); };
 
 /* Line 480 of lalr1.cc  */
-#line 290 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 290 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 127: /* "\"'DOUBLE'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 914 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 914 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->dval); };
 
 /* Line 480 of lalr1.cc  */
-#line 299 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 299 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 152: /* "\"'INTEGER'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 913 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 913 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->ival); };
 
 /* Line 480 of lalr1.cc  */
-#line 308 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 308 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 346: /* "VersionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 317 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 317 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 347: /* "MainModule" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 326 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 326 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 348: /* "LibraryModule" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 335 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 335 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 349: /* "ModuleDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 344 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 344 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 350: /* "SIND_DeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 353 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 353 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 351: /* "SIND_Decl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 362 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 362 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 352: /* "Setter" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 371 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 371 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 353: /* "BoundarySpaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 380 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 380 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 354: /* "DefaultCollationDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 389 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 389 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 355: /* "BaseURIDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 398 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 398 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 356: /* "ConstructionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 407 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 407 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 357: /* "OrderingModeDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 416 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 416 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 358: /* "EmptyOrderDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 425 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 425 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 359: /* "CopyNamespacesDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 434 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 434 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 360: /* "Import" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 443 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 443 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 361: /* "SchemaImport" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 452 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 452 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 362: /* "URILiteralList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 461 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 461 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 363: /* "SchemaPrefix" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 470 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 470 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 364: /* "ModuleImport" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 479 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 479 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 365: /* "NamespaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 488 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 488 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 366: /* "DefaultNamespaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 497 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 497 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 367: /* "VFO_DeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 506 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 506 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 368: /* "VFO_Decl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 515 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 515 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 369: /* "DecimalFormatDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 524 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 524 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 370: /* "DecimalFormatParamList" */
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 947 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->vstrpair); };
 
 /* Line 480 of lalr1.cc  */
-#line 533 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 533 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 371: /* "DecimalFormatParam" */
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 947 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->strpair); };
 
 /* Line 480 of lalr1.cc  */
-#line 542 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 542 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 373: /* "OptionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 551 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 551 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 374: /* "FTOptionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 560 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 560 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 375: /* "CtxItemDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 569 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 569 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 376: /* "CtxItemDecl2" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 578 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 578 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 377: /* "CtxItemDecl3" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 587 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 587 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 378: /* "CtxItemDecl4" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 596 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 596 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 379: /* "VarDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 605 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 605 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 380: /* "VarNameAndType" */
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 947 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->varnametype); };
 
 /* Line 480 of lalr1.cc  */
-#line 614 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 614 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 381: /* "AnnotationList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 623 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 623 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 382: /* "Annotation" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 632 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 632 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 383: /* "AnnotationLiteralList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 641 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 641 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 384: /* "FunctionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 650 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 650 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 385: /* "FunctionDecl2" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 659 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 659 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 386: /* "FunctionDeclSimple" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 668 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 668 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 387: /* "FunctionDeclUpdating" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 677 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 677 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 388: /* "FunctionSig" */
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 947 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->fnsig); };
 
 /* Line 480 of lalr1.cc  */
-#line 686 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 686 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 389: /* "ParamList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 695 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 695 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 390: /* "Param" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 704 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 704 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 391: /* "CollectionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 713 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 713 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 393: /* "IndexDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 722 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 722 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 394: /* "IndexKeyList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 731 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 731 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 395: /* "IndexKeySpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 740 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 740 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 396: /* "IntegrityConstraintDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 749 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 749 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 397: /* "QueryBody" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 758 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 758 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 398: /* "StatementsAndOptionalExprTop" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 767 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 767 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 399: /* "StatementsAndOptionalExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 776 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 776 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 400: /* "StatementsAndExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 785 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 785 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 401: /* "Statements" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 794 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 794 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 402: /* "Statement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 803 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 803 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 403: /* "BlockStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 812 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 812 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 404: /* "BlockExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 821 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 821 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 405: /* "EnclosedStatementsAndOptionalExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 830 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 830 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 406: /* "VarDeclStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 839 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 839 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 409: /* "AssignStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 848 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 848 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 410: /* "ApplyStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 857 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 857 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 411: /* "ExitStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 866 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 866 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 412: /* "WhileStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 875 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 875 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 413: /* "FlowCtlStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 884 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 884 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 414: /* "FLWORStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 893 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 893 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 415: /* "ReturnStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 902 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 902 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 416: /* "IfStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 911 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 911 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 417: /* "TryStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 920 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 920 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 418: /* "CatchListStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 929 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 929 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 419: /* "CatchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 938 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 421: /* "Expr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 947 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 422: /* "ExprSingle" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 956 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 956 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 423: /* "ExprSimple" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 965 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 965 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 424: /* "FLWORExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 974 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 974 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 425: /* "ReturnExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 983 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 983 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 428: /* "FLWORWinCond" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 992 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 992 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 429: /* "WindowClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1001 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1001 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 430: /* "CountClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1010 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1010 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 431: /* "ForLetWinClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1019 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1019 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 433: /* "FLWORClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1028 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1028 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 434: /* "ForClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1037 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1037 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 436: /* "VarInDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1046 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1046 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 437: /* "VarInDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1055 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1055 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 438: /* "PositionalVar" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1064 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1064 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 439: /* "FTScoreVar" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1073 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1073 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 440: /* "LetClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1082 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1082 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 441: /* "VarGetsDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1091 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1091 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 442: /* "VarGetsDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1100 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1100 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 443: /* "WindowVarDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1109 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1109 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 444: /* "WindowVars" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1118 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1118 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 445: /* "WindowVars3" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1127 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1127 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 446: /* "WindowVars2" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1136 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1136 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 447: /* "WhereClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1145 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1145 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 448: /* "GroupByClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1154 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1154 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 449: /* "GroupSpecList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1163 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1163 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 450: /* "GroupSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1172 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1172 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 451: /* "GroupCollationSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1181 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1181 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 452: /* "OrderByClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1190 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1190 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 453: /* "OrderSpecList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1199 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1199 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 454: /* "OrderSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1208 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1208 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 455: /* "OrderModifier" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1217 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1217 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 456: /* "OrderDirSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1226 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1226 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 457: /* "OrderEmptySpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1235 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1235 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 458: /* "OrderCollationSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1244 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1244 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 459: /* "QuantifiedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1253 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1253 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 460: /* "QVarInDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1262 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1262 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 461: /* "QVarInDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1271 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1271 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 462: /* "SwitchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1280 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1280 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 463: /* "SwitchCaseClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1289 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1289 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 464: /* "SwitchCaseClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1298 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1298 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 465: /* "SwitchCaseOperandList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1307 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1307 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 466: /* "SwitchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1316 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1316 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 469: /* "TypeswitchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1325 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1325 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 470: /* "TypeswitchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1334 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1334 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 471: /* "CaseClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1343 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1343 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 472: /* "CaseClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1352 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1352 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 475: /* "SequenceTypeList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1361 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1361 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 476: /* "IfExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1370 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1370 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 477: /* "OrExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1379 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1379 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 478: /* "AndExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1388 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1388 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 479: /* "NotExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1397 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1397 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 480: /* "ComparisonExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1406 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1406 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 481: /* "FTContainsExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1415 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1415 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 482: /* "StringConcatExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1424 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1424 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 483: /* "opt_FTIgnoreOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1433 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1433 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 484: /* "RangeExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1442 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1442 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 485: /* "AdditiveExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1451 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1451 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 486: /* "MultiplicativeExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1460 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1460 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 487: /* "UnionExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1469 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1469 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 488: /* "IntersectExceptExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1478 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1478 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 489: /* "InstanceofExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1487 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1487 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 490: /* "TreatExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1496 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1496 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 491: /* "CastableExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1505 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1505 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 492: /* "CastExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1514 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1514 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 493: /* "SingleType" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1523 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1523 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 494: /* "UnaryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1532 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1532 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 495: /* "SignList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1541 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1541 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 496: /* "ValueExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1550 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1550 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 497: /* "SimpleMapExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1559 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1559 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 498: /* "ValueComp" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1568 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1568 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 499: /* "ValidateExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1577 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1577 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 500: /* "ExtensionExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1586 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1586 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 501: /* "Pragma_list" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1595 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1595 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 502: /* "Pragma" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1604 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1604 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 503: /* "PathExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1613 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1613 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 504: /* "RelativePathExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1622 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1622 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 505: /* "StepExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1631 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1631 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 506: /* "NameTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1640 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1640 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 507: /* "Wildcard" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1649 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1649 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 508: /* "FilterExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1658 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1658 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 509: /* "PredicateList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1667 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1667 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 510: /* "Predicate" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1676 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1676 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 511: /* "PrimaryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1685 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1685 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 512: /* "Literal" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1694 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1694 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 513: /* "NumericLiteral" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1703 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1703 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 515: /* "VarRef" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1712 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1712 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 516: /* "ParenthesizedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1721 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1721 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 517: /* "ContextItemExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1730 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1730 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 518: /* "OrderedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1739 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1739 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 519: /* "UnorderedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1748 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1748 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 520: /* "FunctionCall" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1757 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1757 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 521: /* "ArgList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1766 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1766 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 525: /* "Constructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1775 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1775 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 526: /* "DirectConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1784 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1784 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 527: /* "DirElemConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1793 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1793 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 528: /* "DirElemContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1802 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1802 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 529: /* "DirAttributeList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1811 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1811 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 530: /* "DirAttr" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1820 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1820 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 532: /* "DirAttributeValue" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1829 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1829 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 533: /* "opt_QuoteAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1838 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1838 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 534: /* "QuoteAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1847 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1847 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 535: /* "opt_AposAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1856 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1856 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 536: /* "AposAttrContentList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1865 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1865 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 537: /* "QuoteAttrValueContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1874 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1874 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 538: /* "AposAttrValueContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1883 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1883 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 539: /* "DirElemContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1892 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1892 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 540: /* "CommonContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1901 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1901 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 541: /* "DirCommentConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1910 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1910 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 542: /* "DirPIConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1919 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1919 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 543: /* "CDataSection" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1928 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1928 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 544: /* "ComputedConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1937 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1937 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 545: /* "CompDocConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1946 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1946 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 546: /* "CompElemConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1955 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1955 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 547: /* "CompAttrConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1964 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1964 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 548: /* "CompTextConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1973 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1973 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 549: /* "CompCommentConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1982 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1982 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 550: /* "CompPIConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1991 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 1991 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 551: /* "CompNamespaceConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2000 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2000 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 552: /* "TypeDeclaration" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2009 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2009 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 553: /* "SequenceType" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2018 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2018 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 554: /* "OccurrenceIndicator" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2027 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2027 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 555: /* "ItemType" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2036 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2036 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 556: /* "TypeList" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2045 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2045 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 557: /* "GeneralizedAtomicType" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2054 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2054 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 558: /* "SimpleType" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2063 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2063 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 559: /* "KindTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2072 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2072 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 560: /* "AnyKindTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2081 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2081 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 561: /* "DocumentTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2090 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2090 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 562: /* "NamespaceTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2099 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2099 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 563: /* "TextTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2108 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2108 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 564: /* "CommentTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2117 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2117 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 565: /* "PITest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2126 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2126 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 566: /* "AttributeTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2135 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2135 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 567: /* "SchemaAttributeTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2144 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2144 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 568: /* "ElementTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2153 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2153 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 569: /* "SchemaElementTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2162 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2162 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 570: /* "TypeName" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2171 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2171 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 571: /* "TypeName_WITH_HOOK" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2180 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2180 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 572: /* "StringLiteral" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2189 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2189 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 574: /* "AnyFunctionTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2198 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2198 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 575: /* "TypedFunctionTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2207 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2207 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 578: /* "InsertExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2216 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2216 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 579: /* "DeleteExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2225 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2225 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 580: /* "ReplaceExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2234 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2234 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 581: /* "RenameExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2243 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2243 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 582: /* "TransformExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2252 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2252 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 583: /* "VarNameList" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2261 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2261 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 584: /* "VarNameDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2270 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2270 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 585: /* "TryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2279 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2279 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 586: /* "CatchListExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2288 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2288 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 587: /* "CatchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2297 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2297 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 588: /* "BracedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2306 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2306 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 589: /* "NameTestList" */
 
 /* Line 480 of lalr1.cc  */
-#line 947 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 947 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ delete (yyvaluep->name_test_list); };
 
 /* Line 480 of lalr1.cc  */
-#line 2315 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2315 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 590: /* "FTSelection" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2324 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2324 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 593: /* "FTOr" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2333 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2333 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 594: /* "FTAnd" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2342 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2342 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 595: /* "FTMildNot" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2351 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2351 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 596: /* "FTUnaryNot" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2360 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2360 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 597: /* "FTPrimaryWithOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2369 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2369 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 598: /* "opt_FTMatchOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2378 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2378 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 600: /* "FTWeight" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2387 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2387 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 601: /* "FTPrimary" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2396 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2396 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 602: /* "opt_FTTimes" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2405 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2405 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 603: /* "FTExtensionSelection" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2414 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2414 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 605: /* "FTWords" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2423 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2423 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 606: /* "FTWordsValue" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2432 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2432 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 608: /* "FTAnyallOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2441 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2441 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 611: /* "FTPosFilter" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2450 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2450 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 612: /* "FTOrder" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2459 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2459 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 613: /* "FTWindow" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2468 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2468 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 614: /* "FTDistance" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2477 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2477 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 615: /* "FTUnit" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2486 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2486 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 616: /* "FTMatchOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2495 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2495 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 617: /* "FTMatchOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2504 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2504 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 618: /* "FTCaseOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2513 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2513 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 619: /* "FTDiacriticsOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2522 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2522 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 620: /* "FTExtensionOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2531 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2531 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 621: /* "FTStemOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2540 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2540 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 622: /* "FTThesaurusOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2549 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2549 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 626: /* "FTThesaurusID" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2558 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2558 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 629: /* "FTStopWordOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2567 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2567 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 630: /* "FTStopWords" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2576 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2576 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 634: /* "FTStopWordsInclExcl" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2585 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2585 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 635: /* "FTLanguageOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2594 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2594 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 636: /* "FTWildCardOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2603 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2603 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 637: /* "FTContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2612 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2612 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 638: /* "FTTimes" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2621 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2621 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 639: /* "FTRange" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2630 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2630 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 640: /* "FTScope" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2639 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2639 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 641: /* "FTBigUnit" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2648 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2648 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 642: /* "FTIgnoreOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 935 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 935 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2657 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2657 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 643: /* "JSONArrayConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2666 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2666 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 644: /* "JSONSimpleObjectUnion" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2675 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2675 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 645: /* "JSONAccumulatorObjectUnion" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2684 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2684 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 646: /* "JSONObjectConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2693 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2693 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 647: /* "JSONPairList" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2702 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2702 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 648: /* "JSONInsertExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2711 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2711 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 649: /* "JSONAppendExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2720 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2720 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 650: /* "JSONDeleteExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2729 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2729 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 651: /* "JSONRenameExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2738 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2738 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 652: /* "JSONReplaceExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 938 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 938 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2747 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2747 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 659: /* "QNAME" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2756 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2756 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 660: /* "FUNCTION_NAME" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2765 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2765 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
       case 661: /* "EQNAME" */
 
 /* Line 480 of lalr1.cc  */
-#line 944 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 944 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2774 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2774 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 	break;
 
 	default:
@@ -2861,13 +2861,13 @@
     /* User initialization code.  */
     
 /* Line 565 of lalr1.cc  */
-#line 133 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 133 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
 {
     yylloc.begin.filename = yylloc.end.filename = &(driver.theFilename2);
 }
 
 /* Line 565 of lalr1.cc  */
-#line 2871 "/home/colea/xquery/new-jsoniq/build/src/compiler/parser/jsoniq_parser.cpp"
+#line 2871 "/home/markos/zorba/repo/hof-next/build/src/compiler/parser/jsoniq_parser.cpp"
 
     /* Initialize the stacks.  The initial state will be pushed in
        yynewstate, since the latter expects the semantical and the
@@ -2986,7 +2986,7 @@
 	  case 3:
 
 /* Line 690 of lalr1.cc  */
-#line 1071 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1071 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       }
@@ -2995,7 +2995,7 @@
   case 4:
 
 /* Line 690 of lalr1.cc  */
-#line 1075 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1075 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
       }
@@ -3004,7 +3004,7 @@
   case 5:
 
 /* Line 690 of lalr1.cc  */
-#line 1079 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1079 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = (yysemantic_stack_[(3) - (3)].node);
       }
@@ -3013,7 +3013,7 @@
   case 6:
 
 /* Line 690 of lalr1.cc  */
-#line 1087 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1087 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = NULL;
       }
@@ -3022,7 +3022,7 @@
   case 7:
 
 /* Line 690 of lalr1.cc  */
-#line 1093 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1093 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = NULL; YYABORT;
       }
@@ -3031,7 +3031,7 @@
   case 8:
 
 /* Line 690 of lalr1.cc  */
-#line 1097 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1097 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
         (yyval.node) = NULL; YYABORT;
       }
@@ -3040,7 +3040,7 @@
   case 9:
 
 /* Line 690 of lalr1.cc  */
-#line 1106 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1106 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
       driver.set_expr( (yyval.node) );
@@ -3050,7 +3050,7 @@
   case 10:
 
 /* Line 690 of lalr1.cc  */
-#line 1112 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1112 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       MainModule* mm = dynamic_cast<MainModule*>((yysemantic_stack_[(2) - (2)].node));
       mm->set_version_decl( static_cast<VersionDecl*>((yysemantic_stack_[(2) - (1)].node)) );
@@ -3062,7 +3062,7 @@
   case 11:
 
 /* Line 690 of lalr1.cc  */
-#line 1120 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1120 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
       driver.set_expr( (yyval.node) );
@@ -3072,7 +3072,7 @@
   case 12:
 
 /* Line 690 of lalr1.cc  */
-#line 1126 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1126 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       LibraryModule* lm = dynamic_cast<LibraryModule*>((yysemantic_stack_[(2) - (2)].node));
       lm->set_version_decl( static_cast<VersionDecl*>((yysemantic_stack_[(2) - (1)].node)) );
@@ -3084,7 +3084,7 @@
   case 13:
 
 /* Line 690 of lalr1.cc  */
-#line 1137 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1137 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)), "utf-8" );
     }
@@ -3093,7 +3093,7 @@
   case 14:
 
 /* Line 690 of lalr1.cc  */
-#line 1142 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1142 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)) );
     }
@@ -3102,7 +3102,7 @@
   case 15:
 
 /* Line 690 of lalr1.cc  */
-#line 1146 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1146 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VersionDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (3)].sval)), "utf-8", VersionDecl::jsoniq );
     }
@@ -3111,7 +3111,7 @@
   case 16:
 
 /* Line 690 of lalr1.cc  */
-#line 1151 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1151 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new VersionDecl(
         LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)), VersionDecl::jsoniq );
@@ -3121,7 +3121,7 @@
   case 17:
 
 /* Line 690 of lalr1.cc  */
-#line 1160 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1160 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (1)].node)), NULL);
 
@@ -3132,7 +3132,7 @@
   case 18:
 
 /* Line 690 of lalr1.cc  */
-#line 1167 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1167 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (1)].node)));
 
@@ -3143,7 +3143,7 @@
   case 19:
 
 /* Line 690 of lalr1.cc  */
-#line 1174 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1174 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)),
                                   static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (1)].node)),
@@ -3156,7 +3156,7 @@
   case 20:
 
 /* Line 690 of lalr1.cc  */
-#line 1183 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1183 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new MainModule( LOC((yyloc)), static_cast<QueryBody*>((yysemantic_stack_[(1) - (1)].expr)), NULL );
     }
@@ -3165,7 +3165,7 @@
   case 21:
 
 /* Line 690 of lalr1.cc  */
-#line 1190 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1190 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
       (yylocation_stack_[(3) - (1)]).step();
@@ -3177,7 +3177,7 @@
   case 22:
 
 /* Line 690 of lalr1.cc  */
-#line 1198 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1198 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].expr); // to prevent the Bison warning
       (yylocation_stack_[(3) - (1)]).step();
@@ -3189,7 +3189,7 @@
   case 23:
 
 /* Line 690 of lalr1.cc  */
-#line 1206 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1206 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(5) - (1)].node); (yyval.node) = (yysemantic_stack_[(5) - (3)].node); (yyval.node) = (yysemantic_stack_[(5) - (5)].expr); // to prevent the Bison warning
       (yylocation_stack_[(5) - (3)]).step();
@@ -3201,7 +3201,7 @@
   case 24:
 
 /* Line 690 of lalr1.cc  */
-#line 1214 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1214 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(5) - (1)].node); (yyval.node) = (yysemantic_stack_[(5) - (3)].node); (yyval.node) = (yysemantic_stack_[(5) - (5)].expr); // to prevent the Bison warning
       (yylocation_stack_[(5) - (1)]).step();
@@ -3213,7 +3213,7 @@
   case 25:
 
 /* Line 690 of lalr1.cc  */
-#line 1225 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1225 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new LibraryModule(LOC((yyloc)), static_cast<ModuleDecl*>((yysemantic_stack_[(1) - (1)].node)), NULL);
     }
@@ -3222,7 +3222,7 @@
   case 26:
 
 /* Line 690 of lalr1.cc  */
-#line 1230 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1230 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), static_cast<SIND_DeclList*>((yysemantic_stack_[(3) - (2)].node)), NULL);
 
@@ -3233,7 +3233,7 @@
   case 27:
 
 /* Line 690 of lalr1.cc  */
-#line 1237 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1237 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)), NULL, static_cast<VFO_DeclList*>((yysemantic_stack_[(3) - (2)].node)));
 
@@ -3244,7 +3244,7 @@
   case 28:
 
 /* Line 690 of lalr1.cc  */
-#line 1244 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1244 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       Prolog* prolog = new Prolog(LOC((yyloc)),
                                   static_cast<SIND_DeclList*>((yysemantic_stack_[(5) - (2)].node)),
@@ -3257,7 +3257,7 @@
   case 29:
 
 /* Line 690 of lalr1.cc  */
-#line 1256 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1256 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ModuleDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (3)].sval)), SYMTAB((yysemantic_stack_[(6) - (5)].sval)) );
 
@@ -3268,7 +3268,7 @@
   case 30:
 
 /* Line 690 of lalr1.cc  */
-#line 1266 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1266 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       SIND_DeclList *sdl = new SIND_DeclList( LOC((yyloc)) );
       sdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -3279,7 +3279,7 @@
   case 31:
 
 /* Line 690 of lalr1.cc  */
-#line 1273 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1273 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       ((SIND_DeclList*)(yysemantic_stack_[(3) - (1)].node))->push_back( (yysemantic_stack_[(3) - (3)].node) );
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -3289,7 +3289,7 @@
   case 32:
 
 /* Line 690 of lalr1.cc  */
-#line 1280 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1280 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       // error
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
@@ -3302,7 +3302,7 @@
   case 46:
 
 /* Line 690 of lalr1.cc  */
-#line 1315 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1315 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::preserve_space);
     }
@@ -3311,7 +3311,7 @@
   case 47:
 
 /* Line 690 of lalr1.cc  */
-#line 1320 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1320 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new BoundarySpaceDecl(LOC((yyloc)), StaticContextConsts::strip_space);
     }
@@ -3320,7 +3320,7 @@
   case 48:
 
 /* Line 690 of lalr1.cc  */
-#line 1328 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1328 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DefaultCollationDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)) );
     }
@@ -3329,7 +3329,7 @@
   case 49:
 
 /* Line 690 of lalr1.cc  */
-#line 1336 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1336 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new BaseURIDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
     }
@@ -3338,7 +3338,7 @@
   case 50:
 
 /* Line 690 of lalr1.cc  */
-#line 1344 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1344 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_preserve);
     }
@@ -3347,7 +3347,7 @@
   case 51:
 
 /* Line 690 of lalr1.cc  */
-#line 1349 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1349 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ConstructionDecl(LOC((yyloc)), StaticContextConsts::cons_strip);
     }
@@ -3356,7 +3356,7 @@
   case 52:
 
 /* Line 690 of lalr1.cc  */
-#line 1357 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1357 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::ordered);
     }
@@ -3365,7 +3365,7 @@
   case 53:
 
 /* Line 690 of lalr1.cc  */
-#line 1362 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1362 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new OrderingModeDecl(LOC((yyloc)), StaticContextConsts::unordered);
     }
@@ -3374,7 +3374,7 @@
   case 54:
 
 /* Line 690 of lalr1.cc  */
-#line 1370 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1370 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_greatest);
     }
@@ -3383,7 +3383,7 @@
   case 55:
 
 /* Line 690 of lalr1.cc  */
-#line 1375 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1375 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new EmptyOrderDecl(LOC((yyloc)), StaticContextConsts::empty_least);
     }
@@ -3392,7 +3392,7 @@
   case 56:
 
 /* Line 690 of lalr1.cc  */
-#line 1383 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1383 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, true);
     }
@@ -3401,7 +3401,7 @@
   case 57:
 
 /* Line 690 of lalr1.cc  */
-#line 1388 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1388 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), true, false);
     }
@@ -3410,7 +3410,7 @@
   case 58:
 
 /* Line 690 of lalr1.cc  */
-#line 1393 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1393 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, true);
     }
@@ -3419,7 +3419,7 @@
   case 59:
 
 /* Line 690 of lalr1.cc  */
-#line 1398 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1398 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CopyNamespacesDecl(LOC((yyloc)), false, false);
     }
@@ -3428,7 +3428,7 @@
   case 62:
 
 /* Line 690 of lalr1.cc  */
-#line 1411 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1411 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yyval.node); // to prevent the Bison warning
       error((yylocation_stack_[(3) - (2)]), "syntax error, \"import\" should be followed by either \"schema\" or \"module\".");
@@ -3439,7 +3439,7 @@
   case 63:
 
 /* Line 690 of lalr1.cc  */
-#line 1421 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1421 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaImport( LOC((yyloc)), NULL, SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL );
     }
@@ -3448,7 +3448,7 @@
   case 64:
 
 /* Line 690 of lalr1.cc  */
-#line 1426 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1426 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(4) - (3)].node)),
@@ -3460,7 +3460,7 @@
   case 65:
 
 /* Line 690 of lalr1.cc  */
-#line 1434 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1434 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             NULL,
@@ -3472,7 +3472,7 @@
   case 66:
 
 /* Line 690 of lalr1.cc  */
-#line 1442 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1442 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaImport(LOC((yyloc)),
                             dynamic_cast<SchemaPrefix*>((yysemantic_stack_[(6) - (3)].node)),
@@ -3484,7 +3484,7 @@
   case 67:
 
 /* Line 690 of lalr1.cc  */
-#line 1453 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1453 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       URILiteralList *ull = new URILiteralList( LOC((yyloc)));
       ull->push_back( SYMTAB((yysemantic_stack_[(1) - (1)].sval)) );
@@ -3495,7 +3495,7 @@
   case 68:
 
 /* Line 690 of lalr1.cc  */
-#line 1460 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1460 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       if ( URILiteralList *ull = dynamic_cast<URILiteralList*>((yysemantic_stack_[(3) - (1)].node)) )
         ull->push_back( SYMTAB((yysemantic_stack_[(3) - (3)].sval)) );
@@ -3507,7 +3507,7 @@
   case 69:
 
 /* Line 690 of lalr1.cc  */
-#line 1471 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1471 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaPrefix( LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (2)].sval)) );
     }
@@ -3516,7 +3516,7 @@
   case 70:
 
 /* Line 690 of lalr1.cc  */
-#line 1476 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1476 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new SchemaPrefix( LOC((yyloc)), true );
     }
@@ -3525,7 +3525,7 @@
   case 71:
 
 /* Line 690 of lalr1.cc  */
-#line 1484 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1484 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)), SYMTAB((yysemantic_stack_[(3) - (3)].sval)), NULL);
 
@@ -3536,7 +3536,7 @@
   case 72:
 
 /* Line 690 of lalr1.cc  */
-#line 1491 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1491 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)), SYMTAB((yysemantic_stack_[(6) - (4)].sval)), SYMTAB((yysemantic_stack_[(6) - (6)].sval)), NULL);
 
@@ -3547,7 +3547,7 @@
   case 73:
 
 /* Line 690 of lalr1.cc  */
-#line 1498 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1498 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)),
                             SYMTAB((yysemantic_stack_[(5) - (3)].sval)),
@@ -3560,7 +3560,7 @@
   case 74:
 
 /* Line 690 of lalr1.cc  */
-#line 1507 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1507 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ModuleImport(LOC((yyloc)),
                             SYMTAB((yysemantic_stack_[(8) - (4)].sval)),
@@ -3574,7 +3574,7 @@
   case 75:
 
 /* Line 690 of lalr1.cc  */
-#line 1520 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1520 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new NamespaceDecl( LOC((yyloc)), SYMTAB((yysemantic_stack_[(5) - (3)].sval)), SYMTAB((yysemantic_stack_[(5) - (5)].sval)) );
     }
@@ -3583,7 +3583,7 @@
   case 76:
 
 /* Line 690 of lalr1.cc  */
-#line 1528 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1528 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_element_default,
@@ -3594,7 +3594,7 @@
   case 77:
 
 /* Line 690 of lalr1.cc  */
-#line 1535 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1535 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DefaultNamespaceDecl(LOC((yyloc)),
                                     ParseConstants::ns_function_default,
@@ -3605,7 +3605,7 @@
   case 78:
 
 /* Line 690 of lalr1.cc  */
-#line 1545 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1545 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       VFO_DeclList *vdl = new VFO_DeclList( LOC((yyloc)));
       vdl->push_back( (yysemantic_stack_[(1) - (1)].node) );
@@ -3616,7 +3616,7 @@
   case 79:
 
 /* Line 690 of lalr1.cc  */
-#line 1552 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1552 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       ((VFO_DeclList*)(yysemantic_stack_[(3) - (1)].node))->push_back( (yysemantic_stack_[(3) - (3)].node) );
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -3626,7 +3626,7 @@
   case 80:
 
 /* Line 690 of lalr1.cc  */
-#line 1559 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1559 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node); (yyval.node) = (yysemantic_stack_[(3) - (3)].node); // to prevent the Bison warning
       (yylocation_stack_[(3) - (1)]).step();
@@ -3638,7 +3638,7 @@
   case 89:
 
 /* Line 690 of lalr1.cc  */
-#line 1582 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1582 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DecimalFormatNode(LOC((yyloc)), (yysemantic_stack_[(4) - (4)].vstrpair));
       delete (yysemantic_stack_[(4) - (4)].vstrpair);
@@ -3648,7 +3648,7 @@
   case 90:
 
 /* Line 690 of lalr1.cc  */
-#line 1588 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1588 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new DecimalFormatNode(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), (yysemantic_stack_[(4) - (4)].vstrpair));
       delete (yysemantic_stack_[(4) - (4)].vstrpair);
@@ -3658,7 +3658,7 @@
   case 91:
 
 /* Line 690 of lalr1.cc  */
-#line 1597 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1597 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.vstrpair) = new vector<string_pair_t>();
       (yyval.vstrpair)->push_back( *(yysemantic_stack_[(1) - (1)].strpair) );
@@ -3669,7 +3669,7 @@
   case 92:
 
 /* Line 690 of lalr1.cc  */
-#line 1604 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1604 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yysemantic_stack_[(2) - (1)].vstrpair)->push_back( *(yysemantic_stack_[(2) - (2)].strpair) );
       delete (yysemantic_stack_[(2) - (2)].strpair);
@@ -3680,7 +3680,7 @@
   case 93:
 
 /* Line 690 of lalr1.cc  */
-#line 1614 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1614 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       StringLiteral *sl = static_cast<StringLiteral*>((yysemantic_stack_[(3) - (3)].expr));
       (yyval.strpair) = new string_pair_t( (yysemantic_stack_[(3) - (1)].strval), sl->get_strval().str() );
@@ -3691,77 +3691,77 @@
   case 94:
 
 /* Line 690 of lalr1.cc  */
-#line 1623 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1623 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "decimal-separator"; }
     break;
 
   case 95:
 
 /* Line 690 of lalr1.cc  */
-#line 1624 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1624 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "digit"; }
     break;
 
   case 96:
 
 /* Line 690 of lalr1.cc  */
-#line 1625 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1625 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "grouping-separator"; }
     break;
 
   case 97:
 
 /* Line 690 of lalr1.cc  */
-#line 1626 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1626 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "infinity"; }
     break;
 
   case 98:
 
 /* Line 690 of lalr1.cc  */
-#line 1627 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1627 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "minus-sign"; }
     break;
 
   case 99:
 
 /* Line 690 of lalr1.cc  */
-#line 1628 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1628 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "NaN"; }
     break;
 
   case 100:
 
 /* Line 690 of lalr1.cc  */
-#line 1629 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1629 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "pattern-separator"; }
     break;
 
   case 101:
 
 /* Line 690 of lalr1.cc  */
-#line 1630 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1630 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "percent"; }
     break;
 
   case 102:
 
 /* Line 690 of lalr1.cc  */
-#line 1631 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1631 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "per-mille"; }
     break;
 
   case 103:
 
 /* Line 690 of lalr1.cc  */
-#line 1632 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1632 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     { (yyval.strval) = "zero-digit"; }
     break;
 
   case 104:
 
 /* Line 690 of lalr1.cc  */
-#line 1638 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1638 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new OptionDecl(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)), SYMTAB((yysemantic_stack_[(4) - (4)].sval)));
     }
@@ -3770,7 +3770,7 @@
   case 105:
 
 /* Line 690 of lalr1.cc  */
-#line 1646 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1646 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FTOptionDecl( LOC((yyloc)), dynamic_cast<FTMatchOptions*>((yysemantic_stack_[(3) - (3)].node)) );
     }
@@ -3779,7 +3779,7 @@
   case 106:
 
 /* Line 690 of lalr1.cc  */
-#line 1654 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1654 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(4) - (4)].node);
     }
@@ -3788,7 +3788,7 @@
   case 107:
 
 /* Line 690 of lalr1.cc  */
-#line 1662 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1662 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(3) - (3)].node));
       d->theType = (yysemantic_stack_[(3) - (2)].node);
@@ -3799,7 +3799,7 @@
   case 108:
 
 /* Line 690 of lalr1.cc  */
-#line 1669 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1669 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -3808,7 +3808,7 @@
   case 109:
 
 /* Line 690 of lalr1.cc  */
-#line 1677 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1677 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       CtxItemDecl* d = dynamic_cast<CtxItemDecl*>((yysemantic_stack_[(1) - (1)].node));
       d->theIsExternal = false;
@@ -3819,7 +3819,7 @@
   case 110:
 
 /* Line 690 of lalr1.cc  */
-#line 1684 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1684 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CtxItemDecl(LOC((yyloc)), NULL);
     }
@@ -3828,7 +3828,7 @@
   case 111:
 
 /* Line 690 of lalr1.cc  */
-#line 1689 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1689 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
     }
@@ -3837,7 +3837,7 @@
   case 112:
 
 /* Line 690 of lalr1.cc  */
-#line 1697 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1697 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CtxItemDecl(LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr));
     }
@@ -3846,7 +3846,7 @@
   case 113:
 
 /* Line 690 of lalr1.cc  */
-#line 1705 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1705 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(4) - (2)].varnametype)));
 
@@ -3864,7 +3864,7 @@
   case 114:
 
 /* Line 690 of lalr1.cc  */
-#line 1719 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1719 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(3) - (2)].varnametype)));
 
@@ -3882,7 +3882,7 @@
   case 115:
 
 /* Line 690 of lalr1.cc  */
-#line 1733 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1733 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       std::auto_ptr<VarNameAndType> nt(dynamic_cast<VarNameAndType *>((yysemantic_stack_[(5) - (2)].varnametype)));
 
@@ -3900,7 +3900,7 @@
   case 116:
 
 /* Line 690 of lalr1.cc  */
-#line 1750 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1750 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)), NULL, NULL);
     }
@@ -3909,7 +3909,7 @@
   case 117:
 
 /* Line 690 of lalr1.cc  */
-#line 1755 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1755 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(4) - (3)].expr)),
@@ -3921,7 +3921,7 @@
   case 118:
 
 /* Line 690 of lalr1.cc  */
-#line 1763 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1763 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
@@ -3933,7 +3933,7 @@
   case 119:
 
 /* Line 690 of lalr1.cc  */
-#line 1771 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1771 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.varnametype) = new VarNameAndType(LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(5) - (4)].expr)),
@@ -3945,7 +3945,7 @@
   case 120:
 
 /* Line 690 of lalr1.cc  */
-#line 1782 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1782 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationListParsenode(LOC((yyloc)), static_cast<AnnotationParsenode*>((yysemantic_stack_[(1) - (1)].node)));
     }
@@ -3954,7 +3954,7 @@
   case 121:
 
 /* Line 690 of lalr1.cc  */
-#line 1787 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1787 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       static_cast<AnnotationListParsenode*>((yysemantic_stack_[(2) - (1)].node))->push_back(static_cast<AnnotationParsenode*>((yysemantic_stack_[(2) - (2)].node)));
       (yyval.node) = (yysemantic_stack_[(2) - (1)].node);
@@ -3964,7 +3964,7 @@
   case 122:
 
 /* Line 690 of lalr1.cc  */
-#line 1796 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1796 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval))), NULL);
     }
@@ -3973,7 +3973,7 @@
   case 123:
 
 /* Line 690 of lalr1.cc  */
-#line 1801 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1801 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
                                    new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval))),
@@ -3984,7 +3984,7 @@
   case 124:
 
 /* Line 690 of lalr1.cc  */
-#line 1808 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1808 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)), new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(1) - (1)].sval)), true), NULL);
     }
@@ -3993,7 +3993,7 @@
   case 125:
 
 /* Line 690 of lalr1.cc  */
-#line 1813 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1813 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationParsenode(LOC((yyloc)),
                                    new QName(LOC((yyloc)), SYMTAB((yysemantic_stack_[(4) - (1)].sval)), true),
@@ -4004,7 +4004,7 @@
   case 126:
 
 /* Line 690 of lalr1.cc  */
-#line 1823 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1823 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AnnotationLiteralListParsenode(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr));
     }
@@ -4013,7 +4013,7 @@
   case 127:
 
 /* Line 690 of lalr1.cc  */
-#line 1828 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1828 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       static_cast<AnnotationLiteralListParsenode*>((yysemantic_stack_[(3) - (1)].node))->push_back((yysemantic_stack_[(3) - (3)].expr));
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -4023,7 +4023,7 @@
   case 128:
 
 /* Line 690 of lalr1.cc  */
-#line 1837 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1837 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       static_cast<FunctionDecl*>((yysemantic_stack_[(2) - (2)].node))->setComment( SYMTAB((yysemantic_stack_[(2) - (1)].sval)) );
       (yyval.node) = (yysemantic_stack_[(2) - (2)].node);
@@ -4033,7 +4033,7 @@
   case 129:
 
 /* Line 690 of lalr1.cc  */
-#line 1843 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1843 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       FunctionDecl* fdecl = static_cast<FunctionDecl*>((yysemantic_stack_[(3) - (3)].node));
 
@@ -4047,7 +4047,7 @@
   case 130:
 
 /* Line 690 of lalr1.cc  */
-#line 1856 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1856 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -4056,7 +4056,7 @@
   case 131:
 
 /* Line 690 of lalr1.cc  */
-#line 1861 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1861 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = (yysemantic_stack_[(1) - (1)].node);
     }
@@ -4065,7 +4065,7 @@
   case 132:
 
 /* Line 690 of lalr1.cc  */
-#line 1869 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1869 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4081,7 +4081,7 @@
   case 133:
 
 /* Line 690 of lalr1.cc  */
-#line 1880 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1880 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC ((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4097,7 +4097,7 @@
   case 134:
 
 /* Line 690 of lalr1.cc  */
-#line 1895 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1895 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC ((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4113,7 +4113,7 @@
   case 135:
 
 /* Line 690 of lalr1.cc  */
-#line 1907 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1907 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FunctionDecl(LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4129,7 +4129,7 @@
   case 136:
 
 /* Line 690 of lalr1.cc  */
-#line 1922 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1922 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(NULL);
     }
@@ -4138,7 +4138,7 @@
   case 137:
 
 /* Line 690 of lalr1.cc  */
-#line 1927 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1927 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(3) - (2)].node)));
     }
@@ -4147,7 +4147,7 @@
   case 138:
 
 /* Line 690 of lalr1.cc  */
-#line 1932 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1932 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(NULL, dynamic_cast<SequenceType*>((yysemantic_stack_[(4) - (4)].node)));
     }
@@ -4156,7 +4156,7 @@
   case 139:
 
 /* Line 690 of lalr1.cc  */
-#line 1937 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1937 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.fnsig) = new FunctionSig(dynamic_cast<ParamList*>((yysemantic_stack_[(5) - (2)].node)), dynamic_cast<SequenceType*>((yysemantic_stack_[(5) - (5)].node)));
     }
@@ -4165,7 +4165,7 @@
   case 140:
 
 /* Line 690 of lalr1.cc  */
-#line 1945 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1945 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       ParamList *pl = new ParamList( LOC((yyloc)) );
       pl->push_back( dynamic_cast<Param*>((yysemantic_stack_[(1) - (1)].node)) );
@@ -4176,7 +4176,7 @@
   case 141:
 
 /* Line 690 of lalr1.cc  */
-#line 1952 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1952 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       if ( ParamList *pl = dynamic_cast<ParamList*>((yysemantic_stack_[(3) - (1)].node)) )
         pl->push_back( dynamic_cast<Param*>((yysemantic_stack_[(3) - (3)].node)) );
@@ -4188,7 +4188,7 @@
   case 142:
 
 /* Line 690 of lalr1.cc  */
-#line 1963 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1963 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Param(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)), NULL);
     }
@@ -4197,7 +4197,7 @@
   case 143:
 
 /* Line 690 of lalr1.cc  */
-#line 1968 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1968 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new Param(LOC((yyloc)),
                      static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4208,7 +4208,7 @@
   case 144:
 
 /* Line 690 of lalr1.cc  */
-#line 1978 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1978 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(3) - (3)].expr)),
@@ -4222,7 +4222,7 @@
   case 145:
 
 /* Line 690 of lalr1.cc  */
-#line 1987 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1987 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                               static_cast<QName*>((yysemantic_stack_[(5) - (3)].expr)),
@@ -4236,7 +4236,7 @@
   case 146:
 
 /* Line 690 of lalr1.cc  */
-#line 1996 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 1996 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                                static_cast<QName*>((yysemantic_stack_[(4) - (4)].expr)),
@@ -4250,7 +4250,7 @@
   case 147:
 
 /* Line 690 of lalr1.cc  */
-#line 2005 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2005 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new CollectionDecl( LOC((yyloc)),
                                static_cast<QName*>((yysemantic_stack_[(6) - (4)].expr)),
@@ -4264,7 +4264,7 @@
   case 148:
 
 /* Line 690 of lalr1.cc  */
-#line 2017 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2017 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
     }
@@ -4273,7 +4273,7 @@
   case 149:
 
 /* Line 690 of lalr1.cc  */
-#line 2021 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2021 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
                                                     (yysemantic_stack_[(2) - (1)].node),
@@ -4284,7 +4284,7 @@
   case 150:
 
 /* Line 690 of lalr1.cc  */
-#line 2027 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2027 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].node), NULL));
     }
@@ -4293,7 +4293,7 @@
   case 151:
 
 /* Line 690 of lalr1.cc  */
-#line 2031 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2031 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = static_cast<parsenode*>(new SequenceType(LOC((yyloc)),
                                                     (yysemantic_stack_[(2) - (1)].node),
@@ -4305,7 +4305,7 @@
   case 152:
 
 /* Line 690 of lalr1.cc  */
-#line 2041 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2041 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AST_IndexDecl(LOC((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(8) - (3)].expr)),
@@ -4320,7 +4320,7 @@
   case 153:
 
 /* Line 690 of lalr1.cc  */
-#line 2051 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2051 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new AST_IndexDecl(LOC((yyloc)),
                              static_cast<QName*>((yysemantic_stack_[(9) - (4)].expr)),
@@ -4335,7 +4335,7 @@
   case 154:
 
 /* Line 690 of lalr1.cc  */
-#line 2064 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2064 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       IndexKeyList* keyList = new IndexKeyList(LOC((yyloc)));
       keyList->addKeySpec(dynamic_cast<IndexKeySpec*>((yysemantic_stack_[(1) - (1)].node)));
@@ -4346,7 +4346,7 @@
   case 155:
 
 /* Line 690 of lalr1.cc  */
-#line 2070 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2070 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       dynamic_cast<IndexKeyList*>((yysemantic_stack_[(3) - (1)].node))->addKeySpec(dynamic_cast<IndexKeySpec*>((yysemantic_stack_[(3) - (3)].node)));
       (yyval.node) = (yysemantic_stack_[(3) - (1)].node);
@@ -4356,7 +4356,7 @@
   case 156:
 
 /* Line 690 of lalr1.cc  */
-#line 2079 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2079 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)), (yysemantic_stack_[(1) - (1)].expr), NULL, NULL);
     }
@@ -4365,7 +4365,7 @@
   case 157:
 
 /* Line 690 of lalr1.cc  */
-#line 2084 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2084 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -4377,7 +4377,7 @@
   case 158:
 
 /* Line 690 of lalr1.cc  */
-#line 2091 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2091 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(2) - (1)].expr),
@@ -4389,7 +4389,7 @@
   case 159:
 
 /* Line 690 of lalr1.cc  */
-#line 2098 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2098 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new IndexKeySpec(LOC((yyloc)),
                             (yysemantic_stack_[(3) - (1)].expr),
@@ -4401,7 +4401,7 @@
   case 160:
 
 /* Line 690 of lalr1.cc  */
-#line 2110 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2110 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ICCollSimpleCheck(LOC((yyloc)),
                                  static_cast<QName*>((yysemantic_stack_[(11) - (4)].expr)),
@@ -4414,7 +4414,7 @@
   case 161:
 
 /* Line 690 of lalr1.cc  */
-#line 2120 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2120 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ICCollUniqueKeyCheck(LOC((yyloc)),
                                     static_cast<QName*>((yysemantic_stack_[(14) - (4)].expr)),
@@ -4427,7 +4427,7 @@
   case 162:
 
 /* Line 690 of lalr1.cc  */
-#line 2130 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2130 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ICCollForeachNode(LOC((yyloc)),
                                  static_cast<QName*>((yysemantic_stack_[(13) - (4)].expr)),
@@ -4440,7 +4440,7 @@
   case 163:
 
 /* Line 690 of lalr1.cc  */
-#line 2141 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2141 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new ICForeignKey( LOC((yyloc)),
                             static_cast<QName*>((yysemantic_stack_[(22) - (4)].expr)),
@@ -4456,7 +4456,7 @@
   case 164:
 
 /* Line 690 of lalr1.cc  */
-#line 2157 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2157 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       if ((yysemantic_stack_[(1) - (1)].expr) == NULL)
       {
@@ -4477,7 +4477,7 @@
   case 165:
 
 /* Line 690 of lalr1.cc  */
-#line 2177 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2177 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4486,7 +4486,7 @@
   case 166:
 
 /* Line 690 of lalr1.cc  */
-#line 2181 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2181 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4495,7 +4495,7 @@
   case 167:
 
 /* Line 690 of lalr1.cc  */
-#line 2185 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2185 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) =  NULL;
     }
@@ -4504,7 +4504,7 @@
   case 168:
 
 /* Line 690 of lalr1.cc  */
-#line 2193 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2193 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4513,7 +4513,7 @@
   case 169:
 
 /* Line 690 of lalr1.cc  */
-#line 2197 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2197 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4522,7 +4522,7 @@
   case 170:
 
 /* Line 690 of lalr1.cc  */
-#line 2201 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2201 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) =  new BlockBody(LOC((yyloc)));
     }
@@ -4531,7 +4531,7 @@
   case 171:
 
 /* Line 690 of lalr1.cc  */
-#line 2209 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2209 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4540,7 +4540,7 @@
   case 172:
 
 /* Line 690 of lalr1.cc  */
-#line 2214 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2214 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
 
@@ -4553,7 +4553,7 @@
   case 173:
 
 /* Line 690 of lalr1.cc  */
-#line 2226 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2226 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* blk = new BlockBody(LOC((yyloc)));
       blk->add((yysemantic_stack_[(1) - (1)].expr));
@@ -4564,7 +4564,7 @@
   case 174:
 
 /* Line 690 of lalr1.cc  */
-#line 2233 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2233 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* blk = static_cast<BlockBody*>((yysemantic_stack_[(2) - (1)].expr));
 
@@ -4577,7 +4577,7 @@
   case 175:
 
 /* Line 690 of lalr1.cc  */
-#line 2243 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2243 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (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 +4593,7 @@
   case 189:
 
 /* Line 690 of lalr1.cc  */
-#line 2276 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2276 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -4602,7 +4602,7 @@
   case 190:
 
 /* Line 690 of lalr1.cc  */
-#line 2284 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2284 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* block = dynamic_cast<BlockBody*>((yysemantic_stack_[(3) - (2)].expr));
       if ((yysemantic_stack_[(3) - (2)].expr) == NULL || (block != NULL && block->isEmpty()))
@@ -4625,7 +4625,7 @@
   case 191:
 
 /* Line 690 of lalr1.cc  */
-#line 2306 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2306 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(3) - (2)].expr);
     }
@@ -4634,7 +4634,7 @@
   case 192:
 
 /* Line 690 of lalr1.cc  */
-#line 2314 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2314 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(2) - (1)].expr);
     }
@@ -4643,7 +4643,7 @@
   case 193:
 
 /* Line 690 of lalr1.cc  */
-#line 2322 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2322 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       VarDeclStmt* vdecl = static_cast<VarDeclStmt*>((yysemantic_stack_[(3) - (1)].expr));
       vdecl->add((yysemantic_stack_[(3) - (3)].node));
@@ -4654,7 +4654,7 @@
   case 194:
 
 /* Line 690 of lalr1.cc  */
-#line 2329 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2329 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)), NULL);
       vdecl->add((yysemantic_stack_[(2) - (2)].node));
@@ -4665,7 +4665,7 @@
   case 195:
 
 /* Line 690 of lalr1.cc  */
-#line 2336 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2336 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       VarDeclStmt* vdecl = new VarDeclStmt(LOC((yyloc)),
                                            static_cast<AnnotationListParsenode*>((yysemantic_stack_[(3) - (1)].node)));
@@ -4677,7 +4677,7 @@
   case 196:
 
 /* Line 690 of lalr1.cc  */
-#line 2347 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2347 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(2) - (2)].expr)),
@@ -4691,7 +4691,7 @@
   case 197:
 
 /* Line 690 of lalr1.cc  */
-#line 2356 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2356 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(3) - (2)].expr)),
@@ -4705,7 +4705,7 @@
   case 198:
 
 /* Line 690 of lalr1.cc  */
-#line 2365 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2365 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(4) - (2)].expr)),
@@ -4719,7 +4719,7 @@
   case 199:
 
 /* Line 690 of lalr1.cc  */
-#line 2374 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2374 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       LocalVarDecl* vd = new LocalVarDecl(LOC((yyloc)),
                                           static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)),
@@ -4733,7 +4733,7 @@
   case 200:
 
 /* Line 690 of lalr1.cc  */
-#line 2387 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2387 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new AssignExpr(LOC((yyloc)), static_cast<QName*>((yysemantic_stack_[(5) - (2)].expr)), (yysemantic_stack_[(5) - (4)].expr));
     }
@@ -4742,7 +4742,7 @@
   case 201:
 
 /* Line 690 of lalr1.cc  */
-#line 2395 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2395 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new ApplyExpr(LOC((yyloc)), (yysemantic_stack_[(2) - (1)].expr));
     }
@@ -4751,7 +4751,7 @@
   case 202:
 
 /* Line 690 of lalr1.cc  */
-#line 2403 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2403 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new ExitExpr(LOC((yyloc)), (yysemantic_stack_[(4) - (3)].expr));
     }
@@ -4760,7 +4760,7 @@
   case 203:
 
 /* Line 690 of lalr1.cc  */
-#line 2411 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2411 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       BlockBody* bb = dynamic_cast<BlockBody *>((yysemantic_stack_[(5) - (5)].expr));
       if (bb == NULL)
@@ -4776,7 +4776,7 @@
   case 204:
 
 /* Line 690 of lalr1.cc  */
-#line 2426 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2426 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new FlowCtlStatement(LOC((yyloc)), FlowCtlStatement::BREAK);
     }
@@ -4785,7 +4785,7 @@
   case 205:
 
 /* Line 690 of lalr1.cc  */
-#line 2431 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2431 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new FlowCtlStatement( LOC((yyloc)), FlowCtlStatement::CONTINUE );
     }
@@ -4794,7 +4794,7 @@
   case 206:
 
 /* Line 690 of lalr1.cc  */
-#line 2439 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2439 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       ReturnExpr* re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
       (yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4809,7 +4809,7 @@
   case 207:
 
 /* Line 690 of lalr1.cc  */
-#line 2453 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2453 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       exprnode* retExpr = (yysemantic_stack_[(2) - (2)].expr);
 
@@ -4827,7 +4827,7 @@
   case 208:
 
 /* Line 690 of lalr1.cc  */
-#line 2470 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2470 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       exprnode* thenExpr = (yysemantic_stack_[(8) - (6)].expr);
       exprnode* elseExpr = (yysemantic_stack_[(8) - (8)].expr);
@@ -4853,7 +4853,7 @@
   case 209:
 
 /* Line 690 of lalr1.cc  */
-#line 2495 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2495 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new TryExpr(LOC((yyloc)), (yysemantic_stack_[(3) - (2)].expr), (yysemantic_stack_[(3) - (3)].expr));
     }
@@ -4862,7 +4862,7 @@
   case 210:
 
 /* Line 690 of lalr1.cc  */
-#line 2503 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2503 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       CatchListExpr* cle = new CatchListExpr( LOC((yyloc)) );
       cle->push_back( static_cast<CatchExpr*>((yysemantic_stack_[(1) - (1)].expr)) );
@@ -4873,7 +4873,7 @@
   case 211:
 
 /* Line 690 of lalr1.cc  */
-#line 2510 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2510 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       CatchListExpr *cle = dynamic_cast<CatchListExpr*>((yysemantic_stack_[(2) - (1)].expr));
       if ( cle )
@@ -4885,7 +4885,7 @@
   case 212:
 
 /* Line 690 of lalr1.cc  */
-#line 2521 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2521 "/home/markos/zorba/repo/hof-next/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);
@@ -4895,7 +4895,7 @@
   case 213:
 
 /* Line 690 of lalr1.cc  */
-#line 2530 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2530 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new BlockBody(LOC((yyloc)));
     }
@@ -4904,7 +4904,7 @@
   case 214:
 
 /* Line 690 of lalr1.cc  */
-#line 2537 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2537 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = (yysemantic_stack_[(1) - (1)].expr);
     }
@@ -4913,7 +4913,7 @@
   case 215:
 
 /* Line 690 of lalr1.cc  */
-#line 2542 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2542 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       Expr* expr = dynamic_cast<Expr*>((yysemantic_stack_[(3) - (1)].expr));
       if ( !expr )
@@ -4929,7 +4929,7 @@
   case 216:
 
 /* Line 690 of lalr1.cc  */
-#line 2555 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2555 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (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 +4947,7 @@
   case 235:
 
 /* Line 690 of lalr1.cc  */
-#line 2602 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2602 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       ReturnExpr *re = dynamic_cast<ReturnExpr*>((yysemantic_stack_[(2) - (2)].expr));
       (yyval.expr) = new FLWORExpr(LOC((yyloc)),
@@ -4962,7 +4962,7 @@
   case 236:
 
 /* Line 690 of lalr1.cc  */
-#line 2616 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2616 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.expr) = new ReturnExpr( LOC((yyloc)), (yysemantic_stack_[(2) - (2)].expr) );
     }
@@ -4971,7 +4971,7 @@
   case 237:
 
 /* Line 690 of lalr1.cc  */
-#line 2624 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2624 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_sliding;
     }
@@ -4980,7 +4980,7 @@
   case 238:
 
 /* Line 690 of lalr1.cc  */
-#line 2629 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2629 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_tumbling;
     }
@@ -4989,7 +4989,7 @@
   case 239:
 
 /* Line 690 of lalr1.cc  */
-#line 2637 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2637 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_start;
     }
@@ -4998,7 +4998,7 @@
   case 240:
 
 /* Line 690 of lalr1.cc  */
-#line 2642 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2642 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.strval) = parser::the_end;
     }
@@ -5007,7 +5007,7 @@
   case 241:
 
 /* Line 690 of lalr1.cc  */
-#line 2647 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2647 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
     (yyval.strval) = parser::the_only_end;
   }
@@ -5016,7 +5016,7 @@
   case 242:
 
 /* Line 690 of lalr1.cc  */
-#line 2655 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2655 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FLWORWinCond(LOC((yyloc)),
                             dynamic_cast<WindowVars*>((yysemantic_stack_[(4) - (2)].node)),
@@ -5029,7 +5029,7 @@
   case 243:
 
 /* Line 690 of lalr1.cc  */
-#line 2664 "/home/colea/xquery/new-jsoniq/src/compiler/parser/jsoniq_parser.y"
+#line 2664 "/home/markos/zorba/repo/hof-next/src/compiler/parser/jsoniq_parser.y"
     {
       (yyval.node) = new FLWORWinCond(LOC((yyloc)),
                             NULL,
@@ -5042,7 +5042,7 @@
   case 244: