Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

[Paul J. Lucas]

Better iterator tree printing: it's either pure JSON or pure XML.

Better iterator tree printing: it's either pure JSON or pure XML.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207355

Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207355 :
Votes: {'Approve': 1}

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207355

Stage "CommitZorba" failed.

Check console output at http://jenkins.zorba.io:8180/job/CommitZorba/295/console to view the results.

[Matthias Brantner (matthias-brantner)]

It's actually not pure JSON or pure XML.

JSON doesn't support a sequence of objects. This would need to become an array.
Same for XML, where we would need introduce an artificial root element.

review: Needs Fixing

[Paul J. Lucas (paul-lucas)]

> JSON doesn't support a sequence of objects. This would need to become an
> array.
> Same for XML, where we would need introduce an artificial root element.

The problem with that is that the local code has no way to know whether it's the last time it will ever be called to emit either a closing XML element or a ']' for JSON. Any ideas?

[lp:~paul-lucas/zorba/pjl-misc]

11451. By Paul J. Lucas on 2014-02-21

Now really XML and JSON.

[Paul J. Lucas (paul-lucas)]

Added a work-around. See if you like it.

[lp:~paul-lucas/zorba/pjl-misc]

11452. By Paul J. Lucas on 2014-02-21

Handling description properly.

11453. By Paul J. Lucas on 2014-02-21

Added --debug-stream argument.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207355

Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207355

Stage "TestZorbaUbuntu" failed.
4 tests failed (8754 total tests run).

Check test results at http://jenkins.zorba.io:8180/job/TestZorbaUbuntu/467/testReport/ to view the results.

[lp:~paul-lucas/zorba/pjl-misc]

11454. By Paul J. Lucas on 2014-02-24

Removed wrappers.

11455. By Paul J. Lucas on 2014-02-24

Updated test results.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207355

Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'bin/zorbacmd_args.cpp'
--- bin/zorbacmd_args.cpp	2014-02-19 04:27:02 +0000
+++ bin/zorbacmd_args.cpp	2014-02-24 20:09:23 +0000
@@ -114,6 +114,9 @@
     HELP_OPT( "--debug-file" )
       "Sets the file to write developer debugging information to.\n\n"
 
+    HELP_OPT( "--debug-stream <stream>" )
+      "Sets the stream to write developer debugging information to.\n\n"
+
 #ifdef ZORBA_WITH_DEBUGGER
     HELP_OPT( "--debug-host, -h" )
       "The host where the DBGP-enabled debugger client listens for connections. Defaults to: 127.0.0.1\n\n"
@@ -160,8 +163,8 @@
     HELP_OPT( "--inline-udf" )
       "Inline user-defined functions.\n\n"
 
-    HELP_OPT( "--iterator-tree <type>" )
-      "Print the iterator tree in in one of DOT, JSON, or XML\n\n"
+    HELP_OPT( "--iterator-tree <format>" )
+      "Print the iterator tree in in one of DOT, JSON, or XML formats.\n\n"
 
     ////////// j //////////////////////////////////////////////////////////////
 
@@ -466,6 +469,19 @@
       PARSE_ARG( "--debug-file" );
       z_props.setDebugFile( ARG_VAL );
     }
+    else if ( IS_LONG_OPT( "--debug-stream" ) ) {
+      PARSE_ARG( "--debug-stream" );
+      string val( ARG_VAL );
+      to_lower( val );
+      if ( val == "1" || val == "stdout" || val == "cout" )
+        z_props.setDebugStream( cout );
+      else if ( val == "2" || val == "stderr" || val == "cerr" )
+        z_props.setDebugStream( cerr );
+      else {
+        error = "--debug-stream argument must be one of: 1, stdout, cout, 2, stderr, or cerr.\n";
+        break;
+      }
+    }
 #ifdef ZORBA_WITH_DEBUGGER
     else if ( IS_OPT( "--debug-host", "-h" ) ) {
       PARSE_ARG( "--debug-host" );
 
=== modified file 'src/compiler/codegen/plan_visitor.cpp'
--- src/compiler/codegen/plan_visitor.cpp	2014-02-19 01:53:34 +0000
+++ src/compiler/codegen/plan_visitor.cpp	2014-02-24 20:09:23 +0000
@@ -27,6 +27,7 @@
 
 #include "diagnostics/assert.h"
 #include "util/hashmap32.h"
+#include "util/indent.h"
 #include "util/stl_util.h"
 #include "util/tracer.h"
 
@@ -3812,23 +3813,21 @@
   Zorba_plan_format_t const format = Properties::instance().getPlanFormat();
   if ( result && descr && format ) {
     std::ostream &os = Properties::instance().getDebugStream();
-    os << "Iterator tree for " << descr << ":\n";
     unique_ptr<IterPrinter> printer;
     switch ( format ) {
-      case PLAN_FORMAT_NONE:
-        return result;
       case PLAN_FORMAT_DOT:
-        printer.reset( new DOTIterPrinter( os ) );
+        printer.reset( new DOTIterPrinter( os, descr ) );
         break;
       case PLAN_FORMAT_JSON:
-        printer.reset( new JSONIterPrinter( os ) );
+        printer.reset( new JSONIterPrinter( os, descr ) );
         break;
       case PLAN_FORMAT_XML:
-        printer.reset( new XMLIterPrinter( os ) );
-        break;
-    }
+        printer.reset( new XMLIterPrinter( os, descr ) );
+        break;
+      default: // to silence warning
+        break;
+    } // switch
     print_iter_plan( *printer, result );
-    os << std::endl;
   }
 
   return result;
 
=== modified file 'src/runtime/visitors/iterprinter.cpp'
--- src/runtime/visitors/iterprinter.cpp	2014-02-18 19:52:39 +0000
+++ src/runtime/visitors/iterprinter.cpp	2014-02-24 20:09:23 +0000
@@ -22,6 +22,7 @@
 // Zorba
 #include "runtime/visitors/iterprinter.h"
 #include "util/ascii_util.h"
+#include "util/indent.h"
 #include "util/xml_util.h"
 
 using namespace std;
@@ -30,49 +31,65 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-XMLIterPrinter::XMLIterPrinter(ostream& aOStream) :
-  IterPrinter(aOStream),
-  theOpenStart(false)
-{
+IterPrinter::IterPrinter( ostream &os, char const *descr ) :
+  os_( os ), descr_( descr )
+{
+}
+
+IterPrinter::~IterPrinter() {
+  // out-of-line since it's virtual
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+XMLIterPrinter::XMLIterPrinter( ostream &os, char const *descr ) :
+  IterPrinter( os, descr ),
+  theOpenStart( false )
+{
+}
+
+XMLIterPrinter::~XMLIterPrinter() {
+  // out-of-line since it's virtual
 }
 
 void XMLIterPrinter::start() {
+  os_ << indent << "<iterator-tree";
+  if ( !descr_.empty() )
+    os_ << " description=\"" << descr_ << '"';
+  os_ << ">\n" << inc_indent;
 }
 
 void XMLIterPrinter::stop() {
+  os_ << dec_indent << indent << "</iterator-tree>\n";
 }
 
-void XMLIterPrinter::startBeginVisit(const string& aName, int) {
-  if (theOpenStart)
-    theOStream << ">\n";
-  printSpaces(2 * theNameStack.size());
-  theOStream << '<' << aName;
-  theNameStack.push(aName);
+void XMLIterPrinter::startBeginVisit( string const &name, int ) {
+  if ( theOpenStart )
+    os_ << ">\n";
+  os_ << indent << '<' << name << inc_indent;
+  theNameStack.push( name );
   theOpenStart = true;
 }
 
-void XMLIterPrinter::endBeginVisit(int) {
-}
-
-void XMLIterPrinter::addAttribute(const string& aName, const string& aValue) {
-  assert(theOpenStart);
-  theOStream << ' ' << aName << "=\"" << aValue << "\"";
-}
-
-void XMLIterPrinter::addAttribute(const string& aName, xs_long aValue) {
-  assert(theOpenStart);
-  theOStream << ' ' << aName << "=\"" << aValue << "\"";
+void XMLIterPrinter::endBeginVisit( int ) {
+}
+
+void XMLIterPrinter::addAttribute( string const &name, string const &value) {
+  assert( theOpenStart );
+  os_ << ' ' << name << "=\"" << value << "\"";
+}
+
+void XMLIterPrinter::addAttribute( string const &name, xs_long value) {
+  assert( theOpenStart );
+  os_ << ' ' << name << "=\"" << value << "\"";
 }
 
 void XMLIterPrinter::startEndVisit() {
-  assert(!theNameStack.empty());
-  if (theOpenStart)
-    theOStream << "/>" << endl;
+  assert( !theNameStack.empty() );
+  if ( theOpenStart )
+    os_ << "/>\n" << dec_indent;
   else
-  {
-    printSpaces(2 * (theNameStack.size() - 1));
-    theOStream << "</" << theNameStack.top() << '>' << endl;
-  }
+    os_ << dec_indent << indent << "</" << theNameStack.top() << ">\n";
   theNameStack.pop();
   theOpenStart = false;
 }
@@ -82,48 +99,44 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-DOTIterPrinter::DOTIterPrinter(ostream& aOStream) :
-  IterPrinter(aOStream),
-  theIndent(0)
+DOTIterPrinter::DOTIterPrinter( ostream &os, char const *descr ) :
+  IterPrinter( os, descr )
 {
 }
 
+DOTIterPrinter::~DOTIterPrinter() {
+  // out-of-line since it's virtual
+}
+
 void DOTIterPrinter::start() {
-  theOStream << "digraph {" << endl;
-  theOStream << "node [ color=gray, fontname=\"Arial\" ]" << endl;
+  os_ << indent << "digraph {\n" << inc_indent
+      << indent << "node [ color=gray, fontname=\"Arial\" ]\n";
 }
 
 void DOTIterPrinter::stop() {
-  theOStream << '}' << endl;
-}
-
-void DOTIterPrinter::startBeginVisit(const string& aName, int aAddr) {
-  printSpaces(theIndent);
-  theOStream << aAddr << " [ label=\"" << aName;
-  ++theIndent;
-}
-
-void DOTIterPrinter::endBeginVisit(int aAddr) {
-  --theIndent;
-  printSpaces(theIndent);
-  theOStream << "\"];" << endl;
-  printSpaces(theIndent);
-  if (!theNameStack.empty() && theNameStack.top() != aAddr)
-    theOStream << theNameStack.top() << "->" << aAddr << endl;
-  theNameStack.push(aAddr);
-}
-
-void DOTIterPrinter::addAttribute(const string& aName, const string& aValue) {
-  printSpaces(theIndent);
-  string mvalue( aValue );
-  ascii::replace_all(mvalue, "\"", "\\\"");
-  ascii::replace_all(mvalue, "\n", " \\n ");
-  theOStream << "\\n" << aName << '=' << mvalue;
-}
-
-void DOTIterPrinter::addAttribute(const string& aName, xs_long aValue) {
-  printSpaces(theIndent);
-  theOStream << "\\n" << aName << '=' << aValue;
+  os_ << dec_indent << indent << "}\n";
+}
+
+void DOTIterPrinter::startBeginVisit( string const &name, int addr ) {
+  os_ << indent << addr << " [ label=\"" << name;
+}
+
+void DOTIterPrinter::endBeginVisit( int addr ) {
+  os_ << "\" ];\n";
+  if ( !theNameStack.empty() && theNameStack.top() != addr )
+    os_ << indent << theNameStack.top() << " -> " << addr << '\n';
+  theNameStack.push( addr );
+}
+
+void DOTIterPrinter::addAttribute( string const &name, string const &value) {
+  string temp( value );
+  ascii::replace_all( temp, "\"", "\\\"" );
+  ascii::replace_all( temp, "\n", " \\n " );
+  os_ << "\\n" << name << '=' << temp;
+}
+
+void DOTIterPrinter::addAttribute( string const &name, xs_long value) {
+  os_ << indent << "\\n" << name << '=' << value;
 }
 
 void DOTIterPrinter::startEndVisit() {
@@ -135,68 +148,54 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-JSONIterPrinter::JSONIterPrinter(ostream& aOStream) :
-  IterPrinter(aOStream), theIndent(0)
+JSONIterPrinter::JSONIterPrinter( ostream &os, char const *descr ) :
+  IterPrinter( os, descr )
 {
 }
 
+JSONIterPrinter::~JSONIterPrinter() {
+  // out-of-line since it's virtual
+}
+
 void JSONIterPrinter::start() {
+  os_ << indent << "{\n" << inc_indent;
+  if ( !descr_.empty() )
+    os_ << indent << "\"description\": \"" << descr_ << "\",\n";
+  os_ << indent << "\"iterator-tree\":\n" << inc_indent;
 }
 
 void JSONIterPrinter::stop() {
-  theOStream << endl;
+  os_ << '\n' << dec_indent << dec_indent << indent << "}\n";
 }
 
-void JSONIterPrinter::startBeginVisit(const string& aName, int) {
-  if (!theListStack.empty())
-    theOStream << ',' << endl;
-
-  if (!theListStack.empty() && !theListStack.top()) {
-    printSpaces(2 * theIndent);
-    theOStream << "\"iterators\":" << endl;
-    printSpaces(2 * theIndent);
-    theOStream << '[';
+void JSONIterPrinter::startBeginVisit( string const &name, int ) {
+  if ( !theListStack.empty() )
+    os_ << ",\n";
+  if ( !theListStack.empty() && !theListStack.top() ) {
+    os_ << indent << "\"iterators\": [\n" << inc_indent;
     theListStack.pop();
-    theListStack.push(true);
-    theIndent++;
-    theOStream << endl;
+    theListStack.push( true );
   }
-
-  printSpaces(2 * theIndent);
-  theOStream << "{" << endl;
-  printSpaces(2 * (1+theIndent));
-  theOStream << "\"kind\": \"" << aName << "\"";
-  theIndent++;
-  theListStack.push(false);
-}
-
-void JSONIterPrinter::endBeginVisit(int) {
-}
-
-void JSONIterPrinter::addAttribute(const string& aName, const string& aValue) {
-  theOStream << ',' << endl;
-  printSpaces(2 * theIndent);
-  theOStream << "\"" << aName << "\": \"" << aValue << "\"";
-}
-
-void JSONIterPrinter::addAttribute(const string& aName, xs_long aValue) {
-  theOStream << ',' << endl;
-  printSpaces(2 * theIndent);
-  theOStream << "\"" << aName << "\": " << aValue;
+  os_ << indent << "{\n" << inc_indent
+      << indent << "\"kind\": \"" << name << "\"";
+  theListStack.push( false );
+}
+
+void JSONIterPrinter::endBeginVisit( int ) {
+}
+
+void JSONIterPrinter::addAttribute( string const &name, string const &value ) {
+  os_ << ",\n" << indent << "\"" << name << "\": \"" << value << "\"";
+}
+
+void JSONIterPrinter::addAttribute( string const &name, xs_long value ) {
+  os_ << ",\n" << indent << "\"" << name << "\": " << value;
 }
 
 void JSONIterPrinter::startEndVisit() {
-  if (theListStack.top()) {
-    theOStream << endl;
-    printSpaces(2 * (theIndent - 1));
-    theOStream << ']';
-    theIndent--;
-  }
-
-  theOStream << endl;
-  printSpaces(2 * (theIndent - 1));
-  theOStream << '}';
-  theIndent--;
+  if ( theListStack.top() )
+    os_ << '\n' << dec_indent << indent << ']';
+  os_ << '\n' << dec_indent << indent << '}';
   theListStack.pop();
 }
 
 
=== modified file 'src/runtime/visitors/iterprinter.h'
--- src/runtime/visitors/iterprinter.h	2014-02-18 19:52:39 +0000
+++ src/runtime/visitors/iterprinter.h	2014-02-24 20:09:23 +0000
@@ -17,152 +17,117 @@
 #ifndef ZORBA_VISITORPRINTER_H
 #define ZORBA_VISITORPRINTER_H
 
-#include <string>
+// standard
 #include <ostream>
 #include <stack>
+#include <string>
 
+// Zorba
 #include "common/common.h"
 #include "zorbatypes/schema_types.h"
 
-
-namespace yy 
-{
-  class location;
-}
-
 namespace zorba {
 
-/**
- * Interface to print the PlanIterators.
- */
-class IterPrinter 
-{
+///////////////////////////////////////////////////////////////////////////////
+
+class IterPrinter {
 public:
-  IterPrinter(std::ostream& aOStream) : theOStream(aOStream) {}
-
-  virtual ~IterPrinter() {}
+  IterPrinter( std::ostream &os, char const *descr = "" );
+  virtual ~IterPrinter();
 
   virtual void start() = 0;
   virtual void stop() = 0;
 
-  virtual void startBeginVisit(const std::string& aName, int aAddr) = 0;
-  virtual void endBeginVisit(int aAddr) = 0;
-
-  virtual void addAttribute(const std::string& aName, const std::string& aValue) = 0;
-
-  virtual void addAttribute(const std::string& aName, xs_long aValue) = 0;
+  virtual void startBeginVisit( std::string const &name, int addr ) = 0;
+  virtual void endBeginVisit( int addr ) = 0;
+
+  virtual void addAttribute( std::string const &name, std::string const &value ) = 0;
+
+  virtual void addAttribute( std::string const &name, xs_long value ) = 0;
 
   virtual void startEndVisit() = 0;
-
   virtual void endEndVisit() = 0;
 
 protected:  
-  std::ostream& theOStream;
-  void printSpaces(size_t aNr) { theOStream << std::string(aNr, ' '); }
-}; /* class VisitorPrinter */
-
-  
-/**
- * Implementation of IterPrinter to print a PlanIterator tree in XML format
- */
-class XMLIterPrinter : public IterPrinter 
-{
+  zstring descr_;
+  std::ostream &os_;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+class XMLIterPrinter : public IterPrinter {
+public:
+  XMLIterPrinter( std::ostream&, char const* = "" );
+  ~XMLIterPrinter();
+
+  void start();
+  void stop();
+
+  void startBeginVisit( std::string const &name, int addr );
+  void endBeginVisit( int addr );
+
+  void addAttribute( std::string const &name, std::string const &value );
+  void addAttribute( std::string const &name, xs_long value );
+
+  void startEndVisit();
+  void endEndVisit();
+
 private:
+  std::stack<std::string> theNameStack;
   bool theOpenStart;
-  std::stack<std::string> theNameStack;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+class DOTIterPrinter : public IterPrinter {
+public:
+  DOTIterPrinter( std::ostream&, char const* = "" );
+  ~DOTIterPrinter();
       
-public:
-  XMLIterPrinter(std::ostream& aOStream);
-
-  virtual ~XMLIterPrinter(){}
-
-  virtual void start();
-
-  virtual void stop();
-
-  virtual void startBeginVisit(const std::string& aName, int aAddr);
-
-  virtual void endBeginVisit(int aAddr);
-
-  virtual void addAttribute(const std::string& aName, const std::string& aValue);
-
-  virtual void addAttribute(const std::string& aName, xs_long aValue);
-
-  virtual void startEndVisit();
-
-  virtual void endEndVisit();
-}; /* class XMLVisitorPrinter */
-
-
-/**
- * Implementation of IterPrinter to print a PlanIterator tree in DOT format
- */
-class DOTIterPrinter : public IterPrinter 
-{
+  void start();
+  void stop();
+
+  void startBeginVisit( std::string const &name, int addr );
+  void endBeginVisit( int addr );
+
+  void addAttribute( std::string const &name, std::string const &value );
+  void addAttribute( std::string const &name, xs_long value );
+
+  void startEndVisit();
+  void endEndVisit();
+
 private:
   std::stack<int> theNameStack;
-  uint32_t        theIndent;
-      
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+class JSONIterPrinter : public IterPrinter {
 public:
-  DOTIterPrinter(std::ostream& aOStream);
-
-  virtual ~DOTIterPrinter(){}
-      
-  virtual void start();
-
-  virtual void stop();
-
-  virtual void startBeginVisit(const std::string& aName, int aAddr);
-
-  virtual void endBeginVisit(int aAddr);
-
-  virtual void addAttribute(const std::string& aName, const std::string& aValue);
-
-  virtual void addAttribute(const std::string& aName, xs_long aValue);
-
-  virtual void startEndVisit();
-
-  virtual void endEndVisit();
-  
-}; /* class DOTVisitorPrinter */
-
-/**
- * Implementation of IterPrinter to print a PlanIterator tree in JSON format
- */
-class JSONIterPrinter : public IterPrinter
-{
+  JSONIterPrinter( std::ostream&, char const* = "" );
+  ~JSONIterPrinter();
+
+  void start();
+  void stop();
+
+  void startBeginVisit( std::string const &name, int addr );
+  void endBeginVisit( int addr );
+
+  void addAttribute( std::string const &name, std::string const &value );
+  void addAttribute( std::string const &name, xs_long value );
+
+  void startEndVisit();
+  void endEndVisit();
+
 private:
-  uint32_t        theIndent;
   std::stack<bool> theListStack;
-
-public:
-  JSONIterPrinter(std::ostream& aOStream);
-
-  virtual ~JSONIterPrinter(){}
-
-  virtual void start();
-
-  virtual void stop();
-
-  virtual void startBeginVisit(const std::string& aName, int aAddr);
-
-  virtual void endBeginVisit(int aAddr);
-
-  virtual void addAttribute(const std::string& aName, const std::string& aValue);
-
-  virtual void addAttribute(const std::string& aName, xs_long aValue);
-
-  virtual void startEndVisit();
-
-  virtual void endEndVisit();
-}; /* class JSONVisitorPrinter */
-
-
-
-} /* namespace zorba */
-
-#endif
-
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+} // namespace zorba
+
+#endif /* ZORBA_VISITORPRINTER_H */
 /*
  * Local variables:
  * mode: c++
 
=== modified file 'src/runtime/visitors/printer_visitor_api.cpp'
--- src/runtime/visitors/printer_visitor_api.cpp	2013-02-07 17:24:36 +0000
+++ src/runtime/visitors/printer_visitor_api.cpp	2014-02-24 20:09:23 +0000
@@ -16,19 +16,19 @@
 #include "stdafx.h"
 
 #include "runtime/visitors/printer_visitor_api.h"
-
 #include "runtime/visitors/printer_visitor.h"
 
-namespace zorba 
-{
-
-void print_iter_plan(IterPrinter& aPrinter, PlanIterator* aIter)
-{
-  PrinterVisitor v(aPrinter, aIter);
+namespace zorba {
+
+///////////////////////////////////////////////////////////////////////////////
+
+void print_iter_plan( IterPrinter &p, PlanIterator *pi ) {
+  PrinterVisitor v( p, pi );
   v.print();
 }
 
+///////////////////////////////////////////////////////////////////////////////
 
-} /* namespace zorba */
+} // namespace zorba
 
 /* vim:set et sw=2 ts=2: */
 
=== modified file 'src/runtime/visitors/printer_visitor_impl.cpp'
--- src/runtime/visitors/printer_visitor_impl.cpp	2014-02-19 01:28:17 +0000
+++ src/runtime/visitors/printer_visitor_impl.cpp	2014-02-24 20:09:23 +0000
@@ -74,7 +74,7 @@
 
 void PrinterVisitor::print() {
   thePrinter.start();
-  theIterator->accept(*this);
+  theIterator->accept( *this );
   thePrinter.stop();
 }
 
 
=== modified file 'test/iterplans/apitest_args.cpp'
--- test/iterplans/apitest_args.cpp	2014-02-19 00:43:31 +0000
+++ test/iterplans/apitest_args.cpp	2014-02-24 20:09:23 +0000
@@ -53,14 +53,24 @@
 
     ////////// d //////////////////////////////////////////////////////////////
 
+#ifdef ZORBA_WITH_DEBUGGER
     HELP_OPT( "--debug, -d" )
       "Launch the Zorba debugger server and connect to a DBGP-enabled debugger client.\n\n"
-
+#endif /* ZORBA_WITH_DEBUGGER */
+
+    HELP_OPT( "--debug-file" ) 
+      "Sets the file to write developer debugging information to.\n\n"
+
+    HELP_OPT( "--debug-stream <stream>" )
+      "Sets the stream to write developer debugging information to.\n\n"
+
+#ifdef ZORBA_WITH_DEBUGGER
     HELP_OPT( "--debug-host, -h" )
       "The host where the DBGP-enabled debugger client listens for connections. Defaults to: 127.0.0.1\n\n"
 
     HELP_OPT( "--debug-port, -p" )
       "The port on which the DBGP-enabled debugger client listens for connections. Defaults to: 28028\n\n"
+#endif /* ZORBA_WITH_DEBUGGER */
 
     ////////// e //////////////////////////////////////////////////////////////
 
@@ -301,6 +311,25 @@
       PARSE_ARG( "--debug-host" );
       at_props.debug_host_ = ARG_VAL;
     }
+#endif /* ZORBA_WITH_DEBUGGER */
+    else if ( IS_LONG_OPT( "--debug-file" ) ) {
+      PARSE_ARG( "--debug-file" );
+      z_props.setDebugFile( ARG_VAL );
+    }
+    else if ( IS_LONG_OPT( "--debug-stream" ) ) {
+      PARSE_ARG( "--debug-stream" );
+      string val( ARG_VAL );
+      to_lower( val );
+      if ( val == "1" || val == "stdout" || val == "cout" )
+        z_props.setDebugStream( cout );
+      else if ( val == "2" || val == "stderr" || val == "cerr" )
+        z_props.setDebugStream( cerr );
+      else {
+        error = "--debug-stream argument must be one of: 1, stdout, cout, 2, stderr, or cerr.\n";
+        break;
+      }
+    }
+#ifdef ZORBA_WITH_DEBUGGER
     else if ( IS_OPT( "--debug-port", "-p" ) ) {
       PARSE_ARG( "--debug-port" );
       SET_ATPROP( debug_port_ );
 
=== modified file 'test/iterplans/update_iter_plans'
--- test/iterplans/update_iter_plans	2013-07-11 06:54:25 +0000
+++ test/iterplans/update_iter_plans	2014-02-24 20:09:23 +0000
@@ -1,7 +1,17 @@
-#!/bin/bash
+#! /bin/bash
+
+# uncomment for dry run
+#ECHO=echo
+
 BUILDDIR=$1
 test -e "$BUILDDIR" || { echo "Arguments: BUILD_DIR"; exit 1; }
+
 D=$BUILDDIR/test/iterplans
-for f in `cd $D; find . -name *.iter`; do
- cp $D/$f `dirname $0`/iterplans/$f
+
+for src_file in `cd $D; find . -name *.spec`
+do
+  dst_file=${src_file%.spec}.iter
+  $ECHO cp $D/$src_file $dst_file
 done
+
+# vim:set et sw=2 ts=2:
 
=== modified file 'test/iterplans/zorba/collections/count_dynamic_zorba_collection.iter'
--- test/iterplans/zorba/collections/count_dynamic_zorba_collection.iter	2013-03-24 20:40:03 +0000
+++ test/iterplans/zorba/collections/count_dynamic_zorba_collection.iter	2014-02-24 20:09:23 +0000
@@ -1,19 +1,19 @@
-Iterator tree for main query:
-<SequentialIterator>
-  <CtxVarDeclareIterator varid="4" varname="coll">
-    <SingletonIterator value="xs:QName(,,collection)"/>
-  </CtxVarDeclareIterator>
+<iterator-tree description="main query">
   <SequentialIterator>
-    <ApplyIterator>
-      <ZorbaCreateCollectionIterator>
-        <CtxVarIterator varid="4" varname="coll" varkind="global"/>
-      </ZorbaCreateCollectionIterator>
-    </ApplyIterator>
-    <FnCountIterator>
-      <ZorbaCollectionIterator>
-        <CtxVarIterator varid="4" varname="coll" varkind="global"/>
-      </ZorbaCollectionIterator>
-    </FnCountIterator>
+    <CtxVarDeclareIterator varid="4" varname="coll">
+      <SingletonIterator value="xs:QName(,,collection)"/>
+    </CtxVarDeclareIterator>
+    <SequentialIterator>
+      <ApplyIterator>
+        <ZorbaCreateCollectionIterator>
+          <CtxVarIterator varid="4" varname="coll" varkind="global"/>
+        </ZorbaCreateCollectionIterator>
+      </ApplyIterator>
+      <FnCountIterator>
+        <ZorbaCollectionIterator>
+          <CtxVarIterator varid="4" varname="coll" varkind="global"/>
+        </ZorbaCollectionIterator>
+      </FnCountIterator>
+    </SequentialIterator>
   </SequentialIterator>
-</SequentialIterator>
-
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/collections/count_static_zorba_collection.iter'
--- test/iterplans/zorba/collections/count_static_zorba_collection.iter	2013-03-24 20:40:03 +0000
+++ test/iterplans/zorba/collections/count_static_zorba_collection.iter	2014-02-24 20:09:23 +0000
@@ -1,37 +1,37 @@
-Iterator tree for main query:
-<SequentialIterator>
-  <CtxVarDeclareIterator varid="4" varname="ns:collection_1">
-    <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,collection_1)"/>
-  </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="5" varname="ns:collection_2">
-    <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,collection_2)"/>
-  </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="6" varname="ns:http">
-    <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,http)"/>
-  </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="7" varname="ns:test1">
-    <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,test1)"/>
-  </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="8" varname="ns:test2">
-    <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,test2)"/>
-  </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="9" varname="ns:test3">
-    <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,test3)"/>
-  </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="10" varname="coll">
-    <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,test1)"/>
-  </CtxVarDeclareIterator>
+<iterator-tree description="main query">
   <SequentialIterator>
-    <ApplyIterator>
-      <ZorbaCreateCollectionIterator>
-        <CtxVarIterator varid="10" varname="coll" varkind="global"/>
-      </ZorbaCreateCollectionIterator>
-    </ApplyIterator>
-    <FnCountIterator>
-      <ZorbaCollectionIterator>
-        <CtxVarIterator varid="10" varname="coll" varkind="global"/>
-      </ZorbaCollectionIterator>
-    </FnCountIterator>
+    <CtxVarDeclareIterator varid="4" varname="ns:collection_1">
+      <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,collection_1)"/>
+    </CtxVarDeclareIterator>
+    <CtxVarDeclareIterator varid="5" varname="ns:collection_2">
+      <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,collection_2)"/>
+    </CtxVarDeclareIterator>
+    <CtxVarDeclareIterator varid="6" varname="ns:http">
+      <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,http)"/>
+    </CtxVarDeclareIterator>
+    <CtxVarDeclareIterator varid="7" varname="ns:test1">
+      <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,test1)"/>
+    </CtxVarDeclareIterator>
+    <CtxVarDeclareIterator varid="8" varname="ns:test2">
+      <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,test2)"/>
+    </CtxVarDeclareIterator>
+    <CtxVarDeclareIterator varid="9" varname="ns:test3">
+      <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,test3)"/>
+    </CtxVarDeclareIterator>
+    <CtxVarDeclareIterator varid="10" varname="coll">
+      <SingletonIterator value="xs:QName(http://example.org/datamodule/,ns,test1)"/>
+    </CtxVarDeclareIterator>
+    <SequentialIterator>
+      <ApplyIterator>
+        <ZorbaCreateCollectionIterator>
+          <CtxVarIterator varid="10" varname="coll" varkind="global"/>
+        </ZorbaCreateCollectionIterator>
+      </ApplyIterator>
+      <FnCountIterator>
+        <ZorbaCollectionIterator>
+          <CtxVarIterator varid="10" varname="coll" varkind="global"/>
+        </ZorbaCollectionIterator>
+      </FnCountIterator>
+    </SequentialIterator>
   </SequentialIterator>
