Merge lp:~zorba-coders/zorba/bug923686 into lp:zorba

[Rodolfo Ochoa]

Fixes so context position and context size can be set.

Fixes so context position and context size can be set.

[Markos Zaharioudakis (markos-za)]

The test added in test/empty does not test any of the new functionality, so it should be removed. A new test should be added in test/unit (and be made one of the unit tests that exist there already).

review: Needs Fixing

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug923686-2012-09-19T06-06-26.347Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug923686-2012-09-19T06-06-26.347Z is finished. The
  final status was:

  Undetermined, probably an error - please email <email address hidden> with the
  number of this job!

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/bug923686-2012-09-19T06-33-57.964Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug923686-2012-09-19T06-33-57.964Z is finished. The
  final status was:

  Undetermined, probably an error - please email <email address hidden> with the
  number of this job!

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

[Chris Hillery (ceejatec)]

Stupid Launchpad problem with the email module. Trying again.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug923686-2012-09-19T08-21-15.404Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug923686-2012-09-19T08-21-15.404Z is finished. The
  final status was:

  75 tests did not succeed - changes not commited.

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

[Markos Zaharioudakis (markos-za)]

Rodolfo, you will need to fix all the "iter" tests that fail. The tests fail because the var ids assigned to variables have changed.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug923686-2012-09-22T19-53-57.765Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug923686-2012-09-22T19-53-57.765Z 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

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug923686-2012-09-26T12-32-20.223Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug923686-2012-09-26T12-32-20.223Z is finished. The
  final status was:

  5 tests did not succeed - changes not commited.

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

[lp:~zorba-coders/zorba/bug923686]

11003. By Markos Zaharioudakis on 2012-09-26

merge from trunk

11004. By Markos Zaharioudakis on 2012-09-26

fixed error codes and iter tests

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug923686-2012-09-26T13-39-01.533Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug923686-2012-09-26T13-39-01.533Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2012-09-26 11:14:30 +0000
+++ ChangeLog	2012-09-26 13:28:22 +0000
@@ -39,6 +39,9 @@
   * Fixed bug #1034990 (text serialization with jsoniq fails)
   * Fixed bugs #899364 and 899363 (throw XQST0103 in case of non-distinct window
     variables)
+  * Fixed bug #923686 (implicitly declare global context size and context position
+    variables in main module and provide api function to assign values to these
+    variables)
   * Fixed bug #899366 (enforce the type declaration of a window variable)
   * Now using native UUID libraries.
   * Fixed bug #1034942 (improper variable inlining inside general flwor expr)

=== modified file 'include/zorba/dynamic_context.h'
--- include/zorba/dynamic_context.h	2012-09-17 00:36:37 +0000
+++ include/zorba/dynamic_context.h	2012-09-26 13:28:22 +0000
@@ -138,7 +138,25 @@
    * @throw ZorbaException if an error occured (e.g. the given Item is not valid).
    */
   virtual bool
-  setContextItem ( const Item& aItem ) = 0;
+  setContextItem(const Item& aItem) = 0;
+
+  /** \brief Defines the context item size.
+   *
+   * @param aItem the Item that is used as value for the context item size.
+   * @return true if the context item size was set, false otherwise.
+   * @throw ZorbaException if an error occured (e.g. the given Item is not valid).
+   */
+  virtual bool 
+  setContextSize(const Item& aItem) = 0;
+
+  /** \brief Defines the context item position.
+   *
+   * @param aItem the Item that is used as value for the context item position.
+   * @return true if the context item position was set, false otherwise.
+   * @throw ZorbaException if an error occured (e.g. the given Item is not valid).
+   */
+  virtual bool
+  setContextPosition(const Item& aItem) = 0;
 
   /** \brief Returns the current value of the context item.
    *
@@ -147,7 +165,25 @@
    * @throw ZorbaException if an error occured.
    */
   virtual bool
-  getContextItem( Item& aItem ) const = 0;
+  getContextItem(Item& aItem) const = 0;
+
+  /** \brief Returns the current value of the context item size.
+   *
+   * @param aItem an Item representing the current value of the context item size.
+   * @return true if the variable has been retrieved successfully, false otherwise.
+   * @throw ZorbaException if an error occured.
+   */
+  virtual bool
+  getContextSize(Item& aItem) const = 0;
+
+  /** \brief Returns the current value of the context item position.
+   *
+   * @param aItem an Item representing the current value of the context item position.
+   * @return true if the variable has been retrieved successfully, false otherwise.
+   * @throw ZorbaException if an error occured.
+   */
+  virtual bool
+  getContextPosition(Item& aItem) const = 0;
 
   /** \brief Defines the value of the current date time that can be accessed by the
    *         fn:current-dateTime() function at the time the query is executed.
@@ -280,7 +316,6 @@
   /** \brief Destructor
    */
   virtual ~DynamicContext( ) {}
- 
 };
 
 } /* namespace zorba */

=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h	2012-09-20 18:20:33 +0000
+++ include/zorba/pregenerated/diagnostic_list.h	2012-09-26 13:28:22 +0000
@@ -498,6 +498,14 @@
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0021_ITEM_TO_LOAD_IS_NOT_NODE;
 
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0023_NON_ATOMIC_CONTEXT_SIZE_VALUE;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0024_NON_INTEGER_CONTEXT_SIZE_VALUE;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0025_NON_ATOMIC_CONTEXT_POSITION_VALUE;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0026_NON_INTEGER_CONTEXT_POSITION_VALUE;
+
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0027_CANNOT_UPDATE_DCTX_WITH_ITERATORS;
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0028_INVALID_NODE_URI;

=== modified file 'modules/com/zorba-xquery/www/modules/pregenerated/errors.xq'
--- modules/com/zorba-xquery/www/modules/pregenerated/errors.xq	2012-09-18 16:29:31 +0000
+++ modules/com/zorba-xquery/www/modules/pregenerated/errors.xq	2012-09-26 13:28:22 +0000
@@ -282,6 +282,22 @@
 
 (:~
 :)
+declare variable $zerr:ZAPI0023 as xs:QName := fn:QName($zerr:NS, "zerr:ZAPI0023");
+
+(:~
+:)
+declare variable $zerr:ZAPI0024 as xs:QName := fn:QName($zerr:NS, "zerr:ZAPI0024");
+
+(:~
+:)
+declare variable $zerr:ZAPI0025 as xs:QName := fn:QName($zerr:NS, "zerr:ZAPI0025");
+
+(:~
+:)
+declare variable $zerr:ZAPI0026 as xs:QName := fn:QName($zerr:NS, "zerr:ZAPI0026");
+
+(:~
+:)
 declare variable $zerr:ZAPI0027 as xs:QName := fn:QName($zerr:NS, "zerr:ZAPI0027");
 
 (:~

=== modified file 'src/api/dynamiccontextimpl.cpp'
--- src/api/dynamiccontextimpl.cpp	2012-09-17 00:36:37 +0000
+++ src/api/dynamiccontextimpl.cpp	2012-09-26 13:28:22 +0000
@@ -401,6 +401,96 @@
 /****************************************************************************//**
 
 ********************************************************************************/
+bool DynamicContextImpl::setContextSize(const Item& inValue)
+{
+  try
+  {
+    store::Item* value = Unmarshaller::getInternalItem(inValue);
+
+    if (!value->isAtomic())
+    {
+      throw ZORBA_EXCEPTION(zerr::ZAPI0023_NON_ATOMIC_CONTEXT_SIZE_VALUE);
+    }
+
+    store::SchemaTypeCode typeCode = value->getTypeCode();
+
+    if (typeCode < store::XS_INTEGER || typeCode > store::XS_POSITIVE_INTEGER)
+    {
+      xqtref_t type = GENV_TYPESYSTEM.create_value_type(value);
+
+      throw ZORBA_EXCEPTION(zerr::ZAPI0024_NON_INTEGER_CONTEXT_SIZE_VALUE,
+      ERROR_PARAMS(type->toSchemaString()));
+    }
+  }
+  catch (ZorbaException const& e)
+  {
+    ZorbaImpl::notifyError(theQuery->theDiagnosticHandler, e);
+    return false;
+  }
+  catch (std::exception const& e)
+  {
+    ZorbaImpl::notifyError(theQuery->theDiagnosticHandler, e.what());
+    return false;
+  }
+  catch (...)
+  {
+    ZorbaImpl::notifyError(theQuery->theDiagnosticHandler);
+    return false;
+  }
+
+  String varName = Unmarshaller::newString(static_context::DOT_SIZE_VAR_NAME);
+  return setVariable(varName, inValue);
+}
+
+
+/****************************************************************************//**
+
+********************************************************************************/
+bool DynamicContextImpl::setContextPosition(const Item& inValue)
+{
+  try
+  {
+    store::Item* value = Unmarshaller::getInternalItem(inValue);
+
+    if (!value->isAtomic())
+    {
+      throw ZORBA_EXCEPTION(zerr::ZAPI0025_NON_ATOMIC_CONTEXT_POSITION_VALUE);
+    }
+
+    store::SchemaTypeCode typeCode = value->getTypeCode();
+
+    if (typeCode < store::XS_INTEGER || typeCode > store::XS_POSITIVE_INTEGER)
+    {
+      xqtref_t type = GENV_TYPESYSTEM.create_value_type(value);
+
+      throw ZORBA_EXCEPTION(zerr::ZAPI0026_NON_INTEGER_CONTEXT_POSITION_VALUE,
+      ERROR_PARAMS(type->toSchemaString()));
+    }
+  }
+  catch (ZorbaException const& e)
+  {
+    ZorbaImpl::notifyError(theQuery->theDiagnosticHandler, e);
+    return false;
+  }
+  catch (std::exception const& e)
+  {
+    ZorbaImpl::notifyError(theQuery->theDiagnosticHandler, e.what());
+    return false;
+  }
+  catch (...)
+  {
+    ZorbaImpl::notifyError(theQuery->theDiagnosticHandler);
+    return false;
+  }
+
+  String varName = Unmarshaller::newString(static_context::DOT_POS_VAR_NAME);
+  return setVariable(varName, inValue);
+}
+
+
+/****************************************************************************//**
+
+********************************************************************************/
 bool DynamicContextImpl::getContextItem(Item& outValue) const
 {
   String varName;
@@ -420,6 +510,44 @@
 /****************************************************************************//**
 
 ********************************************************************************/
+bool DynamicContextImpl::getContextSize(Item& outValue) const
+{
+  String varName;
+
+  ZORBA_DCTX_TRY
+  {
+    varName = Unmarshaller::newString(static_context::DOT_SIZE_VAR_NAME);
+  }
+  ZORBA_DCTX_CATCH
+
+  Iterator_t dummy;
+
+  return getVariable("", varName, outValue, dummy);
+}
+
+
+/****************************************************************************//**
+
+********************************************************************************/
+bool DynamicContextImpl::getContextPosition(Item& outValue) const
+{
+  String varName;
+
+  ZORBA_DCTX_TRY
+  {
+    varName = Unmarshaller::newString(static_context::DOT_POS_VAR_NAME);
+  }
+  ZORBA_DCTX_CATCH
+
+  Iterator_t dummy;
+
+  return getVariable("", varName, outValue, dummy);
+}
+
+
+/****************************************************************************//**
+
+********************************************************************************/
 bool DynamicContextImpl::setCurrentDateTime(const Item& aDateTimeItem)
 {
   ZORBA_DCTX_TRY
@@ -646,5 +774,7 @@
   return false;
 }
 
+
+
 } // namespace zorba
 /* vim:set et sw=2 ts=2: */

=== modified file 'src/api/dynamiccontextimpl.h'
--- src/api/dynamiccontextimpl.h	2012-09-17 00:36:37 +0000
+++ src/api/dynamiccontextimpl.h	2012-09-26 13:28:22 +0000
@@ -109,10 +109,22 @@
   virtual bool
   setContextItem(const Item& inValue);
 
+  virtual bool 
+  setContextSize(const Item& inValue);
+
+  virtual bool
+  setContextPosition(const Item& inValue);
+
   virtual bool
   getContextItem(Item& outValue) const;
 
   virtual bool
+  getContextSize(Item& outValue) const;
+
+  virtual bool
+  getContextPosition(Item& outValue) const;
+
+  virtual bool
   setCurrentDateTime(const Item& aDateTimeItem);
 
   virtual Item

=== modified file 'src/api/staticcontextimpl.cpp'
--- src/api/staticcontextimpl.cpp	2012-09-18 21:23:14 +0000
+++ src/api/staticcontextimpl.cpp	2012-09-26 13:28:22 +0000
@@ -74,7 +74,7 @@
 StaticContextImpl::StaticContextImpl(DiagnosticHandler* aDiagnosticHandler)
   :
   theCompilerCB(NULL),
-  theMaxVarId(2),
+  theMaxVarId(dynamic_context::MAX_IDVARS_RESERVED),
   theDiagnosticHandler(aDiagnosticHandler),
   theUserDiagnosticHandler(true),
   theCollectionMgr(0)
@@ -100,7 +100,7 @@
   :
   theCtx(aCtx),
   theCompilerCB(NULL),
-  theMaxVarId(2),
+  theMaxVarId(dynamic_context::MAX_IDVARS_RESERVED),
   theDiagnosticHandler(aDiagnosticHandler),
   theUserDiagnosticHandler(true),
   theCollectionMgr(0)
@@ -123,7 +123,7 @@
   :
   StaticContext(),
   theCompilerCB(NULL),
-  theMaxVarId(2),
+  theMaxVarId(dynamic_context::MAX_IDVARS_RESERVED),
   theDiagnosticHandler(aStaticContext.theDiagnosticHandler),
   theUserDiagnosticHandler(aStaticContext.theUserDiagnosticHandler),
   theCollectionMgr(0)
@@ -1552,7 +1552,11 @@
 
   for (; ite != end; ++ite)
   {
-    if ((*ite)->getName()->getStringValue() == static_context::DOT_VAR_NAME)
+    zstring varName = (*ite)->getName()->getStringValue();
+
+    if (varName == static_context::DOT_VAR_NAME ||
+        varName == static_context::DOT_POS_VAR_NAME ||
+        varName == static_context::DOT_SIZE_VAR_NAME)
       continue;
 
     extVars.push_back((*ite)->getName());        

=== modified file 'src/api/xqueryimpl.cpp'
--- src/api/xqueryimpl.cpp	2012-09-18 21:23:14 +0000
+++ src/api/xqueryimpl.cpp	2012-09-26 13:28:22 +0000
@@ -433,7 +433,7 @@
 
     // 0 is reserved as an invalid var id, and 1 is taken by the context item
     // in the main module.
-    ulong nextVarId = 2;
+    ulong nextVarId = dynamic_context::MAX_IDVARS_RESERVED;
 
     doCompile(lQueryStream, aHints, true, nextVarId);
   }
@@ -457,7 +457,7 @@
 
     // 0 is reserved as an invalid var id, and 1 is taken by the context item
     // in the main module.
-    ulong nextVarId = 2;
+    ulong nextVarId = dynamic_context::MAX_IDVARS_RESERVED;
 
     doCompile(aQuery, aHints, true, nextVarId);
   }
