Merge lp:~nbrinza/zorba/hof into lp:zorba

[Nicolae Brinza]

Implementation of higher order functions.

Implementation of higher order functions.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-2013-03-05T00-49-26.585Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~nbrinza/zorba/hof 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-2013-03-05T00-49-26.585Z is finished. The final
  status was:

  2 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-2013-03-05T01-36-25.371Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~nbrinza/zorba/hof 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-2013-03-05T01-36-25.371Z is finished. The final
  status was:

  1 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-2013-03-05T02-53-19.978Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~nbrinza/zorba/hof 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-2013-03-05T02-53-19.978Z is finished. The final
  status was:

  1 tests did not succeed - changes not commited.

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

[lp:~nbrinza/zorba/hof]

10702. By Nicolae Brinza on 2013-03-12

Fixed issues reported by Markos.

10703. By Nicolae Brinza on 2013-03-12

Removed HoFs from the features system. They are now always supported.

10704. By Nicolae Brinza on 2013-03-12

Removed redundant arity checks

10705. By Nicolae Brinza on 2013-03-13

Enabled FOTS HoF tests

10706. By Nicolae Brinza on 2013-03-13

Fixed more fn:function-lookup() tests.

10707. By Nicolae Brinza on 2013-03-13

Fixed a small error in the code

10708. By Nicolae Brinza on 2013-03-13

Better static typing for dynamic_function_invocation_expr

10709. By Nicolae Brinza on 2013-03-13

The testdriver no longer attempts to set enable the HoF feature

10710. By Nicolae Brinza on 2013-03-13

dynamic_function_invocation_expr's flwor translation now uses allowing empty, so that the flow reaches the iterator and the proper error is thrown

10711. By Nicolae Brinza on 2013-03-13

Merged with Zorba trunk

10712. By Nicolae Brinza on 2013-03-15

Removed more obsolete HoF feature enabling code.

10713. By Nicolae Brinza on 2013-03-15

HoF work in progress

10714. By Nicolae Brinza on 2013-03-15

Pulled some changes from the hof-merge branch

10715. By Nicolae Brinza on 2013-03-17

Fixed fn:function-name() for coerced functions.

10716. By Nicolae Brinza on 2013-03-17

Pulled changes from the hof-merge branch

=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h	2013-03-06 10:37:33 +0000
+++ include/zorba/pregenerated/diagnostic_list.h	2013-03-17 13:46:23 +0000
@@ -64,6 +64,8 @@
 
 extern ZORBA_DLL_PUBLIC XQueryErrorCode XQTY0086;
 
+extern ZORBA_DLL_PUBLIC XQueryErrorCode XQTY0105;
+
 extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0009;
 
 extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0012;
@@ -304,6 +306,8 @@
 
 extern ZORBA_DLL_PUBLIC XQueryErrorCode FOUT1190;
 
+extern ZORBA_DLL_PUBLIC XQueryErrorCode FOFL0001;
+
 extern ZORBA_DLL_PUBLIC XQueryErrorCode FOCZ0001;
 
 extern ZORBA_DLL_PUBLIC XQueryErrorCode XUST0001;

=== modified file 'modules/w3c/pregenerated/xqt-errors.xq'
--- modules/w3c/pregenerated/xqt-errors.xq	2013-03-06 10:37:33 +0000
+++ modules/w3c/pregenerated/xqt-errors.xq	2013-03-17 13:46:23 +0000
@@ -203,6 +203,14 @@
 
 (:~
  :
+ : It is a type error if the content sequence in an element constructor contains a function item.
+ : 
+ : @see http://www.w3.org/2005/xqt-errors
+:)
+declare variable $err:XQTY0105 as xs:QName := fn:QName($err:NS, "err:XQTY0105");
+
+(:~
+ :
  : An implementation that does not support the Schema Import Feature must
  : raise a static error if a Prolog contains a schema import.
  : 
@@ -1319,6 +1327,14 @@
 
 (:~
  :
+ : This error is raised if the fn:function-lookup returns a context-dependent function and the context-dependent function is then called.
+ : 
+ : @see http://www.w3.org/2005/xqt-errors
+:)
+declare variable $err:FOFL0001 as xs:QName := fn:QName($err:NS, "err:FOFL0001");
+
+(:~
+ :
  : Invalid content passed to \c x:canonicalize().
  : 
  : @see http://www.w3.org/2005/xqt-errors

=== modified file 'modules/xqxq/xqxq.xq'
--- modules/xqxq/xqxq.xq	2013-02-15 06:11:20 +0000
+++ modules/xqxq/xqxq.xq	2013-03-17 13:46:23 +0000
@@ -31,7 +31,6 @@
 declare namespace f = "http://www.zorba-xquery.com/features";
 
 declare option ver:module-version "1.0";
-declare option op:enable "f:hof";
 
 (:~
  : The function prepares a given XQuery program for execution.

=== modified file 'src/api/serialization/serializer.cpp'
--- src/api/serialization/serializer.cpp	2013-03-11 15:00:50 +0000
+++ src/api/serialization/serializer.cpp	2013-03-17 13:46:23 +0000
@@ -463,6 +463,11 @@
     ERROR_PARAMS(lMethod, item->getType()->getStringValue()));
   }
 #endif
+  else if (item->isFunction())
+  {
+    throw XQUERY_EXCEPTION(err::SENR0001,
+    ERROR_PARAMS(item->show(), "function item node"));
+  }
 }
 
 

=== modified file 'src/compiler/api/compiler_api.cpp'
--- src/compiler/api/compiler_api.cpp	2013-02-07 17:24:36 +0000
+++ src/compiler/api/compiler_api.cpp	2013-03-17 13:46:23 +0000
@@ -273,6 +273,9 @@
                   lTimer);
 
     rootExpr = optimize(rootExpr);
+
+    // TODO: remove debug message
+//    std::cerr << "==========================================\nOptimizations finished" << std::endl;
   }
 
 #if 0
@@ -355,7 +358,7 @@
   // are actually non-deterministic and mark them as such. This has to be done
   // before optimization.
   udfGraph.inferDeterminism();