-</SequentialIterator>
-
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/collections/count_w3c_collection.iter'
--- test/iterplans/zorba/collections/count_w3c_collection.iter	2013-10-09 02:40:46 +0000
+++ test/iterplans/zorba/collections/count_w3c_collection.iter	2014-02-24 20:09:23 +0000
@@ -1,29 +1,29 @@
-Iterator tree for main query:
-<SequentialIterator>
-  <CtxVarDeclareIterator varid="4" varname="coll">
-    <SingletonIterator value="xs:string(http://zorba.io/collection)"/>
-  </CtxVarDeclareIterator>
+<iterator-tree description="main query">
   <SequentialIterator>
-    <ApplyIterator>
-      <UDFunctionCallIterator function="ddl:create">
-        <CtxVarIterator varid="4" varname="coll" varkind="global"/>
-      </UDFunctionCallIterator>
-    </ApplyIterator>
-    <FnCountIterator>
-      <FnCollectionIterator>
-        <CtxVarIterator varid="4" varname="coll" varkind="global"/>
-      </FnCollectionIterator>
-    </FnCountIterator>
+    <CtxVarDeclareIterator varid="4" varname="coll">
+      <SingletonIterator value="xs:string(http://zorba.io/collection)"/>
+    </CtxVarDeclareIterator>
+    <SequentialIterator>
+      <ApplyIterator>
+        <UDFunctionCallIterator function="ddl:create">
+          <CtxVarIterator varid="4" varname="coll" varkind="global"/>
+        </UDFunctionCallIterator>
+      </ApplyIterator>
+      <FnCountIterator>
+        <FnCollectionIterator>
+          <CtxVarIterator varid="4" varname="coll" varkind="global"/>
+        </FnCollectionIterator>
+      </FnCountIterator>
+    </SequentialIterator>
   </SequentialIterator>
-</SequentialIterator>
-
-Iterator tree for ddl:create:
-<ZorbaCreateCollectionIterator>
-  <FunctionTraceIterator>
-    <QNameIterator>
-      <LetVarIterator varname="uri"/>
-      <SingletonIterator value="xs:string(zorba-internal-name-for-w3c-collections)"/>
-    </QNameIterator>
-  </FunctionTraceIterator>
-</ZorbaCreateCollectionIterator>
-
+</iterator-tree>
+<iterator-tree description="ddl:create">
+  <ZorbaCreateCollectionIterator>
+    <FunctionTraceIterator>
+      <QNameIterator>
+        <LetVarIterator varname="uri"/>
+        <SingletonIterator value="xs:string(zorba-internal-name-for-w3c-collections)"/>
+      </QNameIterator>
+    </FunctionTraceIterator>
+  </ZorbaCreateCollectionIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/collections/no_copy_01.iter'
--- test/iterplans/zorba/collections/no_copy_01.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/collections/no_copy_01.iter	2014-02-24 20:09:23 +0000
@@ -1,61 +1,61 @@
-Iterator tree for main query:
-<SequentialIterator>
-  <ApplyIterator>
-    <ZorbaCreateCollectionIterator>
-      <SingletonIterator value="xs:QName(http://www.w3.org/2005/xquery-local-functions,local,bar)"/>
-    </ZorbaCreateCollectionIterator>
-  </ApplyIterator>
-  <FnConcatIterator>
-    <MaterializeIterator>
-      <FLWORIterator>
-        <ForVariable name="n">
-          <ElementIterator>
-            <SingletonIterator value="xs:QName(,,a)"/>
-          </ElementIterator>
-        </ForVariable>
-        <MaterializeClause>
-          <MaterializeForVariable inputVar="n : "/>
-        </MaterializeClause>
-        <ReturnClause>
-          <IsSameNodeIterator>
-            <ForVarIterator varname="n"/>
-            <MaterializeIterator>
-              <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="?">
-                <ZorbaApplyInsertLastIterator is-dynamic="true" need-to-copy="true">
-                  <SingletonIterator value="xs:QName(http://www.w3.org/2005/xquery-local-functions,local,bar)"/>
-                  <ForVarIterator varname="n"/>
-                </ZorbaApplyInsertLastIterator>
-              </TreatIterator>
-            </MaterializeIterator>
-          </IsSameNodeIterator>
-        </ReturnClause>
-      </FLWORIterator>
-    </MaterializeIterator>
-    <MaterializeIterator>
-      <FLWORIterator>
-        <ForVariable name="n">
-          <ElementIterator>
-            <SingletonIterator value="xs:QName(,,a)"/>
-          </ElementIterator>
-        </ForVariable>
-        <MaterializeClause>
-          <MaterializeForVariable inputVar="n : "/>
-        </MaterializeClause>
-        <ReturnClause>
-          <IsSameNodeIterator>
-            <ForVarIterator varname="n"/>
-            <MaterializeIterator>
-              <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="?">
-                <ZorbaApplyInsertLastIterator is-dynamic="true">
-                  <SingletonIterator value="xs:QName(http://www.w3.org/2005/xquery-local-functions,local,bar)"/>
-                  <ForVarIterator varname="n"/>
-                </ZorbaApplyInsertLastIterator>
-              </TreatIterator>
-            </MaterializeIterator>
-          </IsSameNodeIterator>
-        </ReturnClause>
-      </FLWORIterator>
-    </MaterializeIterator>
-  </FnConcatIterator>
-</SequentialIterator>
-
+<iterator-tree description="main query">
+  <SequentialIterator>
+    <ApplyIterator>
+      <ZorbaCreateCollectionIterator>
+        <SingletonIterator value="xs:QName(http://www.w3.org/2005/xquery-local-functions,local,bar)"/>
+      </ZorbaCreateCollectionIterator>
+    </ApplyIterator>
+    <FnConcatIterator>
+      <MaterializeIterator>
+        <FLWORIterator>
+          <ForVariable name="n">
+            <ElementIterator>
+              <SingletonIterator value="xs:QName(,,a)"/>
+            </ElementIterator>
+          </ForVariable>
+          <MaterializeClause>
+            <MaterializeForVariable inputVar="n : "/>
+          </MaterializeClause>
+          <ReturnClause>
+            <IsSameNodeIterator>
+              <ForVarIterator varname="n"/>
+              <MaterializeIterator>
+                <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="?">
+                  <ZorbaApplyInsertLastIterator is-dynamic="true" need-to-copy="true">
+                    <SingletonIterator value="xs:QName(http://www.w3.org/2005/xquery-local-functions,local,bar)"/>
+                    <ForVarIterator varname="n"/>
+                  </ZorbaApplyInsertLastIterator>
+                </TreatIterator>
+              </MaterializeIterator>
+            </IsSameNodeIterator>
+          </ReturnClause>
+        </FLWORIterator>
+      </MaterializeIterator>
+      <MaterializeIterator>
+        <FLWORIterator>
+          <ForVariable name="n">
+            <ElementIterator>
+              <SingletonIterator value="xs:QName(,,a)"/>
+            </ElementIterator>
+          </ForVariable>
+          <MaterializeClause>
+            <MaterializeForVariable inputVar="n : "/>
+          </MaterializeClause>
+          <ReturnClause>
+            <IsSameNodeIterator>
+              <ForVarIterator varname="n"/>
+              <MaterializeIterator>
+                <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="?">
+                  <ZorbaApplyInsertLastIterator is-dynamic="true">
+                    <SingletonIterator value="xs:QName(http://www.w3.org/2005/xquery-local-functions,local,bar)"/>
+                    <ForVarIterator varname="n"/>
+                  </ZorbaApplyInsertLastIterator>
+                </TreatIterator>
+              </MaterializeIterator>
+            </IsSameNodeIterator>
+          </ReturnClause>
+        </FLWORIterator>
+      </MaterializeIterator>
+    </FnConcatIterator>
+  </SequentialIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/dblp/q0.iter'
--- test/iterplans/zorba/dblp/q0.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/dblp/q0.iter	2014-02-24 20:09:23 +0000
@@ -1,182 +1,182 @@
-Iterator tree for const-folded expr:
-<OrIterator>
-  <SingletonIterator value="xs:boolean(false)"/>
-  <SingletonIterator value="xs:boolean(false)"/>
-  <SingletonIterator value="xs:boolean(false)"/>
-</OrIterator>
-
-Iterator tree for const-folded expr:
-<OrIterator>
-  <SingletonIterator value="xs:boolean(false)"/>
-  <SingletonIterator value="xs:boolean(false)"/>
-  <SingletonIterator value="xs:boolean(false)"/>
-</OrIterator>
-
-Iterator tree for main query:
-<SequentialIterator>
-  <CtxVarDeclareIterator varid="4" varname="input-context"/>
-  <FLWORIterator>
-    <LetVariable name="doc" materialize="true">
-      <FnDocIterator>
-        <PromoteIterator type="xs:string">
-          <FnDataIterator>
-            <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
-          </FnDataIterator>
-        </PromoteIterator>
-      </FnDocIterator>
-    </LetVariable>
-    <LetVariable name="$$opt_temp_1" materialize="true">
-      <HoistIterator>
-        <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">
-          <LetVarIterator varname="doc"/>
-        </ChildAxisIterator>
-      </HoistIterator>
-    </LetVariable>
-    <LetVariable name="$$opt_temp_0" materialize="true">
-      <HoistIterator>
-        <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">
-          <LetVarIterator varname="doc"/>
-        </ChildAxisIterator>
-      </HoistIterator>
-    </LetVariable>
-    <ReturnClause>
-      <ElementIterator>
-        <SingletonIterator value="xs:QName(,,statistics)"/>
-        <FnConcatIterator>
-          <ElementIterator>
-            <SingletonIterator value="xs:QName(,,total)"/>
-            <FnConcatIterator>
-              <ElementIterator>
-                <SingletonIterator value="xs:QName(,,paper)"/>
-                <EnclosedIterator attr_cont="false">
-                  <FnCountIterator>
-                    <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">
-                      <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">
-                        <LetVarIterator varname="doc"/>
+<iterator-tree description="const-folded expr">
+  <OrIterator>
+    <SingletonIterator value="xs:boolean(false)"/>
+    <SingletonIterator value="xs:boolean(false)"/>
+    <SingletonIterator value="xs:boolean(false)"/>
+  </OrIterator>
+</iterator-tree>
+<iterator-tree description="const-folded expr">
+  <OrIterator>
+    <SingletonIterator value="xs:boolean(false)"/>
+    <SingletonIterator value="xs:boolean(false)"/>
+    <SingletonIterator value="xs:boolean(false)"/>
+  </OrIterator>
+</iterator-tree>
+<iterator-tree description="main query">
+  <SequentialIterator>
+    <CtxVarDeclareIterator varid="4" varname="input-context"/>
+    <FLWORIterator>
+      <LetVariable name="doc" materialize="true">
+        <FnDocIterator>
+          <PromoteIterator type="xs:string">
+            <FnDataIterator>
+              <CtxVarIterator varid="4" varname="input-context" varkind="global"/>
+            </FnDataIterator>
+          </PromoteIterator>
+        </FnDocIterator>
+      </LetVariable>
+      <LetVariable name="$$opt_temp_1" materialize="true">
+        <HoistIterator>
+          <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">
+            <LetVarIterator varname="doc"/>
+          </ChildAxisIterator>
+        </HoistIterator>
+      </LetVariable>
+      <LetVariable name="$$opt_temp_0" materialize="true">
+        <HoistIterator>
+          <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">
+            <LetVarIterator varname="doc"/>
+          </ChildAxisIterator>
+        </HoistIterator>
+      </LetVariable>
+      <ReturnClause>
+        <ElementIterator>
+          <SingletonIterator value="xs:QName(,,statistics)"/>
+          <FnConcatIterator>
+            <ElementIterator>
+              <SingletonIterator value="xs:QName(,,total)"/>
+              <FnConcatIterator>
+                <ElementIterator>
+                  <SingletonIterator value="xs:QName(,,paper)"/>
+                  <EnclosedIterator attr_cont="false">
+                    <FnCountIterator>
+                      <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">
+                        <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,dblp)" typename="*" nill allowed="0">
+                          <LetVarIterator varname="doc"/>
+                        </ChildAxisIterator>
                       </ChildAxisIterator>
-                    </ChildAxisIterator>
-                  </FnCountIterator>
-                </EnclosedIterator>
-              </ElementIterator>
-              <ElementIterator>
-                <SingletonIterator value="xs:QName(,,author)"/>
-                <EnclosedIterator attr_cont="false">
-                  <FnCountIterator>
-                    <FnDistinctValuesIterator>
-                      <FnDataIterator>
-                        <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
-                          <LetVarIterator varname="doc"/>
-                        </DescendantAxisIterator>
-                      </FnDataIterator>
-                    </FnDistinctValuesIterator>
-                  </FnCountIterator>
-                </EnclosedIterator>
-              </ElementIterator>
-            </FnConcatIterator>
-          </ElementIterator>
-          <ElementIterator>
-            <SingletonIterator value="xs:QName(,,conferences)"/>
-            <EnclosedIterator attr_cont="false">
-              <FLWORIterator>
-                <ForVariable name="conference">
-                  <FnConcatIterator>
-                    <SingletonIterator value="xs:string(EDBT)"/>
-                    <SingletonIterator value="xs:string(ICDT)"/>
-                    <SingletonIterator value="xs:string(ICDE)"/>
-                    <SingletonIterator value="xs:string(PODS)"/>
-                    <SingletonIterator value="xs:string(VLDB)"/>
-                    <SingletonIterator value="xs:string(SIGMOD Conference)"/>
-                  </FnConcatIterator>
-                </ForVariable>
-                <ReturnClause>
-                  <ElementIterator>
-                    <SingletonIterator value="xs:QName(,,conference)"/>
+                    </FnCountIterator>
+                  </EnclosedIterator>
+                </ElementIterator>
+                <ElementIterator>
+                  <SingletonIterator value="xs:QName(,,author)"/>
+                  <EnclosedIterator attr_cont="false">
+                    <FnCountIterator>
+                      <FnDistinctValuesIterator>
+                        <FnDataIterator>
+                          <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+                            <LetVarIterator varname="doc"/>
+                          </DescendantAxisIterator>
+                        </FnDataIterator>
+                      </FnDistinctValuesIterator>
+                    </FnCountIterator>
+                  </EnclosedIterator>
+                </ElementIterator>
+              </FnConcatIterator>
+            </ElementIterator>
+            <ElementIterator>
+              <SingletonIterator value="xs:QName(,,conferences)"/>
+              <EnclosedIterator attr_cont="false">
+                <FLWORIterator>
+                  <ForVariable name="conference">
                     <FnConcatIterator>