@@ -796,7 +796,11 @@
    
     for(; varIte != varEnd; ++varIte)
     {
-      if ((*varIte)->getName()->getStringValue() == static_context::DOT_VAR_NAME)
+      zstring varName = (*varIte)->getName()->getStringValue();
+
+      if (varName == static_context::DOT_VAR_NAME ||
+          varName == static_context::DOT_POS_VAR_NAME ||
+          varName == static_context::DOT_SIZE_VAR_NAME)
         continue;
 
       extVars.push_back((*varIte)->getName());

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2012-09-26 11:14:30 +0000
+++ src/compiler/translator/translator.cpp	2012-09-26 13:28:22 +0000
@@ -79,6 +79,7 @@
 #include "context/static_context.h"
 #include "context/static_context_consts.h"
 #include "context/namespace_context.h"
+#include "context/dynamic_context.h"
 
 #include "types/node_test.h"
 #include "types/casting.h"
@@ -741,7 +742,6 @@
   return theRootTranslator->theDotPosVarName;
 }
 
-
 const QName* getLastIdxVarName() const
 {
   return theRootTranslator->theLastIdxVarName;
@@ -2026,28 +2026,25 @@
 
   if (initExpr != NULL && varType != NULL && !b.is_extern())
   {
-    initExpr = theExprManager->create_treat_expr(theRootSctx,
-                                                 loc,
-                                                 initExpr,
-                                                 varType,
-                                                 TreatIterator::TYPE_MATCH);
+    initExpr = theExprManager->
+    create_treat_expr(theRootSctx, loc, initExpr, varType, TreatIterator::TYPE_MATCH);
   }
 
-  expr* declExpr =
-  theExprManager->create_var_decl_expr(theRootSctx, loc, varExpr, initExpr);
+  expr* declExpr = theExprManager->
+  create_var_decl_expr(theRootSctx, loc, varExpr, initExpr);
 
   stmts.push_back(declExpr);
 
   // check type for vars that are external
   if (varType != NULL && b.is_extern())
   {
-    expr* getExpr = theExprManager->create_fo_expr(theRootSctx, loc, varGet, varExpr);
-
-    stmts.push_back(theExprManager->create_treat_expr(theRootSctx,
-                                                      loc,
-                                                      getExpr,
-                                                      varType,
-                                                      TreatIterator::TYPE_MATCH));
+    expr* getExpr = theExprManager->
+    create_fo_expr(theRootSctx, loc, varGet, varExpr);
+
+    expr* treatExpr = theExprManager->
+    create_treat_expr(theRootSctx, loc, getExpr, varType, TreatIterator::TYPE_MATCH);
+
+    stmts.push_back(treatExpr);
   }
 }
 
@@ -2390,13 +2387,26 @@
   // However, do not create a ver_decl expr for it, because this will create a
   // treat_as expr as well, so the ctx item will always appear as being used,
   // and as a result it will always have to be set.
-  var_expr* var = bind_var(loc,
-                           DOT_VARNAME,
-                           var_expr::prolog_var,
-                           theSctx->get_context_item_type());
+  var_expr* var1 = bind_var(loc,
+                            DOT_VARNAME,
+                            var_expr::prolog_var,
+                            theSctx->get_context_item_type());
+  var_expr* var2 = bind_var(loc,
+                            DOT_POS_VARNAME,
+                            var_expr::prolog_var, 
+                            theRTM.INTEGER_TYPE_ONE);
+  var_expr* var3 = bind_var(loc,
+                            LAST_IDX_VARNAME,
+                            var_expr::prolog_var,
+                            theRTM.INTEGER_TYPE_ONE);
 
-  var->set_external(true);
-  var->set_unique_id(1);
+  var1->set_external(true);
+  var2->set_external(true);
+  var3->set_external(true);
+  
+  var1->set_unique_id(dynamic_context::IDVAR_CONTEXT_ITEM);
+  var2->set_unique_id(dynamic_context::IDVAR_CONTEXT_ITEM_POSITION);
+  var3->set_unique_id(dynamic_context::IDVAR_CONTEXT_ITEM_SIZE);
 
   //GlobalBinding b(var, NULL, true);
   //declare_var(b, theModulesInfo->theInitExprs);

=== modified file 'src/context/dynamic_context.h'
--- src/context/dynamic_context.h	2012-09-17 00:36:37 +0000
+++ src/context/dynamic_context.h	2012-09-26 13:28:22 +0000
@@ -54,6 +54,9 @@
   friend class DebugIterator;
 
 public:
+
+  static enum  ID_VARS { IDVAR_CONTEXT_ITEM=1, IDVAR_CONTEXT_ITEM_POSITION, IDVAR_CONTEXT_ITEM_SIZE, MAX_IDVARS_RESERVED  } IDVARS_RESERVED;
+
   struct VarValue
   {
     typedef enum

=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp	2012-09-25 15:03:46 +0000
+++ src/context/static_context.cpp	2012-09-26 13:28:22 +0000
@@ -314,13 +314,13 @@
 ********************************************************************************/
 
 const zstring
-static_context::DOT_VAR_NAME = "$$dot";
-
-const zstring
-static_context::DOT_POS_VAR_NAME = "$$pos";
-
-const zstring
-static_context::DOT_SIZE_VAR_NAME = "$$last-idx";
+static_context::DOT_VAR_NAME = "$$context-item";
+
+const zstring
+static_context::DOT_POS_VAR_NAME = "$$context-position";
+
+const zstring
+static_context::DOT_SIZE_VAR_NAME = "$$context-size";
 
 const char*
 static_context::W3C_NS_PREFIX = "http://www.w3.org/";

=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml	2012-09-26 11:14:30 +0000
+++ src/diagnostics/diagnostic_en.xml	2012-09-26 13:28:22 +0000
@@ -1923,6 +1923,22 @@
       <value>"$1": item to load is not a node</value>
     </diagnostic>
 
+    <diagnostic code="ZAPI0023" name="NON_ATOMIC_CONTEXT_SIZE_VALUE">
+      <value>non-atomic value can not be assigned to the context size</value>
+    </diagnostic>
+
+    <diagnostic code="ZAPI0024" name="NON_INTEGER_CONTEXT_SIZE_VALUE">
+      <value>"$1": wrong type for context size value (must be integer)</value>
+    </diagnostic>
+
+    <diagnostic code="ZAPI0025" name="NON_ATOMIC_CONTEXT_POSITION_VALUE">
+      <value>non-atomic value can not be assigned to the context position</value>
+    </diagnostic>
+
+    <diagnostic code="ZAPI0026" name="NON_INTEGER_CONTEXT_POSITION_VALUE">
+      <value>"$1": wrong type for context position value (must be integer)</value>
+    </diagnostic>
+
     <diagnostic code="ZAPI0027" name="CANNOT_UPDATE_DCTX_WITH_ITERATORS">
       <value>cannot update dynamic context with iterators</value>
     </diagnostic>

=== modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp'
--- src/diagnostics/pregenerated/diagnostic_list.cpp	2012-09-20 18:20:33 +0000
+++ src/diagnostics/pregenerated/diagnostic_list.cpp	2012-09-26 13:28:22 +0000
@@ -726,6 +726,18 @@
 ZorbaErrorCode ZAPI0021_ITEM_TO_LOAD_IS_NOT_NODE( "ZAPI0021" );
 
 
+ZorbaErrorCode ZAPI0023_NON_ATOMIC_CONTEXT_SIZE_VALUE( "ZAPI0023" );
+
+
+ZorbaErrorCode ZAPI0024_NON_INTEGER_CONTEXT_SIZE_VALUE( "ZAPI0024" );
+
+
+ZorbaErrorCode ZAPI0025_NON_ATOMIC_CONTEXT_POSITION_VALUE( "ZAPI0025" );
+
+
+ZorbaErrorCode ZAPI0026_NON_INTEGER_CONTEXT_POSITION_VALUE( "ZAPI0026" );
+
+
 ZorbaErrorCode ZAPI0027_CANNOT_UPDATE_DCTX_WITH_ITERATORS( "ZAPI0027" );
 
 

=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp	2012-09-26 11:14:30 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp	2012-09-26 13:28:22 +0000
@@ -308,6 +308,10 @@
   { "ZAPI0019", "\"$1\": external module already registered" },
   { "ZAPI0020", "\"$1\": document already exists in store" },
   { "ZAPI0021", "\"$1\": item to load is not a node" },
+  { "ZAPI0023", "non-atomic value can not be assigned to the context size" },
+  { "ZAPI0024", "\"$1\": wrong type for context size value (must be integer)" },
+  { "ZAPI0025", "non-atomic value can not be assigned to the context position" },
+  { "ZAPI0026", "\"$1\": wrong type for context position value (must be integer)" },
   { "ZAPI0027", "cannot update dynamic context with iterators" },
   { "ZAPI0028", "\"$1\": invalid node URI" },
   { "ZAPI0029", "\"$1\": reference already present in the store" },

=== modified file 'test/api/CMakeLists.txt'
--- test/api/CMakeLists.txt	2012-09-17 00:36:37 +0000
+++ test/api/CMakeLists.txt	2012-09-26 13:28:22 +0000
@@ -17,6 +17,7 @@
   itemfactory.cpp
   xmldatamanager.cpp
   test_static_context.cpp
+  test_dynamic_context.cpp
   serializer.cpp
   annotations.cpp
   external_function_errors.cpp

=== added file 'test/api/test_dynamic_context.cpp'
--- test/api/test_dynamic_context.cpp	1970-01-01 00:00:00 +0000
+++ test/api/test_dynamic_context.cpp	2012-09-26 13:28:22 +0000
@@ -0,0 +1,186 @@
+/*
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+#include <zorba/zorba.h>
+#include <zorba/store_manager.h>
+#include <zorba/uri_resolvers.h>
+#include <zorba/xquery_exception.h>
+#include <zorba/diagnostic_list.h>
+
+
+using namespace zorba;
+
+bool
+context_test_1(Zorba* aZorba)
+{
+  XQuery_t lQuery = aZorba->compileQuery(".");
+
+  ItemFactory* lFactory = aZorba->getItemFactory();
+  Item lItem = lFactory->createInteger(4);
+
+  DynamicContext* lDCtx = lQuery->getDynamicContext();
+  bool result;
+
+  try 
+  {
+    result = lDCtx->setContextPosition(lItem);
+    Item rItem;
+    result = lDCtx->getContextPosition(rItem);
+    if (rItem.getStringValue()!="4") 
+      result = false;
+  }
+  catch (ZorbaException &e)
+  {
+    std::cerr << e << std::endl;
+    return false;
+  }
+
+  return result;
+}
+
+
+bool
+context_test_2(Zorba* aZorba)
+{
+  XQuery_t lQuery = aZorba->compileQuery(".");
+
+  ItemFactory* lFactory = aZorba->getItemFactory();
+  Item lItem = lFactory->createInteger(4);
+
+  DynamicContext* lDCtx = lQuery->getDynamicContext();
+  bool result;
+
+  try
+  {
+    result = lDCtx->setContextSize(lItem);
+    Item rItem;
+    result = lDCtx->getContextSize(rItem);
+    if (rItem.getStringValue()!="4") 
+      result = false;
+  }
+  catch (ZorbaException &e)
+  {
+    std::cerr << e << std::endl;
+    return false;
+  }
+
+  return result;
+}
+
+
+bool
+context_test_3(Zorba* aZorba)
+{
+  XQuery_t lQuery = aZorba->compileQuery("declare variable $x := 2; $x + position()");
+
+  ItemFactory* lFactory = aZorba->getItemFactory();
+
+  Item lItem = lFactory->createInteger(4);
+
+  DynamicContext* lDCtx = lQuery->getDynamicContext();
+
+  try 
+  {
+    (void)lDCtx->setContextPosition(lItem);
+
+    std::ostringstream stream;
+    stream << lQuery;
+
+    std::string result = stream.str();
+
+    if (result != "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n6")
+    {
+      std::cout << result << std::endl;
+      return false;
+    }
+  }
+  catch (ZorbaException &e)
+  {
+    std::cerr << e << std::endl;
+    return false;
+  }
+
+  return true;
+}
+
+
+bool
+context_test_4(Zorba* aZorba)
+{
+  XQuery_t lQuery = aZorba->compileQuery(".");
+
+  ItemFactory* lFactory = aZorba->getItemFactory();
+  Item lItem = lFactory->createString("4");
+
+  DynamicContext* lDCtx = lQuery->getDynamicContext();
+  bool result;
+
+  try
+  {
+    result = lDCtx->setContextSize(lItem);
+  }
+  catch (ZorbaException& e)
+  {
+    std::cerr << e << std::endl;
+
+    if (e.diagnostic() == zerr::ZAPI0024_NON_INTEGER_CONTEXT_SIZE_VALUE)
+    {
+      return true;
+    }
+
+    return false;
+  }
+
+  return result;
+}
+
+
+int
+test_dynamic_context(int argc, char* argv[])
+{
+  void* lStore = zorba::StoreManager::getStore();
+
+  Zorba* lZorba = Zorba::getInstance(lStore);
+  bool res = false;
+
+  std::cout << "executing Context Position test 1" << std::endl;
+  res = context_test_1(lZorba);
+  if (!res) return 1;
+  std::cout << "Passed" << std::endl;
+
+  std::cout << "executing Context Size test 2" << std::endl;
+  res = context_test_2(lZorba);
+  if (!res) return 1;
+  std::cout << "Passed" << std::endl;
+
+  std::cout << "executing Context Size test 3" << std::endl;
+  res = context_test_3(lZorba);
+  if (!res) return 1;
+  std::cout << "Passed" << std::endl;
+
+  std::cout << "executing Context Size test 4" << std::endl;
+  res = context_test_4(lZorba);
+  if (!res) return 1;
+  std::cout << "Passed" << std::endl;
+
+  lZorba->shutdown();
+  zorba::StoreManager::shutdownStore(lStore);
+  return 0;
+}

=== modified file 'test/api/userdefined_uri_resolution.cpp'
--- test/api/userdefined_uri_resolution.cpp	2012-09-17 00:36:37 +0000
+++ test/api/userdefined_uri_resolution.cpp	2012-09-26 13:28:22 +0000
@@ -262,6 +262,7 @@
   return false;
 }
 
+
 bool test_deny_internal_module_access(Zorba* aZorba)
 {
   StaticContext_t lContext = aZorba->createStaticContext();
@@ -285,6 +286,7 @@
   return false;
 }
 
+
 bool test_deny_external_module_access(Zorba* aZorba)
 {
   StaticContext_t lContext = aZorba->createStaticContext();

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/collections/count_dynamic_zorba_collection.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/collections/count_dynamic_zorba_collection.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/collections/count_dynamic_zorba_collection.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="coll">
+  <CtxVarDeclareIterator varid="4" varname="coll">
     <SingletonIterator value="xs:QName(,,collection)"/>
   </CtxVarDeclareIterator>
   <SequentialIterator>
@@ -8,7 +8,7 @@
       <ZorbaCreateCollectionIterator>
         <PromoteIterator type="xs:QName">
           <FnDataIterator>
-            <CtxVarIterator varid="2" varname="coll" varkind="global"/>
+            <CtxVarIterator varid="4" varname="coll" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </ZorbaCreateCollectionIterator>
@@ -16,7 +16,7 @@
     <CountCollectionIterator>
       <PromoteIterator type="xs:QName">
         <FnDataIterator>
-          <CtxVarIterator varid="2" varname="coll" varkind="global"/>
+          <CtxVarIterator varid="4" varname="coll" varkind="global"/>
         </FnDataIterator>
       </PromoteIterator>
     </CountCollectionIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/collections/count_static_zorba_collection.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/collections/count_static_zorba_collection.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/collections/count_static_zorba_collection.iter	2012-09-26 13:28:22 +0000
@@ -1,24 +1,24 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="ns:collection_1">
+  <CtxVarDeclareIterator varid="4" varname="ns:collection_1">
     <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,collection_1)"/>
   </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="3" varname="ns:collection_2">
+  <CtxVarDeclareIterator varid="5" varname="ns:collection_2">
     <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,collection_2)"/>
   </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="4" varname="ns:http">
+  <CtxVarDeclareIterator varid="6" varname="ns:http">
     <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,http)"/>
   </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="5" varname="ns:test1">
+  <CtxVarDeclareIterator varid="7" varname="ns:test1">
     <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,test1)"/>
   </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="6" varname="ns:test2">
+  <CtxVarDeclareIterator varid="8" varname="ns:test2">
     <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,test2)"/>
   </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="7" varname="ns:test3">
+  <CtxVarDeclareIterator varid="9" varname="ns:test3">
     <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,test3)"/>
   </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="8" varname="coll">
+  <CtxVarDeclareIterator varid="10" varname="coll">
     <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,test1)"/>
   </CtxVarDeclareIterator>
   <SequentialIterator>
@@ -26,7 +26,7 @@
       <ZorbaCreateCollectionIterator>
         <PromoteIterator type="xs:QName">
           <FnDataIterator>
-            <CtxVarIterator varid="8" varname="coll" varkind="global"/>
+            <CtxVarIterator varid="10" varname="coll" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </ZorbaCreateCollectionIterator>
@@ -34,7 +34,7 @@
     <CountCollectionIterator>
       <PromoteIterator type="xs:QName">
         <FnDataIterator>
-          <CtxVarIterator varid="8" varname="coll" varkind="global"/>
+          <CtxVarIterator varid="10" varname="coll" varkind="global"/>
         </FnDataIterator>
       </PromoteIterator>
     </CountCollectionIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/collections/count_w3c_collection.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/collections/count_w3c_collection.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/collections/count_w3c_collection.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="coll">
+  <CtxVarDeclareIterator varid="4" varname="coll">
     <SingletonIterator value="xs:string(http://www.zorba-xquery.com/collection)"/>
   </CtxVarDeclareIterator>
   <SequentialIterator>
@@ -8,7 +8,7 @@
       <UDFunctionCallIterator>
         <PromoteIterator type="xs:string">
           <FnDataIterator>
-            <CtxVarIterator varid="2" varname="coll" varkind="global"/>
+            <CtxVarIterator varid="4" varname="coll" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </UDFunctionCallIterator>
@@ -16,7 +16,7 @@
     <CountCollectionIterator>
       <PromoteIterator type="xs:string">
         <FnDataIterator>
-          <CtxVarIterator varid="2" varname="coll" varkind="global"/>
+          <CtxVarIterator varid="4" varname="coll" varkind="global"/>
         </FnDataIterator>
       </PromoteIterator>
     </CountCollectionIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/dblp/q0.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/dblp/q0.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/dblp/q0.iter	2012-09-26 13:28:22 +0000
@@ -14,13 +14,13 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <LetVariable name="doc" materialize="true">
       <FnDocIterator>
         <PromoteIterator type="xs:string">
           <FnDataIterator>
-            <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+            <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </FnDocIterator>
@@ -103,21 +103,21 @@
                         <EnclosedIterator attr_cont="false">
                           <FnCountIterator>
                             <flwor::FLWORIterator>
-                              <ForVariable name="$$dot">
+                              <ForVariable name="$$context-item">
                                 <UnhoistIterator>
                                   <LetVarIterator varname="$$opt_temp_0"/>
                                 </UnhoistIterator>
                               </ForVariable>
-                              <ForVariable name="$$dot">
+                              <ForVariable name="$$context-item">
                                 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">
-                                  <ForVarIterator varname="$$dot"/>
+                                  <ForVarIterator varname="$$context-item"/>
                                 </ChildAxisIterator>
                               </ForVariable>
                               <WhereClause>
                                 <CompareIterator>
                                   <FnDataIterator>
                                     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill allowed="0">
-                                      <ForVarIterator varname="$$dot"/>
+                                      <ForVarIterator varname="$$context-item"/>
                                     </ChildAxisIterator>
                                   </FnDataIterator>
                                   <ForVarIterator varname="conference"/>
@@ -138,28 +138,28 @@
                               <FnDataIterator>
                                 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
                                   <flwor::FLWORIterator>
-                                    <ForVariable name="$$dot">
+                                    <ForVariable name="$$context-item">
                                       <UnhoistIterator>
                                         <LetVarIterator varname="$$opt_temp_1"/>
                                       </UnhoistIterator>
                                     </ForVariable>
-                                    <ForVariable name="$$dot">
+                                    <ForVariable name="$$context-item">
                                       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">
-                                        <ForVarIterator varname="$$dot"/>
+                                        <ForVarIterator varname="$$context-item"/>
                                       </ChildAxisIterator>
                                     </ForVariable>
                                     <WhereClause>
                                       <CompareIterator>
                                         <FnDataIterator>
                                           <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill allowed="0">
-                                            <ForVarIterator varname="$$dot"/>
+                                            <ForVarIterator varname="$$context-item"/>
                                           </ChildAxisIterator>
                                         </FnDataIterator>
                                         <ForVarIterator varname="conference"/>
                                       </CompareIterator>
                                     </WhereClause>
                                     <ReturnClause>
-                                      <ForVarIterator varname="$$dot"/>
+                                      <ForVarIterator varname="$$context-item"/>
                                     </ReturnClause>
                                   </flwor::FLWORIterator>
                                 </ChildAxisIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/gary1.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/gary1.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/gary1.iter	2012-09-26 13:28:22 +0000
@@ -27,30 +27,30 @@
       <LetVariable name="y" materialize="true">
         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill allowed="0">
           <flwor::FLWORIterator>
-            <ForVariable name="$$dot">
+            <ForVariable name="$$context-item">
               <FnDocIterator>
                 <SingletonIterator value="xs:string(min_ic1980.xml)"/>
               </FnDocIterator>
             </ForVariable>
-            <ForVariable name="$$dot">
+            <ForVariable name="$$context-item">
               <flwor::FLWORIterator>
-                <ForVariable name="$$dot">
+                <ForVariable name="$$context-item">
                   <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,ipeds)" typename="*" nill allowed="0">
-                    <ForVarIterator varname="$$dot"/>
+                    <ForVarIterator varname="$$context-item"/>
                   </ChildAxisIterator>
                 </ForVariable>
                 <WhereClause>
                   <CompareIterator>
                     <FnDataIterator>
                       <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill allowed="0">
-                        <ForVarIterator varname="$$dot"/>
+                        <ForVarIterator varname="$$context-item"/>
                       </AttributeAxisIterator>
                     </FnDataIterator>
                     <SingletonIterator value="xs:integer(1980)"/>
                   </CompareIterator>
                 </WhereClause>
                 <ReturnClause>
-                  <ForVarIterator varname="$$dot"/>
+                  <ForVarIterator varname="$$context-item"/>
                 </ReturnClause>
               </flwor::FLWORIterator>
             </ForVariable>
@@ -58,14 +58,14 @@
               <CompareIterator>
                 <FnDataIterator>
                   <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill allowed="0">
-                    <ForVarIterator varname="$$dot"/>
+                    <ForVarIterator varname="$$context-item"/>
                   </AttributeAxisIterator>
                 </FnDataIterator>
                 <SingletonIterator value="xs:string(ic1980)"/>
               </CompareIterator>
             </WhereClause>
             <ReturnClause>
-              <ForVarIterator varname="$$dot"/>
+              <ForVarIterator varname="$$context-item"/>
             </ReturnClause>
           </flwor::FLWORIterator>
         </ChildAxisIterator>
@@ -108,7 +108,7 @@
               <HoistIterator>
                 <AttributeAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
                   <flwor::FLWORIterator>
-                    <ForVariable name="$$dot">
+                    <ForVariable name="$$context-item">
                       <NodeSortIterator distinct="true" ascending="true">
                         <ProbeIndexPointGeneralIterator>
                           <SingletonIterator value="xs:QName(,,tempIndex0)"/>
@@ -119,7 +119,7 @@
                       </NodeSortIterator>
                     </ForVariable>
                     <ReturnClause>
-                      <ForVarIterator varname="$$dot"/>
+                      <ForVarIterator varname="$$context-item"/>
                     </ReturnClause>
                   </flwor::FLWORIterator>
                 </AttributeAxisIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/idx5.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/idx5.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/idx5.iter	2012-09-26 13:28:22 +0000
@@ -14,7 +14,7 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="tests">
+  <CtxVarDeclareIterator varid="4" varname="tests">
     <ElementIterator copyInputNodes="false">
       <SingletonIterator value="xs:QName(,,tests)"/>
     </ElementIterator>
@@ -23,7 +23,7 @@
     <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
       <flwor::FLWORIterator>
         <ForVariable name="$$opt_temp_2">
-          <CtxVarIterator varid="2" varname="tests" varkind="global"/>
+          <CtxVarIterator varid="4" varname="tests" varkind="global"/>
         </ForVariable>
         <ReturnClause>
           <ValueIndexEntryBuilderIterator>
@@ -47,26 +47,26 @@
       <LetVariable name="$$opt_temp_1" materialize="true">
         <HoistIterator>
           <flwor::FLWORIterator>
-            <ForVariable name="$$dot">
-              <CtxVarIterator varid="2" varname="tests" varkind="global"/>
+            <ForVariable name="$$context-item">
+              <CtxVarIterator varid="4" varname="tests" varkind="global"/>
             </ForVariable>
             <WhereClause>
               <FnBooleanIterator>
                 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
                   <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
-                    <ForVarIterator varname="$$dot"/>
+                    <ForVarIterator varname="$$context-item"/>
                   </TreatIterator>
                 </AttributeAxisIterator>
               </FnBooleanIterator>
             </WhereClause>
             <ReturnClause>
-              <ForVarIterator varname="$$dot"/>
+              <ForVarIterator varname="$$context-item"/>
             </ReturnClause>
           </flwor::FLWORIterator>
         </HoistIterator>
       </LetVariable>
       <ForVariable name="test">
-        <CtxVarIterator varid="2" varname="tests" varkind="global"/>
+        <CtxVarIterator varid="4" varname="tests" varkind="global"/>
       </ForVariable>
       <LetVariable name="$$opt_temp_0" materialize="true">
         <HoistIterator>
@@ -85,7 +85,7 @@
       </LetVariable>
       <LetVariable name="test_old" materialize="true">
         <flwor::FLWORIterator>
-          <ForVariable name="$$dot">
+          <ForVariable name="$$context-item">
             <ProbeIndexPointValueIterator>
               <SingletonIterator value="xs:QName(,,tempIndex0)"/>
               <UnhoistIterator>
@@ -94,7 +94,7 @@
             </ProbeIndexPointValueIterator>
           </ForVariable>
           <ReturnClause>
-            <ForVarIterator varname="$$dot"/>
+            <ForVarIterator varname="$$context-item"/>
           </ReturnClause>
         </flwor::FLWORIterator>
       </LetVariable>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/no_idx1.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/no_idx1.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/hashjoins/no_idx1.iter	2012-09-26 13:28:22 +0000
@@ -32,21 +32,21 @@
           </NodeNameIterator>
         </FnStringIterator>
         <flwor::FLWORIterator>
-          <ForVariable name="$$dot">
+          <ForVariable name="$$context-item">
             <ParentAxisIterator test kind="match_anykind_test" qname="*" typename="*" nill allowed="0">
               <ForVarIterator varname="ancestor"/>
             </ParentAxisIterator>
           </ForVariable>
-          <ForVariable name="$$dot">
+          <ForVariable name="$$context-item">
             <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
-              <ForVarIterator varname="$$dot"/>
+              <ForVarIterator varname="$$context-item"/>
             </ChildAxisIterator>
           </ForVariable>
           <WhereClause>
             <TypedValueCompareIterator_STRING>
               <FnStringIterator>
                 <NodeNameIterator>
-                  <ForVarIterator varname="$$dot"/>
+                  <ForVarIterator varname="$$context-item"/>
                 </NodeNameIterator>
               </FnStringIterator>
               <UnhoistIterator>
@@ -55,7 +55,7 @@
             </TypedValueCompareIterator_STRING>
           </WhereClause>
           <ReturnClause>
-            <ForVarIterator varname="$$dot"/>
+            <ForVarIterator varname="$$context-item"/>
           </ReturnClause>
         </flwor::FLWORIterator>
       </FnConcatIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/misc/hoist4.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/misc/hoist4.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/misc/hoist4.iter	2012-09-26 13:28:22 +0000
@@ -56,7 +56,7 @@
   </ForVariable>
   <ReturnClause>
     <SequentialIterator>
-      <CtxVarDeclareIterator varid="2" varname="x">
+      <CtxVarDeclareIterator varid="4" varname="x">
         <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
           <ForVarIterator varname="b"/>
         </AttributeAxisIterator>
@@ -76,7 +76,7 @@
                 <SingletonIterator value="xs:integer(2)"/>
                 <PromoteIterator type="xs:anyAtomicType">
                   <FnDataIterator>
-                    <CtxVarIterator varid="2" varname="x" varkind="local"/>
+                    <CtxVarIterator varid="4" varname="x" varkind="local"/>
                   </FnDataIterator>
                 </PromoteIterator>
               </GenericArithIterator_MultiplyOperation>
@@ -88,7 +88,7 @@
             <SingletonIterator value="xs:integer(1)"/>
             <PromoteIterator type="xs:integer">
               <FnDataIterator>
-                <CtxVarIterator varid="2" varname="x" varkind="local"/>
+                <CtxVarIterator varid="4" varname="x" varkind="local"/>
               </FnDataIterator>
             </PromoteIterator>
           </OpToIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/dataguide-c.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/dataguide-c.iter	2012-09-20 13:49:19 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/dataguide-c.iter	2012-09-26 13:28:22 +0000
@@ -25,16 +25,16 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="co">
+  <CtxVarDeclareIterator varid="4" varname="co">
     <SingletonIterator value="xs:integer(0)"/>
   </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="3" varname="map1">
+  <CtxVarDeclareIterator varid="5" varname="map1">
     <SingletonIterator value="xs:QName(,,map-co)"/>
   </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="4" varname="str">
+  <CtxVarDeclareIterator varid="6" varname="str">
     <SingletonIterator value="xs:QName(http://www.w3.org/2001/XMLSchema,,string)"/>
   </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="5" varname="input">
+  <CtxVarDeclareIterator varid="7" varname="input">
     <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
       <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
         <FnDocIterator>
@@ -48,20 +48,20 @@
       <MapCreateIterator>
         <PromoteIterator type="xs:QName">
           <FnDataIterator>
-            <CtxVarIterator varid="3" varname="map1" varkind="global"/>
+            <CtxVarIterator varid="5" varname="map1" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
         <PromoteIterator type="xs:QName">
           <FnDataIterator>
-            <CtxVarIterator varid="4" varname="str" varkind="global"/>
+            <CtxVarIterator varid="6" varname="str" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </MapCreateIterator>
     </ApplyIterator>
-    <CtxVarDeclareIterator varid="6" varname="DG">
+    <CtxVarDeclareIterator varid="8" varname="DG">
       <UDFunctionCallIterator>
         <TreatIterator quant="+">
-          <CtxVarIterator varid="5" varname="input" varkind="global"/>
+          <CtxVarIterator varid="7" varname="input" varkind="global"/>
         </TreatIterator>
         <SingletonIterator value="xs:boolean(true)"/>
         <SingletonIterator value="xs:string()"/>
@@ -71,12 +71,12 @@
       <MapDestroyIterator>
         <PromoteIterator type="xs:QName">
           <FnDataIterator>
-            <CtxVarIterator varid="3" varname="map1" varkind="global"/>
+            <CtxVarIterator varid="5" varname="map1" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </MapDestroyIterator>
     </ApplyIterator>
-    <CtxVarIterator varid="6" varname="DG" varkind="local"/>
+    <CtxVarIterator varid="8" varname="DG" varkind="local"/>
   </SequentialIterator>
 </SequentialIterator>
 
@@ -197,7 +197,7 @@
           <MapGetIterator>
             <PromoteIterator type="xs:QName">
               <FnDataIterator>
-                <CtxVarIterator varid="3" varname="map1" varkind="global"/>
+                <CtxVarIterator varid="5" varname="map1" varkind="global"/>
               </FnDataIterator>
             </PromoteIterator>
             <PromoteIterator type="xs:anyAtomicType">
@@ -213,23 +213,23 @@
           <CtxVarIterator varid="1" varname="label" varkind="local"/>
         </FnEmptyIterator>
         <SequentialIterator>
-          <CtxVarAssignIterator varid="2" varname="co" varkind="global">
+          <CtxVarAssignIterator varid="4" varname="co" varkind="global">
             <SpecificNumArithIterator_AddOperation_INTEGER>
-              <CtxVarIterator varid="2" varname="co" varkind="global"/>
+              <CtxVarIterator varid="4" varname="co" varkind="global"/>
               <SingletonIterator value="xs:integer(1)"/>
             </SpecificNumArithIterator_AddOperation_INTEGER>
           </CtxVarAssignIterator>
           <CtxVarAssignIterator varid="1" varname="label" varkind="local">
-            <CtxVarIterator varid="2" varname="co" varkind="global"/>
+            <CtxVarIterator varid="4" varname="co" varkind="global"/>
           </CtxVarAssignIterator>
           <ApplyIterator>
             <MapInsertIterator>
               <PromoteIterator type="xs:QName">
                 <FnDataIterator>
-                  <CtxVarIterator varid="3" varname="map1" varkind="global"/>
+                  <CtxVarIterator varid="5" varname="map1" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
-              <CtxVarIterator varid="2" varname="co" varkind="global"/>
+              <CtxVarIterator varid="4" varname="co" varkind="global"/>
               <PromoteIterator type="xs:anyAtomicType">
                 <FnDataIterator>
                   <CtxVarIterator varid="4" varname="s2" varkind="local"/>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/dataguide-nc.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/dataguide-nc.iter	2012-09-20 13:49:19 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/dataguide-nc.iter	2012-09-26 13:28:22 +0000
@@ -25,16 +25,16 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="co">
+  <CtxVarDeclareIterator varid="4" varname="co">
     <SingletonIterator value="xs:integer(0)"/>
   </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="3" varname="map1">
+  <CtxVarDeclareIterator varid="5" varname="map1">
     <SingletonIterator value="xs:QName(,,map-co)"/>
   </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="4" varname="str">
+  <CtxVarDeclareIterator varid="6" varname="str">
     <SingletonIterator value="xs:QName(http://www.w3.org/2001/XMLSchema,,string)"/>
   </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="5" varname="input">
+  <CtxVarDeclareIterator varid="7" varname="input">
     <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
       <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
         <FnDocIterator>
@@ -48,20 +48,20 @@
       <MapCreateIterator>
         <PromoteIterator type="xs:QName">
           <FnDataIterator>
-            <CtxVarIterator varid="3" varname="map1" varkind="global"/>
+            <CtxVarIterator varid="5" varname="map1" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
         <PromoteIterator type="xs:QName">
           <FnDataIterator>
-            <CtxVarIterator varid="4" varname="str" varkind="global"/>
+            <CtxVarIterator varid="6" varname="str" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </MapCreateIterator>
     </ApplyIterator>
-    <CtxVarDeclareIterator varid="6" varname="DG">
+    <CtxVarDeclareIterator varid="8" varname="DG">
       <UDFunctionCallIterator>
         <TreatIterator quant="+">
-          <CtxVarIterator varid="5" varname="input" varkind="global"/>
+          <CtxVarIterator varid="7" varname="input" varkind="global"/>
         </TreatIterator>
         <SingletonIterator value="xs:boolean(true)"/>
         <SingletonIterator value="xs:string()"/>
@@ -71,12 +71,12 @@
       <MapDestroyIterator>
         <PromoteIterator type="xs:QName">
           <FnDataIterator>
-            <CtxVarIterator varid="3" varname="map1" varkind="global"/>
+            <CtxVarIterator varid="5" varname="map1" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </MapDestroyIterator>
     </ApplyIterator>
-    <CtxVarIterator varid="6" varname="DG" varkind="local"/>
+    <CtxVarIterator varid="8" varname="DG" varkind="local"/>
   </SequentialIterator>
 </SequentialIterator>
 
@@ -197,7 +197,7 @@
           <MapGetIterator>
             <PromoteIterator type="xs:QName">
               <FnDataIterator>
-                <CtxVarIterator varid="3" varname="map1" varkind="global"/>
+                <CtxVarIterator varid="5" varname="map1" varkind="global"/>
               </FnDataIterator>
             </PromoteIterator>
             <PromoteIterator type="xs:anyAtomicType">
@@ -213,23 +213,23 @@
           <CtxVarIterator varid="1" varname="label" varkind="local"/>
         </FnEmptyIterator>
         <SequentialIterator>
-          <CtxVarAssignIterator varid="2" varname="co" varkind="global">
+          <CtxVarAssignIterator varid="4" varname="co" varkind="global">
             <SpecificNumArithIterator_AddOperation_INTEGER>
-              <CtxVarIterator varid="2" varname="co" varkind="global"/>
+              <CtxVarIterator varid="4" varname="co" varkind="global"/>
               <SingletonIterator value="xs:integer(1)"/>
             </SpecificNumArithIterator_AddOperation_INTEGER>
           </CtxVarAssignIterator>
           <CtxVarAssignIterator varid="1" varname="label" varkind="local">
-            <CtxVarIterator varid="2" varname="co" varkind="global"/>
+            <CtxVarIterator varid="4" varname="co" varkind="global"/>
           </CtxVarAssignIterator>
           <ApplyIterator>
             <MapInsertIterator>
               <PromoteIterator type="xs:QName">
                 <FnDataIterator>
-                  <CtxVarIterator varid="3" varname="map1" varkind="global"/>
+                  <CtxVarIterator varid="5" varname="map1" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
-              <CtxVarIterator varid="2" varname="co" varkind="global"/>
+              <CtxVarIterator varid="4" varname="co" varkind="global"/>
               <PromoteIterator type="xs:anyAtomicType">
                 <FnDataIterator>
                   <CtxVarIterator varid="4" varname="s2" varkind="local"/>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/dataguide2-c.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/dataguide2-c.iter	2012-09-20 13:49:19 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/dataguide2-c.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input">
+  <CtxVarDeclareIterator varid="4" varname="input">
     <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
       <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
         <FnDocIterator>
@@ -11,7 +11,7 @@
   </CtxVarDeclareIterator>
   <UDFunctionCallIterator>
     <TreatIterator quant="+">
-      <CtxVarIterator varid="2" varname="input" varkind="global"/>
+      <CtxVarIterator varid="4" varname="input" varkind="global"/>
     </TreatIterator>
   </UDFunctionCallIterator>
 </SequentialIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/dataguide2-nc.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/dataguide2-nc.iter	2012-09-20 13:49:19 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/dataguide2-nc.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input">
+  <CtxVarDeclareIterator varid="4" varname="input">
     <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
       <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
         <FnDocIterator>
@@ -11,7 +11,7 @@
   </CtxVarDeclareIterator>
   <UDFunctionCallIterator>
     <TreatIterator quant="+">
-      <CtxVarIterator varid="2" varname="input" varkind="global"/>
+      <CtxVarIterator varid="4" varname="input" varkind="global"/>
     </TreatIterator>
   </UDFunctionCallIterator>
 </SequentialIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/dblp-q0.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/dblp-q0.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/dblp-q0.iter	2012-09-26 13:28:22 +0000
@@ -14,13 +14,13 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <LetVariable name="doc" materialize="true">
       <FnDocIterator>
         <PromoteIterator type="xs:string">
           <FnDataIterator>
-            <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+            <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </FnDocIterator>
@@ -103,21 +103,21 @@
                         <EnclosedIterator attr_cont="false">
                           <FnCountIterator>
                             <flwor::FLWORIterator>
-                              <ForVariable name="$$dot">
+                              <ForVariable name="$$context-item">
                                 <UnhoistIterator>
                                   <LetVarIterator varname="$$opt_temp_0"/>
                                 </UnhoistIterator>
                               </ForVariable>
-                              <ForVariable name="$$dot">
+                              <ForVariable name="$$context-item">
                                 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">
-                                  <ForVarIterator varname="$$dot"/>
+                                  <ForVarIterator varname="$$context-item"/>
                                 </ChildAxisIterator>
                               </ForVariable>
                               <WhereClause>
                                 <CompareIterator>
                                   <FnDataIterator>
                                     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill allowed="0">
-                                      <ForVarIterator varname="$$dot"/>
+                                      <ForVarIterator varname="$$context-item"/>
                                     </ChildAxisIterator>
                                   </FnDataIterator>
                                   <ForVarIterator varname="conference"/>
@@ -138,28 +138,28 @@
                               <FnDataIterator>
                                 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
                                   <flwor::FLWORIterator>
-                                    <ForVariable name="$$dot">
+                                    <ForVariable name="$$context-item">
                                       <UnhoistIterator>
                                         <LetVarIterator varname="$$opt_temp_1"/>
                                       </UnhoistIterator>
                                     </ForVariable>
-                                    <ForVariable name="$$dot">
+                                    <ForVariable name="$$context-item">
                                       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">
-                                        <ForVarIterator varname="$$dot"/>
+                                        <ForVarIterator varname="$$context-item"/>
                                       </ChildAxisIterator>
                                     </ForVariable>
                                     <WhereClause>
                                       <CompareIterator>
                                         <FnDataIterator>
                                           <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill allowed="0">
-                                            <ForVarIterator varname="$$dot"/>
+                                            <ForVarIterator varname="$$context-item"/>
                                           </ChildAxisIterator>
                                         </FnDataIterator>
                                         <ForVarIterator varname="conference"/>
                                       </CompareIterator>
                                     </WhereClause>
                                     <ReturnClause>
-                                      <ForVarIterator varname="$$dot"/>
+                                      <ForVarIterator varname="$$context-item"/>
                                     </ReturnClause>
                                   </flwor::FLWORIterator>
                                 </ChildAxisIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-gary1.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-gary1.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/hashjoin-gary1.iter	2012-09-26 13:28:22 +0000
@@ -27,30 +27,30 @@
       <LetVariable name="y" materialize="true">
         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill allowed="0">
           <flwor::FLWORIterator>
-            <ForVariable name="$$dot">
+            <ForVariable name="$$context-item">
               <FnDocIterator>
                 <SingletonIterator value="xs:string(../hashjoins/min_ic1980.xml)"/>
               </FnDocIterator>
             </ForVariable>
-            <ForVariable name="$$dot">
+            <ForVariable name="$$context-item">
               <flwor::FLWORIterator>
-                <ForVariable name="$$dot">
+                <ForVariable name="$$context-item">
                   <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,ipeds)" typename="*" nill allowed="0">
-                    <ForVarIterator varname="$$dot"/>
+                    <ForVarIterator varname="$$context-item"/>
                   </ChildAxisIterator>
                 </ForVariable>
                 <WhereClause>
                   <CompareIterator>
                     <FnDataIterator>
                       <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill allowed="0">
-                        <ForVarIterator varname="$$dot"/>
+                        <ForVarIterator varname="$$context-item"/>
                       </AttributeAxisIterator>
                     </FnDataIterator>
                     <SingletonIterator value="xs:integer(1980)"/>
                   </CompareIterator>
                 </WhereClause>
                 <ReturnClause>
-                  <ForVarIterator varname="$$dot"/>
+                  <ForVarIterator varname="$$context-item"/>
                 </ReturnClause>
               </flwor::FLWORIterator>
             </ForVariable>
@@ -58,14 +58,14 @@
               <CompareIterator>
                 <FnDataIterator>
                   <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill allowed="0">
-                    <ForVarIterator varname="$$dot"/>
+                    <ForVarIterator varname="$$context-item"/>
                   </AttributeAxisIterator>
                 </FnDataIterator>
                 <SingletonIterator value="xs:string(ic1980)"/>
               </CompareIterator>
             </WhereClause>
             <ReturnClause>
-              <ForVarIterator varname="$$dot"/>
+              <ForVarIterator varname="$$context-item"/>
             </ReturnClause>
           </flwor::FLWORIterator>
         </ChildAxisIterator>
@@ -108,7 +108,7 @@
               <HoistIterator>
                 <AttributeAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
                   <flwor::FLWORIterator>
-                    <ForVariable name="$$dot">
+                    <ForVariable name="$$context-item">
                       <NodeSortIterator distinct="true" ascending="true">
                         <ProbeIndexPointGeneralIterator>
                           <SingletonIterator value="xs:QName(,,tempIndex0)"/>
@@ -119,7 +119,7 @@
                       </NodeSortIterator>
                     </ForVariable>
                     <ReturnClause>
-                      <ForVarIterator varname="$$dot"/>
+                      <ForVarIterator varname="$$context-item"/>
                     </ReturnClause>
                   </flwor::FLWORIterator>
                 </AttributeAxisIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/path17.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/path17.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/path17.iter	2012-09-26 13:28:22 +0000
@@ -7,7 +7,7 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <ElementIterator copyInputNodes="false">
     <SingletonIterator value="xs:QName(,,missing-variable)"/>
     <EnclosedIterator attr_cont="false">
@@ -15,33 +15,33 @@
         <ForVariable name="x">
           <NodeSortIterator distinct="true" ascending="true">
             <flwor::FLWORIterator>
-              <ForVariable name="$$dot">
+              <ForVariable name="$$context-item">
                 <DescendantSelfAxisIterator test kind="match_anykind_test" qname="*" typename="*" nill allowed="0">
                   <FnDocIterator>
                     <PromoteIterator type="xs:string">
                       <FnDataIterator>
-                        <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                        <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                       </FnDataIterator>
                     </PromoteIterator>
                   </FnDocIterator>
                 </DescendantSelfAxisIterator>
               </ForVariable>
-              <ForVariable name="$$dot">
+              <ForVariable name="$$context-item">
                 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,wildcard,input-file)" typename="*" nill allowed="0">
-                  <ForVarIterator varname="$$dot"/>
+                  <ForVarIterator varname="$$context-item"/>
                 </ChildAxisIterator>
               </ForVariable>
               <WhereClause>
                 <AndIterator>
                   <FnEmptyIterator>
                     <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,variable)" typename="*" nill allowed="0">
-                      <ForVarIterator varname="$$dot"/>
+                      <ForVarIterator varname="$$context-item"/>
                     </AttributeAxisIterator>
                   </FnEmptyIterator>
                   <CompareIterator>
                     <FnDataIterator>
                       <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
-                        <ForVarIterator varname="$$dot"/>
+                        <ForVarIterator varname="$$context-item"/>
                       </ChildAxisIterator>
                     </FnDataIterator>
                     <SingletonIterator value="xs:string(emptydoc)"/>
@@ -49,7 +49,7 @@
                 </AndIterator>
               </WhereClause>
               <ReturnClause>
-                <ForVarIterator varname="$$dot"/>
+                <ForVarIterator varname="$$context-item"/>
               </ReturnClause>
             </flwor::FLWORIterator>
           </NodeSortIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q1.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q1.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q1.iter	2012-09-26 13:28:22 +0000
@@ -7,31 +7,31 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
-    <ForVariable name="$$dot">
+    <ForVariable name="$$context-item">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
           <FnDocIterator>
             <PromoteIterator type="xs:string">
               <FnDataIterator>
-                <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
               </FnDataIterator>
             </PromoteIterator>
           </FnDocIterator>
         </ChildAxisIterator>
       </ChildAxisIterator>
     </ForVariable>
-    <ForVariable name="$$dot">
+    <ForVariable name="$$context-item">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
-        <ForVarIterator varname="$$dot"/>
+        <ForVarIterator varname="$$context-item"/>
       </ChildAxisIterator>
     </ForVariable>
     <WhereClause>
       <CompareIterator>
         <FnDataIterator>
           <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
-            <ForVarIterator varname="$$dot"/>
+            <ForVarIterator varname="$$context-item"/>
           </AttributeAxisIterator>
         </FnDataIterator>
         <SingletonIterator value="xs:string(person0)"/>
@@ -40,7 +40,7 @@
     <ReturnClause>
       <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
-          <ForVarIterator varname="$$dot"/>
+          <ForVarIterator varname="$$context-item"/>
         </ChildAxisIterator>
       </ChildAxisIterator>
     </ReturnClause>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q10.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q10.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q10.iter	2012-09-26 13:28:22 +0000
@@ -1,12 +1,12 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <LetVariable name="auction" materialize="true">
       <FnDocIterator>
         <PromoteIterator type="xs:string">
           <FnDataIterator>
-            <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+            <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q11.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q11.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q11.iter	2012-09-26 13:28:22 +0000
@@ -5,13 +5,13 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <LetVariable name="auction" materialize="true">
       <FnDocIterator>
         <PromoteIterator type="xs:string">
           <FnDataIterator>
-            <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+            <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q12.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q12.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q12.iter	2012-09-26 13:28:22 +0000
@@ -5,13 +5,13 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <LetVariable name="auction" materialize="true">
       <FnDocIterator>
         <PromoteIterator type="xs:string">
           <FnDataIterator>
-            <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+            <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q13.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q13.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q13.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="i">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">
@@ -10,7 +10,7 @@
               <FnDocIterator>
                 <PromoteIterator type="xs:string">
                   <FnDataIterator>
-                    <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                    <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                   </FnDataIterator>
                 </PromoteIterator>
               </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q14.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q14.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q14.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="i">
       <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">
@@ -8,7 +8,7 @@
           <FnDocIterator>
             <PromoteIterator type="xs:string">
               <FnDataIterator>
-                <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
               </FnDataIterator>
             </PromoteIterator>
           </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q15.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q15.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q15.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="a">
       <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
@@ -19,7 +19,7 @@
                                 <FnDocIterator>
                                   <PromoteIterator type="xs:string">
                                     <FnDataIterator>
-                                      <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                                      <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                                     </FnDataIterator>
                                   </PromoteIterator>
                                 </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q16.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q16.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q16.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="a">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">
@@ -9,7 +9,7 @@
             <FnDocIterator>
               <PromoteIterator type="xs:string">
                 <FnDataIterator>
-                  <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                  <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
             </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q17.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q17.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q17.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="p">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
@@ -9,7 +9,7 @@
             <FnDocIterator>
               <PromoteIterator type="xs:string">
                 <FnDataIterator>
-                  <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                  <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
             </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q18.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q18.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q18.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="i">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">
@@ -9,7 +9,7 @@
             <FnDocIterator>
               <PromoteIterator type="xs:string">
                 <FnDataIterator>
-                  <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                  <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
             </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q19.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q19.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q19.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="b">
       <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">
@@ -9,7 +9,7 @@
             <FnDocIterator>
               <PromoteIterator type="xs:string">
                 <FnDataIterator>
-                  <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                  <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
             </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q2.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q2.iter	2012-09-20 13:49:19 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q2.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="b">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">
@@ -9,7 +9,7 @@
             <FnDocIterator>
               <PromoteIterator type="xs:string">
                 <FnDataIterator>
-                  <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                  <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
             </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q20.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q20.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q20.iter	2012-09-26 13:28:22 +0000
@@ -21,13 +21,13 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <LetVariable name="auction" materialize="true">
       <FnDocIterator>
         <PromoteIterator type="xs:string">
           <FnDataIterator>
-            <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+            <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </FnDocIterator>
@@ -41,7 +41,7 @@
             <EnclosedIterator attr_cont="false">
               <FnCountIterator>
                 <flwor::FLWORIterator>
-                  <ForVariable name="$$dot">
+                  <ForVariable name="$$context-item">
                     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
                       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
                         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
@@ -50,16 +50,16 @@
                       </ChildAxisIterator>
                     </ChildAxisIterator>
                   </ForVariable>
-                  <ForVariable name="$$dot">
+                  <ForVariable name="$$context-item">
                     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
-                      <ForVarIterator varname="$$dot"/>
+                      <ForVarIterator varname="$$context-item"/>
                     </ChildAxisIterator>
                   </ForVariable>
                   <WhereClause>
                     <CompareIterator>
                       <FnDataIterator>
                         <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
-                          <ForVarIterator varname="$$dot"/>
+                          <ForVarIterator varname="$$context-item"/>
                         </AttributeAxisIterator>
                       </FnDataIterator>
                       <SingletonIterator value="xs:integer(100000)"/>
@@ -77,7 +77,7 @@
             <EnclosedIterator attr_cont="false">
               <FnCountIterator>
                 <flwor::FLWORIterator>
-                  <ForVariable name="$$dot">
+                  <ForVariable name="$$context-item">
                     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
                       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
                         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
@@ -86,9 +86,9 @@
                       </ChildAxisIterator>
                     </ChildAxisIterator>
                   </ForVariable>
-                  <ForVariable name="$$dot">
+                  <ForVariable name="$$context-item">
                     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
-                      <ForVarIterator varname="$$dot"/>
+                      <ForVarIterator varname="$$context-item"/>
                     </ChildAxisIterator>
                   </ForVariable>
                   <WhereClause>
@@ -96,7 +96,7 @@
                       <CompareIterator>
                         <FnDataIterator>
                           <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
-                            <ForVarIterator varname="$$dot"/>
+                            <ForVarIterator varname="$$context-item"/>
                           </AttributeAxisIterator>
                         </FnDataIterator>
                         <SingletonIterator value="xs:integer(100000)"/>
@@ -104,7 +104,7 @@
                       <CompareIterator>
                         <FnDataIterator>
                           <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
-                            <ForVarIterator varname="$$dot"/>
+                            <ForVarIterator varname="$$context-item"/>
                           </AttributeAxisIterator>
                         </FnDataIterator>
                         <SingletonIterator value="xs:integer(30000)"/>
@@ -123,7 +123,7 @@
             <EnclosedIterator attr_cont="false">
               <FnCountIterator>
                 <flwor::FLWORIterator>
-                  <ForVariable name="$$dot">
+                  <ForVariable name="$$context-item">
                     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
                       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
                         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
@@ -132,16 +132,16 @@
                       </ChildAxisIterator>
                     </ChildAxisIterator>
                   </ForVariable>
-                  <ForVariable name="$$dot">
+                  <ForVariable name="$$context-item">
                     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
-                      <ForVarIterator varname="$$dot"/>
+                      <ForVarIterator varname="$$context-item"/>
                     </ChildAxisIterator>
                   </ForVariable>
                   <WhereClause>
                     <CompareIterator>
                       <FnDataIterator>
                         <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
-                          <ForVarIterator varname="$$dot"/>
+                          <ForVarIterator varname="$$context-item"/>
                         </AttributeAxisIterator>
                       </FnDataIterator>
                       <SingletonIterator value="xs:integer(30000)"/>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q3.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q3.iter	2012-09-20 13:49:19 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q3.iter	2012-09-26 13:28:22 +0000
@@ -5,7 +5,7 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="b">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">
@@ -14,7 +14,7 @@
             <FnDocIterator>
               <PromoteIterator type="xs:string">
                 <FnDataIterator>
-                  <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                  <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
             </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q4.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q4.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q4.iter	2012-09-26 13:28:22 +0000
@@ -14,7 +14,7 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="b">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">
@@ -23,7 +23,7 @@
             <FnDocIterator>
               <PromoteIterator type="xs:string">
                 <FnDataIterator>
-                  <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                  <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
             </FnDocIterator>
@@ -34,28 +34,28 @@
     <LetVariable name="$$opt_temp_0" materialize="true">
       <HoistIterator>
         <flwor::FLWORIterator>
-          <ForVariable name="$$dot">
+          <ForVariable name="$$context-item">
             <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0">
               <ForVarIterator varname="b"/>
             </ChildAxisIterator>
           </ForVariable>
-          <ForVariable name="$$dot">
+          <ForVariable name="$$context-item">
             <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,personref)" typename="*" nill allowed="0">
-              <ForVarIterator varname="$$dot"/>
+              <ForVarIterator varname="$$context-item"/>
             </ChildAxisIterator>
           </ForVariable>
           <WhereClause>
             <CompareIterator>
               <FnDataIterator>
                 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
-                  <ForVarIterator varname="$$dot"/>
+                  <ForVarIterator varname="$$context-item"/>
                 </AttributeAxisIterator>
               </FnDataIterator>
               <SingletonIterator value="xs:string(person51)"/>
             </CompareIterator>
           </WhereClause>
           <ReturnClause>
-            <ForVarIterator varname="$$dot"/>
+            <ForVarIterator varname="$$context-item"/>
           </ReturnClause>
         </flwor::FLWORIterator>
       </HoistIterator>
@@ -65,28 +65,28 @@
         <flwor::FLWORIterator>
           <ForVariable name="pr1">
             <flwor::FLWORIterator>
-              <ForVariable name="$$dot">
+              <ForVariable name="$$context-item">
                 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0">
                   <ForVarIterator varname="b"/>
                 </ChildAxisIterator>
               </ForVariable>
-              <ForVariable name="$$dot">
+              <ForVariable name="$$context-item">
                 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,personref)" typename="*" nill allowed="0">
-                  <ForVarIterator varname="$$dot"/>
+                  <ForVarIterator varname="$$context-item"/>
                 </ChildAxisIterator>
               </ForVariable>
               <WhereClause>
                 <CompareIterator>
                   <FnDataIterator>
                     <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
-                      <ForVarIterator varname="$$dot"/>
+                      <ForVarIterator varname="$$context-item"/>
                     </AttributeAxisIterator>
                   </FnDataIterator>
                   <SingletonIterator value="xs:string(person20)"/>
                 </CompareIterator>
               </WhereClause>
               <ReturnClause>
-                <ForVarIterator varname="$$dot"/>
+                <ForVarIterator varname="$$context-item"/>
               </ReturnClause>
             </flwor::FLWORIterator>
           </ForVariable>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q5.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q5.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q5.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <FnCountIterator>
     <flwor::FLWORIterator>
       <ForVariable name="i">
@@ -10,7 +10,7 @@
               <FnDocIterator>
                 <PromoteIterator type="xs:string">
                   <FnDataIterator>
-                    <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                    <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                   </FnDataIterator>
                 </PromoteIterator>
               </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q6.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q6.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q6.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="b">
       <NodeSortIterator distinct="false" ascending="true">
@@ -9,7 +9,7 @@
             <FnDocIterator>
               <PromoteIterator type="xs:string">
                 <FnDataIterator>
-                  <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                  <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
             </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q7.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q7.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q7.iter	2012-09-26 13:28:22 +0000
@@ -1,13 +1,13 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="p">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
         <FnDocIterator>
           <PromoteIterator type="xs:string">
             <FnDataIterator>
-              <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+              <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
             </FnDataIterator>
           </PromoteIterator>
         </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q8.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q8.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q8.iter	2012-09-26 13:28:22 +0000
@@ -1,12 +1,12 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <LetVariable name="auction" materialize="true">
       <FnDocIterator>
         <PromoteIterator type="xs:string">
           <FnDataIterator>
-            <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+            <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q9.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q9.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/q9.iter	2012-09-26 13:28:22 +0000
@@ -1,12 +1,12 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <LetVariable name="auction" materialize="true">
       <FnDocIterator>
         <PromoteIterator type="xs:string">
           <FnDataIterator>
-            <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+            <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/udfs1.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/udfs1.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/no-copy/udfs1.iter	2012-09-26 13:28:22 +0000
@@ -5,7 +5,7 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="d1">
+  <CtxVarDeclareIterator varid="4" varname="d1">
     <ElementIterator>
       <SingletonIterator value="xs:QName(,,a)"/>
       <ElementIterator>
@@ -16,7 +16,7 @@
       </ElementIterator>
     </ElementIterator>
   </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="3" varname="d2">
+  <CtxVarDeclareIterator varid="5" varname="d2">
     <ElementIterator>
       <SingletonIterator value="xs:QName(,,a)"/>
       <ElementIterator>
@@ -30,12 +30,12 @@
   <FnConcatIterator>
     <UDFunctionCallIterator>
       <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="">
-        <CtxVarIterator varid="2" varname="d1" varkind="local"/>
+        <CtxVarIterator varid="4" varname="d1" varkind="local"/>
       </TreatIterator>
     </UDFunctionCallIterator>
     <UDFunctionCallIterator>
       <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="">
-        <CtxVarIterator varid="3" varname="d2" varkind="local"/>
+        <CtxVarIterator varid="5" varname="d2" varkind="local"/>
       </TreatIterator>
     </UDFunctionCallIterator>
   </FnConcatIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/hoist01.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/hoist01.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/hoist01.iter	2012-09-26 13:28:22 +0000
@@ -31,7 +31,7 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="testlib:user">
+  <CtxVarDeclareIterator varid="4" varname="testlib:user">
     <SingletonIterator value="xs:QName(http://www.test.ch,testlib,user)"/>
   </CtxVarDeclareIterator>
   <UDFunctionCallIterator>
@@ -48,11 +48,11 @@
       </FnBooleanIterator>
       <FunctionTraceIterator>
         <flwor::FLWORIterator>
-          <ForVariable name="$$dot">
+          <ForVariable name="$$context-item">
             <ZorbaCollectionIterator>
               <PromoteIterator type="xs:QName">
                 <FnDataIterator>
-                  <CtxVarIterator varid="2" varname="testlib:user" varkind="global"/>
+                  <CtxVarIterator varid="4" varname="testlib:user" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
             </ZorbaCollectionIterator>
@@ -64,7 +64,7 @@
                   <FnDataIterator>
                     <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,deleted)" typename="*" nill allowed="0">
                       <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
-                        <ForVarIterator varname="$$dot"/>
+                        <ForVarIterator varname="$$context-item"/>
                       </TreatIterator>
                     </AttributeAxisIterator>
                   </FnDataIterator>
@@ -74,7 +74,7 @@
             </FnBooleanIterator>
           </WhereClause>
           <ReturnClause>
-            <ForVarIterator varname="$$dot"/>
+            <ForVarIterator varname="$$context-item"/>
           </ReturnClause>
         </flwor::FLWORIterator>
       </FunctionTraceIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred11.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred11.iter	2012-09-20 13:49:19 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred11.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="doc">
+  <CtxVarDeclareIterator varid="4" varname="doc">
     <ElementIterator>
       <SingletonIterator value="xs:QName(,,doc)"/>
       <FnConcatIterator>
@@ -23,30 +23,30 @@
     </ElementIterator>
   </CtxVarDeclareIterator>
   <flwor::FLWORIterator>
-    <ForVariable name="$$dot">
+    <ForVariable name="$$context-item">
       <NodeSortIterator distinct="true" ascending="true">
         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
           <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
-            <CtxVarIterator varid="2" varname="doc" varkind="local"/>
+            <CtxVarIterator varid="4" varname="doc" varkind="local"/>
           </TreatIterator>
         </ChildAxisIterator>
       </NodeSortIterator>
     </ForVariable>
     <WhereClause>
       <TypedValueCompareIterator_INTEGER>
-        <ForVarIterator varname="$$pos"/>
+        <ForVarIterator varname="$$context-position"/>
         <IfThenElseIterator>
           <TypedValueCompareIterator_INTEGER>
-            <ForVarIterator varname="$$pos"/>
+            <ForVarIterator varname="$$context-position"/>
             <SingletonIterator value="xs:integer(3)"/>
           </TypedValueCompareIterator_INTEGER>
-          <ForVarIterator varname="$$pos"/>
+          <ForVarIterator varname="$$context-position"/>
           <SingletonIterator value="xs:integer(1)"/>
         </IfThenElseIterator>
       </TypedValueCompareIterator_INTEGER>
     </WhereClause>
     <ReturnClause>
-      <ForVarIterator varname="$$dot"/>
+      <ForVarIterator varname="$$context-item"/>
     </ReturnClause>
   </flwor::FLWORIterator>
 </SequentialIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred12.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred12.iter	2012-09-24 15:27:00 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred12.iter	2012-09-26 13:28:22 +0000
@@ -78,7 +78,7 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="doc">
+  <CtxVarDeclareIterator varid="4" varname="doc">
     <ElementIterator>
       <SingletonIterator value="xs:QName(,,doc)"/>
       <FnConcatIterator>
@@ -120,7 +120,7 @@
       <NodeSortIterator distinct="true" ascending="true">
         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
           <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
-            <CtxVarIterator varid="2" varname="doc" varkind="local"/>
+            <CtxVarIterator varid="4" varname="doc" varkind="local"/>
           </TreatIterator>
         </ChildAxisIterator>
       </NodeSortIterator>
@@ -133,7 +133,7 @@
       <NodeSortIterator distinct="true" ascending="true">
         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
           <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
-            <CtxVarIterator varid="2" varname="doc" varkind="local"/>
+            <CtxVarIterator varid="4" varname="doc" varkind="local"/>
           </TreatIterator>
         </ChildAxisIterator>
       </NodeSortIterator>
@@ -146,7 +146,7 @@
       <NodeSortIterator distinct="true" ascending="true">
         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
           <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
-            <CtxVarIterator varid="2" varname="doc" varkind="local"/>
+            <CtxVarIterator varid="4" varname="doc" varkind="local"/>
           </TreatIterator>
         </ChildAxisIterator>
       </NodeSortIterator>
@@ -159,7 +159,7 @@
       <NodeSortIterator distinct="true" ascending="true">
         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
           <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
-            <CtxVarIterator varid="2" varname="doc" varkind="local"/>
+            <CtxVarIterator varid="4" varname="doc" varkind="local"/>
           </TreatIterator>
         </ChildAxisIterator>
       </NodeSortIterator>
@@ -172,7 +172,7 @@
       <NodeSortIterator distinct="true" ascending="true">
         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
           <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
-            <CtxVarIterator varid="2" varname="doc" varkind="local"/>
+            <CtxVarIterator varid="4" varname="doc" varkind="local"/>
           </TreatIterator>
         </ChildAxisIterator>
       </NodeSortIterator>
@@ -185,7 +185,7 @@
       <NodeSortIterator distinct="true" ascending="true">
         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
           <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
-            <CtxVarIterator varid="2" varname="doc" varkind="local"/>
+            <CtxVarIterator varid="4" varname="doc" varkind="local"/>
           </TreatIterator>
         </ChildAxisIterator>
       </NodeSortIterator>
@@ -197,7 +197,7 @@
       <NodeSortIterator distinct="true" ascending="true">
         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
           <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
-            <CtxVarIterator varid="2" varname="doc" varkind="local"/>
+            <CtxVarIterator varid="4" varname="doc" varkind="local"/>
           </TreatIterator>
         </ChildAxisIterator>
       </NodeSortIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred13.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred13.iter	2012-09-24 06:06:10 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred13.iter	2012-09-26 13:28:22 +0000
@@ -13,7 +13,7 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="doc">
+  <CtxVarDeclareIterator varid="4" varname="doc">
     <ElementIterator>
       <SingletonIterator value="xs:QName(,,doc)"/>
       <FnConcatIterator>
@@ -51,12 +51,12 @@
     </ElementIterator>
   </CtxVarDeclareIterator>
   <flwor::FLWORIterator>
-    <ForVariable name="$$dot">
+    <ForVariable name="$$context-item">
       <SubsequenceIntIterator>
         <NodeSortIterator distinct="true" ascending="true">
           <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
             <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
-              <CtxVarIterator varid="2" varname="doc" varkind="local"/>
+              <CtxVarIterator varid="4" varname="doc" varkind="local"/>
             </TreatIterator>
           </ChildAxisIterator>
         </NodeSortIterator>
@@ -69,7 +69,7 @@
         <PromoteIterator type="xs:anyAtomicType">
           <FnDataIterator>
             <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,i)" typename="*" nill allowed="0">
-              <ForVarIterator varname="$$dot"/>
+              <ForVarIterator varname="$$context-item"/>
             </AttributeAxisIterator>
           </FnDataIterator>
         </PromoteIterator>
@@ -77,7 +77,7 @@
       </CompareIterator>
     </WhereClause>
     <ReturnClause>
-      <ForVarIterator varname="$$dot"/>
+      <ForVarIterator varname="$$context-item"/>
     </ReturnClause>
   </flwor::FLWORIterator>
 </SequentialIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred2.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred2.iter	2012-09-10 03:03:44 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred2.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="doc">
+  <CtxVarDeclareIterator varid="4" varname="doc">
     <ElementIterator>
       <SingletonIterator value="xs:QName(,,a)"/>
       <ElementIterator>
@@ -16,7 +16,7 @@
           <NodeSortIterator distinct="true" ascending="true">
             <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,foo)" typename="*" nill allowed="0">
               <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
-                <CtxVarIterator varid="2" varname="doc" varkind="local"/>
+                <CtxVarIterator varid="4" varname="doc" varkind="local"/>
               </TreatIterator>
             </ChildAxisIterator>
           </NodeSortIterator>
@@ -43,7 +43,7 @@
           <NodeSortIterator distinct="true" ascending="true">
             <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,foo)" typename="*" nill allowed="0">
               <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
-                <CtxVarIterator varid="2" varname="doc" varkind="local"/>
+                <CtxVarIterator varid="4" varname="doc" varkind="local"/>
               </TreatIterator>
             </ChildAxisIterator>
           </NodeSortIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred3.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred3.iter	2012-09-06 17:36:04 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred3.iter	2012-09-26 13:28:22 +0000
@@ -61,14 +61,14 @@
     <SingletonIterator value="xs:QName(,,grp)"/>
     <EnclosedIterator attr_cont="false">
       <flwor::FLWORIterator>
-        <ForVariable name="$$dot">
+        <ForVariable name="$$context-item">
           <NodeSortIterator distinct="true" ascending="true">
             <LetVarIterator varname="x"/>
           </NodeSortIterator>
         </ForVariable>
         <ReturnClause>
           <FnDataIterator>
-            <ForVarIterator varname="$$dot"/>
+            <ForVarIterator varname="$$context-item"/>
           </FnDataIterator>
         </ReturnClause>
       </flwor::FLWORIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred7.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred7.iter	2012-09-07 18:02:16 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred7.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="g">
+  <CtxVarDeclareIterator varid="4" varname="g">
     <SingletonIterator value="xs:integer(4)"/>
   </CtxVarDeclareIterator>
   <SequencePointAccessIterator>
@@ -16,7 +16,7 @@
       <SingletonIterator value="xs:integer(9)"/>
       <SingletonIterator value="xs:integer(0)"/>
     </FnConcatIterator>
-    <CtxVarIterator varid="2" varname="g" varkind="global"/>
+    <CtxVarIterator varid="4" varname="g" varkind="global"/>
   </SequencePointAccessIterator>
 </SequentialIterator>
 

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred8.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred8.iter	2012-09-07 18:02:16 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred8.iter	2012-09-26 13:28:22 +0000
@@ -5,7 +5,7 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="g">
+  <CtxVarDeclareIterator varid="4" varname="g">
     <SingletonIterator value="xs:integer(-4)"/>
   </CtxVarDeclareIterator>
   <SequencePointAccessIterator>
@@ -21,7 +21,7 @@
       <SingletonIterator value="xs:integer(9)"/>
       <SingletonIterator value="xs:integer(0)"/>
     </FnConcatIterator>
-    <CtxVarIterator varid="2" varname="g" varkind="global"/>
+    <CtxVarIterator varid="4" varname="g" varkind="global"/>
   </SequencePointAccessIterator>
 </SequentialIterator>
 

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred9.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred9.iter	2012-09-07 18:02:16 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/pos_pred9.iter	2012-09-26 13:28:22 +0000
@@ -5,7 +5,7 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="g">
+  <CtxVarDeclareIterator varid="4" varname="g">
     <SingletonIterator value="xs:integer(-4)"/>
   </CtxVarDeclareIterator>
   <flwor::FLWORIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/positioned-access.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/positioned-access.iter	2012-09-20 13:49:19 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/positioned-access.iter	2012-09-26 13:28:22 +0000
@@ -1,13 +1,13 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="n1">
+  <CtxVarDeclareIterator varid="4" varname="n1">
     <FnConcatIterator>
       <SingletonIterator value="xs:integer(2)"/>
       <SingletonIterator value="xs:integer(3)"/>
       <SingletonIterator value="xs:integer(6)"/>
     </FnConcatIterator>
   </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="3" varname="n2">
+  <CtxVarDeclareIterator varid="5" varname="n2">
     <FnConcatIterator>
       <SingletonIterator value="xs:integer(2)"/>
       <SingletonIterator value="xs:integer(3)"/>
@@ -19,7 +19,7 @@
         <LetVariable name="x" materialize="true">
           <PromoteIterator type="xs:integer">
             <FnDataIterator>
-              <CtxVarIterator varid="2" varname="n1" varkind="global"/>
+              <CtxVarIterator varid="4" varname="n1" varkind="global"/>
             </FnDataIterator>
           </PromoteIterator>
         </LetVariable>
@@ -37,7 +37,7 @@
         <LetVariable name="x" materialize="true">
           <PromoteIterator type="xs:integer">
             <FnDataIterator>
-              <CtxVarIterator varid="3" varname="n2" varkind="global"/>
+              <CtxVarIterator varid="5" varname="n2" varkind="global"/>
             </FnDataIterator>
           </PromoteIterator>
         </LetVariable>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/var_inline_01.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/var_inline_01.iter	2012-09-07 18:02:16 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/var_inline_01.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="g">
+  <CtxVarDeclareIterator varid="4" varname="g">
     <SingletonIterator value="xs:integer(3)"/>
   </CtxVarDeclareIterator>
   <flwor::FLWORIterator>
@@ -18,7 +18,7 @@
       </NumArithIterator_ModOperation>
     </ForVariable>
     <LetVariable name="foo" materialize="true">
-      <CtxVarIterator varid="2" varname="g" varkind="global"/>
+      <CtxVarIterator varid="4" varname="g" varkind="global"/>
     </LetVariable>
     <LetVariable name="$$opt_temp_0" materialize="true">
       <HoistIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/var_inline_03.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/var_inline_03.iter	2012-09-08 02:57:35 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/optim/var_inline_03.iter	2012-09-26 13:28:22 +0000
@@ -1,13 +1,13 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="foo">
+  <CtxVarDeclareIterator varid="4" varname="foo">
     <FnConcatIterator>
       <SingletonIterator value="xs:integer(1)"/>
       <SingletonIterator value="xs:integer(2)"/>
       <SingletonIterator value="xs:integer(3)"/>
     </FnConcatIterator>
   </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="3" varname="boo">
+  <CtxVarDeclareIterator varid="5" varname="boo">
     <FnConcatIterator>
       <SingletonIterator value="xs:integer(1)"/>
       <SingletonIterator value="xs:integer(2)"/>
@@ -18,12 +18,12 @@
     <AndIterator>
       <TypedValueCompareIterator_INTEGER>
         <FnCountIterator>
-          <CtxVarIterator varid="3" varname="boo" varkind="global"/>
+          <CtxVarIterator varid="5" varname="boo" varkind="global"/>
         </FnCountIterator>
         <SingletonIterator value="xs:integer(3)"/>
       </TypedValueCompareIterator_INTEGER>
       <FnExactlyOneIterator>
-        <CtxVarIterator varid="2" varname="foo" varkind="global">
+        <CtxVarIterator varid="4" varname="foo" varkind="global">
           <SingletonIterator value="xs:integer(3)"/>
           <SingletonIterator value="xs:integer(2)"/>
         </CtxVarIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/paths/path13.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/paths/path13.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/paths/path13.iter	2012-09-26 13:28:22 +0000
@@ -7,7 +7,7 @@
 
 Iterator tree for main query:
 <flwor::FLWORIterator>
-  <ForVariable name="$$dot">
+  <ForVariable name="$$context-item">
     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">
       <ElementIterator>
         <SingletonIterator value="xs:QName(,,a)"/>
@@ -43,12 +43,12 @@
   <WhereClause>
     <FnBooleanIterator>
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0">
-        <ForVarIterator varname="$$dot"/>
+        <ForVarIterator varname="$$context-item"/>
       </ChildAxisIterator>
     </FnBooleanIterator>
   </WhereClause>
   <ReturnClause>
-    <ForVarIterator varname="$$dot"/>
+    <ForVarIterator varname="$$context-item"/>
   </ReturnClause>
 </flwor::FLWORIterator>
 

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/paths/path17.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/paths/path17.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/paths/path17.iter	2012-09-26 13:28:22 +0000
@@ -7,7 +7,7 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <ElementIterator>
     <SingletonIterator value="xs:QName(,,missing-variable)"/>
     <EnclosedIterator attr_cont="false">
@@ -15,33 +15,33 @@
         <ForVariable name="x">
           <NodeSortIterator distinct="true" ascending="true">
             <flwor::FLWORIterator>
-              <ForVariable name="$$dot">
+              <ForVariable name="$$context-item">
                 <DescendantSelfAxisIterator test kind="match_anykind_test" qname="*" typename="*" nill allowed="0">
                   <FnDocIterator>
                     <PromoteIterator type="xs:string">
                       <FnDataIterator>
-                        <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                        <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                       </FnDataIterator>
                     </PromoteIterator>
                   </FnDocIterator>
                 </DescendantSelfAxisIterator>
               </ForVariable>
-              <ForVariable name="$$dot">
+              <ForVariable name="$$context-item">
                 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,wildcard,input-file)" typename="*" nill allowed="0">
-                  <ForVarIterator varname="$$dot"/>
+                  <ForVarIterator varname="$$context-item"/>
                 </ChildAxisIterator>
               </ForVariable>
               <WhereClause>
                 <AndIterator>
                   <FnEmptyIterator>
                     <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,variable)" typename="*" nill allowed="0">
-                      <ForVarIterator varname="$$dot"/>
+                      <ForVarIterator varname="$$context-item"/>
                     </AttributeAxisIterator>
                   </FnEmptyIterator>
                   <CompareIterator>
                     <FnDataIterator>
                       <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
-                        <ForVarIterator varname="$$dot"/>
+                        <ForVarIterator varname="$$context-item"/>
                       </ChildAxisIterator>
                     </FnDataIterator>
                     <SingletonIterator value="xs:string(emptydoc)"/>
@@ -49,7 +49,7 @@
                 </AndIterator>
               </WhereClause>
               <ReturnClause>
-                <ForVarIterator varname="$$dot"/>
+                <ForVarIterator varname="$$context-item"/>
               </ReturnClause>
             </flwor::FLWORIterator>
           </NodeSortIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/paths/path_pred4.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/paths/path_pred4.iter	2012-09-20 13:49:19 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/paths/path_pred4.iter	2012-09-26 13:28:22 +0000
@@ -1,7 +1,7 @@
 Iterator tree for main query:
 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,d)" typename="*" nill allowed="0">
   <flwor::FLWORIterator>
-    <ForVariable name="$$dot">
+    <ForVariable name="$$context-item">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,b)" typename="*" nill allowed="0">
         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,a)" typename="*" nill allowed="0">
           <ElementIterator>
@@ -48,7 +48,7 @@
     </ForVariable>
     <ReturnClause>
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,c)" typename="*" nill allowed="0" target_position="1">
-        <ForVarIterator varname="$$dot"/>
+        <ForVarIterator varname="$$context-item"/>
       </ChildAxisIterator>
     </ReturnClause>
   </flwor::FLWORIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/udf/udf1.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/udf/udf1.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/udf/udf1.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="x">
+  <CtxVarDeclareIterator varid="4" varname="x">
     <SingletonIterator value="xs:integer(1)"/>
   </CtxVarDeclareIterator>
   <UDFunctionCallIterator>
@@ -33,7 +33,7 @@
     </ChildAxisIterator>
     <PromoteIterator type="xs:integer">
       <FnDataIterator>
-        <CtxVarIterator varid="2" varname="x" varkind="global"/>
+        <CtxVarIterator varid="4" varname="x" varkind="global"/>
       </FnDataIterator>
     </PromoteIterator>
   </UDFunctionCallIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/windowing/q10.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/windowing/q10.iter	2012-04-12 22:52:42 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/windowing/q10.iter	2012-09-26 13:28:22 +0000
@@ -17,7 +17,7 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="seq">
+  <CtxVarDeclareIterator varid="4" varname="seq">
     <FnDocIterator>
       <SingletonIterator value="xs:string(person_events.xml)"/>
     </FnDocIterator>
@@ -31,18 +31,18 @@
             <WindowVariable name="w">
               <NodeSortIterator distinct="true" ascending="true">
                 <flwor::FLWORIterator>
-                  <ForVariable name="$$dot">
+                  <ForVariable name="$$context-item">
                     <NodeDistinctIterator allow-atomics="false" check-only="false">
                       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,stream)" typename="*" nill allowed="0">
                         <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
-                          <CtxVarIterator varid="2" varname="seq" varkind="global"/>
+                          <CtxVarIterator varid="4" varname="seq" varkind="global"/>
                         </TreatIterator>
                       </ChildAxisIterator>
                     </NodeDistinctIterator>
                   </ForVariable>
-                  <ForVariable name="$$dot">
+                  <ForVariable name="$$context-item">
                     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,event)" typename="*" nill allowed="0">
-                      <ForVarIterator varname="$$dot"/>
+                      <ForVarIterator varname="$$context-item"/>
                     </ChildAxisIterator>
                   </ForVariable>
                   <WhereClause>
@@ -51,7 +51,7 @@
                         <PromoteIterator type="xs:anyAtomicType">
                           <FnDataIterator>
                             <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,direction)" typename="*" nill allowed="0">
-                              <ForVarIterator varname="$$dot"/>
+                              <ForVarIterator varname="$$context-item"/>
                             </ChildAxisIterator>
                           </FnDataIterator>
                         </PromoteIterator>
@@ -60,7 +60,7 @@
                     </FnBooleanIterator>
                   </WhereClause>
                   <ReturnClause>
-                    <ForVarIterator varname="$$dot"/>
+                    <ForVarIterator varname="$$context-item"/>
                   </ReturnClause>
                 </flwor::FLWORIterator>
               </NodeSortIterator>
@@ -95,7 +95,7 @@
           </flwor::WindowIterator>
           <FnBooleanIterator>
             <flwor::FLWORIterator>
-              <ForVariable name="$$dot">
+              <ForVariable name="$$context-item">
                 <LetVarIterator varname="w"/>
               </ForVariable>
               <WhereClause>
@@ -104,7 +104,7 @@
                     <PromoteIterator type="xs:anyAtomicType">
                       <FnDataIterator>
                         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
-                          <ForVarIterator varname="$$dot"/>
+                          <ForVarIterator varname="$$context-item"/>
                         </ChildAxisIterator>
                       </FnDataIterator>
                     </PromoteIterator>
@@ -113,7 +113,7 @@
                 </FnBooleanIterator>
               </WhereClause>
               <ReturnClause>
-                <ForVarIterator varname="$$dot"/>
+                <ForVarIterator varname="$$context-item"/>
               </ReturnClause>
             </flwor::FLWORIterator>
           </FnBooleanIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/windowing/q4.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/windowing/q4.iter	2012-04-12 22:52:42 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/windowing/q4.iter	2012-09-26 13:28:22 +0000
@@ -3,7 +3,7 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="timesequence">
+  <CtxVarDeclareIterator varid="4" varname="timesequence">
     <FnDocIterator>
       <SingletonIterator value="xs:string(temp_events.xml)"/>
     </FnDocIterator>
@@ -15,7 +15,7 @@
           <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,event)" typename="*" nill allowed="0">
             <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,stream)" typename="*" nill allowed="0">
               <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
-                <CtxVarIterator varid="2" varname="timesequence" varkind="global"/>
+                <CtxVarIterator varid="4" varname="timesequence" varkind="global"/>
               </TreatIterator>
             </ChildAxisIterator>
           </ChildAxisIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/windowing/q9.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/windowing/q9.iter	2012-09-26 10:26:47 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/windowing/q9.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="seq">
+  <CtxVarDeclareIterator varid="4" varname="seq">
     <FnDocIterator>
       <SingletonIterator value="xs:string(person_events.xml)"/>
     </FnDocIterator>
@@ -18,7 +18,7 @@
                   <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,event)" typename="*" nill allowed="0">
                     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,stream)" typename="*" nill allowed="0">
                       <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="*">
-                        <CtxVarIterator varid="2" varname="seq" varkind="global"/>
+                        <CtxVarIterator varid="4" varname="seq" varkind="global"/>
                       </TreatIterator>
                     </ChildAxisIterator>
                   </ChildAxisIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q1.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q1.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q1.iter	2012-09-26 13:28:22 +0000
@@ -7,31 +7,31 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
-    <ForVariable name="$$dot">
+    <ForVariable name="$$context-item">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
           <FnDocIterator>
             <PromoteIterator type="xs:string">
               <FnDataIterator>
-                <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
               </FnDataIterator>
             </PromoteIterator>
           </FnDocIterator>
         </ChildAxisIterator>
       </ChildAxisIterator>
     </ForVariable>
-    <ForVariable name="$$dot">
+    <ForVariable name="$$context-item">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
-        <ForVarIterator varname="$$dot"/>
+        <ForVarIterator varname="$$context-item"/>
       </ChildAxisIterator>
     </ForVariable>
     <WhereClause>
       <CompareIterator>
         <FnDataIterator>
           <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,id)" typename="*" nill allowed="0">
-            <ForVarIterator varname="$$dot"/>
+            <ForVarIterator varname="$$context-item"/>
           </AttributeAxisIterator>
         </FnDataIterator>
         <SingletonIterator value="xs:string(person0)"/>
@@ -40,7 +40,7 @@
     <ReturnClause>
       <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,name)" typename="*" nill allowed="0">
-          <ForVarIterator varname="$$dot"/>
+          <ForVarIterator varname="$$context-item"/>
         </ChildAxisIterator>
       </ChildAxisIterator>
     </ReturnClause>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q10.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q10.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q10.iter	2012-09-26 13:28:22 +0000
@@ -1,12 +1,12 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <LetVariable name="auction" materialize="true">
       <FnDocIterator>
         <PromoteIterator type="xs:string">
           <FnDataIterator>
-            <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+            <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q11.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q11.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q11.iter	2012-09-26 13:28:22 +0000
@@ -5,13 +5,13 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <LetVariable name="auction" materialize="true">
       <FnDocIterator>
         <PromoteIterator type="xs:string">
           <FnDataIterator>
-            <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+            <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q12.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q12.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q12.iter	2012-09-26 13:28:22 +0000
@@ -5,13 +5,13 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <LetVariable name="auction" materialize="true">
       <FnDocIterator>
         <PromoteIterator type="xs:string">
           <FnDataIterator>
-            <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+            <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q13.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q13.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q13.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="i">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">
@@ -10,7 +10,7 @@
               <FnDocIterator>
                 <PromoteIterator type="xs:string">
                   <FnDataIterator>
-                    <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                    <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                   </FnDataIterator>
                 </PromoteIterator>
               </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q14.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q14.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q14.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="i">
       <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">
@@ -8,7 +8,7 @@
           <FnDocIterator>
             <PromoteIterator type="xs:string">
               <FnDataIterator>
-                <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
               </FnDataIterator>
             </PromoteIterator>
           </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q15.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q15.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q15.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="a">
       <ChildAxisIterator test kind="match_text_test" qname="*" typename="*" nill allowed="0">
@@ -19,7 +19,7 @@
                                 <FnDocIterator>
                                   <PromoteIterator type="xs:string">
                                     <FnDataIterator>
-                                      <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                                      <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                                     </FnDataIterator>
                                   </PromoteIterator>
                                 </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q16.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q16.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q16.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="a">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,closed_auction)" typename="*" nill allowed="0">
@@ -9,7 +9,7 @@
             <FnDocIterator>
               <PromoteIterator type="xs:string">
                 <FnDataIterator>
-                  <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                  <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
             </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q17.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q17.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q17.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="p">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
@@ -9,7 +9,7 @@
             <FnDocIterator>
               <PromoteIterator type="xs:string">
                 <FnDataIterator>
-                  <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                  <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
             </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q18.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q18.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q18.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="i">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">
@@ -9,7 +9,7 @@
             <FnDocIterator>
               <PromoteIterator type="xs:string">
                 <FnDataIterator>
-                  <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                  <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
             </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q19.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q19.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q19.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="b">
       <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,item)" typename="*" nill allowed="0">
@@ -9,7 +9,7 @@
             <FnDocIterator>
               <PromoteIterator type="xs:string">
                 <FnDataIterator>
-                  <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                  <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
             </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q2.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q2.iter	2012-09-20 13:49:19 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q2.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="b">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">
@@ -9,7 +9,7 @@
             <FnDocIterator>
               <PromoteIterator type="xs:string">
                 <FnDataIterator>
-                  <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                  <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
             </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q20.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q20.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q20.iter	2012-09-26 13:28:22 +0000
@@ -21,13 +21,13 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <LetVariable name="auction" materialize="true">
       <FnDocIterator>
         <PromoteIterator type="xs:string">
           <FnDataIterator>
-            <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+            <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </FnDocIterator>
@@ -41,7 +41,7 @@
             <EnclosedIterator attr_cont="false">
               <FnCountIterator>
                 <flwor::FLWORIterator>
-                  <ForVariable name="$$dot">
+                  <ForVariable name="$$context-item">
                     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
                       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
                         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
@@ -50,16 +50,16 @@
                       </ChildAxisIterator>
                     </ChildAxisIterator>
                   </ForVariable>
-                  <ForVariable name="$$dot">
+                  <ForVariable name="$$context-item">
                     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
-                      <ForVarIterator varname="$$dot"/>
+                      <ForVarIterator varname="$$context-item"/>
                     </ChildAxisIterator>
                   </ForVariable>
                   <WhereClause>
                     <CompareIterator>
                       <FnDataIterator>
                         <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
-                          <ForVarIterator varname="$$dot"/>
+                          <ForVarIterator varname="$$context-item"/>
                         </AttributeAxisIterator>
                       </FnDataIterator>
                       <SingletonIterator value="xs:integer(100000)"/>
@@ -77,7 +77,7 @@
             <EnclosedIterator attr_cont="false">
               <FnCountIterator>
                 <flwor::FLWORIterator>
-                  <ForVariable name="$$dot">
+                  <ForVariable name="$$context-item">
                     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
                       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
                         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
@@ -86,9 +86,9 @@
                       </ChildAxisIterator>
                     </ChildAxisIterator>
                   </ForVariable>
-                  <ForVariable name="$$dot">
+                  <ForVariable name="$$context-item">
                     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
-                      <ForVarIterator varname="$$dot"/>
+                      <ForVarIterator varname="$$context-item"/>
                     </ChildAxisIterator>
                   </ForVariable>
                   <WhereClause>
@@ -96,7 +96,7 @@
                       <CompareIterator>
                         <FnDataIterator>
                           <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
-                            <ForVarIterator varname="$$dot"/>
+                            <ForVarIterator varname="$$context-item"/>
                           </AttributeAxisIterator>
                         </FnDataIterator>
                         <SingletonIterator value="xs:integer(100000)"/>
@@ -104,7 +104,7 @@
                       <CompareIterator>
                         <FnDataIterator>
                           <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
-                            <ForVarIterator varname="$$dot"/>
+                            <ForVarIterator varname="$$context-item"/>
                           </AttributeAxisIterator>
                         </FnDataIterator>
                         <SingletonIterator value="xs:integer(30000)"/>
@@ -123,7 +123,7 @@
             <EnclosedIterator attr_cont="false">
               <FnCountIterator>
                 <flwor::FLWORIterator>
-                  <ForVariable name="$$dot">
+                  <ForVariable name="$$context-item">
                     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
                       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,people)" typename="*" nill allowed="0">
                         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
@@ -132,16 +132,16 @@
                       </ChildAxisIterator>
                     </ChildAxisIterator>
                   </ForVariable>
-                  <ForVariable name="$$dot">
+                  <ForVariable name="$$context-item">
                     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,profile)" typename="*" nill allowed="0">
-                      <ForVarIterator varname="$$dot"/>
+                      <ForVarIterator varname="$$context-item"/>
                     </ChildAxisIterator>
                   </ForVariable>
                   <WhereClause>
                     <CompareIterator>
                       <FnDataIterator>
                         <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,income)" typename="*" nill allowed="0">
-                          <ForVarIterator varname="$$dot"/>
+                          <ForVarIterator varname="$$context-item"/>
                         </AttributeAxisIterator>
                       </FnDataIterator>
                       <SingletonIterator value="xs:integer(30000)"/>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q3.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q3.iter	2012-09-20 13:49:19 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q3.iter	2012-09-26 13:28:22 +0000
@@ -5,7 +5,7 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="b">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">
@@ -14,7 +14,7 @@
             <FnDocIterator>
               <PromoteIterator type="xs:string">
                 <FnDataIterator>
-                  <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                  <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
             </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q4.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q4.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q4.iter	2012-09-26 13:28:22 +0000
@@ -14,7 +14,7 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="b">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,open_auction)" typename="*" nill allowed="0">
@@ -23,7 +23,7 @@
             <FnDocIterator>
               <PromoteIterator type="xs:string">
                 <FnDataIterator>
-                  <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                  <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
             </FnDocIterator>
@@ -34,28 +34,28 @@
     <LetVariable name="$$opt_temp_0" materialize="true">
       <HoistIterator>
         <flwor::FLWORIterator>
-          <ForVariable name="$$dot">
+          <ForVariable name="$$context-item">
             <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0">
               <ForVarIterator varname="b"/>
             </ChildAxisIterator>
           </ForVariable>
-          <ForVariable name="$$dot">
+          <ForVariable name="$$context-item">
             <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,personref)" typename="*" nill allowed="0">
-              <ForVarIterator varname="$$dot"/>
+              <ForVarIterator varname="$$context-item"/>
             </ChildAxisIterator>
           </ForVariable>
           <WhereClause>
             <CompareIterator>
               <FnDataIterator>
                 <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
-                  <ForVarIterator varname="$$dot"/>
+                  <ForVarIterator varname="$$context-item"/>
                 </AttributeAxisIterator>
               </FnDataIterator>
               <SingletonIterator value="xs:string(person51)"/>
             </CompareIterator>
           </WhereClause>
           <ReturnClause>
-            <ForVarIterator varname="$$dot"/>
+            <ForVarIterator varname="$$context-item"/>
           </ReturnClause>
         </flwor::FLWORIterator>
       </HoistIterator>
@@ -65,28 +65,28 @@
         <flwor::FLWORIterator>
           <ForVariable name="pr1">
             <flwor::FLWORIterator>
-              <ForVariable name="$$dot">
+              <ForVariable name="$$context-item">
                 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bidder)" typename="*" nill allowed="0">
                   <ForVarIterator varname="b"/>
                 </ChildAxisIterator>
               </ForVariable>
-              <ForVariable name="$$dot">
+              <ForVariable name="$$context-item">
                 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,personref)" typename="*" nill allowed="0">
-                  <ForVarIterator varname="$$dot"/>
+                  <ForVarIterator varname="$$context-item"/>
                 </ChildAxisIterator>
               </ForVariable>
               <WhereClause>
                 <CompareIterator>
                   <FnDataIterator>
                     <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,person)" typename="*" nill allowed="0">
-                      <ForVarIterator varname="$$dot"/>
+                      <ForVarIterator varname="$$context-item"/>
                     </AttributeAxisIterator>
                   </FnDataIterator>
                   <SingletonIterator value="xs:string(person20)"/>
                 </CompareIterator>
               </WhereClause>
               <ReturnClause>
-                <ForVarIterator varname="$$dot"/>
+                <ForVarIterator varname="$$context-item"/>
               </ReturnClause>
             </flwor::FLWORIterator>
           </ForVariable>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q5.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q5.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q5.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <FnCountIterator>
     <flwor::FLWORIterator>
       <ForVariable name="i">
@@ -10,7 +10,7 @@
               <FnDocIterator>
                 <PromoteIterator type="xs:string">
                   <FnDataIterator>
-                    <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                    <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                   </FnDataIterator>
                 </PromoteIterator>
               </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q6.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q6.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q6.iter	2012-09-26 13:28:22 +0000
@@ -1,6 +1,6 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="b">
       <NodeSortIterator distinct="false" ascending="true">
@@ -9,7 +9,7 @@
             <FnDocIterator>
               <PromoteIterator type="xs:string">
                 <FnDataIterator>
-                  <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+                  <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
                 </FnDataIterator>
               </PromoteIterator>
             </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q7.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q7.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q7.iter	2012-09-26 13:28:22 +0000
@@ -1,13 +1,13 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <ForVariable name="p">
       <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,site)" typename="*" nill allowed="0">
         <FnDocIterator>
           <PromoteIterator type="xs:string">
             <FnDataIterator>
-              <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+              <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
             </FnDataIterator>
           </PromoteIterator>
         </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q8.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q8.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q8.iter	2012-09-26 13:28:22 +0000
@@ -1,12 +1,12 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <LetVariable name="auction" materialize="true">
       <FnDocIterator>
         <PromoteIterator type="xs:string">
           <FnDataIterator>
-            <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+            <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q9.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q9.iter	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xmark/q9.iter	2012-09-26 13:28:22 +0000
@@ -1,12 +1,12 @@
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="input-context"/>
+  <CtxVarDeclareIterator varid="4" varname="input-context"/>
   <flwor::FLWORIterator>
     <LetVariable name="auction" materialize="true">
       <FnDocIterator>
         <PromoteIterator type="xs:string">
           <FnDataIterator>
-            <CtxVarIterator varid="2" varname="input-context" varkind="global"/>
+            <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
           </FnDataIterator>
         </PromoteIterator>
       </FnDocIterator>

=== modified file 'test/rbkt/ExpCompilerResults/IterPlan/zorba/xray/ppm_10.iter'
--- test/rbkt/ExpCompilerResults/IterPlan/zorba/xray/ppm_10.iter	2012-09-20 13:49:19 +0000
+++ test/rbkt/ExpCompilerResults/IterPlan/zorba/xray/ppm_10.iter	2012-09-26 13:28:22 +0000
@@ -149,13 +149,13 @@
 
 Iterator tree for main query:
 <SequentialIterator>
-  <CtxVarDeclareIterator varid="2" varname="width">
-    <SingletonIterator value="xs:integer(10)"/>
-  </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="3" varname="height">
-    <SingletonIterator value="xs:integer(10)"/>
-  </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="4" varname="scene">
+  <CtxVarDeclareIterator varid="4" varname="width">
+    <SingletonIterator value="xs:integer(10)"/>
+  </CtxVarDeclareIterator>
+  <CtxVarDeclareIterator varid="5" varname="height">
+    <SingletonIterator value="xs:integer(10)"/>
+  </CtxVarDeclareIterator>
+  <CtxVarDeclareIterator varid="6" varname="scene">
     <UDFunctionCallIterator>
       <TreatIterator quant="">
         <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,scene)" typename="*" nill allowed="0">
@@ -173,10 +173,10 @@
         <StringJoinIterator>
           <FnConcatIterator>
             <FnStringIterator>
-              <CtxVarIterator varid="2" varname="width" varkind="global"/>
+              <CtxVarIterator varid="4" varname="width" varkind="global"/>
             </FnStringIterator>
             <FnStringIterator>
-              <CtxVarIterator varid="3" varname="height" varkind="global"/>
+              <CtxVarIterator varid="5" varname="height" varkind="global"/>
             </FnStringIterator>
           </FnConcatIterator>
           <SingletonIterator value="xs:string( )"/>
@@ -186,7 +186,7 @@
           <LetVariable name="$$opt_temp_1" materialize="true">
             <HoistIterator>
               <TreatIterator type="[NodeXQType elementNode content=[XQType ANY_TYPE_KIND*]]" quant="">
-                <CtxVarIterator varid="4" varname="scene" varkind="global"/>
+                <CtxVarIterator varid="6" varname="scene" varkind="global"/>
               </TreatIterator>
             </HoistIterator>
           </LetVariable>
@@ -194,20 +194,20 @@
             <HoistIterator>
               <OpToIterator>
                 <SingletonIterator value="xs:integer(1)"/>
-                <CtxVarIterator varid="2" varname="width" varkind="global"/>
+                <CtxVarIterator varid="4" varname="width" varkind="global"/>
               </OpToIterator>
             </HoistIterator>
           </LetVariable>
           <ForVariable name="aspect-ratio">
             <SpecificNumArithIterator_DivideOperation_DECIMAL>
-              <CtxVarIterator varid="2" varname="width" varkind="global"/>
-              <CtxVarIterator varid="3" varname="height" varkind="global"/>
+              <CtxVarIterator varid="4" varname="width" varkind="global"/>
+              <CtxVarIterator varid="5" varname="height" varkind="global"/>
             </SpecificNumArithIterator_DivideOperation_DECIMAL>
           </ForVariable>
           <ForVariable name="y">
             <OpToIterator>
               <SingletonIterator value="xs:integer(1)"/>
-              <CtxVarIterator varid="3" varname="height" varkind="global"/>
+              <CtxVarIterator varid="5" varname="height" varkind="global"/>
             </OpToIterator>
           </ForVariable>
           <ForVariable name="y-recentered">
@@ -216,7 +216,7 @@
                 <OpNumericUnaryIterator>
                   <ForVarIterator varname="y"/>
                 </OpNumericUnaryIterator>
-                <CtxVarIterator varid="3" varname="height" varkind="global"/>
+                <CtxVarIterator varid="5" varname="height" varkind="global"/>
               </SpecificNumArithIterator_DivideOperation_DECIMAL>
               <SingletonIterator value="xs:decimal(0.5)"/>
             </SpecificNumArithIterator_AddOperation_DECIMAL>
@@ -246,7 +246,7 @@
                         <SpecificNumArithIterator_SubtractOperation_DECIMAL>
                           <SpecificNumArithIterator_DivideOperation_DECIMAL>
                             <ForVarIterator varname="x"/>
-                            <CtxVarIterator varid="2" varname="width" varkind="global"/>
+                            <CtxVarIterator varid="4" varname="width" varkind="global"/>
                           </SpecificNumArithIterator_DivideOperation_DECIMAL>
                           <SingletonIterator value="xs:decimal(0.5)"/>
                         </SpecificNumArithIterator_SubtractOperation_DECIMAL>
@@ -947,26 +947,26 @@
         <flwor::FLWORIterator>
           <ForVariable name="shape">
             <flwor::FLWORIterator>
-              <ForVariable name="$$dot">
+              <ForVariable name="$$context-item">
                 <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,shapes)" typename="*" nill allowed="0">
                   <ForVarIterator varname="scene"/>
                 </ChildAxisIterator>
               </ForVariable>
-              <ForVariable name="$$dot">
+              <ForVariable name="$$context-item">
                 <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
-                  <ForVarIterator varname="$$dot"/>
+                  <ForVarIterator varname="$$context-item"/>
                 </ChildAxisIterator>
               </ForVariable>
               <WhereClause>
                 <FnBooleanIterator>
                   <IsSameNodeIterator>
-                    <ForVarIterator varname="$$dot"/>
+                    <ForVarIterator varname="$$context-item"/>
                     <LetVarIterator varname="ignore"/>
                   </IsSameNodeIterator>
                 </FnBooleanIterator>
               </WhereClause>
               <ReturnClause>
-                <ForVarIterator varname="$$dot"/>
+                <ForVarIterator varname="$$context-item"/>
               </ReturnClause>
             </flwor::FLWORIterator>
           </ForVariable>
@@ -1398,7 +1398,7 @@
   </WhereClause>
   <ReturnClause>
     <flwor::FLWORIterator>
-      <ForVariable name="$$dot">
+      <ForVariable name="$$context-item">
         <SpecificNumArithIterator_SubtractOperation_DOUBLE>
           <CastIterator type="xs:double">
             <FnDataIterator>
@@ -1431,12 +1431,12 @@
       </ForVariable>
       <WhereClause>
         <TypedValueCompareIterator_DOUBLE>
-          <ForVarIterator varname="$$dot"/>
+          <ForVarIterator varname="$$context-item"/>
           <SingletonIterator value="xs:double(0)"/>
         </TypedValueCompareIterator_DOUBLE>
       </WhereClause>
       <ReturnClause>
-        <ForVarIterator varname="$$dot"/>
+        <ForVarIterator varname="$$context-item"/>
       </ReturnClause>
     </flwor::FLWORIterator>
   </ReturnClause>
@@ -1577,7 +1577,7 @@
       <ReturnClause>
         <SequencePointAccessIterator>
           <flwor::FLWORIterator>
-            <ForVariable name="$$dot">
+            <ForVariable name="$$context-item">
               <FnConcatIterator>
                 <SpecificNumArithIterator_SubtractOperation_DOUBLE>
                   <OpDoubleUnaryIterator>
@@ -1595,12 +1595,12 @@
             </ForVariable>
             <WhereClause>
               <TypedValueCompareIterator_DOUBLE>
-                <ForVarIterator varname="$$dot"/>
+                <ForVarIterator varname="$$context-item"/>
                 <SingletonIterator value="xs:double(0)"/>
               </TypedValueCompareIterator_DOUBLE>
             </WhereClause>
             <ReturnClause>
-              <ForVarIterator varname="$$dot"/>
+              <ForVarIterator varname="$$context-item"/>
             </ReturnClause>
           </flwor::FLWORIterator>
           <SingletonIterator value="xs:integer(1)"/>
@@ -2158,20 +2158,20 @@
   <ForVariable name="ignore">
     <LetVarIterator varname="ignore"/>
   </ForVariable>
-  <ForVariable name="$$dot">
+  <ForVariable name="$$context-item">
     <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,shapes)" typename="*" nill allowed="0">
       <LetVarIterator varname="scene"/>
     </ChildAxisIterator>
   </ForVariable>
-  <ForVariable name="$$dot">
+  <ForVariable name="$$context-item">
     <ChildAxisIterator test kind="match_name_test" qname="*" typename="*" nill allowed="0">
-      <ForVarIterator varname="$$dot"/>
+      <ForVarIterator varname="$$context-item"/>
     </ChildAxisIterator>
   </ForVariable>
   <WhereClause>
     <FnBooleanIterator>
       <IsSameNodeIterator>
-        <ForVarIterator varname="$$dot"/>
+        <ForVarIterator varname="$$context-item"/>
         <ForVarIterator varname="ignore"/>
       </IsSameNodeIterator>
     </FnBooleanIterator>
@@ -2180,7 +2180,7 @@
     <UDFunctionCallIterator>
       <LetVarIterator varname="source"/>
       <LetVarIterator varname="direction"/>
-      <ForVarIterator varname="$$dot"/>
+      <ForVarIterator varname="$$context-item"/>
     </UDFunctionCallIterator>
   </ReturnClause>
 </flwor::FLWORIterator>

=== modified file 'test/rbkt/ExpQueryResults/zorba/introspection/introsp-vars-1.xml.res'
--- test/rbkt/ExpQueryResults/zorba/introspection/introsp-vars-1.xml.res	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpQueryResults/zorba/introspection/introsp-vars-1.xml.res	2012-09-26 13:28:22 +0000
@@ -1,2 +1,1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-$$dot
\ No newline at end of file
+$$context-item $$context-position $$context-size

=== modified file 'test/rbkt/ExpQueryResults/zorba/introspection/introsp-vars-3.xml.res'
--- test/rbkt/ExpQueryResults/zorba/introspection/introsp-vars-3.xml.res	2012-09-17 00:36:37 +0000
+++ test/rbkt/ExpQueryResults/zorba/introspection/introsp-vars-3.xml.res	2012-09-26 13:28:22 +0000
@@ -1,2 +1,1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-2
\ No newline at end of file
+4

=== modified file 'test/rbkt/Queries/zorba/introspection/introsp-vars-1.xq'
--- test/rbkt/Queries/zorba/introspection/introsp-vars-1.xq	2012-09-17 00:36:37 +0000
+++ test/rbkt/Queries/zorba/introspection/introsp-vars-1.xq	2012-09-26 13:28:22 +0000
@@ -1,3 +1,5 @@
 import module namespace sctx = "http://www.zorba-xquery.com/modules/introspection/sctx"; 
 
-sctx:in-scope-variables()
\ No newline at end of file
+for $var in sctx:in-scope-variables()
+order by xs:string($var)
+return $var

=== modified file 'test/unit/cxx_api_changes.cpp'
--- test/unit/cxx_api_changes.cpp	2012-09-18 21:23:14 +0000
+++ test/unit/cxx_api_changes.cpp	2012-09-26 13:28:22 +0000
@@ -113,7 +113,10 @@
     varsIte->close();
 
     if (lVars.size() != 2)
+    {
+      std::cout << "Expected 2 variables but got " << lVars.size() << std::endl;
       return false;
+    }
 
     std::vector<Item>::iterator lIte = lVars.begin();
     std::vector<Item>::iterator lEnd = lVars.end();