-
+  
   if (theCompilerCB->theConfig.opt_level <= CompilerCB::config::O0)
   {
     theCompilerCB->setPhase(CompilerCB::NONE);

=== modified file 'src/compiler/api/compilercb.cpp'
--- src/compiler/api/compilercb.cpp	2013-02-07 17:24:36 +0000
+++ src/compiler/api/compilercb.cpp	2013-03-17 13:46:23 +0000
@@ -127,6 +127,8 @@
 {
   if (timeout >= 0)
     theHaveTimeout = true;
+
+  std::cerr << "--> created CompilerCB: " << this << std::endl;
 }
 
 
@@ -155,6 +157,7 @@
   theConfig(cb.theConfig),
   theEM(new ExprManager(this))
 {
+  std::cerr << "--> created CompilerCB: " << this << std::endl;
 }
 
 
@@ -185,6 +188,8 @@
 {
   delete theEM;
   theSctxMap.clear();
+
+  std::cerr << "--> deleted ~CompilerCB: " << this << std::endl;
 }
 
 

=== modified file 'src/compiler/codegen/plan_visitor.cpp'
--- src/compiler/codegen/plan_visitor.cpp	2013-03-08 00:09:46 +0000
+++ src/compiler/codegen/plan_visitor.cpp	2013-03-17 13:46:23 +0000
@@ -466,29 +466,185 @@
 void end_visit(function_item_expr& v)
 {
   CODEGEN_TRACE_OUT("");
-  store::Item_t lQName = v.get_qname();
-  store::Item_t lFItem;
-
-  bool isInline = (lQName == 0);
-
-  if (!isInline)
+
+//  std::cerr << "--> plan_visitor() end_visit of function_item_expr" << std::endl;
+
+  DynamicFunctionInfo* fnInfo = v.get_dynamic_fn_info();
+  fnInfo->theCCB = theCCB;
+  fnInfo->theMustDeleteCCB = false;
+  fnInfo->theLoc = qloc;
+  fnInfo->theFunction = v.get_function();
+  fnInfo->theQName = v.get_qname();
+  fnInfo->theArity = v.get_arity();
+
+  if (v.is_inline())
   {
-    // literal function item
-    lFItem = new FunctionItem(theCCB, sctx, &v);
+    for (csize i = 0; i < v.get_subst_vars_values().size(); ++i)
+    {      
+      if (!v.get_is_global_var()[i])     
+        fnInfo->theScopedVarsIterators.push_back(pop_itstack());
+
+      // TODO: cleanup debug info
+      /*
+      PlanIter_t varIter = NULL;
+      PlanIter_t enclosedIter = NULL;
+
+      store::Item* var_qname = NULL;
+      if (dynamic_cast<LetVarIterator*>(varIter.getp()) != NULL)
+        var_qname = dynamic_cast<LetVarIterator*>(varIter.getp())->getVarName();
+      else if (dynamic_cast<ForVarIterator*>(varIter.getp()) != NULL)
+        var_qname = dynamic_cast<ForVarIterator*>(varIter.getp())->getVarName();
+      else
+        var_qname = v.get_scoped_vars_names()[i].getp();
+
+      std::cerr << "--> PlanVisitor function_item_expr: var name: " << v.get_scoped_vars_names()[i]->show()
+          << " global: " << v.get_is_global_var()[i]
+          << " with iter: "
+          << (enclosedIter.getp()?enclosedIter->toString() : "NULL");
+      if (dynamic_cast<LetVarIterator*>(enclosedIter.getp()) != NULL)
+        std::cerr << " var name: " << dynamic_cast<LetVarIterator*>(enclosedIter.getp())->getVarName()->show();
+      else if (dynamic_cast<ForVarIterator*>(enclosedIter.getp()) != NULL)
+        std::cerr << " var name: " << dynamic_cast<ForVarIterator*>(enclosedIter.getp())->getVarName()->show();
+      else
+        std::cerr << " var name (from the expr, not the iterator): " << (var_qname? var_qname->show() : "NULL");
+      std::cerr << std::endl;
+      */
+    }
+
+    std::reverse(fnInfo->theScopedVarsIterators.begin(), fnInfo->theScopedVarsIterators.end());
   }
-  else
+
+
+  // This portion is taken from the eval iterator
   {
-    // inline function
-    std::vector<PlanIter_t> lVariableValues;
-    size_t lSize = v.get_vars().size();
-    for (size_t i = 0; i < lSize; ++i)
+    // Create the "import" sctx. The importOuterEnv() method (called below) will
+    // register into the importSctx (a) the outer vars of the eval query and (b)
+    // the expression-level ns bindings of the outer query at the place where
+    // the eval call appears at.
+    // static_context* importSctx = sctx->create_child_context();
+
+    // Create the root sctx for the eval query
+    // static_context* evalSctx = importSctx->create_child_context();
+
+    // Create the ccb for the eval query
+
+    // fnInfo->theCCBHolder.reset(new CompilerCB(*theCCB));
+    // fnInfo->theCCB = fnInfo->theCCBHolder.get();
+    // fnInfo->theCCB->theRootSctx = evalSctx;
+    // (fnInfo->theCCB->theSctxMap)[1] = evalSctx;
+
+    // Create the dynamic context for the eval query
+    // std::auto_ptr<dynamic_context> evalDctx;
+    // evalDctx.reset(new dynamic_context(planState.theGlobalDynCtx));
+    // evalDctx.reset(new dynamic_context());
+
+    // Import the outer environment.
+    // importOuterEnv(planState, evalCCB.get(), importSctx, evalDctx.get());
+
+    // Set the values for the (explicit) external vars of the eval query
+    // setExternalVariables(evalCCB.get(), importSctx, evalDctx.get());
+
+
+    // std::cerr << "--> " << toString() << ": creating function item with params: " << std::endl;
+    // for (csize i=0; i<theChildren.size(); i++)
+    //  std::cerr << "    " << (theDynamicFunctionInfo->theScopedVarsNames[i].getp() ? theDynamicFunctionInfo->theScopedVarsNames[i]->show() : "") << std::endl;
+
+    // std::cerr << "--> the body before: " << static_cast<user_function*>(theDynamicFunctionInfo->theFunction.getp())->getBody()->toString() << std::endl;
+
+    // result = new FunctionItem(theDynamicFunctionInfo, evalCCB.release(), evalDctx.release());
+
+    // std::cerr << "--> sctx: " << sctx->toString() << std::endl;
+    // std::cerr << "--> closureSctx: " << fnInfo->theClosureSctx->toString() << std::endl;
+
+    // ulong maxOuterVarId = 1;
+    // ++maxOuterVarId; // TODO: get it from the plan_visitor
+
+    csize curChild = -1;
+    csize numOuterVars = fnInfo->theScopedVarsNames.size();
+    for (csize i = 0; i < numOuterVars; ++i)
     {
-      lVariableValues.push_back(pop_itstack());
+      var_expr* ve = theCCB->theEM->create_var_expr(fnInfo->theClosureSctx,
+                                                            NULL,
+                                                            qloc,
+                                                            var_expr::hof_var,
+                                                            fnInfo->theScopedVarsNames[i].getp());
+
+      // ve->set_type(theOuterVarTypes[i]); TODO: get types
+      if (!fnInfo->theIsGlobalVar[i])
+      {
+        ++curChild;
+        // store::Iterator_t iter = new PlanIteratorWrapper(theChildren[curChild], planState);
+        // evalDctx->add_variable(maxOuterVarId, iter);
+        // ve->set_unique_id(maxOuterVarId);
+
+        if (fnInfo->theSubstVarsValues[i] != NULL
+            &&
+            fnInfo->theSubstVarsValues[i]->get_unique_id() == 0)
+        {
+          fnInfo->theSubstVarsValues[i]->set_var_info(NULL);
+          // fnInfo->theSubstVarsValues[i]->set_unique_id(maxOuterVarId);
+          fnInfo->theSubstVarsValues[i]->set_unique_id(theNextDynamicVarId++);
+        }
+
+        // std::cerr << "--> plan_visitor: " << fnInfo->theQName->toString() << " var: " << fnInfo->theScopedVarsNames[i]->toString() << " has id: " << fnInfo->theSubstVarsValues[i]->get_unique_id() << std::endl;
+
+        ve->set_unique_id(fnInfo->theSubstVarsValues[i]->get_unique_id());
+        fnInfo->theVarId[i] = fnInfo->theSubstVarsValues[i]->get_unique_id();
+
+        // ++maxOuterVarId;
+        // theNextDynamicVarId++;
+      }
+      else
+      {
+        // static_context* outerSctx = importSctx->get_parent();
+        static_context* outerSctx = fnInfo->theClosureSctx->get_parent();
+
+        VarInfo* outerGlobalVar = outerSctx->lookup_var(fnInfo->theScopedVarsNames[i]);
+
+        ulong outerGlobalVarId = 0;
+
+        if (outerGlobalVar)
+        {
+          outerGlobalVarId = outerGlobalVar->getId();
+        }
+        else
+        {
+          // std::cerr << "--> searching for var: " << theDynamicFunctionInfo->theScopedVarsNames[i]->toString() << std::endl;
+          for (csize j=0; j<fnInfo->theSubstVarsValues.size(); j++)
+          {
+            // std::cerr << "    substVar: " << (theDynamicFunctionInfo->theSubstVarsValues[j] ? theDynamicFunctionInfo->theSubstVarsValues[j]->toString() : "NULL");
+            if (fnInfo->theSubstVarsValues[j]->get_name()->equals(fnInfo->theScopedVarsNames[i].getp()))
+              outerGlobalVarId = fnInfo->theSubstVarsValues[j]->get_unique_id();
+          }
+        }
+
+        // ZORBA_ASSERT(outerGlobalVar);
+
+        // std::cerr << "--> importOuterEnv(): outerSctx: " << outerSctx->toString() << std::endl;
+        // std::cerr << "--> plan_visitor: " << fnInfo->theQName->toString() << " updating id for subst_var: " << (fnInfo->theSubstVarsValues[i] ? fnInfo->theSubstVarsValues[i]->toString() : "NULL\n");
+
+        if (fnInfo->theSubstVarsValues[i] != NULL
+            &&
+            fnInfo->theSubstVarsValues[i]->get_unique_id() == 0)
+        {
+          fnInfo->theSubstVarsValues[i]->set_unique_id(outerGlobalVarId);
+        }
+
+        ve->set_unique_id(outerGlobalVarId);
+
+        fnInfo->theVarId[i] = outerGlobalVarId;
+      }
+
+      // importSctx->bind_var(ve, qloc);
+      // fnInfo->theClosureSctx->bind_var(ve, qloc);
     }
-    lFItem = new FunctionItem(theCCB, sctx, &v, lVariableValues);
   }
 
-  push_itstack(new SingletonIterator (sctx, qloc, lFItem));
+  // std::cerr << "--> the body now: " << static_cast<user_function*>(fnInfo->theFunction.getp())->getBody()->toString() << std::endl;
+
+  PlanIter_t tmp = new DynamicFunctionIterator(sctx, qloc, fnInfo);
+  // std::cerr << "--> plan_visitor: pushing iter: " << tmp->toString() << std::endl;
+  push_itstack(tmp);
 }
 
 
@@ -505,20 +661,54 @@
 {
   CODEGEN_TRACE_OUT("");
 
-  ulong numArgs = (ulong)v.get_args().size() + 1;
-
-  std::vector<PlanIter_t> argIters(numArgs);
-
-  for (size_t i = 1; i < numArgs; ++i)
-  {
-    argIters[i] = pop_itstack();
-  }
-
-  argIters[0] = pop_itstack();
-
-  push_itstack(new DynamicFnCallIterator(sctx, qloc, argIters));
-}
-
+  csize numArgs = v.get_args().size() + 1;
+
+  std::vector<PlanIter_t> argIters;
+  
+  bool isPartialApply = false;
+  
+  // the arguments are reversed on the stack
+  if (v.get_dot_var())
+  {
+    PlanIter_t iter = pop_itstack();
+    argIters.push_back(iter);
+    // std::cerr << "--> plan_visitor dot var iterator: " << iter->toString() << std::endl; // TODO
+  }
+
+  for (size_t i = 0; i < numArgs-1; ++i)
+  {
+    if (v.get_args()[i]->get_expr_kind() == argument_placeholder_expr_kind)
+      isPartialApply = true;
+
+    argIters.push_back(pop_itstack());
+  }
+
+  argIters.push_back(pop_itstack());
+
+  std::reverse(argIters.begin(), argIters.end());
+
+  push_itstack(new DynamicFnCallIterator(sctx, qloc,
+                                         argIters,
+                                         v.get_dot_var() ? 1 : 0,
+                                         isPartialApply));
+}
+
+
+/***************************************************************************//**
+
+********************************************************************************/
+bool begin_visit(argument_placeholder_expr& v)
+{
+  CODEGEN_TRACE_IN("");
+  return true;
+}
+
+void end_visit(argument_placeholder_expr& v)
+{
+  CODEGEN_TRACE_OUT("");
+  PlanIter_t it = new ArgumentPlaceholderIterator(sctx, qloc);
+  push_itstack(it);
+}
 
 /***************************************************************************//**
 
@@ -743,6 +933,8 @@
 
   bool isForVar = false;
 
+  // std::cerr << "--> general_var_codegen() on var: " << var.toString();
+
   switch (var.get_kind())
   {
   case var_expr::for_var:
@@ -836,6 +1028,7 @@
 
   case var_expr::arg_var:
   {
+    ZORBA_ASSERT(arg_var_iter_map != NULL);
     PlanIter_t iter = base_var_codegen(var, *arg_var_iter_map);
     push_itstack(iter);
     break;
@@ -856,6 +1049,7 @@
   }
 
   case var_expr::prolog_var:
+  case var_expr::hof_var:
   {
     push_itstack(new CtxVarIterator(sctx,
                                     qloc,
@@ -3600,6 +3794,11 @@
 #ifndef NDEBUG
   if (!itstack.empty())
   {
+    std::cout << "Plan_visitor partial iterator tree:\n"; // TODO: remove this debug output
+    XMLIterPrinter vp(std::cout);
+    print_iter_plan(vp, res);
+    std::cout<< std::endl;
+
     std::cout << "\nPlan_visitor stack still contains "
               << itstack.size() << " entries: " << std::endl;
     while (!itstack.empty())
@@ -3712,9 +3911,37 @@
     hash64map<std::vector<LetVarIter_t> *>* arg_var_map)
 {
   plan_visitor c(ccb, nextDynamicVarId, arg_var_map);
+
+  /*
+  std::cerr << "------------------- codegen: -------------------\n";
+  if (dynamic_cast<function_item_expr*>(root) != NULL)
+    std::cerr << "--> function_item_expr " << root->get_loc() << std::endl;
+
+  std::cerr << std::endl;
+  std::cerr << root->toString() << std::endl;
+  std::cerr << "------------------------------------------------\n";
+  */
+
   root->accept(c);
   PlanIter_t result = c.result();
 