-                      <ElementIterator>
-                        <SingletonIterator value="xs:QName(,,name)"/>
-                        <EnclosedIterator attr_cont="false">
-                          <ForVarIterator varname="conference"/>
-                        </EnclosedIterator>
-                      </ElementIterator>
-                      <ElementIterator>
-                        <SingletonIterator value="xs:QName(,,paper)"/>
-                        <EnclosedIterator attr_cont="false">
-                          <FnCountIterator>
-                            <FLWORIterator>
-                              <ForVariable name="$$context-item">
-                                <UnhoistIterator>
-                                  <LetVarIterator varname="$$opt_temp_0"/>
-                                </UnhoistIterator>
-                              </ForVariable>
-                              <ForVariable name="$$context-item">
-                                <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">
-                                  <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="$$context-item"/>
-                                    </ChildAxisIterator>
-                                  </FnDataIterator>
-                                  <ForVarIterator varname="conference"/>
-                                </CompareIterator>
-                              </WhereClause>
-                              <ReturnClause>
-                                <SingletonIterator value="xs:boolean(true)"/>
-                              </ReturnClause>
-                            </FLWORIterator>
-                          </FnCountIterator>
-                        </EnclosedIterator>
-                      </ElementIterator>
-                      <ElementIterator>
-                        <SingletonIterator value="xs:QName(,,author)"/>
-                        <EnclosedIterator attr_cont="false">
-                          <FnCountIterator>
-                            <FnDistinctValuesIterator>
-                              <FnDataIterator>
-                                <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
-                                  <FLWORIterator>
-                                    <ForVariable name="$$context-item">
-                                      <UnhoistIterator>
-                                        <LetVarIterator varname="$$opt_temp_1"/>
-                                      </UnhoistIterator>
-                                    </ForVariable>
-                                    <ForVariable name="$$context-item">
-                                      <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">
+                      <SingletonIterator value="xs:string(EDBT)"/>
+                      <SingletonIterator value="xs:string(ICDT)"/>
+                      <SingletonIterator value="xs:string(ICDE)"/>
+                      <SingletonIterator value="xs:string(PODS)"/>
+                      <SingletonIterator value="xs:string(VLDB)"/>
+                      <SingletonIterator value="xs:string(SIGMOD Conference)"/>
+                    </FnConcatIterator>
+                  </ForVariable>
+                  <ReturnClause>
+                    <ElementIterator>
+                      <SingletonIterator value="xs:QName(,,conference)"/>
+                      <FnConcatIterator>
+                        <ElementIterator>
+                          <SingletonIterator value="xs:QName(,,name)"/>
+                          <EnclosedIterator attr_cont="false">
+                            <ForVarIterator varname="conference"/>
+                          </EnclosedIterator>
+                        </ElementIterator>
+                        <ElementIterator>
+                          <SingletonIterator value="xs:QName(,,paper)"/>
+                          <EnclosedIterator attr_cont="false">
+                            <FnCountIterator>
+                              <FLWORIterator>
+                                <ForVariable name="$$context-item">
+                                  <UnhoistIterator>
+                                    <LetVarIterator varname="$$opt_temp_0"/>
+                                  </UnhoistIterator>
+                                </ForVariable>
+                                <ForVariable name="$$context-item">
+                                  <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">
+                                    <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="$$context-item"/>
                                       </ChildAxisIterator>
-                                    </ForVariable>
-                                    <WhereClause>
-                                      <CompareIterator>
-                                        <FnDataIterator>
-                                          <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,booktitle)" typename="*" nill allowed="0">
-                                            <ForVarIterator varname="$$context-item"/>
-                                          </ChildAxisIterator>
-                                        </FnDataIterator>
-                                        <ForVarIterator varname="conference"/>
-                                      </CompareIterator>
-                                    </WhereClause>
-                                    <ReturnClause>
-                                      <ForVarIterator varname="$$context-item"/>
-                                    </ReturnClause>
-                                  </FLWORIterator>
-                                </ChildAxisIterator>
-                              </FnDataIterator>
-                            </FnDistinctValuesIterator>
-                          </FnCountIterator>
-                        </EnclosedIterator>
-                      </ElementIterator>
-                    </FnConcatIterator>
-                  </ElementIterator>
-                </ReturnClause>
-              </FLWORIterator>
-            </EnclosedIterator>
-          </ElementIterator>
-        </FnConcatIterator>
-      </ElementIterator>
-    </ReturnClause>
-  </FLWORIterator>
-</SequentialIterator>
-
+                                    </FnDataIterator>
+                                    <ForVarIterator varname="conference"/>
+                                  </CompareIterator>
+                                </WhereClause>
+                                <ReturnClause>
+                                  <SingletonIterator value="xs:boolean(true)"/>
+                                </ReturnClause>
+                              </FLWORIterator>
+                            </FnCountIterator>
+                          </EnclosedIterator>
+                        </ElementIterator>
+                        <ElementIterator>
+                          <SingletonIterator value="xs:QName(,,author)"/>
+                          <EnclosedIterator attr_cont="false">
+                            <FnCountIterator>
+                              <FnDistinctValuesIterator>
+                                <FnDataIterator>
+                                  <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+                                    <FLWORIterator>
+                                      <ForVariable name="$$context-item">
+                                        <UnhoistIterator>
+                                          <LetVarIterator varname="$$opt_temp_1"/>
+                                        </UnhoistIterator>
+                                      </ForVariable>
+                                      <ForVariable name="$$context-item">
+                                        <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,inproceedings)" typename="*" nill allowed="0">
+                                          <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="$$context-item"/>
+                                            </ChildAxisIterator>
+                                          </FnDataIterator>
+                                          <ForVarIterator varname="conference"/>
+                                        </CompareIterator>
+                                      </WhereClause>
+                                      <ReturnClause>
+                                        <ForVarIterator varname="$$context-item"/>
+                                      </ReturnClause>
+                                    </FLWORIterator>
+                                  </ChildAxisIterator>
+                                </FnDataIterator>
+                              </FnDistinctValuesIterator>
+                            </FnCountIterator>
+                          </EnclosedIterator>
+                        </ElementIterator>
+                      </FnConcatIterator>
+                    </ElementIterator>
+                  </ReturnClause>
+                </FLWORIterator>
+              </EnclosedIterator>
+            </ElementIterator>
+          </FnConcatIterator>
+        </ElementIterator>
+      </ReturnClause>
+    </FLWORIterator>
+  </SequentialIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/error/trace1.iter'
--- test/iterplans/zorba/error/trace1.iter	2013-02-07 17:24:36 +0000
+++ test/iterplans/zorba/error/trace1.iter	2014-02-24 20:09:23 +0000
@@ -1,8 +1,8 @@
-Iterator tree for main query:
-<FunctionTraceIterator>
-  <TraceIterator>
-    <SingletonIterator value="xs:integer(3)"/>
-    <SingletonIterator value="xs:string(foo)"/>
-  </TraceIterator>
-</FunctionTraceIterator>
-
+<iterator-tree description="main query">
+  <FunctionTraceIterator>
+    <TraceIterator>
+      <SingletonIterator value="xs:integer(3)"/>
+      <SingletonIterator value="xs:string(foo)"/>
+    </TraceIterator>
+  </FunctionTraceIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/flwor/flwor24.iter'
--- test/iterplans/zorba/flwor/flwor24.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/flwor/flwor24.iter	2014-02-24 20:09:23 +0000
@@ -1,56 +1,56 @@
-Iterator tree for const-folded expr:
-<FunctionTraceIterator>
-  <FnConcatIterator/>
-</FunctionTraceIterator>
-
-Iterator tree for main query:
-<SequentialIterator>
-  <CtxVarDeclareIterator varid="4" varname="xmlcontents">
-    <UDFunctionCallIterator function="fetch:content">
-      <SingletonIterator value="xs:string($RBKT_SRC_DIR/Queries/zorba/flwor/flwor24.xml)"/>
-    </UDFunctionCallIterator>
-  </CtxVarDeclareIterator>
-  <FLWORIterator>
-    <ForVariable name="w">
-      <FnZorbaParseXmlFragmentIterator>
-        <PromoteIterator type="xs:string">
-          <FnDataIterator>
-            <CtxVarIterator varid="4" varname="xmlcontents" varkind="local"/>
-          </FnDataIterator>
-        </PromoteIterator>
-        <TreatIterator type="[NodeXQType elementNode nametest=[uri: http://zorba.io/modules/xml-options, local: options] content=[XQType ANY_TYPE_KIND*]]" quant="?">
-          <ElementIterator>
-            <SingletonIterator value="xs:QName(http://zorba.io/modules/xml-options,opt,options)"/>
+<iterator-tree description="const-folded expr">
+  <FunctionTraceIterator>
+    <FnConcatIterator/>
+  </FunctionTraceIterator>
+</iterator-tree>
+<iterator-tree description="main query">
+  <SequentialIterator>
+    <CtxVarDeclareIterator varid="4" varname="xmlcontents">
+      <UDFunctionCallIterator function="fetch:content">
+        <SingletonIterator value="xs:string($RBKT_SRC_DIR/Queries/zorba/flwor/flwor24.xml)"/>
+      </UDFunctionCallIterator>
+    </CtxVarDeclareIterator>
+    <FLWORIterator>
+      <ForVariable name="w">
+        <FnZorbaParseXmlFragmentIterator>
+          <PromoteIterator type="xs:string">
+            <FnDataIterator>
+              <CtxVarIterator varid="4" varname="xmlcontents" varkind="local"/>
+            </FnDataIterator>
+          </PromoteIterator>
+          <TreatIterator type="[NodeXQType elementNode nametest=[uri: http://zorba.io/modules/xml-options, local: options] content=[XQType ANY_TYPE_KIND*]]" quant="?">
             <ElementIterator>
-              <SingletonIterator value="xs:QName(http://zorba.io/modules/xml-options,opt,parse-external-parsed-entity)"/>
-              <AttributeIterator qname="xs:QName(http://zorba.io/modules/xml-options,opt,skip-root-nodes)">
-                <SingletonIterator value="xs:string(1)"/>
-              </AttributeIterator>
+              <SingletonIterator value="xs:QName(http://zorba.io/modules/xml-options,opt,options)"/>
+              <ElementIterator>
+                <SingletonIterator value="xs:QName(http://zorba.io/modules/xml-options,opt,parse-external-parsed-entity)"/>
+                <AttributeIterator qname="xs:QName(http://zorba.io/modules/xml-options,opt,skip-root-nodes)">
+                  <SingletonIterator value="xs:string(1)"/>
+                </AttributeIterator>
+              </ElementIterator>
             </ElementIterator>
-          </ElementIterator>
-        </TreatIterator>
-      </FnZorbaParseXmlFragmentIterator>
-    </ForVariable>
-    <MaterializeClause>
-      <MaterializeForVariable inputVar="w : "/>
-    </MaterializeClause>
-    <ReturnClause>
-      <SequentialIterator>
-        <ApplyIterator>
-          <FnConcatIterator/>
-        </ApplyIterator>
-        <ForVarIterator varname="w"/>
-      </SequentialIterator>
-    </ReturnClause>
-  </FLWORIterator>
-</SequentialIterator>
-
-Iterator tree for fetch:content:
-<FunctionTraceIterator>
-  <FetchContentIterator>
-    <LetVarIterator varname="uri"/>
-    <SingletonIterator value="xs:string(SOME_CONTENT)"/>
-    <SingletonIterator value="xs:string(UTF-8)"/>
-  </FetchContentIterator>
-</FunctionTraceIterator>
-
+          </TreatIterator>
+        </FnZorbaParseXmlFragmentIterator>
+      </ForVariable>
+      <MaterializeClause>
+        <MaterializeForVariable inputVar="w : "/>
+      </MaterializeClause>
+      <ReturnClause>
+        <SequentialIterator>
+          <ApplyIterator>
+            <FnConcatIterator/>
+          </ApplyIterator>
+          <ForVarIterator varname="w"/>
+        </SequentialIterator>
+      </ReturnClause>
+    </FLWORIterator>
+  </SequentialIterator>
+</iterator-tree>
+<iterator-tree description="fetch:content">
+  <FunctionTraceIterator>
+    <FetchContentIterator>
+      <LetVarIterator varname="uri"/>
+      <SingletonIterator value="xs:string(SOME_CONTENT)"/>
+      <SingletonIterator value="xs:string(UTF-8)"/>
+    </FetchContentIterator>
+  </FunctionTraceIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/flwor/flwor25.iter'
--- test/iterplans/zorba/flwor/flwor25.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/flwor/flwor25.iter	2014-02-24 20:09:23 +0000
@@ -1,56 +1,56 @@
-Iterator tree for const-folded expr:
-<FunctionTraceIterator>
-  <FnConcatIterator/>
-</FunctionTraceIterator>
-
-Iterator tree for main query:
-<SequentialIterator>
-  <CtxVarDeclareIterator varid="4" varname="xmlcontents">
-    <UDFunctionCallIterator function="fetch:content">
-      <SingletonIterator value="xs:string($RBKT_SRC_DIR/Queries/zorba/flwor/flwor24.xml)"/>
-    </UDFunctionCallIterator>
-  </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="5" varname="contents">
-    <FnZorbaParseXmlFragmentIterator>
-      <PromoteIterator type="xs:string">
-        <FnDataIterator>
-          <CtxVarIterator varid="4" varname="xmlcontents" varkind="local"/>
-        </FnDataIterator>
-      </PromoteIterator>
-      <TreatIterator type="[NodeXQType elementNode nametest=[uri: http://zorba.io/modules/xml-options, local: options] content=[XQType ANY_TYPE_KIND*]]" quant="?">
-        <ElementIterator>
-          <SingletonIterator value="xs:QName(http://zorba.io/modules/xml-options,opt,options)"/>
+<iterator-tree description="const-folded expr">
+  <FunctionTraceIterator>
+    <FnConcatIterator/>
+  </FunctionTraceIterator>
+</iterator-tree>
+<iterator-tree description="main query">
+  <SequentialIterator>
+    <CtxVarDeclareIterator varid="4" varname="xmlcontents">
+      <UDFunctionCallIterator function="fetch:content">
+        <SingletonIterator value="xs:string($RBKT_SRC_DIR/Queries/zorba/flwor/flwor24.xml)"/>
+      </UDFunctionCallIterator>
+    </CtxVarDeclareIterator>
+    <CtxVarDeclareIterator varid="5" varname="contents">
+      <FnZorbaParseXmlFragmentIterator>
+        <PromoteIterator type="xs:string">
+          <FnDataIterator>
+            <CtxVarIterator varid="4" varname="xmlcontents" varkind="local"/>
+          </FnDataIterator>
+        </PromoteIterator>
+        <TreatIterator type="[NodeXQType elementNode nametest=[uri: http://zorba.io/modules/xml-options, local: options] content=[XQType ANY_TYPE_KIND*]]" quant="?">
           <ElementIterator>
-            <SingletonIterator value="xs:QName(http://zorba.io/modules/xml-options,opt,parse-external-parsed-entity)"/>
-            <AttributeIterator qname="xs:QName(http://zorba.io/modules/xml-options,opt,skip-root-nodes)">
-              <SingletonIterator value="xs:string(1)"/>
-            </AttributeIterator>
+            <SingletonIterator value="xs:QName(http://zorba.io/modules/xml-options,opt,options)"/>
+            <ElementIterator>
+              <SingletonIterator value="xs:QName(http://zorba.io/modules/xml-options,opt,parse-external-parsed-entity)"/>
+              <AttributeIterator qname="xs:QName(http://zorba.io/modules/xml-options,opt,skip-root-nodes)">
+                <SingletonIterator value="xs:string(1)"/>
+              </AttributeIterator>
+            </ElementIterator>
           </ElementIterator>
-        </ElementIterator>
-      </TreatIterator>
-    </FnZorbaParseXmlFragmentIterator>
-  </CtxVarDeclareIterator>
-  <FLWORIterator>
-    <ForVariable name="w">
-      <CtxVarIterator varid="5" varname="contents" varkind="local"/>
-    </ForVariable>
-    <ReturnClause>
-      <SequentialIterator>
-        <ApplyIterator>
-          <FnConcatIterator/>
-        </ApplyIterator>
-        <ForVarIterator varname="w"/>
-      </SequentialIterator>
-    </ReturnClause>
-  </FLWORIterator>
-</SequentialIterator>
-
-Iterator tree for fetch:content:
-<FunctionTraceIterator>
-  <FetchContentIterator>
-    <LetVarIterator varname="uri"/>
-    <SingletonIterator value="xs:string(SOME_CONTENT)"/>
-    <SingletonIterator value="xs:string(UTF-8)"/>
-  </FetchContentIterator>
-</FunctionTraceIterator>
-
+        </TreatIterator>
+      </FnZorbaParseXmlFragmentIterator>
+    </CtxVarDeclareIterator>
+    <FLWORIterator>
+      <ForVariable name="w">
+        <CtxVarIterator varid="5" varname="contents" varkind="local"/>
+      </ForVariable>
+      <ReturnClause>
+        <SequentialIterator>
+          <ApplyIterator>
+            <FnConcatIterator/>
+          </ApplyIterator>
+          <ForVarIterator varname="w"/>
+        </SequentialIterator>
+      </ReturnClause>
+    </FLWORIterator>
+  </SequentialIterator>
+</iterator-tree>
+<iterator-tree description="fetch:content">
+  <FunctionTraceIterator>
+    <FetchContentIterator>
+      <LetVarIterator varname="uri"/>
+      <SingletonIterator value="xs:string(SOME_CONTENT)"/>
+      <SingletonIterator value="xs:string(UTF-8)"/>
+    </FetchContentIterator>
+  </FunctionTraceIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/flwor/flwor26.iter'
--- test/iterplans/zorba/flwor/flwor26.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/flwor/flwor26.iter	2014-02-24 20:09:23 +0000
@@ -1,66 +1,66 @@
-Iterator tree for main query:
-<SequentialIterator>
-  <CtxVarDeclareIterator varid="4" varname="coll">
-    <SingletonIterator value="xs:QName(http://zorba.io/modules/store/dynamic/collections/ddl,ddl,coll1)"/>
-  </CtxVarDeclareIterator>
+<iterator-tree description="main query">
   <SequentialIterator>
-    <ApplyIterator>
-      <ZorbaCreateCollectionIterator>
-        <CtxVarIterator varid="4" varname="coll" varkind="global"/>
-      </ZorbaCreateCollectionIterator>
-    </ApplyIterator>
-    <ApplyIterator>
-      <ZorbaInsertLastIterator is-dynamic="true" need-to-copy="true">
-        <CtxVarIterator varid="4" varname="coll" varkind="global"/>
-        <FnConcatIterator>
-          <ElementIterator>
-            <SingletonIterator value="xs:QName(,,a)"/>
-          </ElementIterator>
-          <ElementIterator>
-            <SingletonIterator value="xs:QName(,,c)"/>
-          </ElementIterator>
-          <ElementIterator>
-            <SingletonIterator value="xs:QName(,,b)"/>
-          </ElementIterator>
-        </FnConcatIterator>
-      </ZorbaInsertLastIterator>
-    </ApplyIterator>
-    <FLWORIterator>
-      <ForVariable name="w">
-        <ZorbaCollectionIterator>
-          <CtxVarIterator varid="4" varname="coll" varkind="global"/>
-        </ZorbaCollectionIterator>
-      </ForVariable>
-      <ReturnClause>
-        <SequentialIterator>
-          <ApplyIterator>
-            <FunctionTraceIterator>
-              <IfThenElseIterator>
-                <TypedValueCompareIterator_INTEGER>
-                  <ForVarIterator varname="pos"/>
-                  <SingletonIterator value="xs:integer(1)"/>
-                </TypedValueCompareIterator_INTEGER>
-                <ApplyIterator>
-                  <ZorbaInsertLastIterator is-dynamic="true" need-to-copy="true">
-                    <CtxVarIterator varid="4" varname="coll" varkind="global"/>
-                    <ElementIterator>
-                      <SingletonIterator value="xs:QName(,,d)"/>
-                      <EnclosedIterator attr_cont="false">
-                        <ForVarIterator varname="pos"/>
-                      </EnclosedIterator>
-                    </ElementIterator>
-                  </ZorbaInsertLastIterator>
-                </ApplyIterator>
-                <ApplyIterator>
-                  <FnConcatIterator/>
-                </ApplyIterator>
-              </IfThenElseIterator>
-            </FunctionTraceIterator>
-          </ApplyIterator>
-          <ForVarIterator varname="w"/>
-        </SequentialIterator>
-      </ReturnClause>
-    </FLWORIterator>
+    <CtxVarDeclareIterator varid="4" varname="coll">
+      <SingletonIterator value="xs:QName(http://zorba.io/modules/store/dynamic/collections/ddl,ddl,coll1)"/>
+    </CtxVarDeclareIterator>
+    <SequentialIterator>
+      <ApplyIterator>
+        <ZorbaCreateCollectionIterator>
+          <CtxVarIterator varid="4" varname="coll" varkind="global"/>
+        </ZorbaCreateCollectionIterator>
+      </ApplyIterator>
+      <ApplyIterator>
+        <ZorbaInsertLastIterator is-dynamic="true" need-to-copy="true">
+          <CtxVarIterator varid="4" varname="coll" varkind="global"/>
+          <FnConcatIterator>
+            <ElementIterator>
+              <SingletonIterator value="xs:QName(,,a)"/>
+            </ElementIterator>
+            <ElementIterator>
+              <SingletonIterator value="xs:QName(,,c)"/>
+            </ElementIterator>
+            <ElementIterator>
+              <SingletonIterator value="xs:QName(,,b)"/>
+            </ElementIterator>
+          </FnConcatIterator>
+        </ZorbaInsertLastIterator>
+      </ApplyIterator>
+      <FLWORIterator>
+        <ForVariable name="w">
+          <ZorbaCollectionIterator>
+            <CtxVarIterator varid="4" varname="coll" varkind="global"/>
+          </ZorbaCollectionIterator>
+        </ForVariable>
+        <ReturnClause>
+          <SequentialIterator>
+            <ApplyIterator>
+              <FunctionTraceIterator>
+                <IfThenElseIterator>
+                  <TypedValueCompareIterator_INTEGER>
+                    <ForVarIterator varname="pos"/>
+                    <SingletonIterator value="xs:integer(1)"/>
+                  </TypedValueCompareIterator_INTEGER>
+                  <ApplyIterator>
+                    <ZorbaInsertLastIterator is-dynamic="true" need-to-copy="true">
+                      <CtxVarIterator varid="4" varname="coll" varkind="global"/>
+                      <ElementIterator>
+                        <SingletonIterator value="xs:QName(,,d)"/>
+                        <EnclosedIterator attr_cont="false">
+                          <ForVarIterator varname="pos"/>
+                        </EnclosedIterator>
+                      </ElementIterator>
+                    </ZorbaInsertLastIterator>
+                  </ApplyIterator>
+                  <ApplyIterator>
+                    <FnConcatIterator/>
+                  </ApplyIterator>
+                </IfThenElseIterator>
+              </FunctionTraceIterator>
+            </ApplyIterator>
+            <ForVarIterator varname="w"/>
+          </SequentialIterator>
+        </ReturnClause>
+      </FLWORIterator>
+    </SequentialIterator>
   </SequentialIterator>
-</SequentialIterator>
-
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/flwor/flwor27.iter'
--- test/iterplans/zorba/flwor/flwor27.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/flwor/flwor27.iter	2014-02-24 20:09:23 +0000
@@ -1,63 +1,63 @@
-Iterator tree for const-folded expr:
-<FunctionTraceIterator>
-  <FnConcatIterator/>
-</FunctionTraceIterator>
-
-Iterator tree for main query:
-<SequentialIterator>
-  <CtxVarDeclareIterator varid="4" varname="xmlcontents">
-    <UDFunctionCallIterator function="fetch:content">
-      <SingletonIterator value="xs:string($RBKT_SRC_DIR/Queries/zorba/flwor/flwor24.xml)"/>
-    </UDFunctionCallIterator>
-  </CtxVarDeclareIterator>
-  <CtxVarDeclareIterator varid="5" varname="contents">
-    <FnZorbaParseXmlFragmentIterator>
-      <PromoteIterator type="xs:string">
-        <FnDataIterator>
-          <CtxVarIterator varid="4" varname="xmlcontents" varkind="local"/>
-        </FnDataIterator>
-      </PromoteIterator>
-      <TreatIterator type="[NodeXQType elementNode nametest=[uri: http://zorba.io/modules/xml-options, local: options] content=[XQType ANY_TYPE_KIND*]]" quant="?">
-        <ElementIterator>
-          <SingletonIterator value="xs:QName(http://zorba.io/modules/xml-options,opt,options)"/>
+<iterator-tree description="const-folded expr">
+  <FunctionTraceIterator>
+    <FnConcatIterator/>
+  </FunctionTraceIterator>
+</iterator-tree>
+<iterator-tree description="main query">
+  <SequentialIterator>
+    <CtxVarDeclareIterator varid="4" varname="xmlcontents">
+      <UDFunctionCallIterator function="fetch:content">
+        <SingletonIterator value="xs:string($RBKT_SRC_DIR/Queries/zorba/flwor/flwor24.xml)"/>
+      </UDFunctionCallIterator>
+    </CtxVarDeclareIterator>
+    <CtxVarDeclareIterator varid="5" varname="contents">
+      <FnZorbaParseXmlFragmentIterator>
+        <PromoteIterator type="xs:string">
+          <FnDataIterator>
+            <CtxVarIterator varid="4" varname="xmlcontents" varkind="local"/>
+          </FnDataIterator>
+        </PromoteIterator>
+        <TreatIterator type="[NodeXQType elementNode nametest=[uri: http://zorba.io/modules/xml-options, local: options] content=[XQType ANY_TYPE_KIND*]]" quant="?">
           <ElementIterator>
-            <SingletonIterator value="xs:QName(http://zorba.io/modules/xml-options,opt,parse-external-parsed-entity)"/>
-            <AttributeIterator qname="xs:QName(http://zorba.io/modules/xml-options,opt,skip-root-nodes)">
-              <SingletonIterator value="xs:string(1)"/>
-            </AttributeIterator>
+            <SingletonIterator value="xs:QName(http://zorba.io/modules/xml-options,opt,options)"/>
+            <ElementIterator>
+              <SingletonIterator value="xs:QName(http://zorba.io/modules/xml-options,opt,parse-external-parsed-entity)"/>
+              <AttributeIterator qname="xs:QName(http://zorba.io/modules/xml-options,opt,skip-root-nodes)">
+                <SingletonIterator value="xs:string(1)"/>
+              </AttributeIterator>
+            </ElementIterator>
           </ElementIterator>
-        </ElementIterator>
-      </TreatIterator>
-    </FnZorbaParseXmlFragmentIterator>
-  </CtxVarDeclareIterator>
-  <FLWORIterator>
-    <ForVariable name="w">
-      <CtxVarIterator varid="5" varname="contents" varkind="local"/>
-    </ForVariable>
-    <OrderBySpec>
-      <FnLocalNameIterator>
-        <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="?">
+        </TreatIterator>
+      </FnZorbaParseXmlFragmentIterator>
+    </CtxVarDeclareIterator>
+    <FLWORIterator>
+      <ForVariable name="w">
+        <CtxVarIterator varid="5" varname="contents" varkind="local"/>
+      </ForVariable>
+      <OrderBySpec>
+        <FnLocalNameIterator>
+          <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="?">
+            <ForVarIterator varname="w"/>
+          </TreatIterator>
+        </FnLocalNameIterator>
+      </OrderBySpec>
+      <ReturnClause>
+        <SequentialIterator>
+          <ApplyIterator>
+            <FnConcatIterator/>
+          </ApplyIterator>
           <ForVarIterator varname="w"/>
-        </TreatIterator>
-      </FnLocalNameIterator>
-    </OrderBySpec>
-    <ReturnClause>
-      <SequentialIterator>
-        <ApplyIterator>
-          <FnConcatIterator/>
-        </ApplyIterator>
-        <ForVarIterator varname="w"/>
-      </SequentialIterator>
-    </ReturnClause>
-  </FLWORIterator>
-</SequentialIterator>
-
-Iterator tree for fetch:content:
-<FunctionTraceIterator>
-  <FetchContentIterator>
-    <LetVarIterator varname="uri"/>
-    <SingletonIterator value="xs:string(SOME_CONTENT)"/>
-    <SingletonIterator value="xs:string(UTF-8)"/>
-  </FetchContentIterator>
-</FunctionTraceIterator>
-
+        </SequentialIterator>
+      </ReturnClause>
+    </FLWORIterator>
+  </SequentialIterator>
+</iterator-tree>
+<iterator-tree description="fetch:content">
+  <FunctionTraceIterator>
+    <FetchContentIterator>
+      <LetVarIterator varname="uri"/>
+      <SingletonIterator value="xs:string(SOME_CONTENT)"/>
+      <SingletonIterator value="xs:string(UTF-8)"/>
+    </FetchContentIterator>
+  </FunctionTraceIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/flwor/flwor28.iter'
--- test/iterplans/zorba/flwor/flwor28.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/flwor/flwor28.iter	2014-02-24 20:09:23 +0000
@@ -1,57 +1,57 @@
-Iterator tree for const-folded expr:
-<FunctionTraceIterator>
-  <FnConcatIterator/>
-</FunctionTraceIterator>
-
-Iterator tree for main query:
-<SequentialIterator>
-  <CtxVarDeclareIterator varid="4" varname="coll">
-    <SingletonIterator value="xs:QName(http://zorba.io/modules/store/dynamic/collections/ddl,ddl,coll1)"/>
-  </CtxVarDeclareIterator>
+<iterator-tree description="const-folded expr">
+  <FunctionTraceIterator>
+    <FnConcatIterator/>
+  </FunctionTraceIterator>
+</iterator-tree>
+<iterator-tree description="main query">
   <SequentialIterator>
-    <ApplyIterator>
-      <ZorbaCreateCollectionIterator>
-        <CtxVarIterator varid="4" varname="coll" varkind="global"/>
-      </ZorbaCreateCollectionIterator>
-    </ApplyIterator>
-    <ApplyIterator>
-      <ZorbaInsertLastIterator is-dynamic="true" need-to-copy="true">
-        <CtxVarIterator varid="4" varname="coll" varkind="global"/>
-        <FnConcatIterator>
-          <ElementIterator>
-            <SingletonIterator value="xs:QName(,,a)"/>
-          </ElementIterator>
-          <ElementIterator>
-            <SingletonIterator value="xs:QName(,,c)"/>
-          </ElementIterator>
-          <ElementIterator>
-            <SingletonIterator value="xs:QName(,,b)"/>
-          </ElementIterator>
-        </FnConcatIterator>
-      </ZorbaInsertLastIterator>
-    </ApplyIterator>
-    <FLWORIterator>
-      <ForVariable name="w">
-        <ZorbaCollectionIterator>
-          <CtxVarIterator varid="4" varname="coll" varkind="global"/>
-        </ZorbaCollectionIterator>
-      </ForVariable>
-      <OrderBySpec>
-        <FnLocalNameIterator>
-          <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="?">
+    <CtxVarDeclareIterator varid="4" varname="coll">
+      <SingletonIterator value="xs:QName(http://zorba.io/modules/store/dynamic/collections/ddl,ddl,coll1)"/>
+    </CtxVarDeclareIterator>
+    <SequentialIterator>
+      <ApplyIterator>
+        <ZorbaCreateCollectionIterator>
+          <CtxVarIterator varid="4" varname="coll" varkind="global"/>
+        </ZorbaCreateCollectionIterator>
+      </ApplyIterator>
+      <ApplyIterator>
+        <ZorbaInsertLastIterator is-dynamic="true" need-to-copy="true">
+          <CtxVarIterator varid="4" varname="coll" varkind="global"/>
+          <FnConcatIterator>
+            <ElementIterator>
+              <SingletonIterator value="xs:QName(,,a)"/>
+            </ElementIterator>
+            <ElementIterator>
+              <SingletonIterator value="xs:QName(,,c)"/>
+            </ElementIterator>
+            <ElementIterator>
+              <SingletonIterator value="xs:QName(,,b)"/>
+            </ElementIterator>
+          </FnConcatIterator>
+        </ZorbaInsertLastIterator>
+      </ApplyIterator>
+      <FLWORIterator>
+        <ForVariable name="w">
+          <ZorbaCollectionIterator>
+            <CtxVarIterator varid="4" varname="coll" varkind="global"/>
+          </ZorbaCollectionIterator>
+        </ForVariable>
+        <OrderBySpec>
+          <FnLocalNameIterator>
+            <TreatIterator type="[NodeXQType anyNode content=[XQType ANY_TYPE_KIND*]]" quant="?">
+              <ForVarIterator varname="w"/>
+            </TreatIterator>
+          </FnLocalNameIterator>
+        </OrderBySpec>
+        <ReturnClause>
+          <SequentialIterator>
+            <ApplyIterator>
+              <FnConcatIterator/>
+            </ApplyIterator>
             <ForVarIterator varname="w"/>
-          </TreatIterator>
-        </FnLocalNameIterator>
-      </OrderBySpec>
-      <ReturnClause>
-        <SequentialIterator>
-          <ApplyIterator>
-            <FnConcatIterator/>
-          </ApplyIterator>
-          <ForVarIterator varname="w"/>
-        </SequentialIterator>
-      </ReturnClause>
-    </FLWORIterator>
+          </SequentialIterator>
+        </ReturnClause>
+      </FLWORIterator>
+    </SequentialIterator>
   </SequentialIterator>
-</SequentialIterator>
-
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/flwor/flwor_op00.iter'
--- test/iterplans/zorba/flwor/flwor_op00.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/flwor/flwor_op00.iter	2014-02-24 20:09:23 +0000
@@ -1,27 +1,27 @@
-Iterator tree for main query:
-<FLWORIterator>
-  <ForVariable name="x">
-    <FnConcatIterator>
-      <SingletonIterator value="xs:integer(1)"/>
-      <SingletonIterator value="xs:integer(2)"/>
-      <SingletonIterator value="xs:integer(3)"/>
-      <SingletonIterator value="xs:integer(4)"/>
-      <SingletonIterator value="xs:integer(5)"/>
-      <SingletonIterator value="xs:integer(6)"/>
-      <SingletonIterator value="xs:integer(7)"/>
-      <SingletonIterator value="xs:integer(8)"/>
-      <SingletonIterator value="xs:integer(9)"/>
-      <SingletonIterator value="xs:integer(10)"/>
-    </FnConcatIterator>
-  </ForVariable>
-  <WhereClause>
-    <TypedValueCompareIterator_INTEGER>
+<iterator-tree description="main query">
+  <FLWORIterator>
+    <ForVariable name="x">
+      <FnConcatIterator>
+        <SingletonIterator value="xs:integer(1)"/>
+        <SingletonIterator value="xs:integer(2)"/>
+        <SingletonIterator value="xs:integer(3)"/>
+        <SingletonIterator value="xs:integer(4)"/>
+        <SingletonIterator value="xs:integer(5)"/>
+        <SingletonIterator value="xs:integer(6)"/>
+        <SingletonIterator value="xs:integer(7)"/>
+        <SingletonIterator value="xs:integer(8)"/>
+        <SingletonIterator value="xs:integer(9)"/>
+        <SingletonIterator value="xs:integer(10)"/>
+      </FnConcatIterator>
+    </ForVariable>
+    <WhereClause>
+      <TypedValueCompareIterator_INTEGER>
+        <ForVarIterator varname="x"/>
+        <SingletonIterator value="xs:integer(2)"/>
+      </TypedValueCompareIterator_INTEGER>
+    </WhereClause>
+    <ReturnClause>
       <ForVarIterator varname="x"/>
-      <SingletonIterator value="xs:integer(2)"/>
-    </TypedValueCompareIterator_INTEGER>
-  </WhereClause>
-  <ReturnClause>
-    <ForVarIterator varname="x"/>
-  </ReturnClause>
-</FLWORIterator>
-
+    </ReturnClause>
+  </FLWORIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/flwor/flwor_op01.iter'
--- test/iterplans/zorba/flwor/flwor_op01.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/flwor/flwor_op01.iter	2014-02-24 20:09:23 +0000
@@ -1,33 +1,33 @@
-Iterator tree for main query:
-<FLWORIterator>
-  <ForVariable name="x">
-    <FnConcatIterator>
-      <SingletonIterator value="xs:integer(1)"/>
-      <SingletonIterator value="xs:integer(2)"/>
-      <SingletonIterator value="xs:integer(3)"/>
-      <SingletonIterator value="xs:integer(4)"/>
-      <SingletonIterator value="xs:integer(5)"/>
-      <SingletonIterator value="xs:integer(6)"/>
-      <SingletonIterator value="xs:integer(7)"/>
-      <SingletonIterator value="xs:integer(8)"/>
-      <SingletonIterator value="xs:integer(9)"/>
-      <SingletonIterator value="xs:integer(10)"/>
-    </FnConcatIterator>
-  </ForVariable>
-  <WhereClause>
-    <AndIterator>
-      <TypedValueCompareIterator_INTEGER>
-        <ForVarIterator varname="x"/>
+<iterator-tree description="main query">
+  <FLWORIterator>
+    <ForVariable name="x">
+      <FnConcatIterator>
+        <SingletonIterator value="xs:integer(1)"/>
+        <SingletonIterator value="xs:integer(2)"/>
+        <SingletonIterator value="xs:integer(3)"/>
+        <SingletonIterator value="xs:integer(4)"/>
+        <SingletonIterator value="xs:integer(5)"/>
+        <SingletonIterator value="xs:integer(6)"/>
+        <SingletonIterator value="xs:integer(7)"/>
         <SingletonIterator value="xs:integer(8)"/>
-      </TypedValueCompareIterator_INTEGER>
-      <TypedValueCompareIterator_INTEGER>
-        <ForVarIterator varname="x"/>
-        <SingletonIterator value="xs:integer(2)"/>
-      </TypedValueCompareIterator_INTEGER>
-    </AndIterator>
-  </WhereClause>
-  <ReturnClause>
-    <ForVarIterator varname="x"/>
-  </ReturnClause>
-</FLWORIterator>
-
+        <SingletonIterator value="xs:integer(9)"/>
+        <SingletonIterator value="xs:integer(10)"/>
+      </FnConcatIterator>
+    </ForVariable>
+    <WhereClause>
+      <AndIterator>
+        <TypedValueCompareIterator_INTEGER>
+          <ForVarIterator varname="x"/>
+          <SingletonIterator value="xs:integer(8)"/>
+        </TypedValueCompareIterator_INTEGER>
+        <TypedValueCompareIterator_INTEGER>
+          <ForVarIterator varname="x"/>
+          <SingletonIterator value="xs:integer(2)"/>
+        </TypedValueCompareIterator_INTEGER>
+      </AndIterator>
+    </WhereClause>
+    <ReturnClause>
+      <ForVarIterator varname="x"/>
+    </ReturnClause>
+  </FLWORIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/flwor/flwor_op02.iter'
--- test/iterplans/zorba/flwor/flwor_op02.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/flwor/flwor_op02.iter	2014-02-24 20:09:23 +0000
@@ -1,40 +1,40 @@
-Iterator tree for main query:
-<FLWORIterator>
-  <ForVariable name="x">
-    <FnConcatIterator>
-      <SingletonIterator value="xs:integer(1)"/>
-      <SingletonIterator value="xs:integer(2)"/>
-      <SingletonIterator value="xs:integer(3)"/>
-      <SingletonIterator value="xs:integer(4)"/>
-      <SingletonIterator value="xs:integer(5)"/>
-      <SingletonIterator value="xs:integer(6)"/>
-      <SingletonIterator value="xs:integer(7)"/>
-      <SingletonIterator value="xs:integer(8)"/>
-      <SingletonIterator value="xs:integer(9)"/>
-      <SingletonIterator value="xs:integer(10)"/>
-    </FnConcatIterator>
-  </ForVariable>
-  <WhereClause>
-    <AndIterator>
-      <TypedValueCompareIterator_INTEGER>
-        <ForVarIterator varname="x"/>
+<iterator-tree description="main query">
+  <FLWORIterator>
+    <ForVariable name="x">
+      <FnConcatIterator>
+        <SingletonIterator value="xs:integer(1)"/>
+        <SingletonIterator value="xs:integer(2)"/>
+        <SingletonIterator value="xs:integer(3)"/>
+        <SingletonIterator value="xs:integer(4)"/>
+        <SingletonIterator value="xs:integer(5)"/>
+        <SingletonIterator value="xs:integer(6)"/>
+        <SingletonIterator value="xs:integer(7)"/>
         <SingletonIterator value="xs:integer(8)"/>
-      </TypedValueCompareIterator_INTEGER>
-      <TypedValueCompareIterator_INTEGER>
-        <ForVarIterator varname="x"/>
-        <SingletonIterator value="xs:integer(2)"/>
-      </TypedValueCompareIterator_INTEGER>
-      <TypedValueCompareIterator_INTEGER>
-        <NumArithIterator_ModOperation>
+        <SingletonIterator value="xs:integer(9)"/>
+        <SingletonIterator value="xs:integer(10)"/>
+      </FnConcatIterator>
+    </ForVariable>
+    <WhereClause>
+      <AndIterator>
+        <TypedValueCompareIterator_INTEGER>
+          <ForVarIterator varname="x"/>
+          <SingletonIterator value="xs:integer(8)"/>
+        </TypedValueCompareIterator_INTEGER>
+        <TypedValueCompareIterator_INTEGER>
           <ForVarIterator varname="x"/>
           <SingletonIterator value="xs:integer(2)"/>
-        </NumArithIterator_ModOperation>
-        <SingletonIterator value="xs:integer(0)"/>
-      </TypedValueCompareIterator_INTEGER>
-    </AndIterator>
-  </WhereClause>
-  <ReturnClause>
-    <ForVarIterator varname="x"/>
-  </ReturnClause>
-</FLWORIterator>
-
+        </TypedValueCompareIterator_INTEGER>
+        <TypedValueCompareIterator_INTEGER>
+          <NumArithIterator_ModOperation>
+            <ForVarIterator varname="x"/>
+            <SingletonIterator value="xs:integer(2)"/>
+          </NumArithIterator_ModOperation>
+          <SingletonIterator value="xs:integer(0)"/>
+        </TypedValueCompareIterator_INTEGER>
+      </AndIterator>
+    </WhereClause>
+    <ReturnClause>
+      <ForVarIterator varname="x"/>
+    </ReturnClause>
+  </FLWORIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9065.iter'
--- test/iterplans/zorba/hashjoins/9065.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9065.iter	2014-02-24 20:09:23 +0000
@@ -1,62 +1,62 @@
-Iterator tree for main query:
-<FLWORIterator>
-  <ForVariable name="b">
-    <FnDocIterator>
-      <SingletonIterator value="xs:string(books.xml)"/>
-    </FnDocIterator>
-  </ForVariable>
-  <LetVariable name="$$opt_temp_1" materialize="true">
-    <HoistIterator>
-      <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,title)" typename="*" nill allowed="0">
-        <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-          <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill allowed="0">
-            <ForVarIterator varname="b"/>
-          </ChildAxisIterator>
-        </ChildAxisIterator>
-      </ChildAxisIterator>
-    </HoistIterator>
-  </LetVariable>
-  <ForVariable name="$$opt_temp_0">
-    <HoistIterator>
-      <FnCountIterator>
-        <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+<iterator-tree description="main query">
+  <FLWORIterator>
+    <ForVariable name="b">
+      <FnDocIterator>
+        <SingletonIterator value="xs:string(books.xml)"/>
+      </FnDocIterator>
+    </ForVariable>
+    <LetVariable name="$$opt_temp_1" materialize="true">
+      <HoistIterator>
+        <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,title)" typename="*" nill allowed="0">
           <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
             <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill allowed="0">
               <ForVarIterator varname="b"/>
             </ChildAxisIterator>
           </ChildAxisIterator>
         </ChildAxisIterator>
-      </FnCountIterator>
-    </HoistIterator>
-  </ForVariable>
-  <ForVariable name="er">
-    <OpToIterator>
-      <SingletonIterator value="xs:integer(1)"/>
-      <SingletonIterator value="xs:integer(3)"/>
-    </OpToIterator>
-  </ForVariable>
-  <WhereClause>
-    <TypedValueCompareIterator_INTEGER>
-      <UnhoistIterator>
-        <ForVarIterator varname="$$opt_temp_0"/>
-      </UnhoistIterator>
-      <ForVarIterator varname="er"/>
-    </TypedValueCompareIterator_INTEGER>
-  </WhereClause>
-  <ReturnClause>
-    <ElementIterator>
-      <SingletonIterator value="xs:QName(,,gruppe)"/>
-      <AttributeIterator qname="xs:QName(,,anzahl)">
-        <EnclosedIterator attr_cont="true">
-          <ForVarIterator varname="er"/>
-        </EnclosedIterator>
-      </AttributeIterator>
-      <EnclosedIterator attr_cont="false">
+      </HoistIterator>
+    </LetVariable>
+    <ForVariable name="$$opt_temp_0">
+      <HoistIterator>
+        <FnCountIterator>
+          <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+            <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+              <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill allowed="0">
+                <ForVarIterator varname="b"/>
+              </ChildAxisIterator>
+            </ChildAxisIterator>
+          </ChildAxisIterator>
+        </FnCountIterator>
+      </HoistIterator>
+    </ForVariable>
+    <ForVariable name="er">
+      <OpToIterator>
+        <SingletonIterator value="xs:integer(1)"/>
+        <SingletonIterator value="xs:integer(3)"/>
+      </OpToIterator>
+    </ForVariable>
+    <WhereClause>
+      <TypedValueCompareIterator_INTEGER>
         <UnhoistIterator>
-          <LetVarIterator varname="$$opt_temp_1"/>
+          <ForVarIterator varname="$$opt_temp_0"/>
         </UnhoistIterator>
-      </EnclosedIterator>
-    </ElementIterator>
-  </ReturnClause>
-</FLWORIterator>
-
+        <ForVarIterator varname="er"/>
+      </TypedValueCompareIterator_INTEGER>
+    </WhereClause>
+    <ReturnClause>
+      <ElementIterator>
+        <SingletonIterator value="xs:QName(,,gruppe)"/>
+        <AttributeIterator qname="xs:QName(,,anzahl)">
+          <EnclosedIterator attr_cont="true">
+            <ForVarIterator varname="er"/>
+          </EnclosedIterator>
+        </AttributeIterator>
+        <EnclosedIterator attr_cont="false">
+          <UnhoistIterator>
+            <LetVarIterator varname="$$opt_temp_1"/>
+          </UnhoistIterator>
+        </EnclosedIterator>
+      </ElementIterator>
+    </ReturnClause>
+  </FLWORIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9066.iter'
--- test/iterplans/zorba/hashjoins/9066.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9066.iter	2014-02-24 20:09:23 +0000
@@ -1,46 +1,46 @@
-Iterator tree for main query:
-<FLWORIterator>
-  <ForVariable name="b">
-    <FnDocIterator>
-      <SingletonIterator value="xs:string(books.xml)"/>
-    </FnDocIterator>
-  </ForVariable>
-  <ForVariable name="$$opt_temp_0">
-    <HoistIterator>
-      <FnCountIterator>
-        <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
-          <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-            <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill allowed="0">
-              <ForVarIterator varname="b"/>
+<iterator-tree description="main query">
+  <FLWORIterator>
+    <ForVariable name="b">
+      <FnDocIterator>
+        <SingletonIterator value="xs:string(books.xml)"/>
+      </FnDocIterator>
+    </ForVariable>
+    <ForVariable name="$$opt_temp_0">
+      <HoistIterator>
+        <FnCountIterator>
+          <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+            <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+              <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,bib)" typename="*" nill allowed="0">
+                <ForVarIterator varname="b"/>
+              </ChildAxisIterator>
             </ChildAxisIterator>
           </ChildAxisIterator>