+  /*
+  std::cerr << "--> arg_var_map: " << arg_var_map << " size: " << (arg_var_map==NULL?0 : arg_var_map->size()) << " iterators: ";
+  if (arg_var_map != NULL)
+  {
+    csize i = 0;
+    for (checked_vector<hash64map<std::vector<LetVarIter_t> *>::entry>::const_iterator it = arg_var_map->begin(); it != arg_var_map->end(); ++it, ++i)
+    {
+      var_expr* var = (var_expr*)it->key;
+      std::cerr << std::endl << "--> [" << i << "] " << var->toString() << "--> [" << i << "] referenced by:";
+      for (csize j=0; j < it->val->size(); j++)
+        std::cerr << " " << (*it->val)[j]->getId() << " = LetVarIterator";
+    }
+  }
+  std::cerr << std::endl << "------------------------------------------------\n";
+  */
+
+
   if (result != NULL &&
       descr != NULL &&
       Properties::instance()->printIteratorTree())

=== modified file 'src/compiler/expression/abstract_expr_visitor.h'
--- src/compiler/expression/abstract_expr_visitor.h	2013-02-07 17:24:36 +0000
+++ src/compiler/expression/abstract_expr_visitor.h	2013-03-17 13:46:23 +0000
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006-2008 The FLWOR Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,18 +22,18 @@
 #include "compiler/expression/expr_visitor.h"
 
 /*______________________________________________________________________
-|  
+|
 |  Design note: Visitor pattern.  See, for example:
 |  "Modern C++ Design" by Andrei Alexandrescu,
 |  Addison Wesley (2001), Chapter 10.
 |_______________________________________________________________________*/
 