-        </ChildAxisIterator>
-      </FnCountIterator>
-    </HoistIterator>
-  </ForVariable>
-  <ForVariable name="er">
-    <OpToIterator>
-      <SingletonIterator value="xs:integer(1)"/>
-      <SingletonIterator value="xs:integer(3)"/>
-    </OpToIterator>
-  </ForVariable>
-  <WhereClause>
-    <TypedValueCompareIterator_INTEGER>
-      <UnhoistIterator>
-        <ForVarIterator varname="$$opt_temp_0"/>
-      </UnhoistIterator>
-      <ForVarIterator varname="er"/>
-    </TypedValueCompareIterator_INTEGER>
-  </WhereClause>
-  <ReturnClause>
-    <ElementIterator>
-      <SingletonIterator value="xs:QName(,,gruppe)"/>
-      <AttributeIterator qname="xs:QName(,,anzahl)">
-        <EnclosedIterator attr_cont="true">
-          <ForVarIterator varname="er"/>
-        </EnclosedIterator>
-      </AttributeIterator>
-    </ElementIterator>
-  </ReturnClause>
-</FLWORIterator>
-
+        </FnCountIterator>
+      </HoistIterator>
+    </ForVariable>
+    <ForVariable name="er">
+      <OpToIterator>
+        <SingletonIterator value="xs:integer(1)"/>
+        <SingletonIterator value="xs:integer(3)"/>
+      </OpToIterator>
+    </ForVariable>
+    <WhereClause>
+      <TypedValueCompareIterator_INTEGER>
+        <UnhoistIterator>
+          <ForVarIterator varname="$$opt_temp_0"/>
+        </UnhoistIterator>
+        <ForVarIterator varname="er"/>
+      </TypedValueCompareIterator_INTEGER>
+    </WhereClause>
+    <ReturnClause>
+      <ElementIterator>
+        <SingletonIterator value="xs:QName(,,gruppe)"/>
+        <AttributeIterator qname="xs:QName(,,anzahl)">
+          <EnclosedIterator attr_cont="true">
+            <ForVarIterator varname="er"/>
+          </EnclosedIterator>
+        </AttributeIterator>
+      </ElementIterator>
+    </ReturnClause>
+  </FLWORIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9067.iter'
--- test/iterplans/zorba/hashjoins/9067.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9067.iter	2014-02-24 20:09:23 +0000
@@ -1,63 +1,63 @@
-Iterator tree for main query:
-<FLWORIterator>
-  <LetVariable name="$$opt_temp_0" materialize="true">
-    <HoistIterator>
-      <OpToIterator>
-        <SingletonIterator value="xs:integer(1)"/>
-        <SingletonIterator value="xs:integer(3)"/>
-      </OpToIterator>
-    </HoistIterator>
-  </LetVariable>
-  <LetVariable name="$$opt_temp_4" materialize="true">
-    <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-      <FLWORIterator>
-        <ForVariable name="$$opt_temp_2">
-          <UnhoistIterator>
-            <LetVarIterator varname="$$opt_temp_0"/>
-          </UnhoistIterator>
-        </ForVariable>
-        <ReturnClause>
-          <ValueIndexEntryBuilderIterator>
-            <ForVarIterator varname="$$opt_temp_2"/>
-            <ForVarIterator varname="$$opt_temp_2"/>
-          </ValueIndexEntryBuilderIterator>
-        </ReturnClause>
-      </FLWORIterator>
-    </CreateInternalIndexIterator>
-  </LetVariable>
-  <ForVariable name="b">
-    <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-      <FnDocIterator>
-        <SingletonIterator value="xs:string(books.xml)"/>
-      </FnDocIterator>
-    </DescendantAxisIterator>
-  </ForVariable>
-  <ForVariable name="$$opt_temp_1">
-    <HoistIterator>
-      <FnCountIterator>
-        <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
-          <ForVarIterator varname="b"/>
-        </ChildAxisIterator>
-      </FnCountIterator>
-    </HoistIterator>
-  </ForVariable>
-  <ForVariable name="er">
-    <ProbeIndexPointValueIterator>
-      <SingletonIterator value="xs:QName(,,tempIndex0)"/>
-      <UnhoistIterator>
-        <ForVarIterator varname="$$opt_temp_1"/>
-      </UnhoistIterator>
-    </ProbeIndexPointValueIterator>
-  </ForVariable>
-  <ReturnClause>
-    <ElementIterator>
-      <SingletonIterator value="xs:QName(,,gruppe)"/>
-      <AttributeIterator qname="xs:QName(,,anzahl)">
-        <EnclosedIterator attr_cont="true">
-          <ForVarIterator varname="er"/>
-        </EnclosedIterator>
-      </AttributeIterator>
-    </ElementIterator>
-  </ReturnClause>
-</FLWORIterator>
-
+<iterator-tree description="main query">
+  <FLWORIterator>
+    <LetVariable name="$$opt_temp_0" materialize="true">
+      <HoistIterator>
+        <OpToIterator>
+          <SingletonIterator value="xs:integer(1)"/>
+          <SingletonIterator value="xs:integer(3)"/>
+        </OpToIterator>
+      </HoistIterator>
+    </LetVariable>
+    <LetVariable name="$$opt_temp_4" materialize="true">
+      <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
+        <FLWORIterator>
+          <ForVariable name="$$opt_temp_2">
+            <UnhoistIterator>
+              <LetVarIterator varname="$$opt_temp_0"/>
+            </UnhoistIterator>
+          </ForVariable>
+          <ReturnClause>
+            <ValueIndexEntryBuilderIterator>
+              <ForVarIterator varname="$$opt_temp_2"/>
+              <ForVarIterator varname="$$opt_temp_2"/>
+            </ValueIndexEntryBuilderIterator>
+          </ReturnClause>
+        </FLWORIterator>
+      </CreateInternalIndexIterator>
+    </LetVariable>
+    <ForVariable name="b">
+      <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+        <FnDocIterator>
+          <SingletonIterator value="xs:string(books.xml)"/>
+        </FnDocIterator>
+      </DescendantAxisIterator>
+    </ForVariable>
+    <ForVariable name="$$opt_temp_1">
+      <HoistIterator>
+        <FnCountIterator>
+          <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+            <ForVarIterator varname="b"/>
+          </ChildAxisIterator>
+        </FnCountIterator>
+      </HoistIterator>
+    </ForVariable>
+    <ForVariable name="er">
+      <ProbeIndexPointValueIterator>
+        <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+        <UnhoistIterator>
+          <ForVarIterator varname="$$opt_temp_1"/>
+        </UnhoistIterator>
+      </ProbeIndexPointValueIterator>
+    </ForVariable>
+    <ReturnClause>
+      <ElementIterator>
+        <SingletonIterator value="xs:QName(,,gruppe)"/>
+        <AttributeIterator qname="xs:QName(,,anzahl)">
+          <EnclosedIterator attr_cont="true">
+            <ForVarIterator varname="er"/>
+          </EnclosedIterator>
+        </AttributeIterator>
+      </ElementIterator>
+    </ReturnClause>
+  </FLWORIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9068.iter'
--- test/iterplans/zorba/hashjoins/9068.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9068.iter	2014-02-24 20:09:23 +0000
@@ -1,75 +1,75 @@
-Iterator tree for main query:
-<FLWORIterator>
-  <LetVariable name="$$opt_temp_0" materialize="true">
-    <HoistIterator>
-      <OpToIterator>
-        <SingletonIterator value="xs:integer(1)"/>
-        <SingletonIterator value="xs:integer(3)"/>
-      </OpToIterator>
-    </HoistIterator>
-  </LetVariable>
-  <LetVariable name="$$opt_temp_5" materialize="true">
-    <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-      <FLWORIterator>
-        <ForVariable name="$$opt_temp_3">
-          <UnhoistIterator>
-            <LetVarIterator varname="$$opt_temp_0"/>
-          </UnhoistIterator>
-        </ForVariable>
-        <ReturnClause>
-          <ValueIndexEntryBuilderIterator>
-            <ForVarIterator varname="$$opt_temp_3"/>
-            <ForVarIterator varname="$$opt_temp_3"/>
-          </ValueIndexEntryBuilderIterator>
-        </ReturnClause>
-      </FLWORIterator>
-    </CreateInternalIndexIterator>
-  </LetVariable>
-  <ForVariable name="b">
-    <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-      <FnDocIterator>
-        <SingletonIterator value="xs:string(books.xml)"/>
-      </FnDocIterator>
-    </DescendantAxisIterator>
-  </ForVariable>
-  <LetVariable name="$$opt_temp_2" materialize="true">
-    <HoistIterator>
-      <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,title)" typename="*" nill allowed="0">
-        <ForVarIterator varname="b"/>
-      </ChildAxisIterator>
-    </HoistIterator>
-  </LetVariable>
-  <ForVariable name="$$opt_temp_1">
-    <HoistIterator>
-      <FnCountIterator>
-        <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+<iterator-tree description="main query">
+  <FLWORIterator>
+    <LetVariable name="$$opt_temp_0" materialize="true">
+      <HoistIterator>
+        <OpToIterator>
+          <SingletonIterator value="xs:integer(1)"/>
+          <SingletonIterator value="xs:integer(3)"/>
+        </OpToIterator>
+      </HoistIterator>
+    </LetVariable>
+    <LetVariable name="$$opt_temp_5" materialize="true">
+      <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
+        <FLWORIterator>
+          <ForVariable name="$$opt_temp_3">
+            <UnhoistIterator>
+              <LetVarIterator varname="$$opt_temp_0"/>
+            </UnhoistIterator>
+          </ForVariable>
+          <ReturnClause>
+            <ValueIndexEntryBuilderIterator>
+              <ForVarIterator varname="$$opt_temp_3"/>
+              <ForVarIterator varname="$$opt_temp_3"/>
+            </ValueIndexEntryBuilderIterator>
+          </ReturnClause>
+        </FLWORIterator>
+      </CreateInternalIndexIterator>
+    </LetVariable>
+    <ForVariable name="b">
+      <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+        <FnDocIterator>
+          <SingletonIterator value="xs:string(books.xml)"/>
+        </FnDocIterator>
+      </DescendantAxisIterator>
+    </ForVariable>
+    <LetVariable name="$$opt_temp_2" materialize="true">
+      <HoistIterator>
+        <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,title)" typename="*" nill allowed="0">
           <ForVarIterator varname="b"/>
         </ChildAxisIterator>
-      </FnCountIterator>
-    </HoistIterator>
-  </ForVariable>
-  <ForVariable name="er">
-    <ProbeIndexPointValueIterator>
-      <SingletonIterator value="xs:QName(,,tempIndex0)"/>
-      <UnhoistIterator>
-        <ForVarIterator varname="$$opt_temp_1"/>
-      </UnhoistIterator>
-    </ProbeIndexPointValueIterator>
-  </ForVariable>
-  <ReturnClause>
-    <ElementIterator>
-      <SingletonIterator value="xs:QName(,,gruppe)"/>
-      <AttributeIterator qname="xs:QName(,,anzahl)">
-        <EnclosedIterator attr_cont="true">
-          <ForVarIterator varname="er"/>
-        </EnclosedIterator>
-      </AttributeIterator>
-      <EnclosedIterator attr_cont="false">
+      </HoistIterator>
+    </LetVariable>
+    <ForVariable name="$$opt_temp_1">
+      <HoistIterator>
+        <FnCountIterator>
+          <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+            <ForVarIterator varname="b"/>
+          </ChildAxisIterator>
+        </FnCountIterator>
+      </HoistIterator>
+    </ForVariable>
+    <ForVariable name="er">
+      <ProbeIndexPointValueIterator>
+        <SingletonIterator value="xs:QName(,,tempIndex0)"/>
         <UnhoistIterator>
-          <LetVarIterator varname="$$opt_temp_2"/>
+          <ForVarIterator varname="$$opt_temp_1"/>
         </UnhoistIterator>
-      </EnclosedIterator>
-    </ElementIterator>
-  </ReturnClause>
-</FLWORIterator>
-
+      </ProbeIndexPointValueIterator>
+    </ForVariable>
+    <ReturnClause>
+      <ElementIterator>
+        <SingletonIterator value="xs:QName(,,gruppe)"/>
+        <AttributeIterator qname="xs:QName(,,anzahl)">
+          <EnclosedIterator attr_cont="true">
+            <ForVarIterator varname="er"/>
+          </EnclosedIterator>
+        </AttributeIterator>
+        <EnclosedIterator attr_cont="false">
+          <UnhoistIterator>
+            <LetVarIterator varname="$$opt_temp_2"/>
+          </UnhoistIterator>
+        </EnclosedIterator>
+      </ElementIterator>
+    </ReturnClause>
+  </FLWORIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9197.iter'
--- test/iterplans/zorba/hashjoins/9197.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9197.iter	2014-02-24 20:09:23 +0000
@@ -1,68 +1,68 @@
-Iterator tree for main query:
-<ElementIterator>
-  <SingletonIterator value="xs:QName(,,karteikasten)"/>
-  <EnclosedIterator attr_cont="false">
-    <FLWORIterator>
-      <LetVariable name="$$opt_temp_0" materialize="true">
-        <HoistIterator>
-          <OpToIterator>
-            <SingletonIterator value="xs:integer(1)"/>
-            <SingletonIterator value="xs:integer(2)"/>
-          </OpToIterator>
-        </HoistIterator>
-      </LetVariable>
-      <LetVariable name="$$opt_temp_4" materialize="true">
-        <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-          <FLWORIterator>
-            <ForVariable name="$$opt_temp_2">
-              <UnhoistIterator>
-                <LetVarIterator varname="$$opt_temp_0"/>
-              </UnhoistIterator>
-            </ForVariable>
-            <ReturnClause>
-              <ValueIndexEntryBuilderIterator>
-                <ForVarIterator varname="$$opt_temp_2"/>
-                <ForVarIterator varname="$$opt_temp_2"/>
-              </ValueIndexEntryBuilderIterator>
-            </ReturnClause>
-          </FLWORIterator>
-        </CreateInternalIndexIterator>
-      </LetVariable>
-      <ForVariable name="book">
-        <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-          <FnDocIterator>
-            <SingletonIterator value="xs:string(books.xml)"/>
-          </FnDocIterator>
-        </DescendantAxisIterator>
-      </ForVariable>
-      <ForVariable name="$$opt_temp_1">
-        <HoistIterator>
-          <FnCountIterator>
-            <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
-              <ForVarIterator varname="book"/>
-            </ChildAxisIterator>
-          </FnCountIterator>
-        </HoistIterator>
-      </ForVariable>
-      <ForVariable name="anzahl">
-        <ProbeIndexPointValueIterator>
-          <SingletonIterator value="xs:QName(,,tempIndex0)"/>
-          <UnhoistIterator>
-            <ForVarIterator varname="$$opt_temp_1"/>
-          </UnhoistIterator>
-        </ProbeIndexPointValueIterator>
-      </ForVariable>
-      <ReturnClause>
-        <ElementIterator>
-          <SingletonIterator value="xs:QName(,,gruppe)"/>
-          <AttributeIterator qname="xs:QName(,,anzahl)">
-            <EnclosedIterator attr_cont="true">
-              <ForVarIterator varname="anzahl"/>
-            </EnclosedIterator>
-          </AttributeIterator>
-        </ElementIterator>
-      </ReturnClause>
-    </FLWORIterator>
-  </EnclosedIterator>
-</ElementIterator>
-
+<iterator-tree description="main query">
+  <ElementIterator>
+    <SingletonIterator value="xs:QName(,,karteikasten)"/>
+    <EnclosedIterator attr_cont="false">
+      <FLWORIterator>
+        <LetVariable name="$$opt_temp_0" materialize="true">
+          <HoistIterator>
+            <OpToIterator>
+              <SingletonIterator value="xs:integer(1)"/>
+              <SingletonIterator value="xs:integer(2)"/>
+            </OpToIterator>
+          </HoistIterator>
+        </LetVariable>
+        <LetVariable name="$$opt_temp_4" materialize="true">
+          <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
+            <FLWORIterator>
+              <ForVariable name="$$opt_temp_2">
+                <UnhoistIterator>
+                  <LetVarIterator varname="$$opt_temp_0"/>
+                </UnhoistIterator>
+              </ForVariable>
+              <ReturnClause>
+                <ValueIndexEntryBuilderIterator>
+                  <ForVarIterator varname="$$opt_temp_2"/>
+                  <ForVarIterator varname="$$opt_temp_2"/>
+                </ValueIndexEntryBuilderIterator>
+              </ReturnClause>
+            </FLWORIterator>
+          </CreateInternalIndexIterator>
+        </LetVariable>
+        <ForVariable name="book">
+          <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+            <FnDocIterator>
+              <SingletonIterator value="xs:string(books.xml)"/>
+            </FnDocIterator>
+          </DescendantAxisIterator>
+        </ForVariable>
+        <ForVariable name="$$opt_temp_1">
+          <HoistIterator>
+            <FnCountIterator>
+              <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+                <ForVarIterator varname="book"/>
+              </ChildAxisIterator>
+            </FnCountIterator>
+          </HoistIterator>
+        </ForVariable>
+        <ForVariable name="anzahl">
+          <ProbeIndexPointValueIterator>
+            <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+            <UnhoistIterator>
+              <ForVarIterator varname="$$opt_temp_1"/>
+            </UnhoistIterator>
+          </ProbeIndexPointValueIterator>
+        </ForVariable>
+        <ReturnClause>
+          <ElementIterator>
+            <SingletonIterator value="xs:QName(,,gruppe)"/>
+            <AttributeIterator qname="xs:QName(,,anzahl)">
+              <EnclosedIterator attr_cont="true">
+                <ForVarIterator varname="anzahl"/>
+              </EnclosedIterator>
+            </AttributeIterator>
+          </ElementIterator>
+        </ReturnClause>
+      </FLWORIterator>
+    </EnclosedIterator>
+  </ElementIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9198.iter'
--- test/iterplans/zorba/hashjoins/9198.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9198.iter	2014-02-24 20:09:23 +0000
@@ -1,71 +1,71 @@
-Iterator tree for main query:
-<ElementIterator>
-  <SingletonIterator value="xs:QName(,,karteikasten)"/>
-  <EnclosedIterator attr_cont="false">
-    <FLWORIterator>
-      <LetVariable name="$$opt_temp_0" materialize="true">
-        <HoistIterator>
-          <OpToIterator>
-            <SingletonIterator value="xs:integer(1)"/>
-            <SingletonIterator value="xs:integer(2)"/>
-          </OpToIterator>
-        </HoistIterator>
-      </LetVariable>
-      <LetVariable name="$$opt_temp_4" materialize="true">
-        <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-          <FLWORIterator>
-            <ForVariable name="$$opt_temp_2">
-              <UnhoistIterator>
-                <LetVarIterator varname="$$opt_temp_0"/>
-              </UnhoistIterator>
-            </ForVariable>
-            <ReturnClause>
-              <ValueIndexEntryBuilderIterator>
-                <ForVarIterator varname="$$opt_temp_2"/>
-                <ForVarIterator varname="$$opt_temp_2"/>
-              </ValueIndexEntryBuilderIterator>
-            </ReturnClause>
-          </FLWORIterator>
-        </CreateInternalIndexIterator>
-      </LetVariable>
-      <ForVariable name="book">
-        <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-          <FnDocIterator>
-            <SingletonIterator value="xs:string(books.xml)"/>
-          </FnDocIterator>
-        </DescendantAxisIterator>
-      </ForVariable>
-      <ForVariable name="$$opt_temp_1">
-        <HoistIterator>
-          <FnCountIterator>
-            <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+<iterator-tree description="main query">
+  <ElementIterator>
+    <SingletonIterator value="xs:QName(,,karteikasten)"/>
+    <EnclosedIterator attr_cont="false">
+      <FLWORIterator>
+        <LetVariable name="$$opt_temp_0" materialize="true">
+          <HoistIterator>
+            <OpToIterator>
+              <SingletonIterator value="xs:integer(1)"/>
+              <SingletonIterator value="xs:integer(2)"/>
+            </OpToIterator>
+          </HoistIterator>
+        </LetVariable>
+        <LetVariable name="$$opt_temp_4" materialize="true">
+          <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
+            <FLWORIterator>
+              <ForVariable name="$$opt_temp_2">
+                <UnhoistIterator>
+                  <LetVarIterator varname="$$opt_temp_0"/>
+                </UnhoistIterator>
+              </ForVariable>
+              <ReturnClause>
+                <ValueIndexEntryBuilderIterator>
+                  <ForVarIterator varname="$$opt_temp_2"/>
+                  <ForVarIterator varname="$$opt_temp_2"/>
+                </ValueIndexEntryBuilderIterator>
+              </ReturnClause>
+            </FLWORIterator>
+          </CreateInternalIndexIterator>
+        </LetVariable>
+        <ForVariable name="book">
+          <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+            <FnDocIterator>
+              <SingletonIterator value="xs:string(books.xml)"/>
+            </FnDocIterator>
+          </DescendantAxisIterator>
+        </ForVariable>
+        <ForVariable name="$$opt_temp_1">
+          <HoistIterator>
+            <FnCountIterator>
+              <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+                <ForVarIterator varname="book"/>
+              </ChildAxisIterator>
+            </FnCountIterator>
+          </HoistIterator>
+        </ForVariable>
+        <ForVariable name="anzahl">
+          <ProbeIndexPointValueIterator>
+            <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+            <UnhoistIterator>
+              <ForVarIterator varname="$$opt_temp_1"/>
+            </UnhoistIterator>
+          </ProbeIndexPointValueIterator>
+        </ForVariable>
+        <ReturnClause>
+          <ElementIterator>
+            <SingletonIterator value="xs:QName(,,gruppe)"/>
+            <AttributeIterator qname="xs:QName(,,anzahl)">
+              <EnclosedIterator attr_cont="true">
+                <ForVarIterator varname="anzahl"/>
+              </EnclosedIterator>
+            </AttributeIterator>
+            <EnclosedIterator attr_cont="false">
               <ForVarIterator varname="book"/>
-            </ChildAxisIterator>
-          </FnCountIterator>
-        </HoistIterator>
-      </ForVariable>
-      <ForVariable name="anzahl">
-        <ProbeIndexPointValueIterator>
-          <SingletonIterator value="xs:QName(,,tempIndex0)"/>
-          <UnhoistIterator>
-            <ForVarIterator varname="$$opt_temp_1"/>
-          </UnhoistIterator>
-        </ProbeIndexPointValueIterator>
-      </ForVariable>
-      <ReturnClause>
-        <ElementIterator>
-          <SingletonIterator value="xs:QName(,,gruppe)"/>
-          <AttributeIterator qname="xs:QName(,,anzahl)">
-            <EnclosedIterator attr_cont="true">
-              <ForVarIterator varname="anzahl"/>
             </EnclosedIterator>
-          </AttributeIterator>
-          <EnclosedIterator attr_cont="false">
-            <ForVarIterator varname="book"/>
-          </EnclosedIterator>
-        </ElementIterator>
-      </ReturnClause>
-    </FLWORIterator>
-  </EnclosedIterator>
-</ElementIterator>
-
+          </ElementIterator>
+        </ReturnClause>
+      </FLWORIterator>
+    </EnclosedIterator>
+  </ElementIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9199.iter'
--- test/iterplans/zorba/hashjoins/9199.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9199.iter	2014-02-24 20:09:23 +0000
@@ -1,71 +1,71 @@
-Iterator tree for main query:
-<ElementIterator>
-  <SingletonIterator value="xs:QName(,,karteikasten)"/>
-  <EnclosedIterator attr_cont="false">
-    <FLWORIterator>
-      <LetVariable name="$$opt_temp_0" materialize="true">
-        <HoistIterator>
-          <OpToIterator>
-            <SingletonIterator value="xs:integer(1)"/>
-            <SingletonIterator value="xs:integer(2)"/>
-          </OpToIterator>
-        </HoistIterator>
-      </LetVariable>
-      <LetVariable name="$$opt_temp_4" materialize="true">
-        <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-          <FLWORIterator>
-            <ForVariable name="$$opt_temp_2">
-              <UnhoistIterator>
-                <LetVarIterator varname="$$opt_temp_0"/>
-              </UnhoistIterator>
-            </ForVariable>
-            <ReturnClause>
-              <ValueIndexEntryBuilderIterator>
-                <ForVarIterator varname="$$opt_temp_2"/>
-                <ForVarIterator varname="$$opt_temp_2"/>
-              </ValueIndexEntryBuilderIterator>
-            </ReturnClause>
-          </FLWORIterator>
-        </CreateInternalIndexIterator>
-      </LetVariable>
-      <ForVariable name="book">
-        <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-          <FnDocIterator>
-            <SingletonIterator value="xs:string(books.xml)"/>
-          </FnDocIterator>
-        </DescendantAxisIterator>
-      </ForVariable>
-      <ForVariable name="$$opt_temp_1">
-        <HoistIterator>
-          <FnCountIterator>
-            <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+<iterator-tree description="main query">
+  <ElementIterator>
+    <SingletonIterator value="xs:QName(,,karteikasten)"/>
+    <EnclosedIterator attr_cont="false">
+      <FLWORIterator>
+        <LetVariable name="$$opt_temp_0" materialize="true">
+          <HoistIterator>
+            <OpToIterator>
+              <SingletonIterator value="xs:integer(1)"/>
+              <SingletonIterator value="xs:integer(2)"/>
+            </OpToIterator>
+          </HoistIterator>
+        </LetVariable>
+        <LetVariable name="$$opt_temp_4" materialize="true">
+          <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
+            <FLWORIterator>
+              <ForVariable name="$$opt_temp_2">
+                <UnhoistIterator>
+                  <LetVarIterator varname="$$opt_temp_0"/>
+                </UnhoistIterator>
+              </ForVariable>
+              <ReturnClause>
+                <ValueIndexEntryBuilderIterator>
+                  <ForVarIterator varname="$$opt_temp_2"/>
+                  <ForVarIterator varname="$$opt_temp_2"/>
+                </ValueIndexEntryBuilderIterator>
+              </ReturnClause>
+            </FLWORIterator>
+          </CreateInternalIndexIterator>
+        </LetVariable>
+        <ForVariable name="book">
+          <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+            <FnDocIterator>
+              <SingletonIterator value="xs:string(books.xml)"/>
+            </FnDocIterator>
+          </DescendantAxisIterator>
+        </ForVariable>
+        <ForVariable name="$$opt_temp_1">
+          <HoistIterator>
+            <FnCountIterator>
+              <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+                <ForVarIterator varname="book"/>
+              </ChildAxisIterator>
+            </FnCountIterator>
+          </HoistIterator>
+        </ForVariable>
+        <ForVariable name="anzahl">
+          <ProbeIndexPointValueIterator>
+            <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+            <UnhoistIterator>
+              <ForVarIterator varname="$$opt_temp_1"/>
+            </UnhoistIterator>
+          </ProbeIndexPointValueIterator>
+        </ForVariable>
+        <ReturnClause>
+          <ElementIterator>
+            <SingletonIterator value="xs:QName(,,gruppe)"/>
+            <AttributeIterator qname="xs:QName(,,anzahl)">
+              <EnclosedIterator attr_cont="true">
+                <ForVarIterator varname="anzahl"/>
+              </EnclosedIterator>
+            </AttributeIterator>
+            <EnclosedIterator attr_cont="false">
               <ForVarIterator varname="book"/>