-namespace zorba 
+namespace zorba
 {
 
 class abstract_expr_visitor : public expr_visitor
 {
-public: 
+public:
   virtual ~abstract_expr_visitor() {}
 
 public:
@@ -80,6 +80,7 @@
   EXPR_VISITOR_METHODS(trycatch_expr);
   EXPR_VISITOR_METHODS(function_item_expr);
   EXPR_VISITOR_METHODS(dynamic_function_invocation_expr);
+  EXPR_VISITOR_METHODS(argument_placeholder_epxr);
 
   EXPR_VISITOR_METHODS (delete_expr);
   EXPR_VISITOR_METHODS (insert_expr);

=== modified file 'src/compiler/expression/expr_base.cpp'
--- src/compiler/expression/expr_base.cpp	2013-03-05 12:34:19 +0000
+++ src/compiler/expression/expr_base.cpp	2013-03-17 13:46:23 +0000
@@ -288,6 +288,13 @@
   return oss.str();
 }
 
+/*******************************************************************************
+  to mirror the Item's class show() method
+********************************************************************************/
+std::string expr::show() const  
+{ 
+  return toString(); 
+}
 
 /*******************************************************************************
 

=== modified file 'src/compiler/expression/expr_base.h'
--- src/compiler/expression/expr_base.h	2013-03-05 12:34:19 +0000
+++ src/compiler/expression/expr_base.h	2013-03-17 13:46:23 +0000
@@ -71,6 +71,7 @@
 
   fo_expr_kind,
   dynamic_function_invocation_expr_kind,
+  argument_placeholder_expr_kind,
   function_item_expr_kind,
 
   castable_expr_kind,
@@ -270,6 +271,8 @@
 
   std::string toString() const;
 
+  std::string show() const; // to mirror the Item's class show() method
+
 public:
   //
   void setVisitId(uint8_t id) { theVisitId = id; }

=== modified file 'src/compiler/expression/expr_classes.h'
--- src/compiler/expression/expr_classes.h	2013-03-05 12:34:19 +0000
+++ src/compiler/expression/expr_classes.h	2013-03-17 13:46:23 +0000
@@ -51,6 +51,7 @@
   class trycatch_expr;
   class function_item_expr;
   class dynamic_function_invocation_expr;
+  class argument_placeholder_expr;
 
   class insert_expr;
   class delete_expr;

=== modified file 'src/compiler/expression/expr_clone.cpp'
--- src/compiler/expression/expr_clone.cpp	2013-03-05 12:34:19 +0000
+++ src/compiler/expression/expr_clone.cpp	2013-03-17 13:46:23 +0000
@@ -31,6 +31,7 @@
 #include "compiler/api/compilercb.h"
 
 #include "functions/function.h"
+#include "functions/udf.h"
 
 #include "diagnostics/xquery_diagnostics.h"
 #include "diagnostics/util_macros.h"
@@ -159,7 +160,7 @@
 
     std::vector<expr*> names;
     std::vector<expr*> values;
-    
+
     names.reserve(e->theNames.size());
     values.reserve(e->theValues.size());
 
@@ -345,7 +346,7 @@
   }
   case dynamic_function_invocation_expr_kind:
   {
-    const dynamic_function_invocation_expr* e = 
+    const dynamic_function_invocation_expr* e =
     static_cast<const dynamic_function_invocation_expr*>(this);
 
     checked_vector<expr*> newArgs;
@@ -356,12 +357,24 @@
       newArgs.push_back((*ite)->clone(udf, subst));
     }
     
+    expr* newDotVar = NULL;
+    if (e->theDotVar)
+    {
+      newDotVar = e->theDotVar->clone(udf, subst);
+    }
+
     newExpr = theCCB->theEM->
     create_dynamic_function_invocation_expr(theSctx,
                                             udf,
                                             theLoc,
                                             e->theExpr->clone(udf, subst),
-                                            newArgs);
+                                            newArgs,
+                                            newDotVar);
+    break;
+  }
+  case argument_placeholder_expr_kind:
+  {
+    newExpr = theCCB->theEM->create_argument_placeholder_expr(theSctx, udf, theLoc);
     break;
   }
   case function_item_expr_kind:
@@ -371,17 +384,25 @@
     function_item_expr* cloneExpr = theCCB->theEM->
     create_function_item_expr(theSctx,
                               udf,
-                              theLoc,
-                              e->theFunction->getName(),
-                              e->theFunction.getp(),
-                              e->theArity);
+                              get_loc(),
+                              e->theDynamicFunctionInfo->theClosureSctx,
+                              e->theDynamicFunctionInfo->theFunction,
+                              e->theDynamicFunctionInfo->theFunction->getName(),
+                              e->theDynamicFunctionInfo->theArity,
+                              e->is_inline(),
+                              e->needs_context_item(),
+                              e->is_coercion());
 
-    std::vector<expr*> lNewVariables;
-    for (std::vector<expr*>::const_iterator ite = e->theScopedVariables.begin();
-         ite != e->theScopedVariables.end();
-         ++ite)
+    std::vector<expr*>::const_iterator varIter = e->theDynamicFunctionInfo->theScopedVarsValues.begin();
+    std::vector<var_expr*>::const_iterator substVarIter = e->theDynamicFunctionInfo->theSubstVarsValues.begin();
+    std::vector<store::Item_t>::const_iterator nameIter = e->theDynamicFunctionInfo->theScopedVarsNames.begin();
+    std::vector<int>::const_iterator isGlobalIter = e->theDynamicFunctionInfo->theIsGlobalVar.begin();
+    for (; varIter != e->theDynamicFunctionInfo->theScopedVarsValues.end(); ++varIter, ++substVarIter, ++nameIter, ++isGlobalIter)
     {
-      cloneExpr->add_variable((*ite)->clone(udf, subst));
+      cloneExpr->add_variable((*varIter) ? (*varIter)->clone(udf, subst) : NULL,
+                              (*substVarIter) ? static_cast<var_expr*>((*substVarIter)->clone(udf, subst)) : NULL,
+                              *nameIter,
+                              *isGlobalIter);
     }
 
     newExpr = cloneExpr;
@@ -593,7 +614,7 @@
 
     transform_expr* cloneExpr = theCCB->theEM->
     create_transform_expr(theSctx, udf, theLoc);
-    
+
     for (std::vector<copy_clause*>::const_iterator ite = e->theCopyClauses.begin();
          ite != e->theCopyClauses.end();
          ++ite)
@@ -698,10 +719,10 @@
     for (; ite != end; ++ite)
     {
       assert(subst.find(*ite) != subst.end());
-      
+
       clonedExits.push_back(subst[*ite]);
     }
-    
+
     newExpr = theCCB->theEM->
     create_exit_catcher_expr(theSctx, udf, theLoc, clonedInput, clonedExits);
 

=== modified file 'src/compiler/expression/expr_iter.cpp'
--- src/compiler/expression/expr_iter.cpp	2013-03-05 12:34:19 +0000
+++ src/compiler/expression/expr_iter.cpp	2013-03-17 13:46:23 +0000
@@ -195,9 +195,9 @@
 
           theArgsIter = oc->theOrderingExprs.begin();
           theArgsEnd = oc->theOrderingExprs.end();
-          
+
           theCurrentChild = &(*theArgsIter);
-          
+
           ++theArgsIter;
           theState = 3;
           return;
@@ -242,7 +242,7 @@
       while (theWincondIter < 2)
       {
         window_clause* wc = static_cast<window_clause *>(*theClausesIter);
-            
+
         flwor_wincond* wincond = (theWincondIter == 0 ?
                                   wc->theWinStartCond :
                                   wc->theWinStopCond );
@@ -269,7 +269,7 @@
         ++theArgsIter;
         return;
       }
-      
+
       theState = 1;
       ++theClausesIter;
       goto nextclause;
@@ -704,10 +704,12 @@
 
     EXPR_ITER_BEGIN();
 
-    theArgsIter = fiExpr->theScopedVariables.begin();
-    theArgsEnd = fiExpr->theScopedVariables.end();
+    theArgsIter = fiExpr->theDynamicFunctionInfo->theScopedVarsValues.begin();
+    theArgsEnd = fiExpr->theDynamicFunctionInfo->theScopedVarsValues.end();
     for (; theArgsIter != theArgsEnd; ++theArgsIter)
     {
+      if ( ! *theArgsIter) // TODO: the vars values for prolog variables is null, so they have to be skipped, or the optimizer will trip and fall off. Maybe null vars values need not be remembered
+        continue;
       EXPR_ITER_NEXT(*theArgsIter);
     }
 
@@ -730,11 +732,20 @@
     {
       EXPR_ITER_NEXT(*theArgsIter);
     }
+    
+    if (dfiExpr->theDotVar)
+      EXPR_ITER_NEXT(dfiExpr->theDotVar);
 
     EXPR_ITER_END();
     return;
   }
 
+  case argument_placeholder_expr_kind:
+  {
+    theIsDone = true;
+    return;
+  }
+
   case insert_expr_kind:
   {
     insert_expr* insExpr = static_cast<insert_expr*>(theExpr);

=== modified file 'src/compiler/expression/expr_manager.cpp'
--- src/compiler/expression/expr_manager.cpp	2013-03-05 12:34:19 +0000
+++ src/compiler/expression/expr_manager.cpp	2013-03-17 13:46:23 +0000
@@ -796,35 +796,52 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 dynamic_function_invocation_expr*
-ExprManager::create_dynamic_function_invocation_expr(
-    static_context* sctx,
+ExprManager::create_dynamic_function_invocation_expr(static_context* sctx,
     user_function* udf,
     const QueryLoc& loc,
     expr* anExpr,
-    const std::vector<expr*>& args)
+    const std::vector<expr*>& args,
+    expr* dotVar)
 {
-  CREATE_AND_RETURN_EXPR(dynamic_function_invocation_expr, sctx, udf, loc, anExpr, args);
+  CREATE_AND_RETURN_EXPR(dynamic_function_invocation_expr, sctx, udf, loc,
+                         anExpr, args, dotVar);
 }
 
 
-function_item_expr* ExprManager::create_function_item_expr(
+argument_placeholder_expr*
+ExprManager::create_argument_placeholder_expr(
     static_context* sctx,
     user_function* udf,
+    const QueryLoc& loc)
+{
+  CREATE_AND_RETURN_EXPR(argument_placeholder_expr, sctx, udf, loc);
+}
+
+
+function_item_expr* ExprManager::create_function_item_expr(static_context* sctx,
+    user_function* udf,
     const QueryLoc& loc,
-    const store::Item* aQName,
+    static_context* closureSctx,
     function* f,
-    uint32_t aArity)
+    store::Item* aQName,
+    uint32_t aArity,
+    bool isInline,
+    bool needsContextItem,
+    bool isCoercion)
 {
-  CREATE_AND_RETURN_EXPR(function_item_expr, sctx, udf, loc, aQName, f, aArity);
+  CREATE_AND_RETURN_EXPR(function_item_expr, sctx, udf, loc, closureSctx, f, aQName, aArity, isInline, needsContextItem, isCoercion);
 }
 
 
-function_item_expr* ExprManager::create_function_item_expr(
-    static_context* sctx,
+function_item_expr* ExprManager::create_function_item_expr(static_context* sctx,
     user_function* udf,
-    const QueryLoc& loc)
+    const QueryLoc& loc,
+    static_context *closureSctx,
+    bool isInline,
+    bool needsContextItem,
+    bool isCoercion)
 {
-  CREATE_AND_RETURN_EXPR(function_item_expr, sctx, udf, loc);
+  CREATE_AND_RETURN_EXPR(function_item_expr, sctx, udf, loc, closureSctx, isInline, needsContextItem, isCoercion);
 }
 
 

=== modified file 'src/compiler/expression/expr_manager.h'
--- src/compiler/expression/expr_manager.h	2013-03-05 12:34:19 +0000
+++ src/compiler/expression/expr_manager.h	2013-03-17 13:46:23 +0000
@@ -489,20 +489,33 @@
       user_function* udf,
       const QueryLoc& loc,
       expr* anExpr,
-      const std::vector<expr*>& args);
+      const std::vector<expr*>& args,
+      expr* dotVar);
 
-  function_item_expr* create_function_item_expr(
+  argument_placeholder_expr* create_argument_placeholder_expr(
       static_context* sctx,
       user_function* udf,
+      const QueryLoc& loc);
+
+  function_item_expr* create_function_item_expr(static_context* sctx,
+      user_function* udf,
       const QueryLoc& loc,
-      const store::Item* aQName,
+      static_context *closureSctx,
       function* f,
-      uint32_t aArity);
+      store::Item* aQName,
+      uint32_t aArity,
+      bool isInline,
+      bool needsContextItem,
+      bool isCoercion);
 
   function_item_expr* create_function_item_expr(
       static_context* sctx,
-      user_function* udf,
-      const QueryLoc& loc);
+      user_function* udf,      
+      const QueryLoc& loc,
+      static_context *closureSctx,
+      bool isInline,
+      bool needsContextItem,
+      bool isCoercion);
 
   ftcontains_expr* create_ftcontains_expr(
       static_context*,
@@ -616,7 +629,7 @@
       user_function* udf,
       const QueryLoc& loc,
       bool general);
- 
+
   pragma* create_pragma(
       const store::Item_t&,
       const zstring&);

=== modified file 'src/compiler/expression/expr_put.cpp'
--- src/compiler/expression/expr_put.cpp	2013-03-07 10:10:10 +0000
+++ src/compiler/expression/expr_put.cpp	2013-03-17 13:46:23 +0000
@@ -152,7 +152,10 @@
 
     BEGIN_PUT_NO_EOL(vref) ;
     put_qname(varExpr->get_name(), os);
-    os << expr_addr(varExpr) << " ]" << endl;
+    os << expr_addr(varExpr);
+    os << " kind=" << var_expr::decode_var_kind(varExpr->get_kind()); // TODO: remove this info
+    os << " uniqueId=" << varExpr->get_unique_id(); // TODO: remove this info
+    os << " ]" << endl;
     return os;
   }
   else
@@ -185,6 +188,11 @@
     put_qname(get_name(), os);
   }
 
+  if (get_kind() == prolog_var || get_kind() == hof_var)
+  {
+    os << " uniqueId=" << theUniqueId;
+  }
+
 #if VERBOSE
   if (theDeclaredType != NULL)
   {
@@ -224,7 +232,7 @@
   }
 
   os << endl << indent << "[\n" << inc_indent;
-    
+
   theDomainExpr->put(os);
 
   END_PUT();
@@ -502,7 +510,7 @@
 ostream& fo_expr::put(ostream& os) const
 {
   const store::Item* qname = theFunction->getName();
-  BEGIN_PUT_MSG( qname->getStringValue() << "/" << num_args() );
+  BEGIN_PUT_MSG( qname->getStringValue() << "#" << num_args() );
   csize numArgs = num_args();
 
   for (csize i = 0; i < numArgs; ++i)
@@ -528,18 +536,44 @@
 
 std::ostream& function_item_expr::put(std::ostream& os) const
 {
-  os << indent << "funtion_item_expr " << expr_addr(this) << inc_indent;
+  os << indent << "funtion_item_expr" << expr_addr(this) << inc_indent;
 
-  if (theQName != NULL)
+  if (!is_inline())
   {
-    os << " " << theQName->getStringValue() << "/" << theArity;
+    os << " " << theDynamicFunctionInfo->theQName->getStringValue()
+       << "#" << theDynamicFunctionInfo->theArity;
     os << dec_indent << endl;
     return os;
   }
   else
   {
-    os << " inline udf (" << theFunction.getp() << ") [\n";
-    reinterpret_cast<const user_function*>(theFunction.getp())->getBody()->put(os);
+    os << " " << theDynamicFunctionInfo->theQName->getStringValue()
+       << "#" << theDynamicFunctionInfo->theArity << " [\n";
+
+    const signature& sig = get_function()->getSignature();
+    std::vector<xqtref_t> paramTypes;
+    for (csize i=0; i < sig.paramCount(); i++)
+      paramTypes.push_back(sig[i]);
+    xqtref_t funcType = get_type_manager()->create_function_type(paramTypes, sig.returnType(), TypeConstants::QUANT_ONE);
+
+    // TODO: remove type
+    os << indent << "type: " << funcType->toString() << std::endl;
+
+    for (ulong i = 0; i < theDynamicFunctionInfo->theScopedVarsValues.size(); i++)
+    {
+      os << indent << "using $"
+         << theDynamicFunctionInfo->theScopedVarsNames[i]->getStringValue()
+         << (theDynamicFunctionInfo->theIsGlobalVar[i] ? " global=1" : "") << " := [";
+      os << endl << inc_indent;
+      if (theDynamicFunctionInfo->theScopedVarsValues[i])
+        theDynamicFunctionInfo->theScopedVarsValues[i]->put(os);
+      os << dec_indent << indent << "]" << endl;
+    }
+
+    if (theDynamicFunctionInfo->theFunction != NULL &&
+        static_cast<user_function*>(theDynamicFunctionInfo->theFunction.getp())->getBody() != NULL)
+      static_cast<user_function*>(theDynamicFunctionInfo->theFunction.getp())->getBody()->put(os);
+
     END_PUT();
   }
 }
@@ -548,16 +582,30 @@
 ostream& dynamic_function_invocation_expr::put(ostream& os) const
 {
   BEGIN_PUT( dynamic_function_invocation_expr );
-
+ 
   theExpr->put(os);
-
+ 
   for (csize i = 0; i < theArgs.size(); ++i)
     theArgs[i]->put(os);
 
+  if (theDotVar)
+  {
+    os << indent << "using $"; 
+    theDotVar->put(os);
+  }
+
   END_PUT();
 }
 
 
+ostream& argument_placeholder_expr::put(ostream& os) const
+{
+  BEGIN_PUT_NO_EOL( argument_placeholder_expr );
+  os << "? ]\n";
+  return os;
+}
+
+
 ostream& instanceof_expr::put( ostream& os) const
 {
   BEGIN_PUT_MSG("instanceof_expr " << theTargetType->toSchemaString());
@@ -745,7 +793,7 @@
 
   if (theValue->isFunction())
   {
-    os << "functrion item [ " << theValue->show() << " ]";
+    os << "function item [ " << theValue->show() << " ]";
   }
   else
   {
@@ -811,6 +859,7 @@
   BEGIN_PUT(attr_expr);
 
   theQNameExpr->put(os);
+  if (theValueExpr)
   theValueExpr->put(os);
 
   END_PUT();

=== modified file 'src/compiler/expression/expr_type.cpp'
--- src/compiler/expression/expr_type.cpp	2013-03-05 12:34:19 +0000
+++ src/compiler/expression/expr_type.cpp	2013-03-17 13:46:23 +0000
@@ -31,6 +31,7 @@
 #include "compiler/expression/var_expr.h"
 #include "compiler/expression/expr.h"
 #include "compiler/expression/expr_iter.h"
+#include "compiler/expression/function_item_expr.h"
 
 #include "compiler/api/compilercb.h"
 
@@ -259,6 +260,7 @@
     case var_expr::catch_var: // TODO
     case var_expr::arg_var:
     case var_expr::eval_var:
+    case var_expr::hof_var:
     {
       break;
     }
@@ -625,14 +627,42 @@
   }
 
   case dynamic_function_invocation_expr_kind:
+  {    
+    dynamic_function_invocation_expr* e =
+    static_cast<dynamic_function_invocation_expr*>(this);
+
+    xqtref_t fiType = e->theExpr->get_return_type();
+    if (fiType->type_kind() == XQType::FUNCTION_TYPE_KIND)
+    {
+      const FunctionXQType* funcType = static_cast<const FunctionXQType*>(fiType.getp());
+      newType = funcType->get_return_type();
+    }
+    else
+    {
+      newType = rtm.ITEM_TYPE_STAR;
+    }
+    break;
+  }
+
+  case argument_placeholder_expr_kind:
   {
-    theType = rtm.ITEM_TYPE_STAR; // TODO
+    theType = rtm.ITEM_TYPE_STAR;
     return;
   }
 
   case function_item_expr_kind:
   {
     theType = rtm.ANY_FUNCTION_TYPE_ONE;
+    function_item_expr* fiExpr = static_cast<function_item_expr*>(this);
+    if (fiExpr->get_function() != NULL)
+    {
+      const xqtref_t& retType = fiExpr->get_function()->getSignature().returnType();
+      std::vector<xqtref_t> paramTypes;
+      for (csize i=0; i<fiExpr->get_function()->getSignature().paramCount(); i++ )
+        paramTypes.push_back(fiExpr->get_function()->getSignature()[i]);
+
+      theType = new FunctionXQType(&rtm, paramTypes, retType, TypeConstants::QUANT_ONE);
+    }
     return;
   }
 

=== modified file 'src/compiler/expression/expr_visitor.h'
--- src/compiler/expression/expr_visitor.h	2013-03-05 12:34:19 +0000
+++ src/compiler/expression/expr_visitor.h	2013-03-17 13:46:23 +0000
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006-2008 The FLWOR Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@
 #include <zorba/config.h>
 #include "compiler/expression/expr_classes.h"
 
-namespace zorba 
+namespace zorba
 {
 
 #ifndef ZORBA_NO_FULL_TEXT
@@ -29,7 +29,7 @@
 
 class expr_visitor
 {
-public: 
+public:
 
   virtual ~expr_visitor() { }
 
@@ -79,6 +79,7 @@
   DECL_EXPR_VISITOR_VISIT_MEM_FNS( trycatch_expr );
   DECL_EXPR_VISITOR_VISIT_MEM_FNS( function_item_expr );
   DECL_EXPR_VISITOR_VISIT_MEM_FNS( dynamic_function_invocation_expr );
+  DECL_EXPR_VISITOR_VISIT_MEM_FNS( argument_placeholder_expr );
 
   DECL_EXPR_VISITOR_VISIT_MEM_FNS(insert_expr);
   DECL_EXPR_VISITOR_VISIT_MEM_FNS(delete_expr);

=== modified file 'src/compiler/expression/function_item_expr.cpp'
--- src/compiler/expression/function_item_expr.cpp	2013-02-07 17:24:36 +0000
+++ src/compiler/expression/function_item_expr.cpp	2013-03-17 13:46:23 +0000
@@ -15,6 +15,8 @@
  */
 #include "stdafx.h"
 
+#include "store/api/item_factory.h"
+
 #include "compiler/expression/function_item_expr.h"
 #include "compiler/expression/expr_visitor.h"
 
@@ -27,7 +29,7 @@
 namespace zorba {
 
 
-DEF_EXPR_ACCEPT (dynamic_function_invocation_expr)
+DEF_EXPR_ACCEPT (dynamic_function_invocation_expr);
 
 
 dynamic_function_invocation_expr::dynamic_function_invocation_expr(
@@ -36,11 +38,13 @@
     user_function* udf,
     const QueryLoc& loc,
     expr* anExpr,
-    const std::vector<expr*>& args)
+    const std::vector<expr*>& args,
+    expr* dotVar)
   :
   expr(ccb, sctx, udf, loc, dynamic_function_invocation_expr_kind),
   theExpr(anExpr),
-  theArgs(args)
+  theArgs(args),
+  theDotVar(dotVar)
 {
   assert(anExpr != 0);
   compute_scripting_kind();
@@ -61,72 +65,98 @@
 
 ********************************************************************************/
 
-DEF_EXPR_ACCEPT (function_item_expr)
-
-
-function_item_expr::function_item_expr(
-    CompilerCB* ccb,
+DEF_EXPR_ACCEPT (argument_placeholder_expr);
+
+void argument_placeholder_expr::compute_scripting_kind()
+{
+  theScriptingKind = SIMPLE_EXPR;
+}
+
+
+/*******************************************************************************
+
+********************************************************************************/
+
+DEF_EXPR_ACCEPT (function_item_expr);
+
+
+function_item_expr::function_item_expr(CompilerCB* ccb,
     static_context* sctx,
     user_function* udf,
     const QueryLoc& loc,
-    const store::Item* aQName,
+    static_context* closureSctx,
     function* f,
-    uint32_t aArity)
+    store::Item* aQName,
+    uint32_t aArity,
+    bool isInline,
+    bool needsContextItem,
+    bool isCoercion)
   :
   expr(ccb, sctx, udf, loc, function_item_expr_kind),
-  theQName(const_cast<store::Item*>(aQName)),
-  theFunction(f),
-  theArity(aArity)
+  theDynamicFunctionInfo(new DynamicFunctionInfo(
+                         // ccb,
+                         closureSctx,
+                         loc,
+                         f,
+                         aQName,
+                         aArity,
+                         isInline,
+                         needsContextItem,
+                         isCoercion))
 {
   assert(f != NULL);
   compute_scripting_kind();
+
+  // std::cerr << "--> created function_item_expr: " << this // << " with DynamicFunctionInfo: " << theDynamicFunctionInfo << " counter: " << theDynamicFunctionInfo->getRefCount()
+  //          << std::endl;
 }
 
 
-function_item_expr::function_item_expr(
-    CompilerCB* ccb,
+function_item_expr::function_item_expr(CompilerCB* ccb,
     static_context* sctx,
     user_function* udf,
-    const QueryLoc& loc)
+    const QueryLoc& loc,
+    static_context* closureSctx,
+    bool isInline,
+    bool needsContextItem,
+    bool isCoercion)
   :
   expr(ccb, sctx, udf, loc, function_item_expr_kind),
-  theQName(0),
-  theFunction(NULL),
-  theArity(0)
+  theDynamicFunctionInfo(new DynamicFunctionInfo(
+                         // ccb,
+                         closureSctx,
+                         loc,
+                         NULL,
+                         NULL,
+                         0,
+                         isInline,
+                         needsContextItem,
+                         isCoercion))
 {
   theScriptingKind = SIMPLE_EXPR;
+  // std::cerr << "--> created function_item_expr: " << this // << " with DynamicFunctionInfo: " << theDynamicFunctionInfo << " counter: " << theDynamicFunctionInfo->getRefCount()
+  //            << std::endl;
 }
 
 
 function_item_expr::~function_item_expr()
 {
-}
-
-
-user_function* function_item_expr::get_function() const 
-{
-  assert(theFunction->isUdf());
-  return static_cast<user_function*>(theFunction.getp());
-}
-
-
-void function_item_expr::add_variable(expr* var)
-{
-  theScopedVariables.push_back(var);
-}
-
-
-const std::vector<expr*>& function_item_expr::get_vars() const
-{
-  return theScopedVariables;
-}
-
-
-void function_item_expr::set_function(user_function_t& udf)
-{
-  theFunction = udf;
-  theArity = udf->getArity();
-  compute_scripting_kind();
+  // std::cerr << "--> deleted ~function_item_expr: " << this // << " with DynamicFunctionInfo: " << theDynamicFunctionInfo << " counter: " << theDynamicFunctionInfo->getRefCount()
+  //          << std::endl;
+}
+
+void function_item_expr::add_variable(expr* var, var_expr* substVar, const store::Item_t& name, int isGlobal)
+{
+  theDynamicFunctionInfo->add_variable(var, substVar, name, isGlobal);
+}
+
+
+void function_item_expr::set_function(user_function* udf)
+{
+  theDynamicFunctionInfo->theFunction = udf;
+  theDynamicFunctionInfo->theArity = udf->getArity();
+  theDynamicFunctionInfo->theQName = udf->getName();
+  // compute_scripting_kind();
 }
 
 
@@ -136,6 +166,17 @@
   theScriptingKind = SIMPLE_EXPR;
 }
 
+store::Item_t function_item_expr::create_inline_fname(const QueryLoc& loc) 
+{
+  store::Item_t name;
+  std::stringstream ss;
+  ss << "inline function(";
+  ss << loc;
+  ss << ")";
+  GENV_ITEMFACTORY->createQName(name, "", "", ss.str());
+  return name;
+}
+
 
 }//end of namespace
 /* vim:set et sw=2 ts=2: */