-            </ChildAxisIterator>
-          </FnCountIterator>
-        </HoistIterator>
-      </ForVariable>
-      <ForVariable name="anzahl">
-        <ProbeIndexPointValueIterator>
-          <SingletonIterator value="xs:QName(,,tempIndex0)"/>
-          <UnhoistIterator>
-            <ForVarIterator varname="$$opt_temp_1"/>
-          </UnhoistIterator>
-        </ProbeIndexPointValueIterator>
-      </ForVariable>
-      <ReturnClause>
-        <ElementIterator>
-          <SingletonIterator value="xs:QName(,,gruppe)"/>
-          <AttributeIterator qname="xs:QName(,,anzahl)">
-            <EnclosedIterator attr_cont="true">
-              <ForVarIterator varname="anzahl"/>
             </EnclosedIterator>
-          </AttributeIterator>
-          <EnclosedIterator attr_cont="false">
-            <ForVarIterator varname="book"/>
-          </EnclosedIterator>
-        </ElementIterator>
-      </ReturnClause>
-    </FLWORIterator>
-  </EnclosedIterator>
-</ElementIterator>
-
+          </ElementIterator>
+        </ReturnClause>
+      </FLWORIterator>
+    </EnclosedIterator>
+  </ElementIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9204.iter'
--- test/iterplans/zorba/hashjoins/9204.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9204.iter	2014-02-24 20:09:23 +0000
@@ -1,75 +1,75 @@
-Iterator tree for main query:
-<FLWORIterator>
-  <LetVariable name="$$opt_temp_0" materialize="true">
-    <HoistIterator>
-      <OpToIterator>
-        <SingletonIterator value="xs:integer(1)"/>
-        <SingletonIterator value="xs:integer(2)"/>
-      </OpToIterator>
-    </HoistIterator>
-  </LetVariable>
-  <LetVariable name="$$opt_temp_4" materialize="true">
-    <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-      <FLWORIterator>
-        <ForVariable name="$$opt_temp_2">
-          <UnhoistIterator>
-            <LetVarIterator varname="$$opt_temp_0"/>
-          </UnhoistIterator>
-        </ForVariable>
-        <ReturnClause>
-          <ValueIndexEntryBuilderIterator>
-            <ForVarIterator varname="$$opt_temp_2"/>
-            <ForVarIterator varname="$$opt_temp_2"/>
-          </ValueIndexEntryBuilderIterator>
-        </ReturnClause>
-      </FLWORIterator>
-    </CreateInternalIndexIterator>
-  </LetVariable>
-  <ForVariable name="book">
-    <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-      <FnDocIterator>
-        <SingletonIterator value="xs:string(books.xml)"/>
-      </FnDocIterator>
-    </DescendantAxisIterator>
-  </ForVariable>
-  <ForVariable name="$$opt_temp_1">
-    <HoistIterator>
-      <FnCountIterator>
-        <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
-          <ForVarIterator varname="book"/>
-        </ChildAxisIterator>
-      </FnCountIterator>
-    </HoistIterator>
-  </ForVariable>
-  <ReturnClause>
-    <ElementIterator>
-      <SingletonIterator value="xs:QName(,,karteikasten)"/>
-      <EnclosedIterator attr_cont="false">
+<iterator-tree description="main query">
+  <FLWORIterator>
+    <LetVariable name="$$opt_temp_0" materialize="true">
+      <HoistIterator>
+        <OpToIterator>
+          <SingletonIterator value="xs:integer(1)"/>
+          <SingletonIterator value="xs:integer(2)"/>
+        </OpToIterator>
+      </HoistIterator>
+    </LetVariable>
+    <LetVariable name="$$opt_temp_4" materialize="true">
+      <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
         <FLWORIterator>
-          <ForVariable name="anzahl">
-            <ProbeIndexPointValueIterator>
-              <SingletonIterator value="xs:QName(,,tempIndex0)"/>
-              <UnhoistIterator>
-                <ForVarIterator varname="$$opt_temp_1"/>
-              </UnhoistIterator>
-            </ProbeIndexPointValueIterator>
+          <ForVariable name="$$opt_temp_2">
+            <UnhoistIterator>
+              <LetVarIterator varname="$$opt_temp_0"/>
+            </UnhoistIterator>
           </ForVariable>
           <ReturnClause>
-            <ElementIterator>
-              <SingletonIterator value="xs:QName(,,gruppe)"/>
-              <AttributeIterator qname="xs:QName(,,anzahl)">
-                <EnclosedIterator attr_cont="true">
-                  <ForVarIterator varname="anzahl"/>
-                </EnclosedIterator>
-              </AttributeIterator>
-              <EnclosedIterator attr_cont="false">
-                <ForVarIterator varname="book"/>
-              </EnclosedIterator>
-            </ElementIterator>
+            <ValueIndexEntryBuilderIterator>
+              <ForVarIterator varname="$$opt_temp_2"/>
+              <ForVarIterator varname="$$opt_temp_2"/>
+            </ValueIndexEntryBuilderIterator>
           </ReturnClause>
         </FLWORIterator>
-      </EnclosedIterator>
-    </ElementIterator>
-  </ReturnClause>
-</FLWORIterator>
-
+      </CreateInternalIndexIterator>
+    </LetVariable>
+    <ForVariable name="book">
+      <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+        <FnDocIterator>
+          <SingletonIterator value="xs:string(books.xml)"/>
+        </FnDocIterator>
+      </DescendantAxisIterator>
+    </ForVariable>
+    <ForVariable name="$$opt_temp_1">
+      <HoistIterator>
+        <FnCountIterator>
+          <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+            <ForVarIterator varname="book"/>
+          </ChildAxisIterator>
+        </FnCountIterator>
+      </HoistIterator>
+    </ForVariable>
+    <ReturnClause>
+      <ElementIterator>
+        <SingletonIterator value="xs:QName(,,karteikasten)"/>
+        <EnclosedIterator attr_cont="false">
+          <FLWORIterator>
+            <ForVariable name="anzahl">
+              <ProbeIndexPointValueIterator>
+                <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+                <UnhoistIterator>
+                  <ForVarIterator varname="$$opt_temp_1"/>
+                </UnhoistIterator>
+              </ProbeIndexPointValueIterator>
+            </ForVariable>
+            <ReturnClause>
+              <ElementIterator>
+                <SingletonIterator value="xs:QName(,,gruppe)"/>
+                <AttributeIterator qname="xs:QName(,,anzahl)">
+                  <EnclosedIterator attr_cont="true">
+                    <ForVarIterator varname="anzahl"/>
+                  </EnclosedIterator>
+                </AttributeIterator>
+                <EnclosedIterator attr_cont="false">
+                  <ForVarIterator varname="book"/>
+                </EnclosedIterator>
+              </ElementIterator>
+            </ReturnClause>
+          </FLWORIterator>
+        </EnclosedIterator>
+      </ElementIterator>
+    </ReturnClause>
+  </FLWORIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9206.iter'
--- test/iterplans/zorba/hashjoins/9206.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9206.iter	2014-02-24 20:09:23 +0000
@@ -1,64 +1,64 @@
-Iterator tree for main query:
-<ElementIterator>
-  <SingletonIterator value="xs:QName(,,karteikasten)"/>
-  <EnclosedIterator attr_cont="false">
-    <FLWORIterator>
-      <LetVariable name="$$opt_temp_0" materialize="true">
-        <HoistIterator>
-          <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-            <FnDocIterator>
-              <SingletonIterator value="xs:string(books.xml)"/>
-            </FnDocIterator>
-          </DescendantAxisIterator>
-        </HoistIterator>
-      </LetVariable>
-      <LetVariable name="$$opt_temp_3" materialize="true">
-        <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-          <FLWORIterator>
-            <ForVariable name="$$opt_temp_1">
-              <UnhoistIterator>
-                <LetVarIterator varname="$$opt_temp_0"/>
-              </UnhoistIterator>
-            </ForVariable>
-            <ReturnClause>
-              <ValueIndexEntryBuilderIterator>
-                <ForVarIterator varname="$$opt_temp_1"/>
-                <FnCountIterator>
-                  <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
-                    <ForVarIterator varname="$$opt_temp_1"/>
-                  </ChildAxisIterator>
-                </FnCountIterator>
-              </ValueIndexEntryBuilderIterator>
-            </ReturnClause>
-          </FLWORIterator>
-        </CreateInternalIndexIterator>
-      </LetVariable>
-      <ForVariable name="anzahl">
-        <OpToIterator>
-          <SingletonIterator value="xs:integer(1)"/>
-          <SingletonIterator value="xs:integer(2)"/>
-        </OpToIterator>
-      </ForVariable>
-      <ForVariable name="book">
-        <ProbeIndexPointValueIterator>
-          <SingletonIterator value="xs:QName(,,tempIndex0)"/>
-          <ForVarIterator varname="anzahl"/>
-        </ProbeIndexPointValueIterator>
-      </ForVariable>
-      <ReturnClause>
-        <ElementIterator>
-          <SingletonIterator value="xs:QName(,,gruppe)"/>
-          <AttributeIterator qname="xs:QName(,,anzahl)">
-            <EnclosedIterator attr_cont="true">
-              <ForVarIterator varname="anzahl"/>
+<iterator-tree description="main query">
+  <ElementIterator>
+    <SingletonIterator value="xs:QName(,,karteikasten)"/>
+    <EnclosedIterator attr_cont="false">
+      <FLWORIterator>
+        <LetVariable name="$$opt_temp_0" materialize="true">
+          <HoistIterator>
+            <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+              <FnDocIterator>
+                <SingletonIterator value="xs:string(books.xml)"/>
+              </FnDocIterator>
+            </DescendantAxisIterator>
+          </HoistIterator>
+        </LetVariable>
+        <LetVariable name="$$opt_temp_3" materialize="true">
+          <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
+            <FLWORIterator>
+              <ForVariable name="$$opt_temp_1">
+                <UnhoistIterator>
+                  <LetVarIterator varname="$$opt_temp_0"/>
+                </UnhoistIterator>
+              </ForVariable>
+              <ReturnClause>
+                <ValueIndexEntryBuilderIterator>
+                  <ForVarIterator varname="$$opt_temp_1"/>
+                  <FnCountIterator>
+                    <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+                      <ForVarIterator varname="$$opt_temp_1"/>
+                    </ChildAxisIterator>
+                  </FnCountIterator>
+                </ValueIndexEntryBuilderIterator>
+              </ReturnClause>
+            </FLWORIterator>
+          </CreateInternalIndexIterator>
+        </LetVariable>
+        <ForVariable name="anzahl">
+          <OpToIterator>
+            <SingletonIterator value="xs:integer(1)"/>
+            <SingletonIterator value="xs:integer(2)"/>
+          </OpToIterator>
+        </ForVariable>
+        <ForVariable name="book">
+          <ProbeIndexPointValueIterator>
+            <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+            <ForVarIterator varname="anzahl"/>
+          </ProbeIndexPointValueIterator>
+        </ForVariable>
+        <ReturnClause>
+          <ElementIterator>
+            <SingletonIterator value="xs:QName(,,gruppe)"/>
+            <AttributeIterator qname="xs:QName(,,anzahl)">
+              <EnclosedIterator attr_cont="true">
+                <ForVarIterator varname="anzahl"/>
+              </EnclosedIterator>
+            </AttributeIterator>
+            <EnclosedIterator attr_cont="false">
+              <ForVarIterator varname="book"/>
             </EnclosedIterator>
-          </AttributeIterator>
-          <EnclosedIterator attr_cont="false">
-            <ForVarIterator varname="book"/>
-          </EnclosedIterator>
-        </ElementIterator>
-      </ReturnClause>
-    </FLWORIterator>
-  </EnclosedIterator>
-</ElementIterator>
-
+          </ElementIterator>
+        </ReturnClause>
+      </FLWORIterator>
+    </EnclosedIterator>
+  </ElementIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9207.iter'
--- test/iterplans/zorba/hashjoins/9207.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9207.iter	2014-02-24 20:09:23 +0000
@@ -1,71 +1,71 @@
-Iterator tree for main query:
-<ElementIterator>
-  <SingletonIterator value="xs:QName(,,karteikasten)"/>
-  <EnclosedIterator attr_cont="false">
-    <FLWORIterator>
-      <LetVariable name="$$opt_temp_0" materialize="true">
-        <HoistIterator>
-          <OpToIterator>
-            <SingletonIterator value="xs:integer(1)"/>
-            <SingletonIterator value="xs:integer(2)"/>
-          </OpToIterator>
-        </HoistIterator>
-      </LetVariable>
-      <LetVariable name="$$opt_temp_4" materialize="true">
-        <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-          <FLWORIterator>
-            <ForVariable name="$$opt_temp_2">
-              <UnhoistIterator>
-                <LetVarIterator varname="$$opt_temp_0"/>
-              </UnhoistIterator>
-            </ForVariable>
-            <ReturnClause>
-              <ValueIndexEntryBuilderIterator>
-                <ForVarIterator varname="$$opt_temp_2"/>
-                <ForVarIterator varname="$$opt_temp_2"/>
-              </ValueIndexEntryBuilderIterator>
-            </ReturnClause>
-          </FLWORIterator>
-        </CreateInternalIndexIterator>
-      </LetVariable>
-      <ForVariable name="book">
-        <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-          <FnDocIterator>
-            <SingletonIterator value="xs:string(books.xml)"/>
-          </FnDocIterator>
-        </DescendantAxisIterator>
-      </ForVariable>
-      <ForVariable name="$$opt_temp_1">
-        <HoistIterator>
-          <FnCountIterator>
-            <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+<iterator-tree description="main query">
+  <ElementIterator>
+    <SingletonIterator value="xs:QName(,,karteikasten)"/>
+    <EnclosedIterator attr_cont="false">
+      <FLWORIterator>
+        <LetVariable name="$$opt_temp_0" materialize="true">
+          <HoistIterator>
+            <OpToIterator>
+              <SingletonIterator value="xs:integer(1)"/>
+              <SingletonIterator value="xs:integer(2)"/>
+            </OpToIterator>
+          </HoistIterator>
+        </LetVariable>
+        <LetVariable name="$$opt_temp_4" materialize="true">
+          <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
+            <FLWORIterator>
+              <ForVariable name="$$opt_temp_2">
+                <UnhoistIterator>
+                  <LetVarIterator varname="$$opt_temp_0"/>
+                </UnhoistIterator>
+              </ForVariable>
+              <ReturnClause>
+                <ValueIndexEntryBuilderIterator>
+                  <ForVarIterator varname="$$opt_temp_2"/>
+                  <ForVarIterator varname="$$opt_temp_2"/>
+                </ValueIndexEntryBuilderIterator>
+              </ReturnClause>
+            </FLWORIterator>
+          </CreateInternalIndexIterator>
+        </LetVariable>
+        <ForVariable name="book">
+          <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+            <FnDocIterator>
+              <SingletonIterator value="xs:string(books.xml)"/>
+            </FnDocIterator>
+          </DescendantAxisIterator>
+        </ForVariable>
+        <ForVariable name="$$opt_temp_1">
+          <HoistIterator>
+            <FnCountIterator>
+              <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+                <ForVarIterator varname="book"/>
+              </ChildAxisIterator>
+            </FnCountIterator>
+          </HoistIterator>
+        </ForVariable>
+        <ForVariable name="anzahl">
+          <ProbeIndexPointValueIterator>
+            <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+            <UnhoistIterator>
+              <ForVarIterator varname="$$opt_temp_1"/>
+            </UnhoistIterator>
+          </ProbeIndexPointValueIterator>
+        </ForVariable>
+        <ReturnClause>
+          <ElementIterator>
+            <SingletonIterator value="xs:QName(,,gruppe)"/>
+            <AttributeIterator qname="xs:QName(,,anzahl)">
+              <EnclosedIterator attr_cont="true">
+                <ForVarIterator varname="anzahl"/>
+              </EnclosedIterator>
+            </AttributeIterator>
+            <EnclosedIterator attr_cont="false">
               <ForVarIterator varname="book"/>
-            </ChildAxisIterator>
-          </FnCountIterator>
-        </HoistIterator>
-      </ForVariable>
-      <ForVariable name="anzahl">
-        <ProbeIndexPointValueIterator>
-          <SingletonIterator value="xs:QName(,,tempIndex0)"/>
-          <UnhoistIterator>
-            <ForVarIterator varname="$$opt_temp_1"/>
-          </UnhoistIterator>
-        </ProbeIndexPointValueIterator>
-      </ForVariable>
-      <ReturnClause>
-        <ElementIterator>
-          <SingletonIterator value="xs:QName(,,gruppe)"/>
-          <AttributeIterator qname="xs:QName(,,anzahl)">
-            <EnclosedIterator attr_cont="true">
-              <ForVarIterator varname="anzahl"/>
             </EnclosedIterator>
-          </AttributeIterator>
-          <EnclosedIterator attr_cont="false">
-            <ForVarIterator varname="book"/>
-          </EnclosedIterator>
-        </ElementIterator>
-      </ReturnClause>
-    </FLWORIterator>
-  </EnclosedIterator>
-</ElementIterator>
-
+          </ElementIterator>
+        </ReturnClause>
+      </FLWORIterator>
+    </EnclosedIterator>
+  </ElementIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9210.iter'
--- test/iterplans/zorba/hashjoins/9210.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9210.iter	2014-02-24 20:09:23 +0000
@@ -1,68 +1,68 @@
-Iterator tree for main query:
-<ElementIterator>
-  <SingletonIterator value="xs:QName(,,karteikasten)"/>
-  <EnclosedIterator attr_cont="false">
-    <FLWORIterator>
-      <LetVariable name="$$opt_temp_0" materialize="true">
-        <HoistIterator>
-          <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-            <FnDocIterator>
-              <SingletonIterator value="xs:string(books.xml)"/>
-            </FnDocIterator>
-          </DescendantAxisIterator>
-        </HoistIterator>
-      </LetVariable>
-      <LetVariable name="$$opt_temp_3" materialize="true">
-        <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-          <FLWORIterator>
-            <ForVariable name="$$opt_temp_1">
-              <UnhoistIterator>
-                <LetVarIterator varname="$$opt_temp_0"/>
-              </UnhoistIterator>
-            </ForVariable>
-            <ReturnClause>
-              <ValueIndexEntryBuilderIterator>
-                <ForVarIterator varname="$$opt_temp_1"/>
-                <FnCountIterator>
-                  <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
-                    <ForVarIterator varname="$$opt_temp_1"/>
-                  </ChildAxisIterator>
-                </FnCountIterator>
-              </ValueIndexEntryBuilderIterator>
-            </ReturnClause>
-          </FLWORIterator>
-        </CreateInternalIndexIterator>
-      </LetVariable>
-      <ForVariable name="anzahl">
-        <OpToIterator>
-          <SingletonIterator value="xs:integer(1)"/>
-          <SingletonIterator value="xs:integer(2)"/>
-        </OpToIterator>
-      </ForVariable>
-      <ReturnClause>
-        <ElementIterator>
-          <SingletonIterator value="xs:QName(,,gruppe)"/>
-          <AttributeIterator qname="xs:QName(,,anzahl)">
-            <EnclosedIterator attr_cont="true">
-              <ForVarIterator varname="anzahl"/>
-            </EnclosedIterator>
-          </AttributeIterator>
-          <EnclosedIterator attr_cont="false">
+<iterator-tree description="main query">
+  <ElementIterator>
+    <SingletonIterator value="xs:QName(,,karteikasten)"/>
+    <EnclosedIterator attr_cont="false">
+      <FLWORIterator>
+        <LetVariable name="$$opt_temp_0" materialize="true">
+          <HoistIterator>
+            <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+              <FnDocIterator>
+                <SingletonIterator value="xs:string(books.xml)"/>
+              </FnDocIterator>
+            </DescendantAxisIterator>
+          </HoistIterator>
+        </LetVariable>
+        <LetVariable name="$$opt_temp_3" materialize="true">
+          <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
             <FLWORIterator>
-              <ForVariable name="book">
-                <ProbeIndexPointValueIterator>
-                  <SingletonIterator value="xs:QName(,,tempIndex0)"/>
-                  <ForVarIterator varname="anzahl"/>
-                </ProbeIndexPointValueIterator>
+              <ForVariable name="$$opt_temp_1">
+                <UnhoistIterator>
+                  <LetVarIterator varname="$$opt_temp_0"/>
+                </UnhoistIterator>
               </ForVariable>
               <ReturnClause>
-                <ForVarIterator varname="book"/>
+                <ValueIndexEntryBuilderIterator>
+                  <ForVarIterator varname="$$opt_temp_1"/>
+                  <FnCountIterator>
+                    <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+                      <ForVarIterator varname="$$opt_temp_1"/>
+                    </ChildAxisIterator>
+                  </FnCountIterator>
+                </ValueIndexEntryBuilderIterator>
               </ReturnClause>
             </FLWORIterator>
-          </EnclosedIterator>
-        </ElementIterator>
-      </ReturnClause>
-    </FLWORIterator>
-  </EnclosedIterator>
-</ElementIterator>
-
+          </CreateInternalIndexIterator>
+        </LetVariable>
+        <ForVariable name="anzahl">
+          <OpToIterator>
+            <SingletonIterator value="xs:integer(1)"/>
+            <SingletonIterator value="xs:integer(2)"/>
+          </OpToIterator>
+        </ForVariable>
+        <ReturnClause>
+          <ElementIterator>
+            <SingletonIterator value="xs:QName(,,gruppe)"/>
+            <AttributeIterator qname="xs:QName(,,anzahl)">
+              <EnclosedIterator attr_cont="true">
+                <ForVarIterator varname="anzahl"/>
+              </EnclosedIterator>
+            </AttributeIterator>
+            <EnclosedIterator attr_cont="false">
+              <FLWORIterator>
+                <ForVariable name="book">
+                  <ProbeIndexPointValueIterator>
+                    <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+                    <ForVarIterator varname="anzahl"/>
+                  </ProbeIndexPointValueIterator>
+                </ForVariable>
+                <ReturnClause>
+                  <ForVarIterator varname="book"/>
+                </ReturnClause>
+              </FLWORIterator>
+            </EnclosedIterator>
+          </ElementIterator>
+        </ReturnClause>
+      </FLWORIterator>
+    </EnclosedIterator>
+  </ElementIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9211.iter'
--- test/iterplans/zorba/hashjoins/9211.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9211.iter	2014-02-24 20:09:23 +0000
@@ -1,71 +1,71 @@
-Iterator tree for main query:
-<ElementIterator>
-  <SingletonIterator value="xs:QName(,,karteikasten)"/>
-  <EnclosedIterator attr_cont="false">
-    <FLWORIterator>
-      <LetVariable name="$$opt_temp_0" materialize="true">
-        <HoistIterator>
-          <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-            <FnDocIterator>
-              <SingletonIterator value="xs:string(books.xml)"/>
-            </FnDocIterator>
-          </DescendantAxisIterator>
-        </HoistIterator>
-      </LetVariable>
-      <LetVariable name="$$opt_temp_3" materialize="true">
-        <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-          <FLWORIterator>
-            <ForVariable name="$$opt_temp_1">
-              <UnhoistIterator>
-                <LetVarIterator varname="$$opt_temp_0"/>
-              </UnhoistIterator>
-            </ForVariable>
-            <ReturnClause>
-              <ValueIndexEntryBuilderIterator>
-                <ForVarIterator varname="$$opt_temp_1"/>
-                <FnCountIterator>
-                  <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
-                    <ForVarIterator varname="$$opt_temp_1"/>
-                  </ChildAxisIterator>
-                </FnCountIterator>
-              </ValueIndexEntryBuilderIterator>
-            </ReturnClause>
-          </FLWORIterator>
-        </CreateInternalIndexIterator>
-      </LetVariable>
-      <ForVariable name="anzahl">
-        <OpToIterator>
-          <SingletonIterator value="xs:integer(1)"/>
-          <SingletonIterator value="xs:integer(2)"/>
-        </OpToIterator>
-      </ForVariable>
-      <OrderBySpec>
-        <ForVarIterator varname="anzahl"/>
-      </OrderBySpec>
-      <ReturnClause>
-        <ElementIterator>
-          <SingletonIterator value="xs:QName(,,gruppe)"/>
-          <AttributeIterator qname="xs:QName(,,anzahl)">
-            <EnclosedIterator attr_cont="true">
-              <ForVarIterator varname="anzahl"/>
-            </EnclosedIterator>
-          </AttributeIterator>
-          <EnclosedIterator attr_cont="false">
+<iterator-tree description="main query">
+  <ElementIterator>
+    <SingletonIterator value="xs:QName(,,karteikasten)"/>
+    <EnclosedIterator attr_cont="false">
+      <FLWORIterator>
+        <LetVariable name="$$opt_temp_0" materialize="true">
+          <HoistIterator>
+            <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+              <FnDocIterator>
+                <SingletonIterator value="xs:string(books.xml)"/>
+              </FnDocIterator>
+            </DescendantAxisIterator>
+          </HoistIterator>
+        </LetVariable>
+        <LetVariable name="$$opt_temp_3" materialize="true">
+          <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
             <FLWORIterator>
-              <ForVariable name="book">
-                <ProbeIndexPointValueIterator>
-                  <SingletonIterator value="xs:QName(,,tempIndex0)"/>
-                  <ForVarIterator varname="anzahl"/>
-                </ProbeIndexPointValueIterator>
+              <ForVariable name="$$opt_temp_1">
+                <UnhoistIterator>
+                  <LetVarIterator varname="$$opt_temp_0"/>
+                </UnhoistIterator>
               </ForVariable>
               <ReturnClause>
-                <ForVarIterator varname="book"/>
+                <ValueIndexEntryBuilderIterator>
+                  <ForVarIterator varname="$$opt_temp_1"/>
+                  <FnCountIterator>
+                    <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+                      <ForVarIterator varname="$$opt_temp_1"/>
+                    </ChildAxisIterator>
+                  </FnCountIterator>
+                </ValueIndexEntryBuilderIterator>
               </ReturnClause>
             </FLWORIterator>
-          </EnclosedIterator>
-        </ElementIterator>
-      </ReturnClause>
-    </FLWORIterator>
-  </EnclosedIterator>
-</ElementIterator>
-
+          </CreateInternalIndexIterator>
+        </LetVariable>
+        <ForVariable name="anzahl">
+          <OpToIterator>
+            <SingletonIterator value="xs:integer(1)"/>
+            <SingletonIterator value="xs:integer(2)"/>
+          </OpToIterator>
+        </ForVariable>
+        <OrderBySpec>
+          <ForVarIterator varname="anzahl"/>
+        </OrderBySpec>
+        <ReturnClause>
+          <ElementIterator>
+            <SingletonIterator value="xs:QName(,,gruppe)"/>
+            <AttributeIterator qname="xs:QName(,,anzahl)">
+              <EnclosedIterator attr_cont="true">
+                <ForVarIterator varname="anzahl"/>
+              </EnclosedIterator>
+            </AttributeIterator>
+            <EnclosedIterator attr_cont="false">
+              <FLWORIterator>
+                <ForVariable name="book">
+                  <ProbeIndexPointValueIterator>
+                    <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+                    <ForVarIterator varname="anzahl"/>
+                  </ProbeIndexPointValueIterator>
+                </ForVariable>
+                <ReturnClause>
+                  <ForVarIterator varname="book"/>
+                </ReturnClause>
+              </FLWORIterator>
+            </EnclosedIterator>
+          </ElementIterator>
+        </ReturnClause>
+      </FLWORIterator>
+    </EnclosedIterator>
+  </ElementIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9212.iter'
--- test/iterplans/zorba/hashjoins/9212.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9212.iter	2014-02-24 20:09:23 +0000
@@ -1,79 +1,79 @@
-Iterator tree for main query:
-<ElementIterator>
-  <SingletonIterator value="xs:QName(,,karteikasten)"/>
-  <EnclosedIterator attr_cont="false">
-    <FLWORIterator>
-      <LetVariable name="$$opt_temp_0" materialize="true">
-        <HoistIterator>
+<iterator-tree description="main query">
+  <ElementIterator>
+    <SingletonIterator value="xs:QName(,,karteikasten)"/>
+    <EnclosedIterator attr_cont="false">
+      <FLWORIterator>
+        <LetVariable name="$$opt_temp_0" materialize="true">
+          <HoistIterator>
+            <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+              <FnDocIterator>
+                <SingletonIterator value="xs:string(books.xml)"/>
+              </FnDocIterator>
+            </DescendantAxisIterator>
+          </HoistIterator>
+        </LetVariable>
+        <LetVariable name="$$opt_temp_3" materialize="true">
+          <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
+            <FLWORIterator>
+              <ForVariable name="$$opt_temp_1">
+                <UnhoistIterator>
+                  <LetVarIterator varname="$$opt_temp_0"/>
+                </UnhoistIterator>
+              </ForVariable>
+              <ReturnClause>
+                <ValueIndexEntryBuilderIterator>
+                  <ForVarIterator varname="$$opt_temp_1"/>
+                  <FnCountIterator>
+                    <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+                      <ForVarIterator varname="$$opt_temp_1"/>
+                    </ChildAxisIterator>
+                  </FnCountIterator>
+                </ValueIndexEntryBuilderIterator>
+              </ReturnClause>
+            </FLWORIterator>
+          </CreateInternalIndexIterator>
+        </LetVariable>
+        <ForVariable name="book">
           <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
             <FnDocIterator>
               <SingletonIterator value="xs:string(books.xml)"/>
             </FnDocIterator>
           </DescendantAxisIterator>
-        </HoistIterator>
-      </LetVariable>
-      <LetVariable name="$$opt_temp_3" materialize="true">
-        <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-          <FLWORIterator>
-            <ForVariable name="$$opt_temp_1">
-              <UnhoistIterator>
-                <LetVarIterator varname="$$opt_temp_0"/>
-              </UnhoistIterator>
-            </ForVariable>
-            <ReturnClause>
-              <ValueIndexEntryBuilderIterator>
-                <ForVarIterator varname="$$opt_temp_1"/>
-                <FnCountIterator>
-                  <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
-                    <ForVarIterator varname="$$opt_temp_1"/>
-                  </ChildAxisIterator>
-                </FnCountIterator>
-              </ValueIndexEntryBuilderIterator>
-            </ReturnClause>
-          </FLWORIterator>
-        </CreateInternalIndexIterator>
-      </LetVariable>
-      <ForVariable name="book">
-        <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-          <FnDocIterator>
-            <SingletonIterator value="xs:string(books.xml)"/>
-          </FnDocIterator>
-        </DescendantAxisIterator>
-      </ForVariable>
-      <ForVariable name="anzahl">
-        <FnCountIterator>
-          <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
-            <ForVarIterator varname="book"/>
-          </ChildAxisIterator>
-        </FnCountIterator>
-      </ForVariable>
-      <OrderBySpec>
-        <ForVarIterator varname="anzahl"/>
-      </OrderBySpec>
-      <ReturnClause>
-        <ElementIterator>
-          <SingletonIterator value="xs:QName(,,gruppe)"/>
-          <AttributeIterator qname="xs:QName(,,anzahl)">
-            <EnclosedIterator attr_cont="true">
-              <ForVarIterator varname="anzahl"/>
+        </ForVariable>
+        <ForVariable name="anzahl">
+          <FnCountIterator>
+            <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+              <ForVarIterator varname="book"/>
+            </ChildAxisIterator>
+          </FnCountIterator>
+        </ForVariable>
+        <OrderBySpec>
+          <ForVarIterator varname="anzahl"/>
+        </OrderBySpec>
+        <ReturnClause>
+          <ElementIterator>
+            <SingletonIterator value="xs:QName(,,gruppe)"/>
+            <AttributeIterator qname="xs:QName(,,anzahl)">
+              <EnclosedIterator attr_cont="true">
+                <ForVarIterator varname="anzahl"/>
+              </EnclosedIterator>
+            </AttributeIterator>
+            <EnclosedIterator attr_cont="false">
+              <FLWORIterator>
+                <ForVariable name="book">
+                  <ProbeIndexPointValueIterator>
+                    <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+                    <ForVarIterator varname="anzahl"/>
+                  </ProbeIndexPointValueIterator>
+                </ForVariable>
+                <ReturnClause>
+                  <ForVarIterator varname="book"/>
+                </ReturnClause>
+              </FLWORIterator>
             </EnclosedIterator>
-          </AttributeIterator>
-          <EnclosedIterator attr_cont="false">
-            <FLWORIterator>
-              <ForVariable name="book">
-                <ProbeIndexPointValueIterator>
-                  <SingletonIterator value="xs:QName(,,tempIndex0)"/>
-                  <ForVarIterator varname="anzahl"/>
-                </ProbeIndexPointValueIterator>
-              </ForVariable>
-              <ReturnClause>
-                <ForVarIterator varname="book"/>
-              </ReturnClause>
-            </FLWORIterator>
-          </EnclosedIterator>
-        </ElementIterator>
-      </ReturnClause>
-    </FLWORIterator>
-  </EnclosedIterator>
-</ElementIterator>
-
+          </ElementIterator>
+        </ReturnClause>
+      </FLWORIterator>
+    </EnclosedIterator>
+  </ElementIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9389.iter'
--- test/iterplans/zorba/hashjoins/9389.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9389.iter	2014-02-24 20:09:23 +0000
@@ -1,66 +1,66 @@
-Iterator tree for main query:
-<ElementIterator>
-  <SingletonIterator value="xs:QName(,,karteikasten)"/>
-  <EnclosedIterator attr_cont="false">
-    <FLWORIterator>
-      <LetVariable name="$$opt_temp_0" materialize="true">
-        <HoistIterator>
-          <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-            <FnDocIterator>
-              <SingletonIterator value="xs:string(books.xml)"/>
-            </FnDocIterator>
-          </DescendantAxisIterator>
-        </HoistIterator>
-      </LetVariable>
-      <LetVariable name="$$opt_temp_3" materialize="true">
-        <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-          <FLWORIterator>
-            <ForVariable name="$$opt_temp_1">
-              <UnhoistIterator>
-                <LetVarIterator varname="$$opt_temp_0"/>
-              </UnhoistIterator>
-            </ForVariable>
-            <ReturnClause>
-              <ValueIndexEntryBuilderIterator>
-                <ForVarIterator varname="$$opt_temp_1"/>
-                <FnCountIterator>
-                  <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
-                    <ForVarIterator varname="$$opt_temp_1"/>
-                  </ChildAxisIterator>
-                </FnCountIterator>
-              </ValueIndexEntryBuilderIterator>
-            </ReturnClause>
-          </FLWORIterator>
-        </CreateInternalIndexIterator>
-      </LetVariable>
-      <ForVariable name="anzahl">
-        <OpToIterator>
-          <SingletonIterator value="xs:integer(1)"/>
-          <SingletonIterator value="xs:integer(5)"/>
-        </OpToIterator>
-      </ForVariable>
-      <ReturnClause>
-        <ElementIterator>
-          <SingletonIterator value="xs:QName(,,gruppe)"/>
-          <AttributeIterator qname="xs:QName(,,anzahl)">
-            <EnclosedIterator attr_cont="true">
-              <FLWORIterator>
-                <ForVariable name="karte">
-                  <ProbeIndexPointValueIterator>
-                    <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+<iterator-tree description="main query">
+  <ElementIterator>
+    <SingletonIterator value="xs:QName(,,karteikasten)"/>
+    <EnclosedIterator attr_cont="false">
+      <FLWORIterator>
+        <LetVariable name="$$opt_temp_0" materialize="true">
+          <HoistIterator>
+            <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+              <FnDocIterator>
+                <SingletonIterator value="xs:string(books.xml)"/>
+              </FnDocIterator>
+            </DescendantAxisIterator>
+          </HoistIterator>
+        </LetVariable>
+        <LetVariable name="$$opt_temp_3" materialize="true">
+          <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
+            <FLWORIterator>
+              <ForVariable name="$$opt_temp_1">
+                <UnhoistIterator>
+                  <LetVarIterator varname="$$opt_temp_0"/>
+                </UnhoistIterator>
+              </ForVariable>
+              <ReturnClause>
+                <ValueIndexEntryBuilderIterator>
+                  <ForVarIterator varname="$$opt_temp_1"/>
+                  <FnCountIterator>
+                    <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+                      <ForVarIterator varname="$$opt_temp_1"/>
+                    </ChildAxisIterator>
+                  </FnCountIterator>
+                </ValueIndexEntryBuilderIterator>
+              </ReturnClause>
+            </FLWORIterator>
+          </CreateInternalIndexIterator>
+        </LetVariable>
+        <ForVariable name="anzahl">
+          <OpToIterator>
+            <SingletonIterator value="xs:integer(1)"/>
+            <SingletonIterator value="xs:integer(5)"/>
+          </OpToIterator>
+        </ForVariable>
+        <ReturnClause>
+          <ElementIterator>
+            <SingletonIterator value="xs:QName(,,gruppe)"/>
+            <AttributeIterator qname="xs:QName(,,anzahl)">
+              <EnclosedIterator attr_cont="true">
+                <FLWORIterator>
+                  <ForVariable name="karte">
+                    <ProbeIndexPointValueIterator>
+                      <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+                      <ForVarIterator varname="anzahl"/>
+                    </ProbeIndexPointValueIterator>
+                  </ForVariable>
+                  <ReturnClause>
                     <ForVarIterator varname="anzahl"/>
-                  </ProbeIndexPointValueIterator>
-                </ForVariable>
-                <ReturnClause>
-                  <ForVarIterator varname="anzahl"/>
-                </ReturnClause>
-              </FLWORIterator>
-            </EnclosedIterator>
-          </AttributeIterator>
-          <FnConcatIterator/>
-        </ElementIterator>
-      </ReturnClause>
-    </FLWORIterator>
-  </EnclosedIterator>
-</ElementIterator>
-
+                  </ReturnClause>
+                </FLWORIterator>
+              </EnclosedIterator>
+            </AttributeIterator>
+            <FnConcatIterator/>
+          </ElementIterator>
+        </ReturnClause>
+      </FLWORIterator>
+    </EnclosedIterator>
+  </ElementIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9390.iter'
--- test/iterplans/zorba/hashjoins/9390.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9390.iter	2014-02-24 20:09:23 +0000
@@ -1,66 +1,66 @@
-Iterator tree for main query:
-<FLWORIterator>
-  <LetVariable name="$$opt_temp_0" materialize="true">
-    <HoistIterator>
-      <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-        <FnDocIterator>
-          <SingletonIterator value="xs:string(books.xml)"/>
-        </FnDocIterator>
-      </DescendantAxisIterator>
-    </HoistIterator>
-  </LetVariable>
-  <LetVariable name="$$opt_temp_3" materialize="true">
-    <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-      <FLWORIterator>
-        <ForVariable name="$$opt_temp_1">
-          <UnhoistIterator>
-            <LetVarIterator varname="$$opt_temp_0"/>
-          </UnhoistIterator>
-        </ForVariable>
-        <ReturnClause>
-          <ValueIndexEntryBuilderIterator>
-            <ForVarIterator varname="$$opt_temp_1"/>
-            <FnCountIterator>
-              <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
-                <ForVarIterator varname="$$opt_temp_1"/>
-              </ChildAxisIterator>
-            </FnCountIterator>
-          </ValueIndexEntryBuilderIterator>
-        </ReturnClause>
-      </FLWORIterator>
-    </CreateInternalIndexIterator>
-  </LetVariable>
-  <ForVariable name="anzahl">
-    <OpToIterator>
-      <SingletonIterator value="xs:integer(1)"/>
-      <SingletonIterator value="xs:integer(5)"/>
-    </OpToIterator>
-  </ForVariable>
-  <ReturnClause>
-    <ElementIterator>
-      <SingletonIterator value="xs:QName(,,karteikasten)"/>
-      <EnclosedIterator attr_cont="false">
-        <ElementIterator>
-          <SingletonIterator value="xs:QName(,,gruppe)"/>
-          <AttributeIterator qname="xs:QName(,,anzahl)">
-            <EnclosedIterator attr_cont="true">
-              <FLWORIterator>
-                <ForVariable name="karte">
-                  <ProbeIndexPointValueIterator>
-                    <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+<iterator-tree description="main query">
+  <FLWORIterator>
+    <LetVariable name="$$opt_temp_0" materialize="true">
+      <HoistIterator>
+        <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+          <FnDocIterator>
+            <SingletonIterator value="xs:string(books.xml)"/>
+          </FnDocIterator>
+        </DescendantAxisIterator>
+      </HoistIterator>
+    </LetVariable>
+    <LetVariable name="$$opt_temp_3" materialize="true">
+      <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
+        <FLWORIterator>
+          <ForVariable name="$$opt_temp_1">
+            <UnhoistIterator>
+              <LetVarIterator varname="$$opt_temp_0"/>
+            </UnhoistIterator>
+          </ForVariable>
+          <ReturnClause>
+            <ValueIndexEntryBuilderIterator>
+              <ForVarIterator varname="$$opt_temp_1"/>
+              <FnCountIterator>
+                <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+                  <ForVarIterator varname="$$opt_temp_1"/>
+                </ChildAxisIterator>
+              </FnCountIterator>
+            </ValueIndexEntryBuilderIterator>
+          </ReturnClause>
+        </FLWORIterator>
+      </CreateInternalIndexIterator>
+    </LetVariable>
+    <ForVariable name="anzahl">
+      <OpToIterator>
+        <SingletonIterator value="xs:integer(1)"/>
+        <SingletonIterator value="xs:integer(5)"/>
+      </OpToIterator>
+    </ForVariable>
+    <ReturnClause>
+      <ElementIterator>
+        <SingletonIterator value="xs:QName(,,karteikasten)"/>
+        <EnclosedIterator attr_cont="false">
+          <ElementIterator>
+            <SingletonIterator value="xs:QName(,,gruppe)"/>
+            <AttributeIterator qname="xs:QName(,,anzahl)">
+              <EnclosedIterator attr_cont="true">
+                <FLWORIterator>
+                  <ForVariable name="karte">
+                    <ProbeIndexPointValueIterator>
+                      <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+                      <ForVarIterator varname="anzahl"/>
+                    </ProbeIndexPointValueIterator>
+                  </ForVariable>
+                  <ReturnClause>
                     <ForVarIterator varname="anzahl"/>
-                  </ProbeIndexPointValueIterator>
-                </ForVariable>
-                <ReturnClause>
-                  <ForVarIterator varname="anzahl"/>
-                </ReturnClause>
-              </FLWORIterator>
-            </EnclosedIterator>
-          </AttributeIterator>
-          <FnConcatIterator/>
-        </ElementIterator>
-      </EnclosedIterator>
-    </ElementIterator>
-  </ReturnClause>
-</FLWORIterator>
-
+                  </ReturnClause>
+                </FLWORIterator>
+              </EnclosedIterator>
+            </AttributeIterator>
+            <FnConcatIterator/>
+          </ElementIterator>
+        </EnclosedIterator>
+      </ElementIterator>
+    </ReturnClause>
+  </FLWORIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9391.iter'
--- test/iterplans/zorba/hashjoins/9391.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9391.iter	2014-02-24 20:09:23 +0000
@@ -1,71 +1,71 @@
-Iterator tree for main query:
-<ElementIterator>
-  <SingletonIterator value="xs:QName(,,karteikasten)"/>
-  <EnclosedIterator attr_cont="false">
-    <FLWORIterator>
-      <LetVariable name="$$opt_temp_0" materialize="true">
-        <HoistIterator>
-          <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-            <FnDocIterator>
-              <SingletonIterator value="xs:string(books.xml)"/>
-            </FnDocIterator>
-          </DescendantAxisIterator>
-        </HoistIterator>
-      </LetVariable>
-      <LetVariable name="$$opt_temp_3" materialize="true">
-        <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-          <FLWORIterator>
-            <ForVariable name="$$opt_temp_1">
-              <UnhoistIterator>
-                <LetVarIterator varname="$$opt_temp_0"/>
-              </UnhoistIterator>
-            </ForVariable>
-            <ReturnClause>
-              <ValueIndexEntryBuilderIterator>
-                <ForVarIterator varname="$$opt_temp_1"/>
-                <FnCountIterator>
-                  <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
-                    <ForVarIterator varname="$$opt_temp_1"/>
-                  </ChildAxisIterator>
-                </FnCountIterator>
-              </ValueIndexEntryBuilderIterator>
-            </ReturnClause>
-          </FLWORIterator>
-        </CreateInternalIndexIterator>
-      </LetVariable>
-      <ForVariable name="anzahl">
-        <OpToIterator>
-          <SingletonIterator value="xs:integer(1)"/>
-          <SingletonIterator value="xs:integer(2)"/>
-        </OpToIterator>
-      </ForVariable>
-      <ReturnClause>
-        <ElementIterator>
-          <SingletonIterator value="xs:QName(,,gruppe)"/>
-          <AttributeIterator qname="xs:QName(,,anzahl)">
-            <FnDataIterator>
-              <FnConcatIterator>
-                <SingletonIterator value="xs:string( )"/>
-                <EnclosedIterator attr_cont="true">
-                  <FLWORIterator>
-                    <ForVariable name="karte">
-                      <ProbeIndexPointValueIterator>
-                        <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+<iterator-tree description="main query">
+  <ElementIterator>
+    <SingletonIterator value="xs:QName(,,karteikasten)"/>
+    <EnclosedIterator attr_cont="false">
+      <FLWORIterator>
+        <LetVariable name="$$opt_temp_0" materialize="true">
+          <HoistIterator>
+            <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+              <FnDocIterator>
+                <SingletonIterator value="xs:string(books.xml)"/>
+              </FnDocIterator>
+            </DescendantAxisIterator>
+          </HoistIterator>
+        </LetVariable>
+        <LetVariable name="$$opt_temp_3" materialize="true">
+          <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
+            <FLWORIterator>
+              <ForVariable name="$$opt_temp_1">
+                <UnhoistIterator>
+                  <LetVarIterator varname="$$opt_temp_0"/>
+                </UnhoistIterator>
+              </ForVariable>
+              <ReturnClause>
+                <ValueIndexEntryBuilderIterator>
+                  <ForVarIterator varname="$$opt_temp_1"/>
+                  <FnCountIterator>
+                    <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+                      <ForVarIterator varname="$$opt_temp_1"/>
+                    </ChildAxisIterator>
+                  </FnCountIterator>
+                </ValueIndexEntryBuilderIterator>
+              </ReturnClause>
+            </FLWORIterator>
+          </CreateInternalIndexIterator>
+        </LetVariable>
+        <ForVariable name="anzahl">
+          <OpToIterator>
+            <SingletonIterator value="xs:integer(1)"/>
+            <SingletonIterator value="xs:integer(2)"/>
+          </OpToIterator>
+        </ForVariable>
+        <ReturnClause>
+          <ElementIterator>
+            <SingletonIterator value="xs:QName(,,gruppe)"/>
+            <AttributeIterator qname="xs:QName(,,anzahl)">
+              <FnDataIterator>
+                <FnConcatIterator>
+                  <SingletonIterator value="xs:string( )"/>
+                  <EnclosedIterator attr_cont="true">
+                    <FLWORIterator>
+                      <ForVariable name="karte">
+                        <ProbeIndexPointValueIterator>
+                          <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+                          <ForVarIterator varname="anzahl"/>
+                        </ProbeIndexPointValueIterator>
+                      </ForVariable>
+                      <ReturnClause>
                         <ForVarIterator varname="anzahl"/>