=== modified file 'src/compiler/expression/function_item_expr.h'
--- src/compiler/expression/function_item_expr.h	2013-02-07 17:24:36 +0000
+++ src/compiler/expression/function_item_expr.h	2013-03-17 13:46:23 +0000
@@ -23,16 +23,55 @@
 
 #include "store/naive/shared_types.h"
 
+#include "runtime/function_item/function_item.h"
+
+
 namespace zorba {
 
 /*******************************************************************************
-
-  [121] FilterExpr ::= PrimaryExpr (Predicate | DynamicFunctionInvocation)*
-
-  [164] DynamicFunctionInvocation ::= "(" (ExprSingle ("," ExprSingle)*)? ")"
-
-  theExpr : The input expr that produces a function item
-  theArgs : The arg exprs to pass to the function.
+  [133]     ArgumentPlaceholder      ::=      "?"
+********************************************************************************/
+class argument_placeholder_expr : public expr
+{
+  friend class ExprIterator;
+  friend class expr;
+  friend class ExprManager;
+
+protected:
+  argument_placeholder_expr(CompilerCB* ccb, static_context* sctx, user_function* udf, const QueryLoc& loc)
+    :
+    expr(ccb, sctx, udf, loc, argument_placeholder_expr_kind)
+  {
+    compute_scripting_kind();
+  }
+
+public:
+  void compute_scripting_kind();
+
+  void accept(expr_visitor&);
+
+  std::ostream& put(std::ostream& os) const;
+};
+
+
+/*******************************************************************************
+
+  PostfixExpr ::= PrimaryExpr (Predicate | ArgumentList)*
+
+  ArgumentList ::= "(" (Argument ("," Argument)*)? ")"
+
+  Argument ::= ExprSingle
+
+  theExpr:
+  --------
+  The input expr that produces a function item
+
+  theArgs:
+  --------
+  The arg exprs to pass to the function.
+ 
+  theDotVars:
+  ----------- 
 ********************************************************************************/
 class dynamic_function_invocation_expr : public expr
 {
@@ -43,20 +82,23 @@
 protected:
   expr                * theExpr;
   std::vector<expr*>    theArgs;
+  expr                * theDotVar;
 
 protected:
-  dynamic_function_invocation_expr(
-      CompilerCB* ccb,
+  dynamic_function_invocation_expr(CompilerCB* ccb,
       static_context* sctx,
       user_function* udf,
       const QueryLoc& loc,
       expr* anExpr,
-      const std::vector<expr*>& args);
+      const std::vector<expr*>& args,
+      expr* dotVar);
 
 public:
   const expr* get_function() const { return theExpr; }
 
   const std::vector<expr*>& get_args() const { return theArgs; }
+  
+  expr* get_dot_var() const { return theDotVar; }
 
   void compute_scripting_kind();
 
@@ -74,10 +116,6 @@
 
   InlineFunction ::= "function" "(" ParamList? ")" ("as" SequenceType)? EnclosedExpr
 
-  theQName :
-  NULL in case of inline function. Otherwise, the qname of the named function
-  in the LiteralFunctionItem.
-
   theFunction :
   This is always a pointer to a user_function obj. In case of an inline function
   expr, it is an anonymous user_function obj that is created on-the-fly by the
@@ -103,50 +141,83 @@
   friend class expr;
   friend class ExprManager;
 
-private:
-  store::Item_t       theQName;
-  function_t          theFunction;
-  uint32_t            theArity;
-  std::vector<expr*>  theScopedVariables;
-
-public:
-
+protected:
+  DynamicFunctionInfo_t  theDynamicFunctionInfo;
+  
 protected:
   function_item_expr(
       CompilerCB* ccb,
       static_context* sctx,
       user_function* udf,
       const QueryLoc& loc,
-      const store::Item* aQName,
+      static_context* closureSctx,
       function* f,
-      uint32_t aArity);
+      store::Item* aQName,
+      uint32_t aArity,
+      bool isInline,
+      bool needsContextItem,
+      bool isCoercion);
 
   function_item_expr(
       CompilerCB* ccb,
       static_context* sctx,
       user_function* udf,
-      const QueryLoc& loc);
-
+      const QueryLoc& loc,
+      static_context* closureSctx,
+      bool isInline,
+      bool needsContextItem,
+      bool isCoercion);
+  
+  virtual ~function_item_expr();
+  
 public:
-  ~function_item_expr();
-
-  void add_variable(expr* var);
-
-  void set_function(user_function_t& udf);
-
-  user_function* get_function() const;
-
-  const store::Item_t& get_qname() const { return theQName; }
-
-  uint32_t get_arity() const { return theArity; }
-
-  const std::vector<expr*>& get_vars() const;
+  DynamicFunctionInfo* get_dynamic_fn_info() { return theDynamicFunctionInfo; }
+
+  void add_variable(
+      expr* var,
+      var_expr* substVar,
+      const store::Item_t& name,
+      int isGlobal);
+
+  const std::vector<var_expr*>& get_subst_vars_values() const
+  {
+    return theDynamicFunctionInfo->theSubstVarsValues;
+  }
+
+  const std::vector<store::Item_t>& get_scoped_vars_names() const
+  {
+    return theDynamicFunctionInfo->theScopedVarsNames;
+  }
+
+  const std::vector<int>& get_is_global_var() const
+  {
+    return theDynamicFunctionInfo->theIsGlobalVar;
+  }
+
+  void set_function(user_function* udf);
+
+  function* get_function() const { return theDynamicFunctionInfo->theFunction; }
+
+  const store::Item_t& get_qname() const { return theDynamicFunctionInfo->theQName; }
+
+  uint32_t get_arity() const { return theDynamicFunctionInfo->theArity; }
+  
+  bool is_inline() const { return theDynamicFunctionInfo->theIsInline; }
+  
+  bool needs_context_item() const { return theDynamicFunctionInfo->theNeedsContextItem; }
+
+  bool is_coercion() const { return theDynamicFunctionInfo->theIsCoercion; }
 
   void compute_scripting_kind();
 
   void accept(expr_visitor&);
 
   std::ostream& put(std::ostream& os) const;
+  
+public:
+  // Given a location, will create an inline function name string such 
+  // as "inline function(loc)"
+  static store::Item_t create_inline_fname(const QueryLoc& loc);
 };
 
 } //end of namespace

=== modified file 'src/compiler/expression/var_expr.cpp'
--- src/compiler/expression/var_expr.cpp	2013-02-07 17:24:36 +0000
+++ src/compiler/expression/var_expr.cpp	2013-03-17 13:46:23 +0000
@@ -53,6 +53,7 @@
   case count_var: return "CNT"; break;
   case score_var: return "SCORE"; break;
   case prolog_var: return "PROLOG"; break;
+  case hof_var: return "HOF"; break;
   case local_var: return "LOCAL"; break;
   case catch_var: return "CATCH"; break;
   case copy_var: return "COPY"; break;
@@ -315,7 +316,7 @@
 ********************************************************************************/
 void var_expr::remove_set_expr(expr* e)
 {
-  assert(theVarKind == local_var || theVarKind == prolog_var);
+  assert(theVarKind == local_var || theVarKind == prolog_var || theVarKind == hof_var);
 
   bool found = false;
   VarSetExprs::iterator ite = theSetExprs.begin();

=== modified file 'src/compiler/expression/var_expr.h'
--- src/compiler/expression/var_expr.h	2013-02-21 16:34:45 +0000
+++ src/compiler/expression/var_expr.h	2013-03-17 13:46:23 +0000
@@ -152,6 +152,8 @@
 
     prolog_var,
 
+    hof_var,      // used by HoF functions, behaves similarly to prolog vars
+
     local_var,
 
     arg_var

=== modified file 'src/compiler/parser/xquery_parser.cpp'
--- src/compiler/parser/xquery_parser.cpp	2013-03-07 11:42:29 +0000
+++ src/compiler/parser/xquery_parser.cpp	2013-03-17 13:46:23 +0000
@@ -36,7 +36,7 @@
 /* First part of user declarations.  */
 
 /* Line 293 of lalr1.cc  */
-#line 87 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 87 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 
 
 #include "common/common.h"
@@ -73,7 +73,7 @@
 
 
 /* Line 293 of lalr1.cc  */
-#line 77 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 77 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 
 
 #include "xquery_parser.hpp"
@@ -81,7 +81,7 @@
 /* User implementation prologue.  */
 
 /* Line 299 of lalr1.cc  */
-#line 915 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 915 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 
 // HACK to trigger rchandle release: rchandles are freed when refcount == 0
 // (not <= 0); but Bison never increments the refcount, so we do it manually...
@@ -93,7 +93,7 @@
 }
 
 /* Line 299 of lalr1.cc  */
-#line 1040 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 1040 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 
 #include "compiler/parser/xquery_scanner.h"
 
@@ -103,7 +103,7 @@
 
 
 /* Line 299 of lalr1.cc  */
-#line 107 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 107 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 
 #ifndef YY_
 # if defined YYENABLE_NLS && YYENABLE_NLS
@@ -189,7 +189,7 @@
 namespace zorba {
 
 /* Line 382 of lalr1.cc  */
-#line 193 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 193 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 
   /* Return YYSTR after stripping away unnecessary quotes and
      backslashes, so that it's suitable for yyerror.  The heuristic is
@@ -290,2558 +290,2558 @@
         case 112: /* "\"'DECIMAL'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 913 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 913 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->decval); };
 
 /* Line 480 of lalr1.cc  */
-#line 298 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 298 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 126: /* "\"'DOUBLE'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 912 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 912 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->dval); };
 
 /* Line 480 of lalr1.cc  */
-#line 307 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 307 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 151: /* "\"'INTEGER'\"" */
 
 /* Line 480 of lalr1.cc  */
-#line 911 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 911 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->ival); };
 
 /* Line 480 of lalr1.cc  */
-#line 316 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 316 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 340: /* "VersionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 325 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 325 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 341: /* "MainModule" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 334 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 334 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 342: /* "LibraryModule" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 343 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 343 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 343: /* "ModuleDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 352 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 352 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 344: /* "SIND_DeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 361 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 361 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 345: /* "SIND_Decl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 370 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 370 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 346: /* "Setter" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 379 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 379 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 347: /* "BoundarySpaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 388 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 388 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 348: /* "DefaultCollationDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 397 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 397 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 349: /* "BaseURIDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 406 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 406 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 350: /* "ConstructionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 415 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 415 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 351: /* "OrderingModeDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 424 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 424 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 352: /* "EmptyOrderDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 433 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 433 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 353: /* "CopyNamespacesDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 442 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 442 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 354: /* "Import" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 451 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 451 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 355: /* "SchemaImport" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 460 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 460 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 356: /* "URILiteralList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 469 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 469 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 357: /* "SchemaPrefix" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 478 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 478 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 358: /* "ModuleImport" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 487 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 487 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 359: /* "NamespaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 496 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 496 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 360: /* "DefaultNamespaceDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 505 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 505 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 361: /* "VFO_DeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 514 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 514 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 362: /* "VFO_Decl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 523 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 523 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 363: /* "DecimalFormatDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 532 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 532 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 364: /* "DecimalFormatParamList" */
 
 /* Line 480 of lalr1.cc  */
-#line 939 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 939 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->vstrpair); };
 
 /* Line 480 of lalr1.cc  */
-#line 541 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 541 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 365: /* "DecimalFormatParam" */
 
 /* Line 480 of lalr1.cc  */
-#line 939 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 939 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->strpair); };
 
 /* Line 480 of lalr1.cc  */
-#line 550 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 550 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 367: /* "OptionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 559 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 559 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 368: /* "FTOptionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 568 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 568 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 369: /* "CtxItemDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 577 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 577 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 370: /* "CtxItemDecl2" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 586 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 586 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 371: /* "CtxItemDecl3" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 595 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 595 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 372: /* "CtxItemDecl4" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 604 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 604 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 373: /* "VarDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 613 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 613 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 374: /* "VarNameAndType" */
 
 /* Line 480 of lalr1.cc  */
-#line 939 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 939 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->varnametype); };
 
 /* Line 480 of lalr1.cc  */
-#line 622 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 622 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 375: /* "AnnotationList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 631 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 631 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 376: /* "Annotation" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 640 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 640 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 377: /* "AnnotationLiteralList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 649 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 649 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 378: /* "FunctionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 658 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 658 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 379: /* "FunctionDecl2" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 667 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 667 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 380: /* "FunctionDeclSimple" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 676 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 676 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 381: /* "FunctionDeclUpdating" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 685 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 685 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 382: /* "FunctionSig" */
 
 /* Line 480 of lalr1.cc  */
-#line 939 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 939 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->fnsig); };
 
 /* Line 480 of lalr1.cc  */
-#line 694 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 694 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 383: /* "ParamList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 703 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 703 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 384: /* "Param" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 712 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 712 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 385: /* "CollectionDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 721 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 721 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 387: /* "IndexDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 730 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 730 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 388: /* "IndexKeyList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 739 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 739 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 389: /* "IndexKeySpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 748 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 748 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 390: /* "IntegrityConstraintDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 757 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 757 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 391: /* "QueryBody" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 766 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 766 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 392: /* "StatementsAndOptionalExprTop" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 775 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 775 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 393: /* "StatementsAndOptionalExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 784 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 784 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 394: /* "StatementsAndExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 793 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 793 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 395: /* "Statements" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 802 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 802 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 396: /* "Statement" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 811 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 811 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 397: /* "BlockStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 820 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 820 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 398: /* "BlockExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 829 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 829 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 399: /* "EnclosedStatementsAndOptionalExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 838 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 838 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 400: /* "VarDeclStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 847 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 847 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 403: /* "AssignStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 856 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 856 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 404: /* "ApplyStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 865 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 865 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 405: /* "ExitStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 874 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 874 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 406: /* "WhileStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 883 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 883 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 407: /* "FlowCtlStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 892 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 892 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 408: /* "FLWORStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 901 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 901 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 409: /* "ReturnStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 910 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 910 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 410: /* "IfStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 919 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 919 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 411: /* "TryStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 928 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 928 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 412: /* "CatchListStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 937 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 937 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 413: /* "CatchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 946 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 946 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 414: /* "Expr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 955 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 955 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 415: /* "ExprSingle" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 964 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 964 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 416: /* "ExprSimple" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 973 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 973 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 417: /* "FLWORExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 982 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 982 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 418: /* "ReturnExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 991 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 991 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 421: /* "FLWORWinCond" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1000 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1000 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 422: /* "WindowClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1009 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1009 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 423: /* "CountClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1018 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1018 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 424: /* "ForLetWinClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1027 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1027 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 426: /* "FLWORClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1036 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1036 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 427: /* "ForClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1045 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1045 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 428: /* "VarInDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1054 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1054 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 429: /* "VarInDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1063 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1063 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 430: /* "PositionalVar" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1072 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1072 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 431: /* "FTScoreVar" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1081 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1081 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 432: /* "LetClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1090 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1090 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 433: /* "VarGetsDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1099 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1099 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 434: /* "VarGetsDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1108 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1108 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 435: /* "WindowVarDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1117 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1117 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 436: /* "WindowVars" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1126 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1126 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 437: /* "WindowVars3" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1135 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1135 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 438: /* "WindowVars2" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1144 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1144 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 439: /* "WhereClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1153 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1153 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 440: /* "GroupByClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1162 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1162 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 441: /* "GroupSpecList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1171 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1171 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 442: /* "GroupSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1180 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1180 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 443: /* "GroupCollationSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1189 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1189 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 444: /* "OrderByClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1198 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1198 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 445: /* "OrderSpecList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1207 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1207 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 446: /* "OrderSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1216 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1216 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 447: /* "OrderModifier" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1225 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1225 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 448: /* "OrderDirSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1234 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1234 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 449: /* "OrderEmptySpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1243 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1243 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 450: /* "OrderCollationSpec" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1252 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1252 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 451: /* "QuantifiedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1261 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1261 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 452: /* "QVarInDeclList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1270 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1270 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 453: /* "QVarInDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1279 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1279 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 454: /* "SwitchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1288 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1288 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 455: /* "SwitchCaseClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1297 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1297 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 456: /* "SwitchCaseClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1306 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1306 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 457: /* "SwitchCaseOperandList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1315 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1315 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 458: /* "SwitchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1324 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1324 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 461: /* "TypeswitchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1333 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1333 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 462: /* "TypeswitchStatement" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1342 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1342 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 463: /* "CaseClauseList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1351 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1351 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 464: /* "CaseClause" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1360 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1360 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 467: /* "SequenceTypeList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1369 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1369 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 468: /* "IfExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1378 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1378 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 469: /* "OrExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1387 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1387 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 470: /* "AndExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1396 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1396 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 471: /* "ComparisonExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1405 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1405 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 473: /* "FTContainsExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1414 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1414 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 474: /* "StringConcatExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1423 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1423 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 475: /* "opt_FTIgnoreOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1432 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1432 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 476: /* "RangeExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1441 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1441 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 477: /* "AdditiveExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1450 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1450 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 478: /* "MultiplicativeExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1459 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1459 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 479: /* "UnionExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1468 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1468 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 480: /* "IntersectExceptExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1477 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1477 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 481: /* "InstanceofExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1486 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1486 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 482: /* "TreatExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1495 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1495 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 483: /* "CastableExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1504 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1504 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 484: /* "CastExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1513 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1513 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 485: /* "SingleType" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1522 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1522 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 486: /* "UnaryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1531 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1531 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 487: /* "SignList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1540 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1540 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 488: /* "ValueExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1549 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1549 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 489: /* "SimpleMapExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1558 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1558 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 490: /* "ValueComp" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1567 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1567 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 491: /* "NodeComp" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1576 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1576 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 492: /* "ValidateExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1585 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1585 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 493: /* "ExtensionExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1594 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1594 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 494: /* "Pragma_list" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1603 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1603 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 495: /* "Pragma" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1612 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1612 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 496: /* "PathExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1621 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1621 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 498: /* "RelativePathExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1630 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1630 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 499: /* "StepExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1639 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1639 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 500: /* "AxisStep" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1648 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1648 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 501: /* "ForwardStep" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1657 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1657 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 502: /* "ForwardAxis" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1666 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1666 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 503: /* "AbbrevForwardStep" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1675 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1675 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 504: /* "ReverseStep" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1684 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1684 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 505: /* "ReverseAxis" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1693 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1693 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 506: /* "NodeTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1702 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1702 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 507: /* "NameTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1711 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1711 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 508: /* "Wildcard" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1720 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1720 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 509: /* "FilterExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1729 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1729 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 510: /* "PredicateList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1738 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1738 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 511: /* "Predicate" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1747 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1747 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 512: /* "PrimaryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1756 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1756 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 513: /* "Literal" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1765 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1765 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 514: /* "NumericLiteral" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1774 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1774 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 515: /* "VarRef" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1783 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1783 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 516: /* "ParenthesizedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1792 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1792 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 517: /* "ContextItemExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1801 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1801 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 518: /* "OrderedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1810 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1810 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 519: /* "UnorderedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1819 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1819 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 520: /* "FunctionCall" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 1828 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 1828 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 521: /* "ArgList" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1837 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 522: /* "Constructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1846 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 523: /* "DirectConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1855 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 524: /* "DirElemConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1864 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 525: /* "DirElemContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1873 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 526: /* "DirAttributeList" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1882 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 527: /* "DirAttr" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1891 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 529: /* "DirAttributeValue" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1900 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 530: /* "opt_QuoteAttrContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1909 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 531: /* "QuoteAttrContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1918 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 532: /* "opt_AposAttrContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1927 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 533: /* "AposAttrContentList" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1936 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 534: /* "QuoteAttrValueContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1945 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 535: /* "AposAttrValueContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1954 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 536: /* "DirElemContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1963 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 537: /* "CommonContent" */
-
-/* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1972 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 538: /* "DirCommentConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1981 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 539: /* "DirPIConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1990 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 540: /* "CDataSection" */
-
-/* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 1999 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 541: /* "ComputedConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2008 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 542: /* "CompDocConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2017 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 543: /* "CompElemConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2026 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 544: /* "CompAttrConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2035 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 545: /* "CompTextConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2044 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 546: /* "CompCommentConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2053 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 547: /* "CompPIConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2062 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 548: /* "CompNamespaceConstructor" */
-
-/* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2071 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 549: /* "TypeDeclaration" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2080 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 550: /* "SequenceType" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2089 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 551: /* "OccurrenceIndicator" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2098 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 552: /* "ItemType" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2107 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 553: /* "TypeList" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2116 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 554: /* "GeneralizedAtomicType" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2125 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 555: /* "SimpleType" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2134 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 556: /* "KindTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2143 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 557: /* "AnyKindTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2152 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 558: /* "DocumentTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2161 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 559: /* "NamespaceTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2170 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 560: /* "TextTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2179 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 561: /* "CommentTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2188 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 562: /* "PITest" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2197 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 563: /* "AttributeTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2206 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 564: /* "SchemaAttributeTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2215 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 565: /* "ElementTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2224 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 566: /* "SchemaElementTest" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2233 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 567: /* "TypeName" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2242 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 568: /* "TypeName_WITH_HOOK" */
-
-/* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->node) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2251 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
-	break;
-      case 569: /* "StringLiteral" */
-
-/* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
-	{ release_hack( (yyvaluep->expr) ); };
-
-/* Line 480 of lalr1.cc  */
-#line 2260 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1837 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 525: /* "Constructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1846 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 526: /* "DirectConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1855 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 527: /* "DirElemConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1864 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 528: /* "DirElemContentList" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1873 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 529: /* "DirAttributeList" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1882 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 530: /* "DirAttr" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1891 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 532: /* "DirAttributeValue" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1900 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 533: /* "opt_QuoteAttrContentList" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1909 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 534: /* "QuoteAttrContentList" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1918 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 535: /* "opt_AposAttrContentList" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1927 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 536: /* "AposAttrContentList" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1936 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 537: /* "QuoteAttrValueContent" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1945 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 538: /* "AposAttrValueContent" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1954 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 539: /* "DirElemContent" */
+
+/* Line 480 of lalr1.cc  */
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1963 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 540: /* "CommonContent" */
+
+/* Line 480 of lalr1.cc  */
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1972 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 541: /* "DirCommentConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1981 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 542: /* "DirPIConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1990 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 543: /* "CDataSection" */
+
+/* Line 480 of lalr1.cc  */
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 1999 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 544: /* "ComputedConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2008 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 545: /* "CompDocConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2017 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 546: /* "CompElemConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2026 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 547: /* "CompAttrConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2035 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 548: /* "CompTextConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2044 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 549: /* "CompCommentConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2053 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 550: /* "CompPIConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2062 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 551: /* "CompNamespaceConstructor" */
+
+/* Line 480 of lalr1.cc  */
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2071 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 552: /* "TypeDeclaration" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2080 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 553: /* "SequenceType" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2089 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 554: /* "OccurrenceIndicator" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2098 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 555: /* "ItemType" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2107 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 556: /* "TypeList" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2116 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 557: /* "GeneralizedAtomicType" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2125 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 558: /* "SimpleType" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2134 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 559: /* "KindTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2143 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 560: /* "AnyKindTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2152 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 561: /* "DocumentTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2161 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 562: /* "NamespaceTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2170 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 563: /* "TextTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2179 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 564: /* "CommentTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2188 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 565: /* "PITest" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2197 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 566: /* "AttributeTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2206 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 567: /* "SchemaAttributeTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2215 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 568: /* "ElementTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2224 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 569: /* "SchemaElementTest" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2233 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 570: /* "TypeName" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2242 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 571: /* "TypeName_WITH_HOOK" */
+
+/* Line 480 of lalr1.cc  */
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2251 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
+	break;
+      case 572: /* "StringLiteral" */
+
+/* Line 480 of lalr1.cc  */
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
+	{ release_hack( (yyvaluep->expr) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 2260 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 574: /* "AnyFunctionTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2269 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2269 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 575: /* "TypedFunctionTest" */
 
 /* Line 480 of lalr1.cc  */
-#line 927 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 927 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2278 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2278 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 578: /* "InsertExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2287 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2287 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 579: /* "DeleteExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2296 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2296 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 580: /* "ReplaceExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2305 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2305 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 581: /* "RenameExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2314 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2314 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 582: /* "TransformExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2323 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2323 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 583: /* "VarNameList" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2332 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2332 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 584: /* "VarNameDecl" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2341 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2341 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 585: /* "TryExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2350 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2350 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 586: /* "CatchListExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2359 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2359 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 587: /* "CatchExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2368 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2368 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 588: /* "BracedExpr" */
 
 /* Line 480 of lalr1.cc  */
-#line 936 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 936 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2377 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2377 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 589: /* "NameTestList" */
 
 /* Line 480 of lalr1.cc  */
-#line 939 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 939 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ delete (yyvaluep->name_test_list); };
 
 /* Line 480 of lalr1.cc  */
-#line 2386 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2386 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 590: /* "FTSelection" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2395 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2395 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 593: /* "FTOr" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2404 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2404 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 594: /* "FTAnd" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2413 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2413 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 595: /* "FTMildNot" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2422 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2422 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 596: /* "FTUnaryNot" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2431 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2431 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 597: /* "FTPrimaryWithOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2440 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2440 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 598: /* "opt_FTMatchOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2449 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2449 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 600: /* "FTWeight" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2458 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2458 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 601: /* "FTPrimary" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2467 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2467 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 602: /* "opt_FTTimes" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2476 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2476 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 603: /* "FTExtensionSelection" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2485 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2485 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 605: /* "FTWords" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2494 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2494 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 606: /* "FTWordsValue" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2503 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2503 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 608: /* "FTAnyallOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2512 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2512 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 611: /* "FTPosFilter" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2521 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2521 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 612: /* "FTOrder" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2530 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2530 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 613: /* "FTWindow" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2539 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2539 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 614: /* "FTDistance" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2548 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2548 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 615: /* "FTUnit" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2557 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2557 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 616: /* "FTMatchOptions" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2566 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2566 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 617: /* "FTMatchOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2575 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2575 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 618: /* "FTCaseOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2584 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2584 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 619: /* "FTDiacriticsOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2593 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2593 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 620: /* "FTExtensionOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2602 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2602 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 621: /* "FTStemOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2611 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2611 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 622: /* "FTThesaurusOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2620 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2620 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 626: /* "FTThesaurusID" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2629 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2629 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 629: /* "FTStopWordOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2638 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2638 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 630: /* "FTStopWords" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2647 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2647 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 634: /* "FTStopWordsInclExcl" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2656 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2656 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 635: /* "FTLanguageOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2665 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2665 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 636: /* "FTWildCardOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2674 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2674 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 637: /* "FTContent" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2683 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2683 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 638: /* "FTTimes" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2692 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2692 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 639: /* "FTRange" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2701 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2701 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 640: /* "FTScope" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2710 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2710 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 641: /* "FTBigUnit" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2719 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2719 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 642: /* "FTIgnoreOption" */
 
 /* Line 480 of lalr1.cc  */
-#line 930 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 930 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->node) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2728 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2728 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 643: /* "JSONArrayConstructor" */
 
 /* Line 480 of lalr1.cc  */
-#line 933 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 933 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2737 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2737 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 644: /* "JSONSimpleObjectUnion" */
 
 /* Line 480 of lalr1.cc  */
-#line 933 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 933 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2746 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2746 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 645: /* "JSONAccumulatorObjectUnion" */
 
 /* Line 480 of lalr1.cc  */
-#line 933 "/home/markos/zorba/repo/ns-nodes/src/compiler/parser/xquery_parser.y"
+#line 933 "/home/colea/xquery_bzr/hof-merge/src/compiler/parser/xquery_parser.y"
 	{ release_hack( (yyvaluep->expr) ); };
 
 /* Line 480 of lalr1.cc  */
-#line 2755 "/home/markos/zorba/repo/ns-nodes/build-opt/src/compiler/parser/xquery_parser.cpp"
+#line 2755 "/home/colea/xquery_bzr/hof-merge/build/src/compiler/parser/xquery_parser.cpp"
 	break;
       case 646: /* "JSONObjectConstructor" */