-                      </ProbeIndexPointValueIterator>
-                    </ForVariable>
-                    <ReturnClause>
-                      <ForVarIterator varname="anzahl"/>
-                    </ReturnClause>
-                  </FLWORIterator>
-                </EnclosedIterator>
-              </FnConcatIterator>
-            </FnDataIterator>
-          </AttributeIterator>
-          <FnConcatIterator/>
-        </ElementIterator>
-      </ReturnClause>
-    </FLWORIterator>
-  </EnclosedIterator>
-</ElementIterator>
-
+                      </ReturnClause>
+                    </FLWORIterator>
+                  </EnclosedIterator>
+                </FnConcatIterator>
+              </FnDataIterator>
+            </AttributeIterator>
+            <FnConcatIterator/>
+          </ElementIterator>
+        </ReturnClause>
+      </FLWORIterator>
+    </EnclosedIterator>
+  </ElementIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9392.iter'
--- test/iterplans/zorba/hashjoins/9392.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9392.iter	2014-02-24 20:09:23 +0000
@@ -1,67 +1,67 @@
-Iterator tree for main query:
-<ElementIterator>
-  <SingletonIterator value="xs:QName(,,karteikasten)"/>
-  <EnclosedIterator attr_cont="false">
-    <ElementIterator>
-      <SingletonIterator value="xs:QName(,,gruppe)"/>
-      <AttributeIterator qname="xs:QName(,,anzahl)">
-        <FnDataIterator>
-          <FnConcatIterator>
-            <SingletonIterator value="xs:string( )"/>
-            <EnclosedIterator attr_cont="true">
-              <FLWORIterator>
-                <LetVariable name="$$opt_temp_0" materialize="true">
-                  <HoistIterator>
-                    <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-                      <FnDocIterator>
-                        <SingletonIterator value="xs:string(books.xml)"/>
-                      </FnDocIterator>
-                    </DescendantAxisIterator>
-                  </HoistIterator>
-                </LetVariable>
-                <LetVariable name="$$opt_temp_3" materialize="true">
-                  <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-                    <FLWORIterator>
-                      <ForVariable name="$$opt_temp_1">
-                        <UnhoistIterator>
-                          <LetVarIterator varname="$$opt_temp_0"/>
-                        </UnhoistIterator>
-                      </ForVariable>
-                      <ReturnClause>
-                        <ValueIndexEntryBuilderIterator>
-                          <ForVarIterator varname="$$opt_temp_1"/>
-                          <FnCountIterator>
-                            <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
-                              <ForVarIterator varname="$$opt_temp_1"/>
-                            </ChildAxisIterator>
-                          </FnCountIterator>
-                        </ValueIndexEntryBuilderIterator>
-                      </ReturnClause>
-                    </FLWORIterator>
-                  </CreateInternalIndexIterator>
-                </LetVariable>
-                <ForVariable name="anzahl">
-                  <OpToIterator>
-                    <SingletonIterator value="xs:integer(1)"/>
-                    <SingletonIterator value="xs:integer(2)"/>
-                  </OpToIterator>
-                </ForVariable>
-                <ForVariable name="karte">
-                  <ProbeIndexPointValueIterator>
-                    <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+<iterator-tree description="main query">
+  <ElementIterator>
+    <SingletonIterator value="xs:QName(,,karteikasten)"/>
+    <EnclosedIterator attr_cont="false">
+      <ElementIterator>
+        <SingletonIterator value="xs:QName(,,gruppe)"/>
+        <AttributeIterator qname="xs:QName(,,anzahl)">
+          <FnDataIterator>
+            <FnConcatIterator>
+              <SingletonIterator value="xs:string( )"/>
+              <EnclosedIterator attr_cont="true">
+                <FLWORIterator>
+                  <LetVariable name="$$opt_temp_0" materialize="true">
+                    <HoistIterator>
+                      <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+                        <FnDocIterator>
+                          <SingletonIterator value="xs:string(books.xml)"/>
+                        </FnDocIterator>
+                      </DescendantAxisIterator>
+                    </HoistIterator>
+                  </LetVariable>
+                  <LetVariable name="$$opt_temp_3" materialize="true">
+                    <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
+                      <FLWORIterator>
+                        <ForVariable name="$$opt_temp_1">
+                          <UnhoistIterator>
+                            <LetVarIterator varname="$$opt_temp_0"/>
+                          </UnhoistIterator>
+                        </ForVariable>
+                        <ReturnClause>
+                          <ValueIndexEntryBuilderIterator>
+                            <ForVarIterator varname="$$opt_temp_1"/>
+                            <FnCountIterator>
+                              <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+                                <ForVarIterator varname="$$opt_temp_1"/>
+                              </ChildAxisIterator>
+                            </FnCountIterator>
+                          </ValueIndexEntryBuilderIterator>
+                        </ReturnClause>
+                      </FLWORIterator>
+                    </CreateInternalIndexIterator>
+                  </LetVariable>
+                  <ForVariable name="anzahl">
+                    <OpToIterator>
+                      <SingletonIterator value="xs:integer(1)"/>
+                      <SingletonIterator value="xs:integer(2)"/>
+                    </OpToIterator>
+                  </ForVariable>
+                  <ForVariable name="karte">
+                    <ProbeIndexPointValueIterator>
+                      <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+                      <ForVarIterator varname="anzahl"/>
+                    </ProbeIndexPointValueIterator>
+                  </ForVariable>
+                  <ReturnClause>
                     <ForVarIterator varname="anzahl"/>
-                  </ProbeIndexPointValueIterator>
-                </ForVariable>
-                <ReturnClause>
-                  <ForVarIterator varname="anzahl"/>
-                </ReturnClause>
-              </FLWORIterator>
-            </EnclosedIterator>
-          </FnConcatIterator>
-        </FnDataIterator>
-      </AttributeIterator>
-      <FnConcatIterator/>
-    </ElementIterator>
-  </EnclosedIterator>
-</ElementIterator>
-
+                  </ReturnClause>
+                </FLWORIterator>
+              </EnclosedIterator>
+            </FnConcatIterator>
+          </FnDataIterator>
+        </AttributeIterator>
+        <FnConcatIterator/>
+      </ElementIterator>
+    </EnclosedIterator>
+  </ElementIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9399.iter'
--- test/iterplans/zorba/hashjoins/9399.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9399.iter	2014-02-24 20:09:23 +0000
@@ -1,65 +1,65 @@
-Iterator tree for main query:
-<ElementIterator>
-  <SingletonIterator value="xs:QName(,,karteikasten)"/>
-  <EnclosedIterator attr_cont="false">
-    <FLWORIterator>
-      <LetVariable name="$$opt_temp_0" materialize="true">
-        <HoistIterator>
-          <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-            <FnDocIterator>
-              <SingletonIterator value="xs:string(books.xml)"/>
-            </FnDocIterator>
-          </DescendantAxisIterator>
-        </HoistIterator>
-      </LetVariable>
-      <LetVariable name="$$opt_temp_3" materialize="true">
-        <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-          <FLWORIterator>
-            <ForVariable name="$$opt_temp_1">
-              <UnhoistIterator>
-                <LetVarIterator varname="$$opt_temp_0"/>
-              </UnhoistIterator>
-            </ForVariable>
-            <ReturnClause>
-              <ValueIndexEntryBuilderIterator>
-                <ForVarIterator varname="$$opt_temp_1"/>
-                <FnCountIterator>
-                  <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
-                    <ForVarIterator varname="$$opt_temp_1"/>
-                  </ChildAxisIterator>
-                </FnCountIterator>
-              </ValueIndexEntryBuilderIterator>
-            </ReturnClause>
-          </FLWORIterator>
-        </CreateInternalIndexIterator>
-      </LetVariable>
-      <ForVariable name="anzahl">
-        <OpToIterator>
-          <SingletonIterator value="xs:integer(1)"/>
-          <SingletonIterator value="xs:integer(2)"/>
-        </OpToIterator>
-      </ForVariable>
-      <ReturnClause>
-        <ElementIterator>
-          <SingletonIterator value="xs:QName(,,gruppe)"/>
-          <AttributeIterator qname="xs:QName(,,anzahl)">
-            <EnclosedIterator attr_cont="true">
-              <FLWORIterator>
-                <ForVariable name="a">
-                  <ProbeIndexPointValueIterator>
-                    <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+<iterator-tree description="main query">
+  <ElementIterator>
+    <SingletonIterator value="xs:QName(,,karteikasten)"/>
+    <EnclosedIterator attr_cont="false">
+      <FLWORIterator>
+        <LetVariable name="$$opt_temp_0" materialize="true">
+          <HoistIterator>
+            <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+              <FnDocIterator>
+                <SingletonIterator value="xs:string(books.xml)"/>
+              </FnDocIterator>
+            </DescendantAxisIterator>
+          </HoistIterator>
+        </LetVariable>
+        <LetVariable name="$$opt_temp_3" materialize="true">
+          <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
+            <FLWORIterator>
+              <ForVariable name="$$opt_temp_1">
+                <UnhoistIterator>
+                  <LetVarIterator varname="$$opt_temp_0"/>
+                </UnhoistIterator>
+              </ForVariable>
+              <ReturnClause>
+                <ValueIndexEntryBuilderIterator>
+                  <ForVarIterator varname="$$opt_temp_1"/>
+                  <FnCountIterator>
+                    <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+                      <ForVarIterator varname="$$opt_temp_1"/>
+                    </ChildAxisIterator>
+                  </FnCountIterator>
+                </ValueIndexEntryBuilderIterator>
+              </ReturnClause>
+            </FLWORIterator>
+          </CreateInternalIndexIterator>
+        </LetVariable>
+        <ForVariable name="anzahl">
+          <OpToIterator>
+            <SingletonIterator value="xs:integer(1)"/>
+            <SingletonIterator value="xs:integer(2)"/>
+          </OpToIterator>
+        </ForVariable>
+        <ReturnClause>
+          <ElementIterator>
+            <SingletonIterator value="xs:QName(,,gruppe)"/>
+            <AttributeIterator qname="xs:QName(,,anzahl)">
+              <EnclosedIterator attr_cont="true">
+                <FLWORIterator>
+                  <ForVariable name="a">
+                    <ProbeIndexPointValueIterator>
+                      <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+                      <ForVarIterator varname="anzahl"/>
+                    </ProbeIndexPointValueIterator>
+                  </ForVariable>
+                  <ReturnClause>
                     <ForVarIterator varname="anzahl"/>
-                  </ProbeIndexPointValueIterator>
-                </ForVariable>
-                <ReturnClause>
-                  <ForVarIterator varname="anzahl"/>
-                </ReturnClause>
-              </FLWORIterator>
-            </EnclosedIterator>
-          </AttributeIterator>
-        </ElementIterator>
-      </ReturnClause>
-    </FLWORIterator>
-  </EnclosedIterator>
-</ElementIterator>
-
+                  </ReturnClause>
+                </FLWORIterator>
+              </EnclosedIterator>
+            </AttributeIterator>
+          </ElementIterator>
+        </ReturnClause>
+      </FLWORIterator>
+    </EnclosedIterator>
+  </ElementIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/9400.iter'
--- test/iterplans/zorba/hashjoins/9400.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/9400.iter	2014-02-24 20:09:23 +0000
@@ -1,66 +1,66 @@
-Iterator tree for main query:
-<ElementIterator>
-  <SingletonIterator value="xs:QName(,,karteikasten)"/>
-  <EnclosedIterator attr_cont="false">
-    <FLWORIterator>
-      <LetVariable name="$$opt_temp_0" materialize="true">
-        <HoistIterator>
-          <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
-            <FnDocIterator>
-              <SingletonIterator value="xs:string(books.xml)"/>
-            </FnDocIterator>
-          </DescendantAxisIterator>
-        </HoistIterator>
-      </LetVariable>
-      <LetVariable name="$$opt_temp_3" materialize="true">
-        <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-          <FLWORIterator>
-            <ForVariable name="$$opt_temp_1">
-              <UnhoistIterator>
-                <LetVarIterator varname="$$opt_temp_0"/>
-              </UnhoistIterator>
-            </ForVariable>
-            <ReturnClause>
-              <ValueIndexEntryBuilderIterator>
-                <ForVarIterator varname="$$opt_temp_1"/>
-                <FnCountIterator>
-                  <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
-                    <ForVarIterator varname="$$opt_temp_1"/>
-                  </ChildAxisIterator>
-                </FnCountIterator>
-              </ValueIndexEntryBuilderIterator>
-            </ReturnClause>
-          </FLWORIterator>
-        </CreateInternalIndexIterator>
-      </LetVariable>
-      <ForVariable name="anzahl">
-        <OpToIterator>
-          <SingletonIterator value="xs:integer(1)"/>
-          <SingletonIterator value="xs:integer(2)"/>
-        </OpToIterator>
-      </ForVariable>
-      <ReturnClause>
-        <ElementIterator>
-          <SingletonIterator value="xs:QName(,,gruppe)"/>
-          <AttributeIterator qname="xs:QName(,,anzahl)">
-            <EmptyIterator/>
-          </AttributeIterator>
-          <EnclosedIterator attr_cont="false">
+<iterator-tree description="main query">
+  <ElementIterator>
+    <SingletonIterator value="xs:QName(,,karteikasten)"/>
+    <EnclosedIterator attr_cont="false">
+      <FLWORIterator>
+        <LetVariable name="$$opt_temp_0" materialize="true">
+          <HoistIterator>
+            <DescendantAxisIterator test kind="match_name_test" qname="xs:QName(,,book)" typename="*" nill allowed="0">
+              <FnDocIterator>
+                <SingletonIterator value="xs:string(books.xml)"/>
+              </FnDocIterator>
+            </DescendantAxisIterator>
+          </HoistIterator>
+        </LetVariable>
+        <LetVariable name="$$opt_temp_3" materialize="true">
+          <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
             <FLWORIterator>
-              <ForVariable name="a">
-                <ProbeIndexPointValueIterator>
-                  <SingletonIterator value="xs:QName(,,tempIndex0)"/>
-                  <ForVarIterator varname="anzahl"/>
-                </ProbeIndexPointValueIterator>
+              <ForVariable name="$$opt_temp_1">
+                <UnhoistIterator>
+                  <LetVarIterator varname="$$opt_temp_0"/>
+                </UnhoistIterator>
               </ForVariable>
               <ReturnClause>
-                <ForVarIterator varname="a"/>
+                <ValueIndexEntryBuilderIterator>
+                  <ForVarIterator varname="$$opt_temp_1"/>
+                  <FnCountIterator>
+                    <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,author)" typename="*" nill allowed="0">
+                      <ForVarIterator varname="$$opt_temp_1"/>
+                    </ChildAxisIterator>
+                  </FnCountIterator>
+                </ValueIndexEntryBuilderIterator>
               </ReturnClause>
             </FLWORIterator>
-          </EnclosedIterator>
-        </ElementIterator>
-      </ReturnClause>
-    </FLWORIterator>
-  </EnclosedIterator>
-</ElementIterator>
-
+          </CreateInternalIndexIterator>
+        </LetVariable>
+        <ForVariable name="anzahl">
+          <OpToIterator>
+            <SingletonIterator value="xs:integer(1)"/>
+            <SingletonIterator value="xs:integer(2)"/>
+          </OpToIterator>
+        </ForVariable>
+        <ReturnClause>
+          <ElementIterator>
+            <SingletonIterator value="xs:QName(,,gruppe)"/>
+            <AttributeIterator qname="xs:QName(,,anzahl)">
+              <EmptyIterator/>
+            </AttributeIterator>
+            <EnclosedIterator attr_cont="false">
+              <FLWORIterator>
+                <ForVariable name="a">
+                  <ProbeIndexPointValueIterator>
+                    <SingletonIterator value="xs:QName(,,tempIndex0)"/>
+                    <ForVarIterator varname="anzahl"/>
+                  </ProbeIndexPointValueIterator>
+                </ForVariable>
+                <ReturnClause>
+                  <ForVarIterator varname="a"/>
+                </ReturnClause>
+              </FLWORIterator>
+            </EnclosedIterator>
+          </ElementIterator>
+        </ReturnClause>
+      </FLWORIterator>
+    </EnclosedIterator>
+  </ElementIterator>
+</iterator-tree>
 
=== modified file 'test/iterplans/zorba/hashjoins/gary1.iter'
--- test/iterplans/zorba/hashjoins/gary1.iter	2014-02-19 01:28:17 +0000
+++ test/iterplans/zorba/hashjoins/gary1.iter	2014-02-24 20:09:23 +0000
@@ -1,217 +1,217 @@
-Iterator tree for const-folded expr:
-<OrIterator>
-  <SingletonIterator value="xs:boolean(false)"/>
-  <SingletonIterator value="xs:boolean(false)"/>
-  <SingletonIterator value="xs:boolean(false)"/>
-</OrIterator>
-
-Iterator tree for const-folded expr:
-<OrIterator>
-  <SingletonIterator value="xs:boolean(false)"/>
-  <SingletonIterator value="xs:boolean(false)"/>
-  <SingletonIterator value="xs:boolean(false)"/>
-</OrIterator>
-
-Iterator tree for const-folded expr:
-<OrIterator>
-  <SingletonIterator value="xs:boolean(false)"/>
-  <SingletonIterator value="xs:boolean(false)"/>
-  <SingletonIterator value="xs:boolean(false)"/>
-</OrIterator>
-
-Iterator tree for main query:
-<ElementIterator>
-  <SingletonIterator value="xs:QName(,,institutions)"/>
-  <EnclosedIterator attr_cont="false">
-    <FLWORIterator>
-      <LetVariable name="y" materialize="true">
-        <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill allowed="0">
-          <TupleStreamIterator>
-            <WhereIterator>
+<iterator-tree description="const-folded expr">
+  <OrIterator>
+    <SingletonIterator value="xs:boolean(false)"/>
+    <SingletonIterator value="xs:boolean(false)"/>
+    <SingletonIterator value="xs:boolean(false)"/>
+  </OrIterator>
+</iterator-tree>
+<iterator-tree description="const-folded expr">
+  <OrIterator>
+    <SingletonIterator value="xs:boolean(false)"/>
+    <SingletonIterator value="xs:boolean(false)"/>
+    <SingletonIterator value="xs:boolean(false)"/>
+  </OrIterator>
+</iterator-tree>
+<iterator-tree description="const-folded expr">
+  <OrIterator>
+    <SingletonIterator value="xs:boolean(false)"/>
+    <SingletonIterator value="xs:boolean(false)"/>
+    <SingletonIterator value="xs:boolean(false)"/>
+  </OrIterator>
+</iterator-tree>
+<iterator-tree description="main query">
+  <ElementIterator>
+    <SingletonIterator value="xs:QName(,,institutions)"/>
+    <EnclosedIterator attr_cont="false">
+      <FLWORIterator>
+        <LetVariable name="y" materialize="true">
+          <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,data)" typename="*" nill allowed="0">
+            <TupleStreamIterator>
               <WhereIterator>
-                <ForIterator>
-                  <ForVariable name="$$context-item"/>
+                <WhereIterator>
                   <ForIterator>
                     <ForVariable name="$$context-item"/>
-                    <TupleSourceIterator/>
-                    <FnDocIterator>
-                      <SingletonIterator value="xs:string(min_ic1980.xml)"/>
-                    </FnDocIterator>
+                    <ForIterator>
+                      <ForVariable name="$$context-item"/>
+                      <TupleSourceIterator/>
+                      <FnDocIterator>
+                        <SingletonIterator value="xs:string(min_ic1980.xml)"/>
+                      </FnDocIterator>
+                    </ForIterator>
+                    <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,ipeds)" typename="*" nill allowed="0">
+                      <ForVarIterator varname="$$context-item"/>
+                    </ChildAxisIterator>
                   </ForIterator>
-                  <ChildAxisIterator test kind="match_name_test" qname="xs:QName(,,ipeds)" typename="*" nill allowed="0">
-                    <ForVarIterator varname="$$context-item"/>
-                  </ChildAxisIterator>
-                </ForIterator>
+                  <CompareIterator>
+                    <FnDataIterator>
+                      <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill allowed="0">
+                        <ForVarIterator varname="$$context-item"/>
+                      </AttributeAxisIterator>
+                    </FnDataIterator>
+                    <SingletonIterator value="xs:integer(1980)"/>
+                  </CompareIterator>
+                </WhereIterator>
                 <CompareIterator>
                   <FnDataIterator>
-                    <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,year)" typename="*" nill allowed="0">
+                    <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill allowed="0">
                       <ForVarIterator varname="$$context-item"/>
                     </AttributeAxisIterator>
                   </FnDataIterator>
-                  <SingletonIterator value="xs:integer(1980)"/>
+                  <SingletonIterator value="xs:string(ic1980)"/>
                 </CompareIterator>
               </WhereIterator>
-              <CompareIterator>
-                <FnDataIterator>
-                  <AttributeAxisIterator test kind="match_name_test" qname="xs:QName(,,file)" typename="*" nill allowed="0">
-                    <ForVarIterator varname="$$context-item"/>
-                  </AttributeAxisIterator>
-                </FnDataIterator>
-                <SingletonIterator value="xs:string(ic1980)"/>
-              </CompareIterator>
-            </WhereIterator>
-            <ForVarIterator varname="$$context-item"/>
-          </TupleStreamIterator>
-        </ChildAxisIterator>
-      </LetVariable>
-      <LetVariable name="$$opt_temp_4" materialize="true">
-        <CreateInternalIndexIterator name="xs:QName(,,tempIndex0)">
-          <FLWORIterator>
-            <ForVariable name="$$opt_temp_2">
-              <LetVarIterator varname="y"/>
-            </ForVariable>
-            <ReturnClause>
-              <GeneralIndexEntryBuilderIterator>
-                <ForVarIterator varname="$$opt_temp_2"/>
-                <FnDataIterator>