zorba-coders team mailing list archive

["Paul J. Lucas" <paul@xxxxxxxxxxxxx>]

Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.

Commit message:
1. Applied 28io JSON iterator tree patch.
2. Added new --plan-format option.
3. Misc clean-up.

Requested reviews:
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207073

1. Applied 28io JSON iterator tree patch.
2. Added new --plan-format option.
3. Misc clean-up.
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/207073
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'bin/zorbacmd_args.cpp'
--- bin/zorbacmd_args.cpp	2014-02-10 01:15:42 +0000
+++ bin/zorbacmd_args.cpp	2014-02-19 00:45:18 +0000
@@ -160,6 +160,9 @@
     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; default XML\n\n"
+
     ////////// j //////////////////////////////////////////////////////////////
 
     HELP_OPT( "--jsoniq, -j" )
@@ -540,6 +543,23 @@
       PARSE_ARG( "--inline-udf" );
       z_props.setInlineUDF( bool_of( ARG_VAL ) );
     }
+    else if ( IS_LONG_OPT( "--iterator-tree" ) ) {
+      PARSE_ARG( "--iterator-tree" );
+      string val( ARG_VAL );
+      to_lower( val );
+      if ( val == "none" )
+        z_props.setPlanFormat( PLAN_FORMAT_NONE );
+      else if ( val == "dot" )
+        z_props.setPlanFormat( PLAN_FORMAT_DOT );
+      else if ( val == "json" )
+        z_props.setPlanFormat( PLAN_FORMAT_JSON );
+      else if ( val == "xml" )
+        z_props.setPlanFormat( PLAN_FORMAT_XML );
+      else {
+        error = "--iterator-tree argument must be one of: none, dot, json, or xml.\n";
+        break;
+      }
+    }
 
     ////////// j //////////////////////////////////////////////////////////////
 
@@ -638,7 +658,7 @@
     else if ( IS_LONG_OPT( "--print-item-flow" ) )
       z_props.setPrintItemFlow( true );
     else if ( IS_LONG_OPT( "--print-iterator-tree" ) )
-      z_props.setPrintIteratorTree( true );
+      z_props.setPlanFormat( PLAN_FORMAT_XML );
     else if ( IS_LONG_OPT( "--print-locations" ) )
       z_props.setPrintLocations( true );
     else if ( IS_OPT( "--print-optimized", "-P" ) )

=== modified file 'include/zorba/options.h'
--- include/zorba/options.h	2013-09-11 01:43:33 +0000
+++ include/zorba/options.h	2014-02-19 00:45:18 +0000
@@ -172,6 +172,13 @@
   JSONIQ_MULTIPLE_ITEMS_YES
 } Zorba_jsoniq_multiple_items_t;
 
+typedef enum {
+  PLAN_FORMAT_NONE,
+  PLAN_FORMAT_XML,
+  PLAN_FORMAT_DOT,
+  PLAN_FORMAT_JSON
+} Zorba_plan_format_t;
+
 /*****************************************************************************/
 
 /**

=== modified file 'include/zorba/properties.h'
--- include/zorba/properties.h	2014-02-10 03:20:48 +0000
+++ include/zorba/properties.h	2014-02-19 00:45:18 +0000
@@ -24,6 +24,7 @@
 
 // Zorba
 #include <zorba/config.h>
+#include <zorba/options.h>
 #include <zorba/internal/ztd.h>
 #include <zorba/internal/type_traits.h>
 #include <zorba/internal/unique_ptr.h>
@@ -223,6 +224,14 @@
 
   void setOptimizationLevel( unsigned optimization_level );
 
+  Zorba_plan_format_t getPlanFormat() const {
+    return plan_format_;
+  }
+
+  void setPlanFormat( Zorba_plan_format_t format ) {
+    plan_format_ = format;
+  }
+
   bool getPrintAST() const {
     return print_ast_;
   }
@@ -247,14 +256,6 @@
     print_item_flow_ = b ;
   }
 
-  bool getPrintIteratorTree() const {
-    return print_iterator_locations_;
-  }
-
-  void setPrintIteratorTree( bool b ) {
-    print_iterator_locations_ = b;
-  }
-
   bool getPrintLocations() const {
     return print_locations_;
   }
@@ -352,37 +353,37 @@
   ~Properties();
 
 #ifndef NDEBUG
-  bool          abort_;
+  bool                abort_;
 #endif /* NDEBUG */
-  std::string   classpath_;
-  stream_ptr    debug_stream_;
-  bool          owns_debug_stream_;
-  bool          dump_lib_;
-  bool          force_gflwor_;
-  bool          infer_joins_;
-  bool          inline_udf_;
-  bool          loop_hoisting_;
-  uint32_t      max_udf_call_depth_;
-  bool          no_copy_optim_;
-  bool          no_tree_ids_;
-  unsigned      optimization_level_;
-  bool          print_ast_;
-  bool          print_intermediate_opt_;
-  bool          print_item_flow_;
-  bool          print_iterator_locations_;
-  bool          print_locations_;
-  bool          print_optimized_;
-  bool          print_static_types_;
-  bool          print_translated_;
-  bool          stable_iterator_ids_;
-  bool          trace_codegen_;
+  std::string         classpath_;
+  stream_ptr          debug_stream_;
+  bool                owns_debug_stream_;
+  bool                dump_lib_;
+  bool                force_gflwor_;
+  bool                infer_joins_;
+  bool                inline_udf_;
+  bool                loop_hoisting_;
+  uint32_t            max_udf_call_depth_;
+  bool                no_copy_optim_;
+  bool                no_tree_ids_;
+  unsigned            optimization_level_;
+  Zorba_plan_format_t plan_format_;
+  bool                print_ast_;
+  bool                print_intermediate_opt_;
+  bool                print_item_flow_;
+  bool                print_locations_;
+  bool                print_optimized_;
+  bool                print_static_types_;
+  bool                print_translated_;
+  bool                stable_iterator_ids_;
+  bool                trace_codegen_;
 #ifndef ZORBA_NO_FULL_TEXT
-  bool          trace_fulltext_;
+  bool                trace_fulltext_;
 #endif /* ZORBA_NO_FULL_TEXT */
-  bool          trace_parsing_;
-  bool          trace_scanning_;
-  bool          trace_translator_;
-  bool          use_indexes_;
+  bool                trace_parsing_;
+  bool                trace_scanning_;
+  bool                trace_translator_;
+  bool                use_indexes_;
 };
 
 // deprecated name

=== modified file 'include/zorba/xquery.h'
--- include/zorba/xquery.h	2014-01-31 01:39:38 +0000
+++ include/zorba/xquery.h	2014-02-19 00:45:18 +0000
@@ -525,6 +525,23 @@
    */
   virtual void
   parse(std::istream& aQuery, ModuleInfo_t& aResult) = 0;
+
+  /**
+   * \brief Print the execution plan of this query to the given output stream.
+   *
+   * @param aStream the output stream to which the execution plan is printed
+   * @param aFormat specifies the format of the printed execution plan.
+   *    Current possible values are:
+   *      \li PLAN_FORMAT_XML (default)
+   *          To export the plan as an XML file
+   *                  \li PLAN_FORMAT_DOT
+   *          To export the plan as a DOT file
+   *                  \li PLAN_FORMAT_JSON
+   *          To export the plan as a JSON file
+   * @throw ZorbaException if the query has been closed or is not compiled.
+   */
+   virtual void
+   printPlan(std::ostream& aStream, Zorba_plan_format_t aFormat) const = 0;
 };
   
 

=== modified file 'src/api/properties.cpp'
--- src/api/properties.cpp	2014-02-10 00:52:31 +0000
+++ src/api/properties.cpp	2014-02-19 00:45:18 +0000
@@ -47,10 +47,10 @@
   no_copy_optim_ = true;
   no_tree_ids_ = false;
   optimization_level_ = 1;
+  plan_format_ = PLAN_FORMAT_NONE;
   print_ast_ = false;
   print_intermediate_opt_ = false;
   print_item_flow_ = false;
-  print_iterator_locations_ = false;
   print_locations_ = false;
   print_optimized_ = false;
   print_static_types_ = true;

=== modified file 'src/api/xqueryimpl.cpp'
--- src/api/xqueryimpl.cpp	2014-01-31 01:39:38 +0000
+++ src/api/xqueryimpl.cpp	2014-02-19 00:45:18 +0000
@@ -1623,6 +1623,39 @@
   QUERY_CATCH
 }
 
+/*******************************************************************************
+ Prints a query plan.
+********************************************************************************/
+void XQueryImpl::printPlan(std::ostream& aStream, Zorba_plan_format_t format) const
+{
+  SYNC_CODE(AutoMutex lock(&theMutex);)
+
+  try
+  {
+    checkNotClosed();
+    checkCompiled();
+
+    std::auto_ptr<IterPrinter> lPrinter;
+    switch (format)
+    {
+      case PLAN_FORMAT_NONE:
+        return;
+      case PLAN_FORMAT_XML:
+        lPrinter.reset(new XMLIterPrinter(aStream));
+        break;
+      case PLAN_FORMAT_JSON:
+        lPrinter.reset(new JSONIterPrinter(aStream));
+        break;
+      case PLAN_FORMAT_DOT:
+        lPrinter.reset(new DOTIterPrinter(aStream));
+        break;
+    }
+    print_iter_plan(*(lPrinter.get()),
+        static_cast<PlanIterator*>(thePlanProxy->theRootIter.getp()));
+  }
+  QUERY_CATCH
+}
+
 
 /*******************************************************************************
 

=== modified file 'src/api/xqueryimpl.h'
--- src/api/xqueryimpl.h	2014-01-31 01:39:38 +0000
+++ src/api/xqueryimpl.h	2014-02-19 00:45:18 +0000
@@ -284,6 +284,8 @@
 
   void printPlan(std::ostream& aStream, bool aDotFormat = false) const;
 
+  void printPlan(std::ostream& aStream, Zorba_plan_format_t format) const;
+
   DynamicContext* getDynamicContext() const;
 
   void execute(std::ostream&, const Zorba_SerializerOptions_t* = NULL);

=== modified file 'src/compiler/codegen/plan_visitor.cpp'
--- src/compiler/codegen/plan_visitor.cpp	2014-02-10 00:44:55 +0000
+++ src/compiler/codegen/plan_visitor.cpp	2014-02-19 00:45:18 +0000
@@ -148,6 +148,7 @@
 #define CODEGEN_TRACE_OUT(msg) CODEGEN_TRACE(msg)
 #endif
 
+using namespace std;
 
 namespace zorba
 {
@@ -3802,23 +3803,33 @@
     hash64map<std::vector<LetVarIter_t> *>* arg_var_map)
 {
   plan_visitor c(ccb, nextDynamicVarId, arg_var_map);
+  nextDynamicVarId = c.getNextDynamicVarId();
 
   root->accept(c);
   PlanIter_t result = c.result();
 
-  if (result != NULL &&
-      descr != NULL &&
-      Properties::instance().getPrintIteratorTree())
-  {
+  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";
-    XMLIterPrinter vp(os);
-    print_iter_plan(vp, result);
+    unique_ptr<IterPrinter> printer;
+    switch ( format ) {
+      case PLAN_FORMAT_NONE:
+        return result;
+      case PLAN_FORMAT_DOT:
+        printer.reset( new DOTIterPrinter( os ) );
+        break;
+      case PLAN_FORMAT_JSON:
+        printer.reset( new JSONIterPrinter( os ) );
+        break;
+      case PLAN_FORMAT_XML:
+        printer.reset( new XMLIterPrinter( os ) );
+        break;
+    }
+    print_iter_plan( *printer, result );
     os << std::endl;
   }
 
-  nextDynamicVarId = c.getNextDynamicVarId();
-
   return result;
 }
 

=== modified file 'src/compiler/parser/query_loc.cpp'
--- src/compiler/parser/query_loc.cpp	2014-01-21 03:30:42 +0000
+++ src/compiler/parser/query_loc.cpp	2014-02-19 00:45:18 +0000
@@ -37,9 +37,9 @@
 }
 
 
-QueryLoc::QueryLoc( zstring const &filename, unsigned lineBegin,
-                    unsigned lineEnd, unsigned columnBegin,
-                    unsigned columnEnd ) :
+QueryLoc::QueryLoc( zstring const &filename, line_type lineBegin,
+                    line_type lineEnd, column_type columnBegin,
+                    column_type columnEnd ) :
   theFilename(filename),
   theLineBegin(lineBegin),
   theColumnBegin(columnBegin),

=== modified file 'src/compiler/parser/query_loc.h'
--- src/compiler/parser/query_loc.h	2013-02-07 17:24:36 +0000
+++ src/compiler/parser/query_loc.h	2014-02-19 00:45:18 +0000
@@ -18,6 +18,7 @@
 #define ZORBA_QUERY_LOC_H
 
 #include <zorba/internal/ztd.h>
+#include <zorba/internal/diagnostic.h>
 #include "zorbatypes/zstring.h"
 
 namespace zorba {
@@ -40,45 +41,45 @@
 {
   typedef zorba::internal::ztd::explicit_bool explicit_bool;
 public:
+  typedef internal::diagnostic::location::line_type line_type;
+  typedef internal::diagnostic::location::column_type column_type;
+
   static QueryLoc null;
 
-public:
-  zstring      theFilename;
-  unsigned int theLineBegin;
-  unsigned int theColumnBegin;
-  unsigned int theLineEnd;
-  unsigned int theColumnEnd;
+  zstring     theFilename;
+  line_type   theLineBegin;
+  column_type theColumnBegin;
+  line_type   theLineEnd;
+  column_type theColumnEnd;
 
-public:
   QueryLoc();
 
-  QueryLoc( zstring const &filename, unsigned lineBegin, unsigned lineEnd,
-            unsigned columnBegin = 0, unsigned columnEnd = 0 );
+  QueryLoc( zstring const &filename, line_type lineBegin, line_type lineEnd,
+            column_type columnBegin = 0, column_type columnEnd = 0 );
 
-public:
   const zstring& getFilename() const { return theFilename; }
  
   void setFilename(const zstring& aFilename) { theFilename = aFilename; }
 
   void setFilename(const char* aFilename) { theFilename = aFilename; }
 
-  unsigned int getLineBegin() const { return theLineBegin; }  
-   
-  void setLineBegin(unsigned int aLineBegin) { theLineBegin = aLineBegin; }
-
-  unsigned int getLineEnd() const { return theLineEnd; }    
-
-  void setLineEnd(unsigned int aLineEnd) { theLineEnd = aLineEnd; }
-
-  unsigned int getColumnBegin() const { return theColumnBegin; }
-   
-  unsigned int getColumnEnd() const { return theColumnEnd; }     
-
-  void setColumnBegin(unsigned int aColumnBegin) { theColumnBegin = aColumnBegin; }
-
-  void setColumnEnd(unsigned int aColumnEnd) { theColumnEnd = aColumnEnd; }
-
-  unsigned int getLineno() const { return getLineBegin(); }
+  line_type getLineBegin() const { return theLineBegin; }  
+   
+  void setLineBegin(line_type aLineBegin) { theLineBegin = aLineBegin; }
+
+  line_type getLineEnd() const { return theLineEnd; }    
+
+  void setLineEnd(line_type aLineEnd) { theLineEnd = aLineEnd; }
+
+  column_type getColumnBegin() const { return theColumnBegin; }
+   
+  column_type getColumnEnd() const { return theColumnEnd; }     
+
+  void setColumnBegin(column_type aColumnBegin) { theColumnBegin = aColumnBegin; }
+
+  void setColumnEnd(column_type aColumnEnd) { theColumnEnd = aColumnEnd; }
+
+  line_type getLineno() const { return getLineBegin(); }
  
   bool equals(const QueryLoc& loc) const;
 

=== modified file 'src/runtime/spec/printer_visitor_cpp.xq'
--- src/runtime/spec/printer_visitor_cpp.xq	2014-02-10 00:44:55 +0000
+++ src/runtime/spec/printer_visitor_cpp.xq	2014-02-19 00:45:18 +0000
@@ -47,43 +47,6 @@
   local:printer-visitor-definition($iter)
 };
 
-declare function local:create-class() as xs:string
-{
-  string-join((
-  'void PrinterVisitor::print() {',$gen:newline,
-  $gen:indent,'thePrinter.start();',$gen:newline,
-  $gen:indent,'theIterator->accept(*this);',$gen:newline,
-  $gen:indent,'thePrinter.stop();',$gen:newline,'}',$gen:newline,$gen:newline,
-  'void PrinterVisitor::printCommons(const PlanIterator* aIter, int theId) {',$gen:newline,
-  $gen:indent,'if (! Properties::instance().getNoTreeIDs()) {',$gen:newline,
-  gen:indent(2),'std::stringstream lStream;',$gen:newline,
-  gen:indent(2),'if (Properties::instance().getStableIteratorIDs())',$gen:newline,
-  gen:indent(3),'lStream << theId;',$gen:newline,
-  gen:indent(2),'else',$gen:newline,
-  gen:indent(3),'lStream << aIter;',$gen:newline,
-  $gen:newline,
-  gen:indent(2),'thePrinter.addAttribute("id", lStream.str());',$gen:newline,
-  $gen:indent,'}',$gen:newline,'}',$gen:newline,$gen:newline,
-  'void PrinterVisitor::printNameOrKindTest(const AxisIteratorHelper* a) {',$gen:newline,
-  $gen:indent,'thePrinter.addAttribute("test kind", toString(a->getTestKind()));',$gen:newline,$gen:newline,
-  $gen:indent,'if (a->getDocTestKind() != match_no_test)',$gen:newline,
-  gen:indent(2),'thePrinter.addAttribute("doc_test_kind", toString(a->getDocTestKind()));',$gen:newline,$gen:newline,
-  $gen:indent,'if (a->getQName() != 0)',$gen:newline,
-  gen:indent(2),'thePrinter.addAttribute("qname", a->getQName()->show().str());',$gen:newline,
-  $gen:indent,'else',$gen:newline,
-  gen:indent(2),'thePrinter.addAttribute("qname","*");',$gen:newline,$gen:newline,
-  $gen:indent,'if (a->getType() != 0)',$gen:newline,
-  gen:indent(2),'thePrinter.addAttribute("typename", a->getType()->toString());',$gen:newline,
-  $gen:indent,'else',$gen:newline,
-  gen:indent(2),'thePrinter.addAttribute("typename","*");',$gen:newline,$gen:newline,
-  $gen:indent,'std::stringstream lStream;',$gen:newline,
-  $gen:indent,'lStream << a->nilledAllowed();',$gen:newline,
-  $gen:indent,'thePrinter.addAttribute("nill allowed", lStream.str());',$gen:newline,$gen:newline,
-  $gen:indent,'if (a->getTargetPos() >= 0)',$gen:newline,
-  gen:indent(2),'thePrinter.addAttribute("target_position", ztd::to_string(a->getTargetPos()));',$gen:newline,'}'
-  ),'')
-};
-
 declare function local:create-includes($files) as xs:string
 {
   (: compute the name of the header file to be included.
@@ -131,11 +94,11 @@
     $gen:newline,
 
     string-join(('// &lt;',$iter/@name,'&gt;',$gen:newline,
-    'void PrinterVisitor::beginVisit ( const ',$iter/@name,'&amp; a) {',$gen:newline,
+    'void PrinterVisitor::beginVisit( const ',$iter/@name,'&amp; a) {',$gen:newline,
     $gen:indent,'thePrinter.startBeginVisit("',$iter/@name,'", ++theId);',$gen:newline,
     $gen:indent,'printCommons( &amp;a, theId );',$gen:newline,
     $gen:indent,'thePrinter.endBeginVisit( theId );',$gen:newline,'}',$gen:newline,
-    $gen:newline,'void PrinterVisitor::endVisit ( const ',$iter/@name,'&amp; ) {',$gen:newline,
+    $gen:newline,'void PrinterVisitor::endVisit( const ',$iter/@name,'&amp; ) {',$gen:newline,
     $gen:indent,'thePrinter.startEndVisit();',$gen:newline,
     $gen:indent,'thePrinter.endEndVisit();',$gen:newline,'}',$gen:newline,
     '// &lt;/',$iter/@name,'&gt;',$gen:newline),''),
@@ -155,10 +118,9 @@
     (
       gen:add-copyright(),
       local:create-includes($files),
-      'namespace zorba{',
-      local:create-class(),
+      'namespace zorba {',
       $temp,
-      '}'
+      '} // namespace zorba'
     ),
     concat( $gen:newline, $gen:newline )
   )

=== modified file 'src/runtime/visitors/iterprinter.cpp'
--- src/runtime/visitors/iterprinter.cpp	2013-08-02 21:35:01 +0000
+++ src/runtime/visitors/iterprinter.cpp	2014-02-19 00:45:18 +0000
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006-2008 The FLWOR Foundation.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,158 +15,195 @@
  */
 #include "stdafx.h"
 
+// standard
+#include <cassert>
 #include <iostream>
 
+// Zorba
 #include "runtime/visitors/iterprinter.h"
 #include "util/ascii_util.h"
+#include "util/xml_util.h"
+
+using namespace std;
 
 namespace zorba {
 
-/**
- * Iterator printer for xml
- */
-XMLIterPrinter::XMLIterPrinter(std::ostream& aOStream)
-  :
+///////////////////////////////////////////////////////////////////////////////
+
+XMLIterPrinter::XMLIterPrinter(ostream& aOStream) :
   IterPrinter(aOStream),
   theOpenStart(false)
 {
 }
 
-
-void XMLIterPrinter::start() 
-{
-}
-
-
-void XMLIterPrinter::stop() 
-{
-}
-
-  
-void XMLIterPrinter::startBeginVisit(const std::string& aName, int) 
-{
+void XMLIterPrinter::start() {
+}
+
+void XMLIterPrinter::stop() {
+}
+
+void XMLIterPrinter::startBeginVisit(const string& aName, int) {
   if (theOpenStart)
     theOStream << ">\n";
-
   printSpaces(2 * theNameStack.size());
-  theOStream << "<" << aName;
+  theOStream << '<' << aName;
   theNameStack.push(aName);
   theOpenStart = true;
 }
 
-
-void XMLIterPrinter::endBeginVisit(int) 
-{
-}
-
-
-void XMLIterPrinter::addAttribute(const std::string& aName, const std::string& aValue)
-{
-  assert(theOpenStart);
-  theOStream << " " << aName << "=\"" << aValue << "\"";
-}
-
-
-void XMLIterPrinter::addAttribute(const std::string& aName, xs_long aValue)
-{
-  assert(theOpenStart);
-  theOStream << " " << aName << "=\"" << aValue << "\"";
-}
-
-
-void XMLIterPrinter::startEndVisit() 
-{
+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::startEndVisit() {
   assert(!theNameStack.empty());
   if (theOpenStart)
-    theOStream << "/>" << std::endl;
-  else 
+    theOStream << "/>" << endl;
+  else
   {
     printSpaces(2 * (theNameStack.size() - 1));
-    theOStream << "</" << theNameStack.top() << ">" << std::endl;
+    theOStream << "</" << theNameStack.top() << '>' << endl;
   }
   theNameStack.pop();
   theOpenStart = false;
 }
 
-
-void XMLIterPrinter::endEndVisit() 
-{
-}
-  
-
-/**
- * Iterator printer for dot
- */
-DOTIterPrinter::DOTIterPrinter(std::ostream& aOStream) 
-  : IterPrinter(aOStream),
-    theIndent(0)
-{
-}
-
-void DOTIterPrinter::start() 
-{
-  theOStream << "digraph {" << std::endl;
-  theOStream << "node [ color=gray, fontname=\"Arial\" ]" << std::endl;
-}
-
-void DOTIterPrinter::stop() 
-{
-  theOStream << "}" << std::endl;
-}
-  
-
-void DOTIterPrinter::startBeginVisit(const std::string& aName, int aAddr) 
-{
+void XMLIterPrinter::endEndVisit() {
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+DOTIterPrinter::DOTIterPrinter(ostream& aOStream) :
+  IterPrinter(aOStream),
+  theIndent(0)
+{
+}
+
+void DOTIterPrinter::start() {
+  theOStream << "digraph {" << endl;
+  theOStream << "node [ color=gray, fontname=\"Arial\" ]" << endl;
+}
+
+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) 
-{
+void DOTIterPrinter::endBeginVisit(int aAddr) {
   --theIndent;
   printSpaces(theIndent);
-  theOStream << "\"];" << std::endl;
+  theOStream << "\"];" << endl;
   printSpaces(theIndent);
   if (!theNameStack.empty() && theNameStack.top() != aAddr)
-    theOStream << theNameStack.top() << "->" << aAddr << std::endl;
+    theOStream << theNameStack.top() << "->" << aAddr << endl;
   theNameStack.push(aAddr);
 }
 
-
-void DOTIterPrinter::addAttribute(const std::string& aName, const std::string& aValue)
-{
-  printSpaces(theIndent);
-
-  std::string mvalue = aValue;
-
-  if(aValue.find('"') != std::string::npos)
-    ascii::replace_all(mvalue, "\"", "\\\"");
-
-  if(aValue.find("\n") != std::string::npos)
-    ascii::replace_all(mvalue, "\n", " \\n ");
-
-  theOStream << "\\n" << aName << "=" << mvalue;
-}
-
-void DOTIterPrinter::addAttribute(const std::string& aName, xs_long aValue)
-{
-  printSpaces(theIndent);
-  theOStream << "\\n" << aName << "=" << aValue;
-}
-
-
-void DOTIterPrinter::startEndVisit() 
-{
-}
-
-
-void DOTIterPrinter::endEndVisit() 
-{
+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;
+}
+
+void DOTIterPrinter::startEndVisit() {
+}
+
+void DOTIterPrinter::endEndVisit() {
   theNameStack.pop();
 }
-  
-  
-}; /* namespace zorba */
+
+///////////////////////////////////////////////////////////////////////////////
+
+JSONIterPrinter::JSONIterPrinter(ostream& aOStream) :
+  IterPrinter(aOStream), theIndent(0)
+{
+}
+
+void JSONIterPrinter::start() {
+}
+
+void JSONIterPrinter::stop() {
+  theOStream << endl;
+}
+
+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 << '[';
+    theListStack.pop();
+    theListStack.push(true);
+    theIndent++;
+    theOStream << endl;
+  }
+
+  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;
+}
+
+void JSONIterPrinter::startEndVisit() {
+  if (theListStack.top()) {
+    theOStream << endl;
+    printSpaces(2 * (theIndent - 1));
+    theOStream << ']';
+    theIndent--;
+  }
+
+  theOStream << endl;
+  printSpaces(2 * (theIndent - 1));
+  theOStream << '}';
+  theIndent--;
+  theListStack.pop();
+}
+
+void JSONIterPrinter::endEndVisit() {
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+}; // namespace zorba
 /* vim:set et sw=2 ts=2: */

=== modified file 'src/runtime/visitors/iterprinter.h'
--- src/runtime/visitors/iterprinter.h	2013-02-07 17:24:36 +0000
+++ src/runtime/visitors/iterprinter.h	2014-02-19 00:45:18 +0000
@@ -95,7 +95,7 @@
 
 
 /**
- * Implementation of IterPrinter to print a PlanIterator tree in XML format
+ * Implementation of IterPrinter to print a PlanIterator tree in DOT format
  */
 class DOTIterPrinter : public IterPrinter 
 {
@@ -124,7 +124,39 @@
 
   virtual void endEndVisit();
   
-}; /* class XMLVisitorPrinter */
+}; /* class DOTVisitorPrinter */
+
+/**
+ * Implementation of IterPrinter to print a PlanIterator tree in JSON format
+ */
+class JSONIterPrinter : public IterPrinter
+{
+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 */

=== modified file 'src/runtime/visitors/pregenerated/printer_visitor.cpp'
--- src/runtime/visitors/pregenerated/printer_visitor.cpp	2014-02-10 00:44:55 +0000
+++ src/runtime/visitors/pregenerated/printer_visitor.cpp	2014-02-19 00:45:18 +0000
@@ -77,59 +77,17 @@
 #include "runtime/uris/uris.h"
 #include "runtime/xqdoc/xqdoc.h"
 
-namespace zorba{
-
-void PrinterVisitor::print() {
-  thePrinter.start();
-  theIterator->accept(*this);
-  thePrinter.stop();
-}
-
-void PrinterVisitor::printCommons(const PlanIterator* aIter, int theId) {
-  if (! Properties::instance().getNoTreeIDs()) {
-    std::stringstream lStream;
-    if (Properties::instance().getStableIteratorIDs())
-      lStream << theId;
-    else
-      lStream << aIter;
-
-    thePrinter.addAttribute("id", lStream.str());
-  }
-}
-
-void PrinterVisitor::printNameOrKindTest(const AxisIteratorHelper* a) {
-  thePrinter.addAttribute("test kind", toString(a->getTestKind()));
-
-  if (a->getDocTestKind() != match_no_test)
-    thePrinter.addAttribute("doc_test_kind", toString(a->getDocTestKind()));
-
-  if (a->getQName() != 0)
-    thePrinter.addAttribute("qname", a->getQName()->show().str());
-  else
-    thePrinter.addAttribute("qname","*");
-
-  if (a->getType() != 0)
-    thePrinter.addAttribute("typename", a->getType()->toString());
-  else
-    thePrinter.addAttribute("typename","*");
-
-  std::stringstream lStream;
-  lStream << a->nilledAllowed();
-  thePrinter.addAttribute("nill allowed", lStream.str());
-
-  if (a->getTargetPos() >= 0)
-    thePrinter.addAttribute("target_position", ztd::to_string(a->getTargetPos()));
-}
+namespace zorba {
 
 
 // <NodeNameIterator>
-void PrinterVisitor::beginVisit ( const NodeNameIterator& a) {
+void PrinterVisitor::beginVisit( const NodeNameIterator& a) {
   thePrinter.startBeginVisit("NodeNameIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const NodeNameIterator& ) {
+void PrinterVisitor::endVisit( const NodeNameIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -137,13 +95,13 @@
 
 
 // <NilledIterator>
-void PrinterVisitor::beginVisit ( const NilledIterator& a) {
+void PrinterVisitor::beginVisit( const NilledIterator& a) {
   thePrinter.startBeginVisit("NilledIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const NilledIterator& ) {
+void PrinterVisitor::endVisit( const NilledIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -151,13 +109,13 @@
 
 
 // <FnStringIterator>
-void PrinterVisitor::beginVisit ( const FnStringIterator& a) {
+void PrinterVisitor::beginVisit( const FnStringIterator& a) {
   thePrinter.startBeginVisit("FnStringIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnStringIterator& ) {
+void PrinterVisitor::endVisit( const FnStringIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -165,13 +123,13 @@
 
 
 // <FnDataIterator>
-void PrinterVisitor::beginVisit ( const FnDataIterator& a) {
+void PrinterVisitor::beginVisit( const FnDataIterator& a) {
   thePrinter.startBeginVisit("FnDataIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnDataIterator& ) {
+void PrinterVisitor::endVisit( const FnDataIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -179,13 +137,13 @@
 
 
 // <BaseUriIterator>
-void PrinterVisitor::beginVisit ( const BaseUriIterator& a) {
+void PrinterVisitor::beginVisit( const BaseUriIterator& a) {
   thePrinter.startBeginVisit("BaseUriIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const BaseUriIterator& ) {
+void PrinterVisitor::endVisit( const BaseUriIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -193,13 +151,13 @@
 
 
 // <DocumentUriIterator>
-void PrinterVisitor::beginVisit ( const DocumentUriIterator& a) {
+void PrinterVisitor::beginVisit( const DocumentUriIterator& a) {
   thePrinter.startBeginVisit("DocumentUriIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const DocumentUriIterator& ) {
+void PrinterVisitor::endVisit( const DocumentUriIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -207,13 +165,13 @@
 
 
 // <RootIterator>
-void PrinterVisitor::beginVisit ( const RootIterator& a) {
+void PrinterVisitor::beginVisit( const RootIterator& a) {
   thePrinter.startBeginVisit("RootIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const RootIterator& ) {
+void PrinterVisitor::endVisit( const RootIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -221,13 +179,13 @@
 
 
 // <ResolveUriIterator>
-void PrinterVisitor::beginVisit ( const ResolveUriIterator& a) {
+void PrinterVisitor::beginVisit( const ResolveUriIterator& a) {
   thePrinter.startBeginVisit("ResolveUriIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ResolveUriIterator& ) {
+void PrinterVisitor::endVisit( const ResolveUriIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -235,13 +193,13 @@
 
 
 // <Base64DecodeIterator>
-void PrinterVisitor::beginVisit ( const Base64DecodeIterator& a) {
+void PrinterVisitor::beginVisit( const Base64DecodeIterator& a) {
   thePrinter.startBeginVisit("Base64DecodeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const Base64DecodeIterator& ) {
+void PrinterVisitor::endVisit( const Base64DecodeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -249,13 +207,13 @@
 
 
 // <Base64EncodeIterator>
-void PrinterVisitor::beginVisit ( const Base64EncodeIterator& a) {
+void PrinterVisitor::beginVisit( const Base64EncodeIterator& a) {
   thePrinter.startBeginVisit("Base64EncodeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const Base64EncodeIterator& ) {
+void PrinterVisitor::endVisit( const Base64EncodeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -263,13 +221,13 @@
 
 
 // <IsSameNodeIterator>
-void PrinterVisitor::beginVisit ( const IsSameNodeIterator& a) {
+void PrinterVisitor::beginVisit( const IsSameNodeIterator& a) {
   thePrinter.startBeginVisit("IsSameNodeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsSameNodeIterator& ) {
+void PrinterVisitor::endVisit( const IsSameNodeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -277,13 +235,13 @@
 
 
 // <NodeBeforeIterator>
-void PrinterVisitor::beginVisit ( const NodeBeforeIterator& a) {
+void PrinterVisitor::beginVisit( const NodeBeforeIterator& a) {
   thePrinter.startBeginVisit("NodeBeforeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const NodeBeforeIterator& ) {
+void PrinterVisitor::endVisit( const NodeBeforeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -291,13 +249,13 @@
 
 
 // <NodeAfterIterator>
-void PrinterVisitor::beginVisit ( const NodeAfterIterator& a) {
+void PrinterVisitor::beginVisit( const NodeAfterIterator& a) {
   thePrinter.startBeginVisit("NodeAfterIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const NodeAfterIterator& ) {
+void PrinterVisitor::endVisit( const NodeAfterIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -305,13 +263,13 @@
 
 
 // <ZorbaCreateCollectionIterator>
-void PrinterVisitor::beginVisit ( const ZorbaCreateCollectionIterator& a) {
+void PrinterVisitor::beginVisit( const ZorbaCreateCollectionIterator& a) {
   thePrinter.startBeginVisit("ZorbaCreateCollectionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ZorbaCreateCollectionIterator& ) {
+void PrinterVisitor::endVisit( const ZorbaCreateCollectionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -319,13 +277,13 @@
 
 
 // <ZorbaDeleteCollectionIterator>
-void PrinterVisitor::beginVisit ( const ZorbaDeleteCollectionIterator& a) {
+void PrinterVisitor::beginVisit( const ZorbaDeleteCollectionIterator& a) {
   thePrinter.startBeginVisit("ZorbaDeleteCollectionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ZorbaDeleteCollectionIterator& ) {
+void PrinterVisitor::endVisit( const ZorbaDeleteCollectionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -333,13 +291,13 @@
 
 
 // <IsAvailableCollectionIterator>
-void PrinterVisitor::beginVisit ( const IsAvailableCollectionIterator& a) {
+void PrinterVisitor::beginVisit( const IsAvailableCollectionIterator& a) {
   thePrinter.startBeginVisit("IsAvailableCollectionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsAvailableCollectionIterator& ) {
+void PrinterVisitor::endVisit( const IsAvailableCollectionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -347,13 +305,13 @@
 
 
 // <AvailableCollectionsIterator>
-void PrinterVisitor::beginVisit ( const AvailableCollectionsIterator& a) {
+void PrinterVisitor::beginVisit( const AvailableCollectionsIterator& a) {
   thePrinter.startBeginVisit("AvailableCollectionsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const AvailableCollectionsIterator& ) {
+void PrinterVisitor::endVisit( const AvailableCollectionsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -361,13 +319,13 @@
 
 
 // <FnCollectionIterator>
-void PrinterVisitor::beginVisit ( const FnCollectionIterator& a) {
+void PrinterVisitor::beginVisit( const FnCollectionIterator& a) {
   thePrinter.startBeginVisit("FnCollectionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnCollectionIterator& ) {
+void PrinterVisitor::endVisit( const FnCollectionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -375,13 +333,13 @@
 
 
 // <ZorbaCollectionIterator>
-void PrinterVisitor::beginVisit ( const ZorbaCollectionIterator& a) {
+void PrinterVisitor::beginVisit( const ZorbaCollectionIterator& a) {
   thePrinter.startBeginVisit("ZorbaCollectionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ZorbaCollectionIterator& ) {
+void PrinterVisitor::endVisit( const ZorbaCollectionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -389,13 +347,13 @@
 
 
 // <ZorbaCollectionNameIterator>
-void PrinterVisitor::beginVisit ( const ZorbaCollectionNameIterator& a) {
+void PrinterVisitor::beginVisit( const ZorbaCollectionNameIterator& a) {
   thePrinter.startBeginVisit("ZorbaCollectionNameIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ZorbaCollectionNameIterator& ) {
+void PrinterVisitor::endVisit( const ZorbaCollectionNameIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -403,13 +361,13 @@
 
 
 // <ZorbaIndexOfIterator>
-void PrinterVisitor::beginVisit ( const ZorbaIndexOfIterator& a) {
+void PrinterVisitor::beginVisit( const ZorbaIndexOfIterator& a) {
   thePrinter.startBeginVisit("ZorbaIndexOfIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ZorbaIndexOfIterator& ) {
+void PrinterVisitor::endVisit( const ZorbaIndexOfIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -417,13 +375,13 @@
 
 
 // <ZorbaDeleteIterator>
-void PrinterVisitor::beginVisit ( const ZorbaDeleteIterator& a) {
+void PrinterVisitor::beginVisit( const ZorbaDeleteIterator& a) {
   thePrinter.startBeginVisit("ZorbaDeleteIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ZorbaDeleteIterator& ) {
+void PrinterVisitor::endVisit( const ZorbaDeleteIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -431,13 +389,13 @@
 
 
 // <ZorbaDeleteFirstIterator>
-void PrinterVisitor::beginVisit ( const ZorbaDeleteFirstIterator& a) {
+void PrinterVisitor::beginVisit( const ZorbaDeleteFirstIterator& a) {
   thePrinter.startBeginVisit("ZorbaDeleteFirstIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ZorbaDeleteFirstIterator& ) {
+void PrinterVisitor::endVisit( const ZorbaDeleteFirstIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -445,13 +403,13 @@
 
 
 // <ZorbaDeleteLastIterator>
-void PrinterVisitor::beginVisit ( const ZorbaDeleteLastIterator& a) {
+void PrinterVisitor::beginVisit( const ZorbaDeleteLastIterator& a) {
   thePrinter.startBeginVisit("ZorbaDeleteLastIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ZorbaDeleteLastIterator& ) {
+void PrinterVisitor::endVisit( const ZorbaDeleteLastIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -459,13 +417,13 @@
 
 
 // <ZorbaEditIterator>
-void PrinterVisitor::beginVisit ( const ZorbaEditIterator& a) {
+void PrinterVisitor::beginVisit( const ZorbaEditIterator& a) {
   thePrinter.startBeginVisit("ZorbaEditIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ZorbaEditIterator& ) {
+void PrinterVisitor::endVisit( const ZorbaEditIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -473,13 +431,13 @@
 
 
 // <ZorbaTruncateCollectionIterator>
-void PrinterVisitor::beginVisit ( const ZorbaTruncateCollectionIterator& a) {
+void PrinterVisitor::beginVisit( const ZorbaTruncateCollectionIterator& a) {
   thePrinter.startBeginVisit("ZorbaTruncateCollectionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ZorbaTruncateCollectionIterator& ) {
+void PrinterVisitor::endVisit( const ZorbaTruncateCollectionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -487,13 +445,13 @@
 
 
 // <IsAvailableIndexIterator>
-void PrinterVisitor::beginVisit ( const IsAvailableIndexIterator& a) {
+void PrinterVisitor::beginVisit( const IsAvailableIndexIterator& a) {
   thePrinter.startBeginVisit("IsAvailableIndexIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsAvailableIndexIterator& ) {
+void PrinterVisitor::endVisit( const IsAvailableIndexIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -501,13 +459,13 @@
 
 
 // <AvailableIndexesIterator>
-void PrinterVisitor::beginVisit ( const AvailableIndexesIterator& a) {
+void PrinterVisitor::beginVisit( const AvailableIndexesIterator& a) {
   thePrinter.startBeginVisit("AvailableIndexesIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const AvailableIndexesIterator& ) {
+void PrinterVisitor::endVisit( const AvailableIndexesIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -515,13 +473,13 @@
 
 
 // <IsActivatedICIterator>
-void PrinterVisitor::beginVisit ( const IsActivatedICIterator& a) {
+void PrinterVisitor::beginVisit( const IsActivatedICIterator& a) {
   thePrinter.startBeginVisit("IsActivatedICIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsActivatedICIterator& ) {
+void PrinterVisitor::endVisit( const IsActivatedICIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -529,13 +487,13 @@
 
 
 // <ActivatedICsIterator>
-void PrinterVisitor::beginVisit ( const ActivatedICsIterator& a) {
+void PrinterVisitor::beginVisit( const ActivatedICsIterator& a) {
   thePrinter.startBeginVisit("ActivatedICsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ActivatedICsIterator& ) {
+void PrinterVisitor::endVisit( const ActivatedICsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -543,13 +501,13 @@
 
 
 // <IsDeclaredCollectionIterator>
-void PrinterVisitor::beginVisit ( const IsDeclaredCollectionIterator& a) {
+void PrinterVisitor::beginVisit( const IsDeclaredCollectionIterator& a) {
   thePrinter.startBeginVisit("IsDeclaredCollectionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsDeclaredCollectionIterator& ) {
+void PrinterVisitor::endVisit( const IsDeclaredCollectionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -557,13 +515,13 @@
 
 
 // <DeclaredCollectionsIterator>
-void PrinterVisitor::beginVisit ( const DeclaredCollectionsIterator& a) {
+void PrinterVisitor::beginVisit( const DeclaredCollectionsIterator& a) {
   thePrinter.startBeginVisit("DeclaredCollectionsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const DeclaredCollectionsIterator& ) {
+void PrinterVisitor::endVisit( const DeclaredCollectionsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -571,13 +529,13 @@
 
 
 // <IsDeclaredIndexIterator>
-void PrinterVisitor::beginVisit ( const IsDeclaredIndexIterator& a) {
+void PrinterVisitor::beginVisit( const IsDeclaredIndexIterator& a) {
   thePrinter.startBeginVisit("IsDeclaredIndexIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsDeclaredIndexIterator& ) {
+void PrinterVisitor::endVisit( const IsDeclaredIndexIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -585,13 +543,13 @@
 
 
 // <DeclaredIndexesIterator>
-void PrinterVisitor::beginVisit ( const DeclaredIndexesIterator& a) {
+void PrinterVisitor::beginVisit( const DeclaredIndexesIterator& a) {
   thePrinter.startBeginVisit("DeclaredIndexesIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const DeclaredIndexesIterator& ) {
+void PrinterVisitor::endVisit( const DeclaredIndexesIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -599,13 +557,13 @@
 
 
 // <IsDeclaredICIterator>
-void PrinterVisitor::beginVisit ( const IsDeclaredICIterator& a) {
+void PrinterVisitor::beginVisit( const IsDeclaredICIterator& a) {
   thePrinter.startBeginVisit("IsDeclaredICIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsDeclaredICIterator& ) {
+void PrinterVisitor::endVisit( const IsDeclaredICIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -613,13 +571,13 @@
 
 
 // <DeclaredICsIterator>
-void PrinterVisitor::beginVisit ( const DeclaredICsIterator& a) {
+void PrinterVisitor::beginVisit( const DeclaredICsIterator& a) {
   thePrinter.startBeginVisit("DeclaredICsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const DeclaredICsIterator& ) {
+void PrinterVisitor::endVisit( const DeclaredICsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -627,13 +585,13 @@
 
 
 // <FnURICollectionIterator>
-void PrinterVisitor::beginVisit ( const FnURICollectionIterator& a) {
+void PrinterVisitor::beginVisit( const FnURICollectionIterator& a) {
   thePrinter.startBeginVisit("FnURICollectionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnURICollectionIterator& ) {
+void PrinterVisitor::endVisit( const FnURICollectionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -641,13 +599,13 @@
 
 
 // <CurrentDateTimeIterator>
-void PrinterVisitor::beginVisit ( const CurrentDateTimeIterator& a) {
+void PrinterVisitor::beginVisit( const CurrentDateTimeIterator& a) {
   thePrinter.startBeginVisit("CurrentDateTimeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const CurrentDateTimeIterator& ) {
+void PrinterVisitor::endVisit( const CurrentDateTimeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -655,13 +613,13 @@
 
 
 // <CurrentDateIterator>
-void PrinterVisitor::beginVisit ( const CurrentDateIterator& a) {
+void PrinterVisitor::beginVisit( const CurrentDateIterator& a) {
   thePrinter.startBeginVisit("CurrentDateIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const CurrentDateIterator& ) {
+void PrinterVisitor::endVisit( const CurrentDateIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -669,13 +627,13 @@
 
 
 // <CurrentTimeIterator>
-void PrinterVisitor::beginVisit ( const CurrentTimeIterator& a) {
+void PrinterVisitor::beginVisit( const CurrentTimeIterator& a) {
   thePrinter.startBeginVisit("CurrentTimeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const CurrentTimeIterator& ) {
+void PrinterVisitor::endVisit( const CurrentTimeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -683,13 +641,13 @@
 
 
 // <ImplicitTimezoneIterator>
-void PrinterVisitor::beginVisit ( const ImplicitTimezoneIterator& a) {
+void PrinterVisitor::beginVisit( const ImplicitTimezoneIterator& a) {
   thePrinter.startBeginVisit("ImplicitTimezoneIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ImplicitTimezoneIterator& ) {
+void PrinterVisitor::endVisit( const ImplicitTimezoneIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -697,13 +655,13 @@
 
 
 // <DefaultCollationIterator>
-void PrinterVisitor::beginVisit ( const DefaultCollationIterator& a) {
+void PrinterVisitor::beginVisit( const DefaultCollationIterator& a) {
   thePrinter.startBeginVisit("DefaultCollationIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const DefaultCollationIterator& ) {
+void PrinterVisitor::endVisit( const DefaultCollationIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -711,13 +669,13 @@
 
 
 // <CsvParseIterator>
-void PrinterVisitor::beginVisit ( const CsvParseIterator& a) {
+void PrinterVisitor::beginVisit( const CsvParseIterator& a) {
   thePrinter.startBeginVisit("CsvParseIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const CsvParseIterator& ) {
+void PrinterVisitor::endVisit( const CsvParseIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -725,13 +683,13 @@
 
 
 // <CsvSerializeIterator>
-void PrinterVisitor::beginVisit ( const CsvSerializeIterator& a) {
+void PrinterVisitor::beginVisit( const CsvSerializeIterator& a) {
   thePrinter.startBeginVisit("CsvSerializeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const CsvSerializeIterator& ) {
+void PrinterVisitor::endVisit( const CsvSerializeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -739,13 +697,13 @@
 
 
 // <CurrentDate>
-void PrinterVisitor::beginVisit ( const CurrentDate& a) {
+void PrinterVisitor::beginVisit( const CurrentDate& a) {
   thePrinter.startBeginVisit("CurrentDate", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const CurrentDate& ) {
+void PrinterVisitor::endVisit( const CurrentDate& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -753,13 +711,13 @@
 
 
 // <CurrentDateTime>
-void PrinterVisitor::beginVisit ( const CurrentDateTime& a) {
+void PrinterVisitor::beginVisit( const CurrentDateTime& a) {
   thePrinter.startBeginVisit("CurrentDateTime", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const CurrentDateTime& ) {
+void PrinterVisitor::endVisit( const CurrentDateTime& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -767,13 +725,13 @@
 
 
 // <CurrentTime>
-void PrinterVisitor::beginVisit ( const CurrentTime& a) {
+void PrinterVisitor::beginVisit( const CurrentTime& a) {
   thePrinter.startBeginVisit("CurrentTime", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const CurrentTime& ) {
+void PrinterVisitor::endVisit( const CurrentTime& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -781,13 +739,13 @@
 
 
 // <MillisToDateTime>
-void PrinterVisitor::beginVisit ( const MillisToDateTime& a) {
+void PrinterVisitor::beginVisit( const MillisToDateTime& a) {
   thePrinter.startBeginVisit("MillisToDateTime", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MillisToDateTime& ) {
+void PrinterVisitor::endVisit( const MillisToDateTime& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -795,13 +753,13 @@
 
 
 // <ParseDate>
-void PrinterVisitor::beginVisit ( const ParseDate& a) {
+void PrinterVisitor::beginVisit( const ParseDate& a) {
   thePrinter.startBeginVisit("ParseDate", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ParseDate& ) {
+void PrinterVisitor::endVisit( const ParseDate& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -809,13 +767,13 @@
 
 
 // <ParseDateTime>
-void PrinterVisitor::beginVisit ( const ParseDateTime& a) {
+void PrinterVisitor::beginVisit( const ParseDateTime& a) {
   thePrinter.startBeginVisit("ParseDateTime", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ParseDateTime& ) {
+void PrinterVisitor::endVisit( const ParseDateTime& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -823,13 +781,13 @@
 
 
 // <ParseTime>
-void PrinterVisitor::beginVisit ( const ParseTime& a) {
+void PrinterVisitor::beginVisit( const ParseTime& a) {
   thePrinter.startBeginVisit("ParseTime", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ParseTime& ) {
+void PrinterVisitor::endVisit( const ParseTime& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -837,13 +795,13 @@
 
 
 // <Timestamp>
-void PrinterVisitor::beginVisit ( const Timestamp& a) {
+void PrinterVisitor::beginVisit( const Timestamp& a) {
   thePrinter.startBeginVisit("Timestamp", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const Timestamp& ) {
+void PrinterVisitor::endVisit( const Timestamp& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -851,13 +809,13 @@
 
 
 // <UTCOffset>
-void PrinterVisitor::beginVisit ( const UTCOffset& a) {
+void PrinterVisitor::beginVisit( const UTCOffset& a) {
   thePrinter.startBeginVisit("UTCOffset", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const UTCOffset& ) {
+void PrinterVisitor::endVisit( const UTCOffset& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -865,13 +823,13 @@
 
 #ifdef ZORBA_WITH_DEBUGGER
 // <DebugIterator>
-void PrinterVisitor::beginVisit ( const DebugIterator& a) {
+void PrinterVisitor::beginVisit( const DebugIterator& a) {
   thePrinter.startBeginVisit("DebugIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const DebugIterator& ) {
+void PrinterVisitor::endVisit( const DebugIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -880,13 +838,13 @@
 #endif
 
 // <YearsFromDurationIterator>
-void PrinterVisitor::beginVisit ( const YearsFromDurationIterator& a) {
+void PrinterVisitor::beginVisit( const YearsFromDurationIterator& a) {
   thePrinter.startBeginVisit("YearsFromDurationIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const YearsFromDurationIterator& ) {
+void PrinterVisitor::endVisit( const YearsFromDurationIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -894,13 +852,13 @@
 
 
 // <MonthsFromDurationIterator>
-void PrinterVisitor::beginVisit ( const MonthsFromDurationIterator& a) {
+void PrinterVisitor::beginVisit( const MonthsFromDurationIterator& a) {
   thePrinter.startBeginVisit("MonthsFromDurationIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MonthsFromDurationIterator& ) {
+void PrinterVisitor::endVisit( const MonthsFromDurationIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -908,13 +866,13 @@
 
 
 // <DaysFromDurationIterator>
-void PrinterVisitor::beginVisit ( const DaysFromDurationIterator& a) {
+void PrinterVisitor::beginVisit( const DaysFromDurationIterator& a) {
   thePrinter.startBeginVisit("DaysFromDurationIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const DaysFromDurationIterator& ) {
+void PrinterVisitor::endVisit( const DaysFromDurationIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -922,13 +880,13 @@
 
 
 // <HoursFromDurationIterator>
-void PrinterVisitor::beginVisit ( const HoursFromDurationIterator& a) {
+void PrinterVisitor::beginVisit( const HoursFromDurationIterator& a) {
   thePrinter.startBeginVisit("HoursFromDurationIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const HoursFromDurationIterator& ) {
+void PrinterVisitor::endVisit( const HoursFromDurationIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -936,13 +894,13 @@
 
 
 // <MinutesFromDurationIterator>
-void PrinterVisitor::beginVisit ( const MinutesFromDurationIterator& a) {
+void PrinterVisitor::beginVisit( const MinutesFromDurationIterator& a) {
   thePrinter.startBeginVisit("MinutesFromDurationIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MinutesFromDurationIterator& ) {
+void PrinterVisitor::endVisit( const MinutesFromDurationIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -950,13 +908,13 @@
 
 
 // <SecondsFromDurationIterator>
-void PrinterVisitor::beginVisit ( const SecondsFromDurationIterator& a) {
+void PrinterVisitor::beginVisit( const SecondsFromDurationIterator& a) {
   thePrinter.startBeginVisit("SecondsFromDurationIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SecondsFromDurationIterator& ) {
+void PrinterVisitor::endVisit( const SecondsFromDurationIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -964,13 +922,13 @@
 
 
 // <YearFromDatetimeIterator>
-void PrinterVisitor::beginVisit ( const YearFromDatetimeIterator& a) {
+void PrinterVisitor::beginVisit( const YearFromDatetimeIterator& a) {
   thePrinter.startBeginVisit("YearFromDatetimeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const YearFromDatetimeIterator& ) {
+void PrinterVisitor::endVisit( const YearFromDatetimeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -978,13 +936,13 @@
 
 
 // <MonthFromDatetimeIterator>
-void PrinterVisitor::beginVisit ( const MonthFromDatetimeIterator& a) {
+void PrinterVisitor::beginVisit( const MonthFromDatetimeIterator& a) {
   thePrinter.startBeginVisit("MonthFromDatetimeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MonthFromDatetimeIterator& ) {
+void PrinterVisitor::endVisit( const MonthFromDatetimeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -992,13 +950,13 @@
 
 
 // <DayFromDatetimeIterator>
-void PrinterVisitor::beginVisit ( const DayFromDatetimeIterator& a) {
+void PrinterVisitor::beginVisit( const DayFromDatetimeIterator& a) {
   thePrinter.startBeginVisit("DayFromDatetimeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const DayFromDatetimeIterator& ) {
+void PrinterVisitor::endVisit( const DayFromDatetimeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1006,13 +964,13 @@
 
 
 // <HoursFromDatetimeIterator>
-void PrinterVisitor::beginVisit ( const HoursFromDatetimeIterator& a) {
+void PrinterVisitor::beginVisit( const HoursFromDatetimeIterator& a) {
   thePrinter.startBeginVisit("HoursFromDatetimeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const HoursFromDatetimeIterator& ) {
+void PrinterVisitor::endVisit( const HoursFromDatetimeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1020,13 +978,13 @@
 
 
 // <MinutesFromDatetimeIterator>
-void PrinterVisitor::beginVisit ( const MinutesFromDatetimeIterator& a) {
+void PrinterVisitor::beginVisit( const MinutesFromDatetimeIterator& a) {
   thePrinter.startBeginVisit("MinutesFromDatetimeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MinutesFromDatetimeIterator& ) {
+void PrinterVisitor::endVisit( const MinutesFromDatetimeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1034,13 +992,13 @@
 
 
 // <SecondsFromDatetimeIterator>
-void PrinterVisitor::beginVisit ( const SecondsFromDatetimeIterator& a) {
+void PrinterVisitor::beginVisit( const SecondsFromDatetimeIterator& a) {
   thePrinter.startBeginVisit("SecondsFromDatetimeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SecondsFromDatetimeIterator& ) {
+void PrinterVisitor::endVisit( const SecondsFromDatetimeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1048,13 +1006,13 @@
 
 
 // <TimezoneFromDatetimeIterator>
-void PrinterVisitor::beginVisit ( const TimezoneFromDatetimeIterator& a) {
+void PrinterVisitor::beginVisit( const TimezoneFromDatetimeIterator& a) {
   thePrinter.startBeginVisit("TimezoneFromDatetimeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const TimezoneFromDatetimeIterator& ) {
+void PrinterVisitor::endVisit( const TimezoneFromDatetimeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1062,13 +1020,13 @@
 
 
 // <YearFromDateIterator>
-void PrinterVisitor::beginVisit ( const YearFromDateIterator& a) {
+void PrinterVisitor::beginVisit( const YearFromDateIterator& a) {
   thePrinter.startBeginVisit("YearFromDateIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const YearFromDateIterator& ) {
+void PrinterVisitor::endVisit( const YearFromDateIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1076,13 +1034,13 @@
 
 
 // <MonthFromDateIterator>
-void PrinterVisitor::beginVisit ( const MonthFromDateIterator& a) {
+void PrinterVisitor::beginVisit( const MonthFromDateIterator& a) {
   thePrinter.startBeginVisit("MonthFromDateIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MonthFromDateIterator& ) {
+void PrinterVisitor::endVisit( const MonthFromDateIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1090,13 +1048,13 @@
 
 
 // <DayFromDateIterator>
-void PrinterVisitor::beginVisit ( const DayFromDateIterator& a) {
+void PrinterVisitor::beginVisit( const DayFromDateIterator& a) {
   thePrinter.startBeginVisit("DayFromDateIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const DayFromDateIterator& ) {
+void PrinterVisitor::endVisit( const DayFromDateIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1104,13 +1062,13 @@
 
 
 // <TimezoneFromDateIterator>
-void PrinterVisitor::beginVisit ( const TimezoneFromDateIterator& a) {
+void PrinterVisitor::beginVisit( const TimezoneFromDateIterator& a) {
   thePrinter.startBeginVisit("TimezoneFromDateIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const TimezoneFromDateIterator& ) {
+void PrinterVisitor::endVisit( const TimezoneFromDateIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1118,13 +1076,13 @@
 
 
 // <HoursFromTimeIterator>
-void PrinterVisitor::beginVisit ( const HoursFromTimeIterator& a) {
+void PrinterVisitor::beginVisit( const HoursFromTimeIterator& a) {
   thePrinter.startBeginVisit("HoursFromTimeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const HoursFromTimeIterator& ) {
+void PrinterVisitor::endVisit( const HoursFromTimeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1132,13 +1090,13 @@
 
 
 // <MinutesFromTimeIterator>
-void PrinterVisitor::beginVisit ( const MinutesFromTimeIterator& a) {
+void PrinterVisitor::beginVisit( const MinutesFromTimeIterator& a) {
   thePrinter.startBeginVisit("MinutesFromTimeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MinutesFromTimeIterator& ) {
+void PrinterVisitor::endVisit( const MinutesFromTimeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1146,13 +1104,13 @@
 
 
 // <SecondsFromTimeIterator>
-void PrinterVisitor::beginVisit ( const SecondsFromTimeIterator& a) {
+void PrinterVisitor::beginVisit( const SecondsFromTimeIterator& a) {
   thePrinter.startBeginVisit("SecondsFromTimeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SecondsFromTimeIterator& ) {
+void PrinterVisitor::endVisit( const SecondsFromTimeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1160,13 +1118,13 @@
 
 
 // <TimezoneFromTimeIterator>
-void PrinterVisitor::beginVisit ( const TimezoneFromTimeIterator& a) {
+void PrinterVisitor::beginVisit( const TimezoneFromTimeIterator& a) {
   thePrinter.startBeginVisit("TimezoneFromTimeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const TimezoneFromTimeIterator& ) {
+void PrinterVisitor::endVisit( const TimezoneFromTimeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1174,13 +1132,13 @@
 
 
 // <ErrorIterator>
-void PrinterVisitor::beginVisit ( const ErrorIterator& a) {
+void PrinterVisitor::beginVisit( const ErrorIterator& a) {
   thePrinter.startBeginVisit("ErrorIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ErrorIterator& ) {
+void PrinterVisitor::endVisit( const ErrorIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1188,13 +1146,13 @@
 
 
 // <TraceIterator>
-void PrinterVisitor::beginVisit ( const TraceIterator& a) {
+void PrinterVisitor::beginVisit( const TraceIterator& a) {
   thePrinter.startBeginVisit("TraceIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const TraceIterator& ) {
+void PrinterVisitor::endVisit( const TraceIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1202,13 +1160,13 @@
 
 
 // <ReadLineIterator>
-void PrinterVisitor::beginVisit ( const ReadLineIterator& a) {
+void PrinterVisitor::beginVisit( const ReadLineIterator& a) {
   thePrinter.startBeginVisit("ReadLineIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ReadLineIterator& ) {
+void PrinterVisitor::endVisit( const ReadLineIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1216,13 +1174,13 @@
 
 
 // <PrintIterator>
-void PrinterVisitor::beginVisit ( const PrintIterator& a) {
+void PrinterVisitor::beginVisit( const PrintIterator& a) {
   thePrinter.startBeginVisit("PrintIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const PrintIterator& ) {
+void PrinterVisitor::endVisit( const PrintIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1230,13 +1188,13 @@
 
 
 // <FunctionTraceIterator>
-void PrinterVisitor::beginVisit ( const FunctionTraceIterator& a) {
+void PrinterVisitor::beginVisit( const FunctionTraceIterator& a) {
   thePrinter.startBeginVisit("FunctionTraceIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FunctionTraceIterator& ) {
+void PrinterVisitor::endVisit( const FunctionTraceIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1244,13 +1202,13 @@
 
 
 // <FetchContentIterator>
-void PrinterVisitor::beginVisit ( const FetchContentIterator& a) {
+void PrinterVisitor::beginVisit( const FetchContentIterator& a) {
   thePrinter.startBeginVisit("FetchContentIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FetchContentIterator& ) {
+void PrinterVisitor::endVisit( const FetchContentIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1258,13 +1216,13 @@
 
 
 // <FetchContentBinaryIterator>
-void PrinterVisitor::beginVisit ( const FetchContentBinaryIterator& a) {
+void PrinterVisitor::beginVisit( const FetchContentBinaryIterator& a) {
   thePrinter.startBeginVisit("FetchContentBinaryIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FetchContentBinaryIterator& ) {
+void PrinterVisitor::endVisit( const FetchContentBinaryIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1272,13 +1230,13 @@
 
 
 // <FetchContentTypeIterator>
-void PrinterVisitor::beginVisit ( const FetchContentTypeIterator& a) {
+void PrinterVisitor::beginVisit( const FetchContentTypeIterator& a) {
   thePrinter.startBeginVisit("FetchContentTypeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FetchContentTypeIterator& ) {
+void PrinterVisitor::endVisit( const FetchContentTypeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1286,13 +1244,13 @@
 
 
 // <FnPutIterator>
-void PrinterVisitor::beginVisit ( const FnPutIterator& a) {
+void PrinterVisitor::beginVisit( const FnPutIterator& a) {
   thePrinter.startBeginVisit("FnPutIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnPutIterator& ) {
+void PrinterVisitor::endVisit( const FnPutIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1300,13 +1258,13 @@
 
 #ifndef ZORBA_NO_FULL_TEXT
 // <CurrentCompareOptionsIterator>
-void PrinterVisitor::beginVisit ( const CurrentCompareOptionsIterator& a) {
+void PrinterVisitor::beginVisit( const CurrentCompareOptionsIterator& a) {
   thePrinter.startBeginVisit("CurrentCompareOptionsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const CurrentCompareOptionsIterator& ) {
+void PrinterVisitor::endVisit( const CurrentCompareOptionsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1315,13 +1273,13 @@
 #endif
 #ifndef ZORBA_NO_FULL_TEXT
 // <CurrentLangIterator>
-void PrinterVisitor::beginVisit ( const CurrentLangIterator& a) {
+void PrinterVisitor::beginVisit( const CurrentLangIterator& a) {
   thePrinter.startBeginVisit("CurrentLangIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const CurrentLangIterator& ) {
+void PrinterVisitor::endVisit( const CurrentLangIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1330,13 +1288,13 @@
 #endif
 #ifndef ZORBA_NO_FULL_TEXT
 // <HostLangIterator>
-void PrinterVisitor::beginVisit ( const HostLangIterator& a) {
+void PrinterVisitor::beginVisit( const HostLangIterator& a) {
   thePrinter.startBeginVisit("HostLangIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const HostLangIterator& ) {
+void PrinterVisitor::endVisit( const HostLangIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1345,13 +1303,13 @@
 #endif
 #ifndef ZORBA_NO_FULL_TEXT
 // <IsStemLangSupportedIterator>
-void PrinterVisitor::beginVisit ( const IsStemLangSupportedIterator& a) {
+void PrinterVisitor::beginVisit( const IsStemLangSupportedIterator& a) {
   thePrinter.startBeginVisit("IsStemLangSupportedIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsStemLangSupportedIterator& ) {
+void PrinterVisitor::endVisit( const IsStemLangSupportedIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1360,13 +1318,13 @@
 #endif
 #ifndef ZORBA_NO_FULL_TEXT
 // <IsStopWordIterator>
-void PrinterVisitor::beginVisit ( const IsStopWordIterator& a) {
+void PrinterVisitor::beginVisit( const IsStopWordIterator& a) {
   thePrinter.startBeginVisit("IsStopWordIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsStopWordIterator& ) {
+void PrinterVisitor::endVisit( const IsStopWordIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1375,13 +1333,13 @@
 #endif
 #ifndef ZORBA_NO_FULL_TEXT
 // <IsStopWordLangSupportedIterator>
-void PrinterVisitor::beginVisit ( const IsStopWordLangSupportedIterator& a) {
+void PrinterVisitor::beginVisit( const IsStopWordLangSupportedIterator& a) {
   thePrinter.startBeginVisit("IsStopWordLangSupportedIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsStopWordLangSupportedIterator& ) {
+void PrinterVisitor::endVisit( const IsStopWordLangSupportedIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1390,13 +1348,13 @@
 #endif
 #ifndef ZORBA_NO_FULL_TEXT
 // <IsThesaurusLangSupportedIterator>
-void PrinterVisitor::beginVisit ( const IsThesaurusLangSupportedIterator& a) {
+void PrinterVisitor::beginVisit( const IsThesaurusLangSupportedIterator& a) {
   thePrinter.startBeginVisit("IsThesaurusLangSupportedIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsThesaurusLangSupportedIterator& ) {
+void PrinterVisitor::endVisit( const IsThesaurusLangSupportedIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1405,13 +1363,13 @@
 #endif
 #ifndef ZORBA_NO_FULL_TEXT
 // <IsTokenizerLangSupportedIterator>
-void PrinterVisitor::beginVisit ( const IsTokenizerLangSupportedIterator& a) {
+void PrinterVisitor::beginVisit( const IsTokenizerLangSupportedIterator& a) {
   thePrinter.startBeginVisit("IsTokenizerLangSupportedIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsTokenizerLangSupportedIterator& ) {
+void PrinterVisitor::endVisit( const IsTokenizerLangSupportedIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1420,13 +1378,13 @@
 #endif
 #ifndef ZORBA_NO_FULL_TEXT
 // <StemIterator>
-void PrinterVisitor::beginVisit ( const StemIterator& a) {
+void PrinterVisitor::beginVisit( const StemIterator& a) {
   thePrinter.startBeginVisit("StemIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const StemIterator& ) {
+void PrinterVisitor::endVisit( const StemIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1435,13 +1393,13 @@
 #endif
 #ifndef ZORBA_NO_FULL_TEXT
 // <StripDiacriticsIterator>
-void PrinterVisitor::beginVisit ( const StripDiacriticsIterator& a) {
+void PrinterVisitor::beginVisit( const StripDiacriticsIterator& a) {
   thePrinter.startBeginVisit("StripDiacriticsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const StripDiacriticsIterator& ) {
+void PrinterVisitor::endVisit( const StripDiacriticsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1450,13 +1408,13 @@
 #endif
 #ifndef ZORBA_NO_FULL_TEXT
 // <ThesaurusLookupIterator>
-void PrinterVisitor::beginVisit ( const ThesaurusLookupIterator& a) {
+void PrinterVisitor::beginVisit( const ThesaurusLookupIterator& a) {
   thePrinter.startBeginVisit("ThesaurusLookupIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ThesaurusLookupIterator& ) {
+void PrinterVisitor::endVisit( const ThesaurusLookupIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1465,13 +1423,13 @@
 #endif
 #ifndef ZORBA_NO_FULL_TEXT
 // <TokenizeNodeIterator>
-void PrinterVisitor::beginVisit ( const TokenizeNodeIterator& a) {
+void PrinterVisitor::beginVisit( const TokenizeNodeIterator& a) {
   thePrinter.startBeginVisit("TokenizeNodeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const TokenizeNodeIterator& ) {
+void PrinterVisitor::endVisit( const TokenizeNodeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1480,13 +1438,13 @@
 #endif
 #ifndef ZORBA_NO_FULL_TEXT
 // <TokenizeNodesIterator>
-void PrinterVisitor::beginVisit ( const TokenizeNodesIterator& a) {
+void PrinterVisitor::beginVisit( const TokenizeNodesIterator& a) {
   thePrinter.startBeginVisit("TokenizeNodesIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const TokenizeNodesIterator& ) {
+void PrinterVisitor::endVisit( const TokenizeNodesIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1495,13 +1453,13 @@
 #endif
 #ifndef ZORBA_NO_FULL_TEXT
 // <TokenizerPropertiesIterator>
-void PrinterVisitor::beginVisit ( const TokenizerPropertiesIterator& a) {
+void PrinterVisitor::beginVisit( const TokenizerPropertiesIterator& a) {
   thePrinter.startBeginVisit("TokenizerPropertiesIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const TokenizerPropertiesIterator& ) {
+void PrinterVisitor::endVisit( const TokenizerPropertiesIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1510,13 +1468,13 @@
 #endif
 #ifndef ZORBA_NO_FULL_TEXT
 // <TokenizeStringIterator>
-void PrinterVisitor::beginVisit ( const TokenizeStringIterator& a) {
+void PrinterVisitor::beginVisit( const TokenizeStringIterator& a) {
   thePrinter.startBeginVisit("TokenizeStringIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const TokenizeStringIterator& ) {
+void PrinterVisitor::endVisit( const TokenizeStringIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1525,13 +1483,13 @@
 #endif
 
 // <FunctionLookupIterator>
-void PrinterVisitor::beginVisit ( const FunctionLookupIterator& a) {
+void PrinterVisitor::beginVisit( const FunctionLookupIterator& a) {
   thePrinter.startBeginVisit("FunctionLookupIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FunctionLookupIterator& ) {
+void PrinterVisitor::endVisit( const FunctionLookupIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1539,13 +1497,13 @@
 
 
 // <FunctionNameIterator>
-void PrinterVisitor::beginVisit ( const FunctionNameIterator& a) {
+void PrinterVisitor::beginVisit( const FunctionNameIterator& a) {
   thePrinter.startBeginVisit("FunctionNameIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FunctionNameIterator& ) {
+void PrinterVisitor::endVisit( const FunctionNameIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1553,13 +1511,13 @@
 
 
 // <FunctionArityIterator>
-void PrinterVisitor::beginVisit ( const FunctionArityIterator& a) {
+void PrinterVisitor::beginVisit( const FunctionArityIterator& a) {
   thePrinter.startBeginVisit("FunctionArityIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FunctionArityIterator& ) {
+void PrinterVisitor::endVisit( const FunctionArityIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1567,13 +1525,13 @@
 
 
 // <FnForEachPairIterator>
-void PrinterVisitor::beginVisit ( const FnForEachPairIterator& a) {
+void PrinterVisitor::beginVisit( const FnForEachPairIterator& a) {
   thePrinter.startBeginVisit("FnForEachPairIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnForEachPairIterator& ) {
+void PrinterVisitor::endVisit( const FnForEachPairIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1581,13 +1539,13 @@
 
 
 // <FnFoldLeftIterator>
-void PrinterVisitor::beginVisit ( const FnFoldLeftIterator& a) {
+void PrinterVisitor::beginVisit( const FnFoldLeftIterator& a) {
   thePrinter.startBeginVisit("FnFoldLeftIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnFoldLeftIterator& ) {
+void PrinterVisitor::endVisit( const FnFoldLeftIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1595,13 +1553,13 @@
 
 
 // <ActivateICIterator>
-void PrinterVisitor::beginVisit ( const ActivateICIterator& a) {
+void PrinterVisitor::beginVisit( const ActivateICIterator& a) {
   thePrinter.startBeginVisit("ActivateICIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ActivateICIterator& ) {
+void PrinterVisitor::endVisit( const ActivateICIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1609,13 +1567,13 @@
 
 
 // <DeactivateICIterator>
-void PrinterVisitor::beginVisit ( const DeactivateICIterator& a) {
+void PrinterVisitor::beginVisit( const DeactivateICIterator& a) {
   thePrinter.startBeginVisit("DeactivateICIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const DeactivateICIterator& ) {
+void PrinterVisitor::endVisit( const DeactivateICIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1623,13 +1581,13 @@
 
 
 // <CheckICIterator>
-void PrinterVisitor::beginVisit ( const CheckICIterator& a) {
+void PrinterVisitor::beginVisit( const CheckICIterator& a) {
   thePrinter.startBeginVisit("CheckICIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const CheckICIterator& ) {
+void PrinterVisitor::endVisit( const CheckICIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1637,13 +1595,13 @@
 
 
 // <IndexKeysIterator>
-void PrinterVisitor::beginVisit ( const IndexKeysIterator& a) {
+void PrinterVisitor::beginVisit( const IndexKeysIterator& a) {
   thePrinter.startBeginVisit("IndexKeysIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IndexKeysIterator& ) {
+void PrinterVisitor::endVisit( const IndexKeysIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1651,13 +1609,13 @@
 
 
 // <MemSizeIterator>
-void PrinterVisitor::beginVisit ( const MemSizeIterator& a) {
+void PrinterVisitor::beginVisit( const MemSizeIterator& a) {
   thePrinter.startBeginVisit("MemSizeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MemSizeIterator& ) {
+void PrinterVisitor::endVisit( const MemSizeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1665,13 +1623,13 @@
 
 
 // <JSONtoXMLInternal>
-void PrinterVisitor::beginVisit ( const JSONtoXMLInternal& a) {
+void PrinterVisitor::beginVisit( const JSONtoXMLInternal& a) {
   thePrinter.startBeginVisit("JSONtoXMLInternal", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSONtoXMLInternal& ) {
+void PrinterVisitor::endVisit( const JSONtoXMLInternal& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1679,13 +1637,13 @@
 
 
 // <XMLtoJSONInternal>
-void PrinterVisitor::beginVisit ( const XMLtoJSONInternal& a) {
+void PrinterVisitor::beginVisit( const XMLtoJSONInternal& a) {
   thePrinter.startBeginVisit("XMLtoJSONInternal", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const XMLtoJSONInternal& ) {
+void PrinterVisitor::endVisit( const XMLtoJSONInternal& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1693,13 +1651,13 @@
 
 
 // <JSONDecodeFromRoundtripIterator>
-void PrinterVisitor::beginVisit ( const JSONDecodeFromRoundtripIterator& a) {
+void PrinterVisitor::beginVisit( const JSONDecodeFromRoundtripIterator& a) {
   thePrinter.startBeginVisit("JSONDecodeFromRoundtripIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSONDecodeFromRoundtripIterator& ) {
+void PrinterVisitor::endVisit( const JSONDecodeFromRoundtripIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1707,13 +1665,13 @@
 
 
 // <JSONEncodeForRoundtripIterator>
-void PrinterVisitor::beginVisit ( const JSONEncodeForRoundtripIterator& a) {
+void PrinterVisitor::beginVisit( const JSONEncodeForRoundtripIterator& a) {
   thePrinter.startBeginVisit("JSONEncodeForRoundtripIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSONEncodeForRoundtripIterator& ) {
+void PrinterVisitor::endVisit( const JSONEncodeForRoundtripIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1721,13 +1679,13 @@
 
 
 // <JSONParseIterator>
-void PrinterVisitor::beginVisit ( const JSONParseIterator& a) {
+void PrinterVisitor::beginVisit( const JSONParseIterator& a) {
   thePrinter.startBeginVisit("JSONParseIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSONParseIterator& ) {
+void PrinterVisitor::endVisit( const JSONParseIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1735,13 +1693,13 @@
 
 
 // <MultiObjectKeysIterator>
-void PrinterVisitor::beginVisit ( const MultiObjectKeysIterator& a) {
+void PrinterVisitor::beginVisit( const MultiObjectKeysIterator& a) {
   thePrinter.startBeginVisit("MultiObjectKeysIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MultiObjectKeysIterator& ) {
+void PrinterVisitor::endVisit( const MultiObjectKeysIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1749,13 +1707,13 @@
 
 
 // <SingleObjectKeysIterator>
-void PrinterVisitor::beginVisit ( const SingleObjectKeysIterator& a) {
+void PrinterVisitor::beginVisit( const SingleObjectKeysIterator& a) {
   thePrinter.startBeginVisit("SingleObjectKeysIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SingleObjectKeysIterator& ) {
+void PrinterVisitor::endVisit( const SingleObjectKeysIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1763,13 +1721,13 @@
 
 
 // <MultiObjectLookupIterator>
-void PrinterVisitor::beginVisit ( const MultiObjectLookupIterator& a) {
+void PrinterVisitor::beginVisit( const MultiObjectLookupIterator& a) {
   thePrinter.startBeginVisit("MultiObjectLookupIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MultiObjectLookupIterator& ) {
+void PrinterVisitor::endVisit( const MultiObjectLookupIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1777,13 +1735,13 @@
 
 
 // <SingleObjectLookupIterator>
-void PrinterVisitor::beginVisit ( const SingleObjectLookupIterator& a) {
+void PrinterVisitor::beginVisit( const SingleObjectLookupIterator& a) {
   thePrinter.startBeginVisit("SingleObjectLookupIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SingleObjectLookupIterator& ) {
+void PrinterVisitor::endVisit( const SingleObjectLookupIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1791,13 +1749,13 @@
 
 
 // <JSONObjectProjectIterator>
-void PrinterVisitor::beginVisit ( const JSONObjectProjectIterator& a) {
+void PrinterVisitor::beginVisit( const JSONObjectProjectIterator& a) {
   thePrinter.startBeginVisit("JSONObjectProjectIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSONObjectProjectIterator& ) {
+void PrinterVisitor::endVisit( const JSONObjectProjectIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1805,13 +1763,13 @@
 
 
 // <JSONObjectTrimIterator>
-void PrinterVisitor::beginVisit ( const JSONObjectTrimIterator& a) {
+void PrinterVisitor::beginVisit( const JSONObjectTrimIterator& a) {
   thePrinter.startBeginVisit("JSONObjectTrimIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSONObjectTrimIterator& ) {
+void PrinterVisitor::endVisit( const JSONObjectTrimIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1819,13 +1777,13 @@
 
 
 // <MultiArrayMembersIterator>
-void PrinterVisitor::beginVisit ( const MultiArrayMembersIterator& a) {
+void PrinterVisitor::beginVisit( const MultiArrayMembersIterator& a) {
   thePrinter.startBeginVisit("MultiArrayMembersIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MultiArrayMembersIterator& ) {
+void PrinterVisitor::endVisit( const MultiArrayMembersIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1833,13 +1791,13 @@
 
 
 // <SingleArrayMembersIterator>
-void PrinterVisitor::beginVisit ( const SingleArrayMembersIterator& a) {
+void PrinterVisitor::beginVisit( const SingleArrayMembersIterator& a) {
   thePrinter.startBeginVisit("SingleArrayMembersIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SingleArrayMembersIterator& ) {
+void PrinterVisitor::endVisit( const SingleArrayMembersIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1847,13 +1805,13 @@
 
 
 // <MultiArrayLookupIterator>
-void PrinterVisitor::beginVisit ( const MultiArrayLookupIterator& a) {
+void PrinterVisitor::beginVisit( const MultiArrayLookupIterator& a) {
   thePrinter.startBeginVisit("MultiArrayLookupIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MultiArrayLookupIterator& ) {
+void PrinterVisitor::endVisit( const MultiArrayLookupIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1861,13 +1819,13 @@
 
 
 // <SingleArrayLookupIterator>
-void PrinterVisitor::beginVisit ( const SingleArrayLookupIterator& a) {
+void PrinterVisitor::beginVisit( const SingleArrayLookupIterator& a) {
   thePrinter.startBeginVisit("SingleArrayLookupIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SingleArrayLookupIterator& ) {
+void PrinterVisitor::endVisit( const SingleArrayLookupIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1875,13 +1833,13 @@
 
 
 // <JSONArraySizeIterator>
-void PrinterVisitor::beginVisit ( const JSONArraySizeIterator& a) {
+void PrinterVisitor::beginVisit( const JSONArraySizeIterator& a) {
   thePrinter.startBeginVisit("JSONArraySizeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSONArraySizeIterator& ) {
+void PrinterVisitor::endVisit( const JSONArraySizeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1889,13 +1847,13 @@
 
 
 // <JSONArrayFlattenIterator>
-void PrinterVisitor::beginVisit ( const JSONArrayFlattenIterator& a) {
+void PrinterVisitor::beginVisit( const JSONArrayFlattenIterator& a) {
   thePrinter.startBeginVisit("JSONArrayFlattenIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSONArrayFlattenIterator& ) {
+void PrinterVisitor::endVisit( const JSONArrayFlattenIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1903,13 +1861,13 @@
 
 
 // <JSONNullIterator>
-void PrinterVisitor::beginVisit ( const JSONNullIterator& a) {
+void PrinterVisitor::beginVisit( const JSONNullIterator& a) {
   thePrinter.startBeginVisit("JSONNullIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSONNullIterator& ) {
+void PrinterVisitor::endVisit( const JSONNullIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1917,13 +1875,13 @@
 
 
 // <JSONObjectInsertIterator>
-void PrinterVisitor::beginVisit ( const JSONObjectInsertIterator& a) {
+void PrinterVisitor::beginVisit( const JSONObjectInsertIterator& a) {
   thePrinter.startBeginVisit("JSONObjectInsertIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSONObjectInsertIterator& ) {
+void PrinterVisitor::endVisit( const JSONObjectInsertIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1931,13 +1889,13 @@
 
 
 // <JSONArrayInsertIterator>
-void PrinterVisitor::beginVisit ( const JSONArrayInsertIterator& a) {
+void PrinterVisitor::beginVisit( const JSONArrayInsertIterator& a) {
   thePrinter.startBeginVisit("JSONArrayInsertIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSONArrayInsertIterator& ) {
+void PrinterVisitor::endVisit( const JSONArrayInsertIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1945,13 +1903,13 @@
 
 
 // <JSONDeleteIterator>
-void PrinterVisitor::beginVisit ( const JSONDeleteIterator& a) {
+void PrinterVisitor::beginVisit( const JSONDeleteIterator& a) {
   thePrinter.startBeginVisit("JSONDeleteIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSONDeleteIterator& ) {
+void PrinterVisitor::endVisit( const JSONDeleteIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1959,13 +1917,13 @@
 
 
 // <JSONReplaceValueIterator>
-void PrinterVisitor::beginVisit ( const JSONReplaceValueIterator& a) {
+void PrinterVisitor::beginVisit( const JSONReplaceValueIterator& a) {
   thePrinter.startBeginVisit("JSONReplaceValueIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSONReplaceValueIterator& ) {
+void PrinterVisitor::endVisit( const JSONReplaceValueIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1973,13 +1931,13 @@
 
 
 // <JSONRenameIterator>
-void PrinterVisitor::beginVisit ( const JSONRenameIterator& a) {
+void PrinterVisitor::beginVisit( const JSONRenameIterator& a) {
   thePrinter.startBeginVisit("JSONRenameIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSONRenameIterator& ) {
+void PrinterVisitor::endVisit( const JSONRenameIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -1987,13 +1945,13 @@
 
 
 // <JSONArrayAppendIterator>
-void PrinterVisitor::beginVisit ( const JSONArrayAppendIterator& a) {
+void PrinterVisitor::beginVisit( const JSONArrayAppendIterator& a) {
   thePrinter.startBeginVisit("JSONArrayAppendIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSONArrayAppendIterator& ) {
+void PrinterVisitor::endVisit( const JSONArrayAppendIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2001,13 +1959,13 @@
 
 
 // <JSONBoxIterator>
-void PrinterVisitor::beginVisit ( const JSONBoxIterator& a) {
+void PrinterVisitor::beginVisit( const JSONBoxIterator& a) {
   thePrinter.startBeginVisit("JSONBoxIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSONBoxIterator& ) {
+void PrinterVisitor::endVisit( const JSONBoxIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2015,13 +1973,13 @@
 
 
 // <JSoundAnnotateIterator>
-void PrinterVisitor::beginVisit ( const JSoundAnnotateIterator& a) {
+void PrinterVisitor::beginVisit( const JSoundAnnotateIterator& a) {
   thePrinter.startBeginVisit("JSoundAnnotateIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSoundAnnotateIterator& ) {
+void PrinterVisitor::endVisit( const JSoundAnnotateIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2029,13 +1987,13 @@
 
 
 // <JSoundValidateIterator>
-void PrinterVisitor::beginVisit ( const JSoundValidateIterator& a) {
+void PrinterVisitor::beginVisit( const JSoundValidateIterator& a) {
   thePrinter.startBeginVisit("JSoundValidateIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const JSoundValidateIterator& ) {
+void PrinterVisitor::endVisit( const JSoundValidateIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2043,13 +2001,13 @@
 
 
 // <SqrtIterator>
-void PrinterVisitor::beginVisit ( const SqrtIterator& a) {
+void PrinterVisitor::beginVisit( const SqrtIterator& a) {
   thePrinter.startBeginVisit("SqrtIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SqrtIterator& ) {
+void PrinterVisitor::endVisit( const SqrtIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2057,13 +2015,13 @@
 
 
 // <ExpIterator>
-void PrinterVisitor::beginVisit ( const ExpIterator& a) {
+void PrinterVisitor::beginVisit( const ExpIterator& a) {
   thePrinter.startBeginVisit("ExpIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ExpIterator& ) {
+void PrinterVisitor::endVisit( const ExpIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2071,13 +2029,13 @@
 
 
 // <Exp10Iterator>
-void PrinterVisitor::beginVisit ( const Exp10Iterator& a) {
+void PrinterVisitor::beginVisit( const Exp10Iterator& a) {
   thePrinter.startBeginVisit("Exp10Iterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const Exp10Iterator& ) {
+void PrinterVisitor::endVisit( const Exp10Iterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2085,13 +2043,13 @@
 
 
 // <LogIterator>
-void PrinterVisitor::beginVisit ( const LogIterator& a) {
+void PrinterVisitor::beginVisit( const LogIterator& a) {
   thePrinter.startBeginVisit("LogIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const LogIterator& ) {
+void PrinterVisitor::endVisit( const LogIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2099,13 +2057,13 @@
 
 
 // <Log10Iterator>
-void PrinterVisitor::beginVisit ( const Log10Iterator& a) {
+void PrinterVisitor::beginVisit( const Log10Iterator& a) {
   thePrinter.startBeginVisit("Log10Iterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const Log10Iterator& ) {
+void PrinterVisitor::endVisit( const Log10Iterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2113,13 +2071,13 @@
 
 
 // <SinIterator>
-void PrinterVisitor::beginVisit ( const SinIterator& a) {
+void PrinterVisitor::beginVisit( const SinIterator& a) {
   thePrinter.startBeginVisit("SinIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SinIterator& ) {
+void PrinterVisitor::endVisit( const SinIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2127,13 +2085,13 @@
 
 
 // <CosIterator>
-void PrinterVisitor::beginVisit ( const CosIterator& a) {
+void PrinterVisitor::beginVisit( const CosIterator& a) {
   thePrinter.startBeginVisit("CosIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const CosIterator& ) {
+void PrinterVisitor::endVisit( const CosIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2141,13 +2099,13 @@
 
 
 // <TanIterator>
-void PrinterVisitor::beginVisit ( const TanIterator& a) {
+void PrinterVisitor::beginVisit( const TanIterator& a) {
   thePrinter.startBeginVisit("TanIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const TanIterator& ) {
+void PrinterVisitor::endVisit( const TanIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2155,13 +2113,13 @@
 
 
 // <ArcSinIterator>
-void PrinterVisitor::beginVisit ( const ArcSinIterator& a) {
+void PrinterVisitor::beginVisit( const ArcSinIterator& a) {
   thePrinter.startBeginVisit("ArcSinIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ArcSinIterator& ) {
+void PrinterVisitor::endVisit( const ArcSinIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2169,13 +2127,13 @@
 
 
 // <ArcCosIterator>
-void PrinterVisitor::beginVisit ( const ArcCosIterator& a) {
+void PrinterVisitor::beginVisit( const ArcCosIterator& a) {
   thePrinter.startBeginVisit("ArcCosIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ArcCosIterator& ) {
+void PrinterVisitor::endVisit( const ArcCosIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2183,13 +2141,13 @@
 
 
 // <ArcTanIterator>
-void PrinterVisitor::beginVisit ( const ArcTanIterator& a) {
+void PrinterVisitor::beginVisit( const ArcTanIterator& a) {
   thePrinter.startBeginVisit("ArcTanIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ArcTanIterator& ) {
+void PrinterVisitor::endVisit( const ArcTanIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2197,13 +2155,13 @@
 
 
 // <Atan2Iterator>
-void PrinterVisitor::beginVisit ( const Atan2Iterator& a) {
+void PrinterVisitor::beginVisit( const Atan2Iterator& a) {
   thePrinter.startBeginVisit("Atan2Iterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const Atan2Iterator& ) {
+void PrinterVisitor::endVisit( const Atan2Iterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2211,13 +2169,13 @@
 
 
 // <CoshIterator>
-void PrinterVisitor::beginVisit ( const CoshIterator& a) {
+void PrinterVisitor::beginVisit( const CoshIterator& a) {
   thePrinter.startBeginVisit("CoshIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const CoshIterator& ) {
+void PrinterVisitor::endVisit( const CoshIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2225,13 +2183,13 @@
 
 
 // <AcoshIterator>
-void PrinterVisitor::beginVisit ( const AcoshIterator& a) {
+void PrinterVisitor::beginVisit( const AcoshIterator& a) {
   thePrinter.startBeginVisit("AcoshIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const AcoshIterator& ) {
+void PrinterVisitor::endVisit( const AcoshIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2239,13 +2197,13 @@
 
 
 // <FmodIterator>
-void PrinterVisitor::beginVisit ( const FmodIterator& a) {
+void PrinterVisitor::beginVisit( const FmodIterator& a) {
   thePrinter.startBeginVisit("FmodIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FmodIterator& ) {
+void PrinterVisitor::endVisit( const FmodIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2253,13 +2211,13 @@
 
 
 // <LdexpIterator>
-void PrinterVisitor::beginVisit ( const LdexpIterator& a) {
+void PrinterVisitor::beginVisit( const LdexpIterator& a) {
   thePrinter.startBeginVisit("LdexpIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const LdexpIterator& ) {
+void PrinterVisitor::endVisit( const LdexpIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2267,13 +2225,13 @@
 
 
 // <PowIterator>
-void PrinterVisitor::beginVisit ( const PowIterator& a) {
+void PrinterVisitor::beginVisit( const PowIterator& a) {
   thePrinter.startBeginVisit("PowIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const PowIterator& ) {
+void PrinterVisitor::endVisit( const PowIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2281,13 +2239,13 @@
 
 
 // <SinhIterator>
-void PrinterVisitor::beginVisit ( const SinhIterator& a) {
+void PrinterVisitor::beginVisit( const SinhIterator& a) {
   thePrinter.startBeginVisit("SinhIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SinhIterator& ) {
+void PrinterVisitor::endVisit( const SinhIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2295,13 +2253,13 @@
 
 
 // <AsinhIterator>
-void PrinterVisitor::beginVisit ( const AsinhIterator& a) {
+void PrinterVisitor::beginVisit( const AsinhIterator& a) {
   thePrinter.startBeginVisit("AsinhIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const AsinhIterator& ) {
+void PrinterVisitor::endVisit( const AsinhIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2309,13 +2267,13 @@
 
 
 // <TanhIterator>
-void PrinterVisitor::beginVisit ( const TanhIterator& a) {
+void PrinterVisitor::beginVisit( const TanhIterator& a) {
   thePrinter.startBeginVisit("TanhIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const TanhIterator& ) {
+void PrinterVisitor::endVisit( const TanhIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2323,13 +2281,13 @@
 
 
 // <AtanhIterator>
-void PrinterVisitor::beginVisit ( const AtanhIterator& a) {
+void PrinterVisitor::beginVisit( const AtanhIterator& a) {
   thePrinter.startBeginVisit("AtanhIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const AtanhIterator& ) {
+void PrinterVisitor::endVisit( const AtanhIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2337,13 +2295,13 @@
 
 
 // <PiNumberIterator>
-void PrinterVisitor::beginVisit ( const PiNumberIterator& a) {
+void PrinterVisitor::beginVisit( const PiNumberIterator& a) {
   thePrinter.startBeginVisit("PiNumberIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const PiNumberIterator& ) {
+void PrinterVisitor::endVisit( const PiNumberIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2351,13 +2309,13 @@
 
 
 // <IsInfIterator>
-void PrinterVisitor::beginVisit ( const IsInfIterator& a) {
+void PrinterVisitor::beginVisit( const IsInfIterator& a) {
   thePrinter.startBeginVisit("IsInfIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsInfIterator& ) {
+void PrinterVisitor::endVisit( const IsInfIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2365,13 +2323,13 @@
 
 
 // <IsNaNIterator>
-void PrinterVisitor::beginVisit ( const IsNaNIterator& a) {
+void PrinterVisitor::beginVisit( const IsNaNIterator& a) {
   thePrinter.startBeginVisit("IsNaNIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsNaNIterator& ) {
+void PrinterVisitor::endVisit( const IsNaNIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2379,13 +2337,13 @@
 
 
 // <ModfIterator>
-void PrinterVisitor::beginVisit ( const ModfIterator& a) {
+void PrinterVisitor::beginVisit( const ModfIterator& a) {
   thePrinter.startBeginVisit("ModfIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ModfIterator& ) {
+void PrinterVisitor::endVisit( const ModfIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2393,13 +2351,13 @@
 
 
 // <FrexpIterator>
-void PrinterVisitor::beginVisit ( const FrexpIterator& a) {
+void PrinterVisitor::beginVisit( const FrexpIterator& a) {
   thePrinter.startBeginVisit("FrexpIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FrexpIterator& ) {
+void PrinterVisitor::endVisit( const FrexpIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2407,13 +2365,13 @@
 
 
 // <NodePositionIterator>
-void PrinterVisitor::beginVisit ( const NodePositionIterator& a) {
+void PrinterVisitor::beginVisit( const NodePositionIterator& a) {
   thePrinter.startBeginVisit("NodePositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const NodePositionIterator& ) {
+void PrinterVisitor::endVisit( const NodePositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2421,13 +2379,13 @@
 
 
 // <IsAncestorPositionIterator>
-void PrinterVisitor::beginVisit ( const IsAncestorPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsAncestorPositionIterator& a) {
   thePrinter.startBeginVisit("IsAncestorPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsAncestorPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsAncestorPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2435,13 +2393,13 @@
 
 
 // <IsFollowingSiblingPositionIterator>
-void PrinterVisitor::beginVisit ( const IsFollowingSiblingPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsFollowingSiblingPositionIterator& a) {
   thePrinter.startBeginVisit("IsFollowingSiblingPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsFollowingSiblingPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsFollowingSiblingPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2449,13 +2407,13 @@
 
 
 // <IsFollowingPositionIterator>
-void PrinterVisitor::beginVisit ( const IsFollowingPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsFollowingPositionIterator& a) {
   thePrinter.startBeginVisit("IsFollowingPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsFollowingPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsFollowingPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2463,13 +2421,13 @@
 
 
 // <IsInSubtreeOfPositionIterator>
-void PrinterVisitor::beginVisit ( const IsInSubtreeOfPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsInSubtreeOfPositionIterator& a) {
   thePrinter.startBeginVisit("IsInSubtreeOfPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsInSubtreeOfPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsInSubtreeOfPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2477,13 +2435,13 @@
 
 
 // <IsDescendantPositionIterator>
-void PrinterVisitor::beginVisit ( const IsDescendantPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsDescendantPositionIterator& a) {
   thePrinter.startBeginVisit("IsDescendantPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsDescendantPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsDescendantPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2491,13 +2449,13 @@
 
 
 // <IsPrecedingSiblingPositionIterator>
-void PrinterVisitor::beginVisit ( const IsPrecedingSiblingPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsPrecedingSiblingPositionIterator& a) {
   thePrinter.startBeginVisit("IsPrecedingSiblingPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsPrecedingSiblingPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsPrecedingSiblingPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2505,13 +2463,13 @@
 
 
 // <IsPrecedingPositionIterator>
-void PrinterVisitor::beginVisit ( const IsPrecedingPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsPrecedingPositionIterator& a) {
   thePrinter.startBeginVisit("IsPrecedingPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsPrecedingPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsPrecedingPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2519,13 +2477,13 @@
 
 
 // <IsChildPositionIterator>
-void PrinterVisitor::beginVisit ( const IsChildPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsChildPositionIterator& a) {
   thePrinter.startBeginVisit("IsChildPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsChildPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsChildPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2533,13 +2491,13 @@
 
 
 // <IsAttributeOfPositionIterator>
-void PrinterVisitor::beginVisit ( const IsAttributeOfPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsAttributeOfPositionIterator& a) {
   thePrinter.startBeginVisit("IsAttributeOfPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsAttributeOfPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsAttributeOfPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2547,13 +2505,13 @@
 
 
 // <IsParentPositionIterator>
-void PrinterVisitor::beginVisit ( const IsParentPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsParentPositionIterator& a) {
   thePrinter.startBeginVisit("IsParentPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsParentPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsParentPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2561,13 +2519,13 @@
 
 
 // <IsPrecedingInDocumentOrderPositionIterator>
-void PrinterVisitor::beginVisit ( const IsPrecedingInDocumentOrderPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsPrecedingInDocumentOrderPositionIterator& a) {
   thePrinter.startBeginVisit("IsPrecedingInDocumentOrderPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsPrecedingInDocumentOrderPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsPrecedingInDocumentOrderPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2575,13 +2533,13 @@
 
 
 // <IsFollowingInDocumentOrderPositionIterator>
-void PrinterVisitor::beginVisit ( const IsFollowingInDocumentOrderPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsFollowingInDocumentOrderPositionIterator& a) {
   thePrinter.startBeginVisit("IsFollowingInDocumentOrderPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsFollowingInDocumentOrderPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsFollowingInDocumentOrderPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2589,13 +2547,13 @@
 
 
 // <LevelPositionIterator>
-void PrinterVisitor::beginVisit ( const LevelPositionIterator& a) {
+void PrinterVisitor::beginVisit( const LevelPositionIterator& a) {
   thePrinter.startBeginVisit("LevelPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const LevelPositionIterator& ) {
+void PrinterVisitor::endVisit( const LevelPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2603,13 +2561,13 @@
 
 
 // <IsAttributePositionIterator>
-void PrinterVisitor::beginVisit ( const IsAttributePositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsAttributePositionIterator& a) {
   thePrinter.startBeginVisit("IsAttributePositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsAttributePositionIterator& ) {
+void PrinterVisitor::endVisit( const IsAttributePositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2617,13 +2575,13 @@
 
 
 // <IsCommentPositionIterator>
-void PrinterVisitor::beginVisit ( const IsCommentPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsCommentPositionIterator& a) {
   thePrinter.startBeginVisit("IsCommentPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsCommentPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsCommentPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2631,13 +2589,13 @@
 
 
 // <IsDocumentPositionIterator>
-void PrinterVisitor::beginVisit ( const IsDocumentPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsDocumentPositionIterator& a) {
   thePrinter.startBeginVisit("IsDocumentPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsDocumentPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsDocumentPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2645,13 +2603,13 @@
 
 
 // <IsElementPositionIterator>
-void PrinterVisitor::beginVisit ( const IsElementPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsElementPositionIterator& a) {
   thePrinter.startBeginVisit("IsElementPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsElementPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsElementPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2659,13 +2617,13 @@
 
 
 // <IsProcessingInstructionPositionIterator>
-void PrinterVisitor::beginVisit ( const IsProcessingInstructionPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsProcessingInstructionPositionIterator& a) {
   thePrinter.startBeginVisit("IsProcessingInstructionPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsProcessingInstructionPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsProcessingInstructionPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2673,13 +2631,13 @@
 
 
 // <IsTextPositionIterator>
-void PrinterVisitor::beginVisit ( const IsTextPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsTextPositionIterator& a) {
   thePrinter.startBeginVisit("IsTextPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsTextPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsTextPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2687,13 +2645,13 @@
 
 
 // <IsSiblingPositionIterator>
-void PrinterVisitor::beginVisit ( const IsSiblingPositionIterator& a) {
+void PrinterVisitor::beginVisit( const IsSiblingPositionIterator& a) {
   thePrinter.startBeginVisit("IsSiblingPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsSiblingPositionIterator& ) {
+void PrinterVisitor::endVisit( const IsSiblingPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2701,13 +2659,13 @@
 
 
 // <InSameTreePositionIterator>
-void PrinterVisitor::beginVisit ( const InSameTreePositionIterator& a) {
+void PrinterVisitor::beginVisit( const InSameTreePositionIterator& a) {
   thePrinter.startBeginVisit("InSameTreePositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const InSameTreePositionIterator& ) {
+void PrinterVisitor::endVisit( const InSameTreePositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2715,13 +2673,13 @@
 
 
 // <InCollectionPositionIterator>
-void PrinterVisitor::beginVisit ( const InCollectionPositionIterator& a) {
+void PrinterVisitor::beginVisit( const InCollectionPositionIterator& a) {
   thePrinter.startBeginVisit("InCollectionPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const InCollectionPositionIterator& ) {
+void PrinterVisitor::endVisit( const InCollectionPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2729,13 +2687,13 @@
 
 
 // <InSameCollectionPositionIterator>
-void PrinterVisitor::beginVisit ( const InSameCollectionPositionIterator& a) {
+void PrinterVisitor::beginVisit( const InSameCollectionPositionIterator& a) {
   thePrinter.startBeginVisit("InSameCollectionPositionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const InSameCollectionPositionIterator& ) {
+void PrinterVisitor::endVisit( const InSameCollectionPositionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2743,13 +2701,13 @@
 
 
 // <FnLocalNameIterator>
-void PrinterVisitor::beginVisit ( const FnLocalNameIterator& a) {
+void PrinterVisitor::beginVisit( const FnLocalNameIterator& a) {
   thePrinter.startBeginVisit("FnLocalNameIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnLocalNameIterator& ) {
+void PrinterVisitor::endVisit( const FnLocalNameIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2757,13 +2715,13 @@
 
 
 // <FnNamespaceUriIterator>
-void PrinterVisitor::beginVisit ( const FnNamespaceUriIterator& a) {
+void PrinterVisitor::beginVisit( const FnNamespaceUriIterator& a) {
   thePrinter.startBeginVisit("FnNamespaceUriIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnNamespaceUriIterator& ) {
+void PrinterVisitor::endVisit( const FnNamespaceUriIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2771,13 +2729,13 @@
 
 
 // <FnLangIterator>
-void PrinterVisitor::beginVisit ( const FnLangIterator& a) {
+void PrinterVisitor::beginVisit( const FnLangIterator& a) {
   thePrinter.startBeginVisit("FnLangIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnLangIterator& ) {
+void PrinterVisitor::endVisit( const FnLangIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2785,13 +2743,13 @@
 
 
 // <FnHasChildrenIterator>
-void PrinterVisitor::beginVisit ( const FnHasChildrenIterator& a) {
+void PrinterVisitor::beginVisit( const FnHasChildrenIterator& a) {
   thePrinter.startBeginVisit("FnHasChildrenIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnHasChildrenIterator& ) {
+void PrinterVisitor::endVisit( const FnHasChildrenIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2799,13 +2757,13 @@
 
 
 // <FnInnermostIterator>
-void PrinterVisitor::beginVisit ( const FnInnermostIterator& a) {
+void PrinterVisitor::beginVisit( const FnInnermostIterator& a) {
   thePrinter.startBeginVisit("FnInnermostIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnInnermostIterator& ) {
+void PrinterVisitor::endVisit( const FnInnermostIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2813,13 +2771,13 @@
 
 
 // <FnOutermostIterator>
-void PrinterVisitor::beginVisit ( const FnOutermostIterator& a) {
+void PrinterVisitor::beginVisit( const FnOutermostIterator& a) {
   thePrinter.startBeginVisit("FnOutermostIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnOutermostIterator& ) {
+void PrinterVisitor::endVisit( const FnOutermostIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2827,13 +2785,13 @@
 
 
 // <FnGenerateIdIterator>
-void PrinterVisitor::beginVisit ( const FnGenerateIdIterator& a) {
+void PrinterVisitor::beginVisit( const FnGenerateIdIterator& a) {
   thePrinter.startBeginVisit("FnGenerateIdIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnGenerateIdIterator& ) {
+void PrinterVisitor::endVisit( const FnGenerateIdIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2841,13 +2799,13 @@
 
 
 // <IsAncestorIterator>
-void PrinterVisitor::beginVisit ( const IsAncestorIterator& a) {
+void PrinterVisitor::beginVisit( const IsAncestorIterator& a) {
   thePrinter.startBeginVisit("IsAncestorIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsAncestorIterator& ) {
+void PrinterVisitor::endVisit( const IsAncestorIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2855,13 +2813,13 @@
 
 
 // <IsDescendantIterator>
-void PrinterVisitor::beginVisit ( const IsDescendantIterator& a) {
+void PrinterVisitor::beginVisit( const IsDescendantIterator& a) {
   thePrinter.startBeginVisit("IsDescendantIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsDescendantIterator& ) {
+void PrinterVisitor::endVisit( const IsDescendantIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2869,13 +2827,13 @@
 
 
 // <IsParentIterator>
-void PrinterVisitor::beginVisit ( const IsParentIterator& a) {
+void PrinterVisitor::beginVisit( const IsParentIterator& a) {
   thePrinter.startBeginVisit("IsParentIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsParentIterator& ) {
+void PrinterVisitor::endVisit( const IsParentIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2883,13 +2841,13 @@
 
 
 // <IsChildIterator>
-void PrinterVisitor::beginVisit ( const IsChildIterator& a) {
+void PrinterVisitor::beginVisit( const IsChildIterator& a) {
   thePrinter.startBeginVisit("IsChildIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsChildIterator& ) {
+void PrinterVisitor::endVisit( const IsChildIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2897,13 +2855,13 @@
 
 
 // <IsFollowingIterator>
-void PrinterVisitor::beginVisit ( const IsFollowingIterator& a) {
+void PrinterVisitor::beginVisit( const IsFollowingIterator& a) {
   thePrinter.startBeginVisit("IsFollowingIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsFollowingIterator& ) {
+void PrinterVisitor::endVisit( const IsFollowingIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2911,13 +2869,13 @@
 
 
 // <IsPrecedingIterator>
-void PrinterVisitor::beginVisit ( const IsPrecedingIterator& a) {
+void PrinterVisitor::beginVisit( const IsPrecedingIterator& a) {
   thePrinter.startBeginVisit("IsPrecedingIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsPrecedingIterator& ) {
+void PrinterVisitor::endVisit( const IsPrecedingIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2925,13 +2883,13 @@
 
 
 // <IsFollowingSiblingIterator>
-void PrinterVisitor::beginVisit ( const IsFollowingSiblingIterator& a) {
+void PrinterVisitor::beginVisit( const IsFollowingSiblingIterator& a) {
   thePrinter.startBeginVisit("IsFollowingSiblingIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsFollowingSiblingIterator& ) {
+void PrinterVisitor::endVisit( const IsFollowingSiblingIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2939,13 +2897,13 @@
 
 
 // <IsPrecedingSiblingIterator>
-void PrinterVisitor::beginVisit ( const IsPrecedingSiblingIterator& a) {
+void PrinterVisitor::beginVisit( const IsPrecedingSiblingIterator& a) {
   thePrinter.startBeginVisit("IsPrecedingSiblingIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsPrecedingSiblingIterator& ) {
+void PrinterVisitor::endVisit( const IsPrecedingSiblingIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2953,13 +2911,13 @@
 
 
 // <LevelIterator>
-void PrinterVisitor::beginVisit ( const LevelIterator& a) {
+void PrinterVisitor::beginVisit( const LevelIterator& a) {
   thePrinter.startBeginVisit("LevelIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const LevelIterator& ) {
+void PrinterVisitor::endVisit( const LevelIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2967,13 +2925,13 @@
 
 
 // <LeastCommonAncestor>
-void PrinterVisitor::beginVisit ( const LeastCommonAncestor& a) {
+void PrinterVisitor::beginVisit( const LeastCommonAncestor& a) {
   thePrinter.startBeginVisit("LeastCommonAncestor", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const LeastCommonAncestor& ) {
+void PrinterVisitor::endVisit( const LeastCommonAncestor& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2981,13 +2939,13 @@
 
 
 // <FnPathIterator>
-void PrinterVisitor::beginVisit ( const FnPathIterator& a) {
+void PrinterVisitor::beginVisit( const FnPathIterator& a) {
   thePrinter.startBeginVisit("FnPathIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnPathIterator& ) {
+void PrinterVisitor::endVisit( const FnPathIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -2995,13 +2953,13 @@
 
 
 // <NodeCopyIterator>
-void PrinterVisitor::beginVisit ( const NodeCopyIterator& a) {
+void PrinterVisitor::beginVisit( const NodeCopyIterator& a) {
   thePrinter.startBeginVisit("NodeCopyIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const NodeCopyIterator& ) {
+void PrinterVisitor::endVisit( const NodeCopyIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3009,13 +2967,13 @@
 
 
 // <AbsIterator>
-void PrinterVisitor::beginVisit ( const AbsIterator& a) {
+void PrinterVisitor::beginVisit( const AbsIterator& a) {
   thePrinter.startBeginVisit("AbsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const AbsIterator& ) {
+void PrinterVisitor::endVisit( const AbsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3023,13 +2981,13 @@
 
 
 // <CeilingIterator>
-void PrinterVisitor::beginVisit ( const CeilingIterator& a) {
+void PrinterVisitor::beginVisit( const CeilingIterator& a) {
   thePrinter.startBeginVisit("CeilingIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const CeilingIterator& ) {
+void PrinterVisitor::endVisit( const CeilingIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3037,13 +2995,13 @@
 
 
 // <FloorIterator>
-void PrinterVisitor::beginVisit ( const FloorIterator& a) {
+void PrinterVisitor::beginVisit( const FloorIterator& a) {
   thePrinter.startBeginVisit("FloorIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FloorIterator& ) {
+void PrinterVisitor::endVisit( const FloorIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3051,13 +3009,13 @@
 
 
 // <RoundIterator>
-void PrinterVisitor::beginVisit ( const RoundIterator& a) {
+void PrinterVisitor::beginVisit( const RoundIterator& a) {
   thePrinter.startBeginVisit("RoundIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const RoundIterator& ) {
+void PrinterVisitor::endVisit( const RoundIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3065,13 +3023,13 @@
 
 
 // <RoundHalfToEvenIterator>
-void PrinterVisitor::beginVisit ( const RoundHalfToEvenIterator& a) {
+void PrinterVisitor::beginVisit( const RoundHalfToEvenIterator& a) {
   thePrinter.startBeginVisit("RoundHalfToEvenIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const RoundHalfToEvenIterator& ) {
+void PrinterVisitor::endVisit( const RoundHalfToEvenIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3079,13 +3037,13 @@
 
 
 // <FormatNumberIterator>
-void PrinterVisitor::beginVisit ( const FormatNumberIterator& a) {
+void PrinterVisitor::beginVisit( const FormatNumberIterator& a) {
   thePrinter.startBeginVisit("FormatNumberIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FormatNumberIterator& ) {
+void PrinterVisitor::endVisit( const FormatNumberIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3093,13 +3051,13 @@
 
 
 // <FormatIntegerIterator>
-void PrinterVisitor::beginVisit ( const FormatIntegerIterator& a) {
+void PrinterVisitor::beginVisit( const FormatIntegerIterator& a) {
   thePrinter.startBeginVisit("FormatIntegerIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FormatIntegerIterator& ) {
+void PrinterVisitor::endVisit( const FormatIntegerIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3107,13 +3065,13 @@
 
 
 // <FnZorbaParseXmlFragmentIterator>
-void PrinterVisitor::beginVisit ( const FnZorbaParseXmlFragmentIterator& a) {
+void PrinterVisitor::beginVisit( const FnZorbaParseXmlFragmentIterator& a) {
   thePrinter.startBeginVisit("FnZorbaParseXmlFragmentIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnZorbaParseXmlFragmentIterator& ) {
+void PrinterVisitor::endVisit( const FnZorbaParseXmlFragmentIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3121,13 +3079,13 @@
 
 
 // <FnZorbaCanonicalizeIterator>
-void PrinterVisitor::beginVisit ( const FnZorbaCanonicalizeIterator& a) {
+void PrinterVisitor::beginVisit( const FnZorbaCanonicalizeIterator& a) {
   thePrinter.startBeginVisit("FnZorbaCanonicalizeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnZorbaCanonicalizeIterator& ) {
+void PrinterVisitor::endVisit( const FnZorbaCanonicalizeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3135,13 +3093,13 @@
 
 
 // <FnParseXmlFragmentIterator>
-void PrinterVisitor::beginVisit ( const FnParseXmlFragmentIterator& a) {
+void PrinterVisitor::beginVisit( const FnParseXmlFragmentIterator& a) {
   thePrinter.startBeginVisit("FnParseXmlFragmentIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnParseXmlFragmentIterator& ) {
+void PrinterVisitor::endVisit( const FnParseXmlFragmentIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3149,13 +3107,13 @@
 
 
 // <FnParseXmlIterator>
-void PrinterVisitor::beginVisit ( const FnParseXmlIterator& a) {
+void PrinterVisitor::beginVisit( const FnParseXmlIterator& a) {
   thePrinter.startBeginVisit("FnParseXmlIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnParseXmlIterator& ) {
+void PrinterVisitor::endVisit( const FnParseXmlIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3163,13 +3121,13 @@
 
 
 // <FnSerializeIterator>
-void PrinterVisitor::beginVisit ( const FnSerializeIterator& a) {
+void PrinterVisitor::beginVisit( const FnSerializeIterator& a) {
   thePrinter.startBeginVisit("FnSerializeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnSerializeIterator& ) {
+void PrinterVisitor::endVisit( const FnSerializeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3177,13 +3135,13 @@
 
 
 // <ResolveQNameIterator>
-void PrinterVisitor::beginVisit ( const ResolveQNameIterator& a) {
+void PrinterVisitor::beginVisit( const ResolveQNameIterator& a) {
   thePrinter.startBeginVisit("ResolveQNameIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ResolveQNameIterator& ) {
+void PrinterVisitor::endVisit( const ResolveQNameIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3191,13 +3149,13 @@
 
 
 // <QNameIterator>
-void PrinterVisitor::beginVisit ( const QNameIterator& a) {
+void PrinterVisitor::beginVisit( const QNameIterator& a) {
   thePrinter.startBeginVisit("QNameIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const QNameIterator& ) {
+void PrinterVisitor::endVisit( const QNameIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3205,13 +3163,13 @@
 
 
 // <QNameEqualIterator>
-void PrinterVisitor::beginVisit ( const QNameEqualIterator& a) {
+void PrinterVisitor::beginVisit( const QNameEqualIterator& a) {
   thePrinter.startBeginVisit("QNameEqualIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const QNameEqualIterator& ) {
+void PrinterVisitor::endVisit( const QNameEqualIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3219,13 +3177,13 @@
 
 
 // <PrefixFromQNameIterator>
-void PrinterVisitor::beginVisit ( const PrefixFromQNameIterator& a) {
+void PrinterVisitor::beginVisit( const PrefixFromQNameIterator& a) {
   thePrinter.startBeginVisit("PrefixFromQNameIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const PrefixFromQNameIterator& ) {
+void PrinterVisitor::endVisit( const PrefixFromQNameIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3233,13 +3191,13 @@
 
 
 // <LocalNameFromQNameIterator>
-void PrinterVisitor::beginVisit ( const LocalNameFromQNameIterator& a) {
+void PrinterVisitor::beginVisit( const LocalNameFromQNameIterator& a) {
   thePrinter.startBeginVisit("LocalNameFromQNameIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const LocalNameFromQNameIterator& ) {
+void PrinterVisitor::endVisit( const LocalNameFromQNameIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3247,13 +3205,13 @@
 
 
 // <NamespaceUriFromQNameIterator>
-void PrinterVisitor::beginVisit ( const NamespaceUriFromQNameIterator& a) {
+void PrinterVisitor::beginVisit( const NamespaceUriFromQNameIterator& a) {
   thePrinter.startBeginVisit("NamespaceUriFromQNameIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const NamespaceUriFromQNameIterator& ) {
+void PrinterVisitor::endVisit( const NamespaceUriFromQNameIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3261,13 +3219,13 @@
 
 
 // <NamespaceUriForPrefixIterator>
-void PrinterVisitor::beginVisit ( const NamespaceUriForPrefixIterator& a) {
+void PrinterVisitor::beginVisit( const NamespaceUriForPrefixIterator& a) {
   thePrinter.startBeginVisit("NamespaceUriForPrefixIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const NamespaceUriForPrefixIterator& ) {
+void PrinterVisitor::endVisit( const NamespaceUriForPrefixIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3275,13 +3233,13 @@
 
 
 // <InScopePrefixesIterator>
-void PrinterVisitor::beginVisit ( const InScopePrefixesIterator& a) {
+void PrinterVisitor::beginVisit( const InScopePrefixesIterator& a) {
   thePrinter.startBeginVisit("InScopePrefixesIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const InScopePrefixesIterator& ) {
+void PrinterVisitor::endVisit( const InScopePrefixesIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3289,13 +3247,13 @@
 
 
 // <SeededRandomIterator>
-void PrinterVisitor::beginVisit ( const SeededRandomIterator& a) {
+void PrinterVisitor::beginVisit( const SeededRandomIterator& a) {
   thePrinter.startBeginVisit("SeededRandomIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SeededRandomIterator& ) {
+void PrinterVisitor::endVisit( const SeededRandomIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3303,13 +3261,13 @@
 
 
 // <RandomIterator>
-void PrinterVisitor::beginVisit ( const RandomIterator& a) {
+void PrinterVisitor::beginVisit( const RandomIterator& a) {
   thePrinter.startBeginVisit("RandomIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const RandomIterator& ) {
+void PrinterVisitor::endVisit( const RandomIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3317,13 +3275,13 @@
 
 
 // <UuidIterator>
-void PrinterVisitor::beginVisit ( const UuidIterator& a) {
+void PrinterVisitor::beginVisit( const UuidIterator& a) {
   thePrinter.startBeginVisit("UuidIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const UuidIterator& ) {
+void PrinterVisitor::endVisit( const UuidIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3331,13 +3289,13 @@
 
 
 // <ReferenceIterator>
-void PrinterVisitor::beginVisit ( const ReferenceIterator& a) {
+void PrinterVisitor::beginVisit( const ReferenceIterator& a) {
   thePrinter.startBeginVisit("ReferenceIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ReferenceIterator& ) {
+void PrinterVisitor::endVisit( const ReferenceIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3345,13 +3303,13 @@
 
 
 // <HasReferenceIterator>
-void PrinterVisitor::beginVisit ( const HasReferenceIterator& a) {
+void PrinterVisitor::beginVisit( const HasReferenceIterator& a) {
   thePrinter.startBeginVisit("HasReferenceIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const HasReferenceIterator& ) {
+void PrinterVisitor::endVisit( const HasReferenceIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3359,13 +3317,13 @@
 
 
 // <AssignReferenceIterator>
-void PrinterVisitor::beginVisit ( const AssignReferenceIterator& a) {
+void PrinterVisitor::beginVisit( const AssignReferenceIterator& a) {
   thePrinter.startBeginVisit("AssignReferenceIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const AssignReferenceIterator& ) {
+void PrinterVisitor::endVisit( const AssignReferenceIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3373,13 +3331,13 @@
 
 
 // <DereferenceIterator>
-void PrinterVisitor::beginVisit ( const DereferenceIterator& a) {
+void PrinterVisitor::beginVisit( const DereferenceIterator& a) {
   thePrinter.startBeginVisit("DereferenceIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const DereferenceIterator& ) {
+void PrinterVisitor::endVisit( const DereferenceIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3387,13 +3345,13 @@
 
 #ifndef ZORBA_NO_XMLSCHEMA
 // <ValidateIterator>
-void PrinterVisitor::beginVisit ( const ValidateIterator& a) {
+void PrinterVisitor::beginVisit( const ValidateIterator& a) {
   thePrinter.startBeginVisit("ValidateIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ValidateIterator& ) {
+void PrinterVisitor::endVisit( const ValidateIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3402,13 +3360,13 @@
 #endif
 
 // <ZorbaValidateInPlaceIterator>
-void PrinterVisitor::beginVisit ( const ZorbaValidateInPlaceIterator& a) {
+void PrinterVisitor::beginVisit( const ZorbaValidateInPlaceIterator& a) {
   thePrinter.startBeginVisit("ZorbaValidateInPlaceIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ZorbaValidateInPlaceIterator& ) {
+void PrinterVisitor::endVisit( const ZorbaValidateInPlaceIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3416,13 +3374,13 @@
 
 
 // <ZorbaSchemaTypeIterator>
-void PrinterVisitor::beginVisit ( const ZorbaSchemaTypeIterator& a) {
+void PrinterVisitor::beginVisit( const ZorbaSchemaTypeIterator& a) {
   thePrinter.startBeginVisit("ZorbaSchemaTypeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ZorbaSchemaTypeIterator& ) {
+void PrinterVisitor::endVisit( const ZorbaSchemaTypeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3430,13 +3388,13 @@
 
 
 // <ZorbaIsValidatedIterator>
-void PrinterVisitor::beginVisit ( const ZorbaIsValidatedIterator& a) {
+void PrinterVisitor::beginVisit( const ZorbaIsValidatedIterator& a) {
   thePrinter.startBeginVisit("ZorbaIsValidatedIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ZorbaIsValidatedIterator& ) {
+void PrinterVisitor::endVisit( const ZorbaIsValidatedIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3444,13 +3402,13 @@
 
 
 // <SctxBaseUriIterator>
-void PrinterVisitor::beginVisit ( const SctxBaseUriIterator& a) {
+void PrinterVisitor::beginVisit( const SctxBaseUriIterator& a) {
   thePrinter.startBeginVisit("SctxBaseUriIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxBaseUriIterator& ) {
+void PrinterVisitor::endVisit( const SctxBaseUriIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3458,13 +3416,13 @@
 
 
 // <SctxBoundarySpacePolicyIterator>
-void PrinterVisitor::beginVisit ( const SctxBoundarySpacePolicyIterator& a) {
+void PrinterVisitor::beginVisit( const SctxBoundarySpacePolicyIterator& a) {
   thePrinter.startBeginVisit("SctxBoundarySpacePolicyIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxBoundarySpacePolicyIterator& ) {
+void PrinterVisitor::endVisit( const SctxBoundarySpacePolicyIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3472,13 +3430,13 @@
 
 
 // <SctxConstructionModeIterator>
-void PrinterVisitor::beginVisit ( const SctxConstructionModeIterator& a) {
+void PrinterVisitor::beginVisit( const SctxConstructionModeIterator& a) {
   thePrinter.startBeginVisit("SctxConstructionModeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxConstructionModeIterator& ) {
+void PrinterVisitor::endVisit( const SctxConstructionModeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3486,13 +3444,13 @@
 
 
 // <SctxCopyNamespacesModeIterator>
-void PrinterVisitor::beginVisit ( const SctxCopyNamespacesModeIterator& a) {
+void PrinterVisitor::beginVisit( const SctxCopyNamespacesModeIterator& a) {
   thePrinter.startBeginVisit("SctxCopyNamespacesModeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxCopyNamespacesModeIterator& ) {
+void PrinterVisitor::endVisit( const SctxCopyNamespacesModeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3500,13 +3458,13 @@
 
 
 // <SctxDefaultCollationIterator>
-void PrinterVisitor::beginVisit ( const SctxDefaultCollationIterator& a) {
+void PrinterVisitor::beginVisit( const SctxDefaultCollationIterator& a) {
   thePrinter.startBeginVisit("SctxDefaultCollationIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxDefaultCollationIterator& ) {
+void PrinterVisitor::endVisit( const SctxDefaultCollationIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3514,13 +3472,13 @@
 
 
 // <SctxDefaultCollectionTypeIterator>
-void PrinterVisitor::beginVisit ( const SctxDefaultCollectionTypeIterator& a) {
+void PrinterVisitor::beginVisit( const SctxDefaultCollectionTypeIterator& a) {
   thePrinter.startBeginVisit("SctxDefaultCollectionTypeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxDefaultCollectionTypeIterator& ) {
+void PrinterVisitor::endVisit( const SctxDefaultCollectionTypeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3528,13 +3486,13 @@
 
 
 // <SctxDefaultFunctionNamespaceIterator>
-void PrinterVisitor::beginVisit ( const SctxDefaultFunctionNamespaceIterator& a) {
+void PrinterVisitor::beginVisit( const SctxDefaultFunctionNamespaceIterator& a) {
   thePrinter.startBeginVisit("SctxDefaultFunctionNamespaceIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxDefaultFunctionNamespaceIterator& ) {
+void PrinterVisitor::endVisit( const SctxDefaultFunctionNamespaceIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3542,13 +3500,13 @@
 
 
 // <SctxDefaultOrderIterator>
-void PrinterVisitor::beginVisit ( const SctxDefaultOrderIterator& a) {
+void PrinterVisitor::beginVisit( const SctxDefaultOrderIterator& a) {
   thePrinter.startBeginVisit("SctxDefaultOrderIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxDefaultOrderIterator& ) {
+void PrinterVisitor::endVisit( const SctxDefaultOrderIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3556,13 +3514,13 @@
 
 
 // <SctxFunctionAnnotationsIterator>
-void PrinterVisitor::beginVisit ( const SctxFunctionAnnotationsIterator& a) {
+void PrinterVisitor::beginVisit( const SctxFunctionAnnotationsIterator& a) {
   thePrinter.startBeginVisit("SctxFunctionAnnotationsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxFunctionAnnotationsIterator& ) {
+void PrinterVisitor::endVisit( const SctxFunctionAnnotationsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3570,13 +3528,13 @@
 
 
 // <SctxFunctionArgumentsCountIterator>
-void PrinterVisitor::beginVisit ( const SctxFunctionArgumentsCountIterator& a) {
+void PrinterVisitor::beginVisit( const SctxFunctionArgumentsCountIterator& a) {
   thePrinter.startBeginVisit("SctxFunctionArgumentsCountIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxFunctionArgumentsCountIterator& ) {
+void PrinterVisitor::endVisit( const SctxFunctionArgumentsCountIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3584,13 +3542,13 @@
 
 
 // <SctxFunctionNamesIterator>
-void PrinterVisitor::beginVisit ( const SctxFunctionNamesIterator& a) {
+void PrinterVisitor::beginVisit( const SctxFunctionNamesIterator& a) {
   thePrinter.startBeginVisit("SctxFunctionNamesIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxFunctionNamesIterator& ) {
+void PrinterVisitor::endVisit( const SctxFunctionNamesIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3598,13 +3556,13 @@
 
 
 // <SctxFunctionsIterator>
-void PrinterVisitor::beginVisit ( const SctxFunctionsIterator& a) {
+void PrinterVisitor::beginVisit( const SctxFunctionsIterator& a) {
   thePrinter.startBeginVisit("SctxFunctionsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxFunctionsIterator& ) {
+void PrinterVisitor::endVisit( const SctxFunctionsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3612,13 +3570,13 @@
 
 
 // <SctxInScopeAttributeDeclarationsIterator>
-void PrinterVisitor::beginVisit ( const SctxInScopeAttributeDeclarationsIterator& a) {
+void PrinterVisitor::beginVisit( const SctxInScopeAttributeDeclarationsIterator& a) {
   thePrinter.startBeginVisit("SctxInScopeAttributeDeclarationsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxInScopeAttributeDeclarationsIterator& ) {
+void PrinterVisitor::endVisit( const SctxInScopeAttributeDeclarationsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3626,13 +3584,13 @@
 
 
 // <SctxInScopeAttributeGroupsIterator>
-void PrinterVisitor::beginVisit ( const SctxInScopeAttributeGroupsIterator& a) {
+void PrinterVisitor::beginVisit( const SctxInScopeAttributeGroupsIterator& a) {
   thePrinter.startBeginVisit("SctxInScopeAttributeGroupsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxInScopeAttributeGroupsIterator& ) {
+void PrinterVisitor::endVisit( const SctxInScopeAttributeGroupsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3640,13 +3598,13 @@
 
 
 // <SctxInScopeElementDeclarationsIterator>
-void PrinterVisitor::beginVisit ( const SctxInScopeElementDeclarationsIterator& a) {
+void PrinterVisitor::beginVisit( const SctxInScopeElementDeclarationsIterator& a) {
   thePrinter.startBeginVisit("SctxInScopeElementDeclarationsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxInScopeElementDeclarationsIterator& ) {
+void PrinterVisitor::endVisit( const SctxInScopeElementDeclarationsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3654,13 +3612,13 @@
 
 
 // <SctxInScopeElementGroupsIterator>
-void PrinterVisitor::beginVisit ( const SctxInScopeElementGroupsIterator& a) {
+void PrinterVisitor::beginVisit( const SctxInScopeElementGroupsIterator& a) {
   thePrinter.startBeginVisit("SctxInScopeElementGroupsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxInScopeElementGroupsIterator& ) {
+void PrinterVisitor::endVisit( const SctxInScopeElementGroupsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3668,13 +3626,13 @@
 
 
 // <SctxInScopeSchemaTypesIterator>
-void PrinterVisitor::beginVisit ( const SctxInScopeSchemaTypesIterator& a) {
+void PrinterVisitor::beginVisit( const SctxInScopeSchemaTypesIterator& a) {
   thePrinter.startBeginVisit("SctxInScopeSchemaTypesIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxInScopeSchemaTypesIterator& ) {
+void PrinterVisitor::endVisit( const SctxInScopeSchemaTypesIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3682,13 +3640,13 @@
 
 
 // <SctxInscopeVariablesIterator>
-void PrinterVisitor::beginVisit ( const SctxInscopeVariablesIterator& a) {
+void PrinterVisitor::beginVisit( const SctxInscopeVariablesIterator& a) {
   thePrinter.startBeginVisit("SctxInscopeVariablesIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxInscopeVariablesIterator& ) {
+void PrinterVisitor::endVisit( const SctxInscopeVariablesIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3696,13 +3654,13 @@
 
 
 // <SctxOptionIterator>
-void PrinterVisitor::beginVisit ( const SctxOptionIterator& a) {
+void PrinterVisitor::beginVisit( const SctxOptionIterator& a) {
   thePrinter.startBeginVisit("SctxOptionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxOptionIterator& ) {
+void PrinterVisitor::endVisit( const SctxOptionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3710,13 +3668,13 @@
 
 
 // <SctxOrderingModeIterator>
-void PrinterVisitor::beginVisit ( const SctxOrderingModeIterator& a) {
+void PrinterVisitor::beginVisit( const SctxOrderingModeIterator& a) {
   thePrinter.startBeginVisit("SctxOrderingModeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxOrderingModeIterator& ) {
+void PrinterVisitor::endVisit( const SctxOrderingModeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3724,13 +3682,13 @@
 
 
 // <SctxStaticallyKnownCollationsIterator>
-void PrinterVisitor::beginVisit ( const SctxStaticallyKnownCollationsIterator& a) {
+void PrinterVisitor::beginVisit( const SctxStaticallyKnownCollationsIterator& a) {
   thePrinter.startBeginVisit("SctxStaticallyKnownCollationsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxStaticallyKnownCollationsIterator& ) {
+void PrinterVisitor::endVisit( const SctxStaticallyKnownCollationsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3738,13 +3696,13 @@
 
 
 // <SctxStaticallyKnownDocumentsIterator>
-void PrinterVisitor::beginVisit ( const SctxStaticallyKnownDocumentsIterator& a) {
+void PrinterVisitor::beginVisit( const SctxStaticallyKnownDocumentsIterator& a) {
   thePrinter.startBeginVisit("SctxStaticallyKnownDocumentsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxStaticallyKnownDocumentsIterator& ) {
+void PrinterVisitor::endVisit( const SctxStaticallyKnownDocumentsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3752,13 +3710,13 @@
 
 
 // <SctxStaticallyKnownDocumentTypeIterator>
-void PrinterVisitor::beginVisit ( const SctxStaticallyKnownDocumentTypeIterator& a) {
+void PrinterVisitor::beginVisit( const SctxStaticallyKnownDocumentTypeIterator& a) {
   thePrinter.startBeginVisit("SctxStaticallyKnownDocumentTypeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxStaticallyKnownDocumentTypeIterator& ) {
+void PrinterVisitor::endVisit( const SctxStaticallyKnownDocumentTypeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3766,13 +3724,13 @@
 
 
 // <SctxStaticallyKnownNamespaceBindingIterator>
-void PrinterVisitor::beginVisit ( const SctxStaticallyKnownNamespaceBindingIterator& a) {
+void PrinterVisitor::beginVisit( const SctxStaticallyKnownNamespaceBindingIterator& a) {
   thePrinter.startBeginVisit("SctxStaticallyKnownNamespaceBindingIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxStaticallyKnownNamespaceBindingIterator& ) {
+void PrinterVisitor::endVisit( const SctxStaticallyKnownNamespaceBindingIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3780,13 +3738,13 @@
 
 
 // <SctxStaticallyKnownNamespacesIterator>
-void PrinterVisitor::beginVisit ( const SctxStaticallyKnownNamespacesIterator& a) {
+void PrinterVisitor::beginVisit( const SctxStaticallyKnownNamespacesIterator& a) {
   thePrinter.startBeginVisit("SctxStaticallyKnownNamespacesIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxStaticallyKnownNamespacesIterator& ) {
+void PrinterVisitor::endVisit( const SctxStaticallyKnownNamespacesIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3794,13 +3752,13 @@
 
 
 // <SctxXPath10CompatModeIterator>
-void PrinterVisitor::beginVisit ( const SctxXPath10CompatModeIterator& a) {
+void PrinterVisitor::beginVisit( const SctxXPath10CompatModeIterator& a) {
   thePrinter.startBeginVisit("SctxXPath10CompatModeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SctxXPath10CompatModeIterator& ) {
+void PrinterVisitor::endVisit( const SctxXPath10CompatModeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3808,13 +3766,13 @@
 
 
 // <SeqValueIntersectIterator>
-void PrinterVisitor::beginVisit ( const SeqValueIntersectIterator& a) {
+void PrinterVisitor::beginVisit( const SeqValueIntersectIterator& a) {
   thePrinter.startBeginVisit("SeqValueIntersectIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SeqValueIntersectIterator& ) {
+void PrinterVisitor::endVisit( const SeqValueIntersectIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3822,13 +3780,13 @@
 
 
 // <SeqValueUnionIterator>
-void PrinterVisitor::beginVisit ( const SeqValueUnionIterator& a) {
+void PrinterVisitor::beginVisit( const SeqValueUnionIterator& a) {
   thePrinter.startBeginVisit("SeqValueUnionIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SeqValueUnionIterator& ) {
+void PrinterVisitor::endVisit( const SeqValueUnionIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3836,13 +3794,13 @@
 
 
 // <SeqValueExceptIterator>
-void PrinterVisitor::beginVisit ( const SeqValueExceptIterator& a) {
+void PrinterVisitor::beginVisit( const SeqValueExceptIterator& a) {
   thePrinter.startBeginVisit("SeqValueExceptIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SeqValueExceptIterator& ) {
+void PrinterVisitor::endVisit( const SeqValueExceptIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3850,13 +3808,13 @@
 
 
 // <FnConcatIterator>
-void PrinterVisitor::beginVisit ( const FnConcatIterator& a) {
+void PrinterVisitor::beginVisit( const FnConcatIterator& a) {
   thePrinter.startBeginVisit("FnConcatIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnConcatIterator& ) {
+void PrinterVisitor::endVisit( const FnConcatIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3864,13 +3822,13 @@
 
 
 // <FnIndexOfIterator>
-void PrinterVisitor::beginVisit ( const FnIndexOfIterator& a) {
+void PrinterVisitor::beginVisit( const FnIndexOfIterator& a) {
   thePrinter.startBeginVisit("FnIndexOfIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnIndexOfIterator& ) {
+void PrinterVisitor::endVisit( const FnIndexOfIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3878,13 +3836,13 @@
 
 
 // <FnEmptyIterator>
-void PrinterVisitor::beginVisit ( const FnEmptyIterator& a) {
+void PrinterVisitor::beginVisit( const FnEmptyIterator& a) {
   thePrinter.startBeginVisit("FnEmptyIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnEmptyIterator& ) {
+void PrinterVisitor::endVisit( const FnEmptyIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3892,13 +3850,13 @@
 
 
 // <FnExistsIterator>
-void PrinterVisitor::beginVisit ( const FnExistsIterator& a) {
+void PrinterVisitor::beginVisit( const FnExistsIterator& a) {
   thePrinter.startBeginVisit("FnExistsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnExistsIterator& ) {
+void PrinterVisitor::endVisit( const FnExistsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3906,13 +3864,13 @@
 
 
 // <FnDistinctValuesIterator>
-void PrinterVisitor::beginVisit ( const FnDistinctValuesIterator& a) {
+void PrinterVisitor::beginVisit( const FnDistinctValuesIterator& a) {
   thePrinter.startBeginVisit("FnDistinctValuesIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnDistinctValuesIterator& ) {
+void PrinterVisitor::endVisit( const FnDistinctValuesIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3920,13 +3878,13 @@
 
 
 // <FnInsertBeforeIterator>
-void PrinterVisitor::beginVisit ( const FnInsertBeforeIterator& a) {
+void PrinterVisitor::beginVisit( const FnInsertBeforeIterator& a) {
   thePrinter.startBeginVisit("FnInsertBeforeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnInsertBeforeIterator& ) {
+void PrinterVisitor::endVisit( const FnInsertBeforeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3934,13 +3892,13 @@
 
 
 // <FnRemoveIterator>
-void PrinterVisitor::beginVisit ( const FnRemoveIterator& a) {
+void PrinterVisitor::beginVisit( const FnRemoveIterator& a) {
   thePrinter.startBeginVisit("FnRemoveIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnRemoveIterator& ) {
+void PrinterVisitor::endVisit( const FnRemoveIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3948,13 +3906,13 @@
 
 
 // <FnReverseIterator>
-void PrinterVisitor::beginVisit ( const FnReverseIterator& a) {
+void PrinterVisitor::beginVisit( const FnReverseIterator& a) {
   thePrinter.startBeginVisit("FnReverseIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnReverseIterator& ) {
+void PrinterVisitor::endVisit( const FnReverseIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3962,13 +3920,13 @@
 
 
 // <FnSubsequenceIterator>
-void PrinterVisitor::beginVisit ( const FnSubsequenceIterator& a) {
+void PrinterVisitor::beginVisit( const FnSubsequenceIterator& a) {
   thePrinter.startBeginVisit("FnSubsequenceIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnSubsequenceIterator& ) {
+void PrinterVisitor::endVisit( const FnSubsequenceIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3976,13 +3934,13 @@
 
 
 // <SubsequenceIntIterator>
-void PrinterVisitor::beginVisit ( const SubsequenceIntIterator& a) {
+void PrinterVisitor::beginVisit( const SubsequenceIntIterator& a) {
   thePrinter.startBeginVisit("SubsequenceIntIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SubsequenceIntIterator& ) {
+void PrinterVisitor::endVisit( const SubsequenceIntIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -3990,13 +3948,13 @@
 
 
 // <SequencePointAccessIterator>
-void PrinterVisitor::beginVisit ( const SequencePointAccessIterator& a) {
+void PrinterVisitor::beginVisit( const SequencePointAccessIterator& a) {
   thePrinter.startBeginVisit("SequencePointAccessIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SequencePointAccessIterator& ) {
+void PrinterVisitor::endVisit( const SequencePointAccessIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4004,13 +3962,13 @@
 
 
 // <FnZeroOrOneIterator>
-void PrinterVisitor::beginVisit ( const FnZeroOrOneIterator& a) {
+void PrinterVisitor::beginVisit( const FnZeroOrOneIterator& a) {
   thePrinter.startBeginVisit("FnZeroOrOneIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnZeroOrOneIterator& ) {
+void PrinterVisitor::endVisit( const FnZeroOrOneIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4018,13 +3976,13 @@
 
 
 // <FnOneOrMoreIterator>
-void PrinterVisitor::beginVisit ( const FnOneOrMoreIterator& a) {
+void PrinterVisitor::beginVisit( const FnOneOrMoreIterator& a) {
   thePrinter.startBeginVisit("FnOneOrMoreIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnOneOrMoreIterator& ) {
+void PrinterVisitor::endVisit( const FnOneOrMoreIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4032,13 +3990,13 @@
 
 
 // <FnExactlyOneIterator>
-void PrinterVisitor::beginVisit ( const FnExactlyOneIterator& a) {
+void PrinterVisitor::beginVisit( const FnExactlyOneIterator& a) {
   thePrinter.startBeginVisit("FnExactlyOneIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnExactlyOneIterator& ) {
+void PrinterVisitor::endVisit( const FnExactlyOneIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4046,13 +4004,13 @@
 
 
 // <FnDeepEqualIterator>
-void PrinterVisitor::beginVisit ( const FnDeepEqualIterator& a) {
+void PrinterVisitor::beginVisit( const FnDeepEqualIterator& a) {
   thePrinter.startBeginVisit("FnDeepEqualIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnDeepEqualIterator& ) {
+void PrinterVisitor::endVisit( const FnDeepEqualIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4060,13 +4018,13 @@
 
 
 // <HashSemiJoinIterator>
-void PrinterVisitor::beginVisit ( const HashSemiJoinIterator& a) {
+void PrinterVisitor::beginVisit( const HashSemiJoinIterator& a) {
   thePrinter.startBeginVisit("HashSemiJoinIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const HashSemiJoinIterator& ) {
+void PrinterVisitor::endVisit( const HashSemiJoinIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4074,13 +4032,13 @@
 
 
 // <SortSemiJoinIterator>
-void PrinterVisitor::beginVisit ( const SortSemiJoinIterator& a) {
+void PrinterVisitor::beginVisit( const SortSemiJoinIterator& a) {
   thePrinter.startBeginVisit("SortSemiJoinIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SortSemiJoinIterator& ) {
+void PrinterVisitor::endVisit( const SortSemiJoinIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4088,13 +4046,13 @@
 
 
 // <FnCountIterator>
-void PrinterVisitor::beginVisit ( const FnCountIterator& a) {
+void PrinterVisitor::beginVisit( const FnCountIterator& a) {
   thePrinter.startBeginVisit("FnCountIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnCountIterator& ) {
+void PrinterVisitor::endVisit( const FnCountIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4102,13 +4060,13 @@
 
 
 // <FnAvgIterator>
-void PrinterVisitor::beginVisit ( const FnAvgIterator& a) {
+void PrinterVisitor::beginVisit( const FnAvgIterator& a) {
   thePrinter.startBeginVisit("FnAvgIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnAvgIterator& ) {
+void PrinterVisitor::endVisit( const FnAvgIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4116,13 +4074,13 @@
 
 
 // <FnSumIterator>
-void PrinterVisitor::beginVisit ( const FnSumIterator& a) {
+void PrinterVisitor::beginVisit( const FnSumIterator& a) {
   thePrinter.startBeginVisit("FnSumIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnSumIterator& ) {
+void PrinterVisitor::endVisit( const FnSumIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4130,13 +4088,13 @@
 
 
 // <FnSumDoubleIterator>
-void PrinterVisitor::beginVisit ( const FnSumDoubleIterator& a) {
+void PrinterVisitor::beginVisit( const FnSumDoubleIterator& a) {
   thePrinter.startBeginVisit("FnSumDoubleIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnSumDoubleIterator& ) {
+void PrinterVisitor::endVisit( const FnSumDoubleIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4144,13 +4102,13 @@
 
 
 // <FnSumFloatIterator>
-void PrinterVisitor::beginVisit ( const FnSumFloatIterator& a) {
+void PrinterVisitor::beginVisit( const FnSumFloatIterator& a) {
   thePrinter.startBeginVisit("FnSumFloatIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnSumFloatIterator& ) {
+void PrinterVisitor::endVisit( const FnSumFloatIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4158,13 +4116,13 @@
 
 
 // <FnSumDecimalIterator>
-void PrinterVisitor::beginVisit ( const FnSumDecimalIterator& a) {
+void PrinterVisitor::beginVisit( const FnSumDecimalIterator& a) {
   thePrinter.startBeginVisit("FnSumDecimalIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnSumDecimalIterator& ) {
+void PrinterVisitor::endVisit( const FnSumDecimalIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4172,13 +4130,13 @@
 
 
 // <FnSumIntegerIterator>
-void PrinterVisitor::beginVisit ( const FnSumIntegerIterator& a) {
+void PrinterVisitor::beginVisit( const FnSumIntegerIterator& a) {
   thePrinter.startBeginVisit("FnSumIntegerIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnSumIntegerIterator& ) {
+void PrinterVisitor::endVisit( const FnSumIntegerIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4186,13 +4144,13 @@
 
 
 // <OpToIterator>
-void PrinterVisitor::beginVisit ( const OpToIterator& a) {
+void PrinterVisitor::beginVisit( const OpToIterator& a) {
   thePrinter.startBeginVisit("OpToIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const OpToIterator& ) {
+void PrinterVisitor::endVisit( const OpToIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4200,13 +4158,13 @@
 
 
 // <FnIdIterator>
-void PrinterVisitor::beginVisit ( const FnIdIterator& a) {
+void PrinterVisitor::beginVisit( const FnIdIterator& a) {
   thePrinter.startBeginVisit("FnIdIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnIdIterator& ) {
+void PrinterVisitor::endVisit( const FnIdIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4214,13 +4172,13 @@
 
 
 // <FnElementWithIdIterator>
-void PrinterVisitor::beginVisit ( const FnElementWithIdIterator& a) {
+void PrinterVisitor::beginVisit( const FnElementWithIdIterator& a) {
   thePrinter.startBeginVisit("FnElementWithIdIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnElementWithIdIterator& ) {
+void PrinterVisitor::endVisit( const FnElementWithIdIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4228,13 +4186,13 @@
 
 
 // <FnIdRefIterator>
-void PrinterVisitor::beginVisit ( const FnIdRefIterator& a) {
+void PrinterVisitor::beginVisit( const FnIdRefIterator& a) {
   thePrinter.startBeginVisit("FnIdRefIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnIdRefIterator& ) {
+void PrinterVisitor::endVisit( const FnIdRefIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4242,13 +4200,13 @@
 
 
 // <FnDocIterator>
-void PrinterVisitor::beginVisit ( const FnDocIterator& a) {
+void PrinterVisitor::beginVisit( const FnDocIterator& a) {
   thePrinter.startBeginVisit("FnDocIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnDocIterator& ) {
+void PrinterVisitor::endVisit( const FnDocIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4256,13 +4214,13 @@
 
 
 // <FnDocAvailableIterator>
-void PrinterVisitor::beginVisit ( const FnDocAvailableIterator& a) {
+void PrinterVisitor::beginVisit( const FnDocAvailableIterator& a) {
   thePrinter.startBeginVisit("FnDocAvailableIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnDocAvailableIterator& ) {
+void PrinterVisitor::endVisit( const FnDocAvailableIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4270,13 +4228,13 @@
 
 
 // <FnAvailableEnvironmentVariablesIterator>
-void PrinterVisitor::beginVisit ( const FnAvailableEnvironmentVariablesIterator& a) {
+void PrinterVisitor::beginVisit( const FnAvailableEnvironmentVariablesIterator& a) {
   thePrinter.startBeginVisit("FnAvailableEnvironmentVariablesIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnAvailableEnvironmentVariablesIterator& ) {
+void PrinterVisitor::endVisit( const FnAvailableEnvironmentVariablesIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4284,13 +4242,13 @@
 
 
 // <FnEnvironmentVariableIterator>
-void PrinterVisitor::beginVisit ( const FnEnvironmentVariableIterator& a) {
+void PrinterVisitor::beginVisit( const FnEnvironmentVariableIterator& a) {
   thePrinter.startBeginVisit("FnEnvironmentVariableIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnEnvironmentVariableIterator& ) {
+void PrinterVisitor::endVisit( const FnEnvironmentVariableIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4298,13 +4256,13 @@
 
 
 // <FnUnparsedTextIterator>
-void PrinterVisitor::beginVisit ( const FnUnparsedTextIterator& a) {
+void PrinterVisitor::beginVisit( const FnUnparsedTextIterator& a) {
   thePrinter.startBeginVisit("FnUnparsedTextIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnUnparsedTextIterator& ) {
+void PrinterVisitor::endVisit( const FnUnparsedTextIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4312,13 +4270,13 @@
 
 
 // <FnUnparsedTextAvailableIterator>
-void PrinterVisitor::beginVisit ( const FnUnparsedTextAvailableIterator& a) {
+void PrinterVisitor::beginVisit( const FnUnparsedTextAvailableIterator& a) {
   thePrinter.startBeginVisit("FnUnparsedTextAvailableIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnUnparsedTextAvailableIterator& ) {
+void PrinterVisitor::endVisit( const FnUnparsedTextAvailableIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4326,13 +4284,13 @@
 
 
 // <FnUnparsedTextLinesIterator>
-void PrinterVisitor::beginVisit ( const FnUnparsedTextLinesIterator& a) {
+void PrinterVisitor::beginVisit( const FnUnparsedTextLinesIterator& a) {
   thePrinter.startBeginVisit("FnUnparsedTextLinesIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnUnparsedTextLinesIterator& ) {
+void PrinterVisitor::endVisit( const FnUnparsedTextLinesIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4340,13 +4298,13 @@
 
 
 // <AvailableDocumentsIterator>
-void PrinterVisitor::beginVisit ( const AvailableDocumentsIterator& a) {
+void PrinterVisitor::beginVisit( const AvailableDocumentsIterator& a) {
   thePrinter.startBeginVisit("AvailableDocumentsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const AvailableDocumentsIterator& ) {
+void PrinterVisitor::endVisit( const AvailableDocumentsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4354,13 +4312,13 @@
 
 
 // <IsAvailableDocumentIterator>
-void PrinterVisitor::beginVisit ( const IsAvailableDocumentIterator& a) {
+void PrinterVisitor::beginVisit( const IsAvailableDocumentIterator& a) {
   thePrinter.startBeginVisit("IsAvailableDocumentIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IsAvailableDocumentIterator& ) {
+void PrinterVisitor::endVisit( const IsAvailableDocumentIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4368,13 +4326,13 @@
 
 
 // <PutDocumentIterator>
-void PrinterVisitor::beginVisit ( const PutDocumentIterator& a) {
+void PrinterVisitor::beginVisit( const PutDocumentIterator& a) {
   thePrinter.startBeginVisit("PutDocumentIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const PutDocumentIterator& ) {
+void PrinterVisitor::endVisit( const PutDocumentIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4382,13 +4340,13 @@
 
 
 // <RemoveDocumentIterator>
-void PrinterVisitor::beginVisit ( const RemoveDocumentIterator& a) {
+void PrinterVisitor::beginVisit( const RemoveDocumentIterator& a) {
   thePrinter.startBeginVisit("RemoveDocumentIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const RemoveDocumentIterator& ) {
+void PrinterVisitor::endVisit( const RemoveDocumentIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4396,13 +4354,13 @@
 
 
 // <RetrieveDocumentIterator>
-void PrinterVisitor::beginVisit ( const RetrieveDocumentIterator& a) {
+void PrinterVisitor::beginVisit( const RetrieveDocumentIterator& a) {
   thePrinter.startBeginVisit("RetrieveDocumentIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const RetrieveDocumentIterator& ) {
+void PrinterVisitor::endVisit( const RetrieveDocumentIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4410,13 +4368,13 @@
 
 
 // <MapCreateIterator>
-void PrinterVisitor::beginVisit ( const MapCreateIterator& a) {
+void PrinterVisitor::beginVisit( const MapCreateIterator& a) {
   thePrinter.startBeginVisit("MapCreateIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MapCreateIterator& ) {
+void PrinterVisitor::endVisit( const MapCreateIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4424,13 +4382,13 @@
 
 
 // <MapDropIterator>
-void PrinterVisitor::beginVisit ( const MapDropIterator& a) {
+void PrinterVisitor::beginVisit( const MapDropIterator& a) {
   thePrinter.startBeginVisit("MapDropIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MapDropIterator& ) {
+void PrinterVisitor::endVisit( const MapDropIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4438,13 +4396,13 @@
 
 
 // <MapGetIterator>
-void PrinterVisitor::beginVisit ( const MapGetIterator& a) {
+void PrinterVisitor::beginVisit( const MapGetIterator& a) {
   thePrinter.startBeginVisit("MapGetIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MapGetIterator& ) {
+void PrinterVisitor::endVisit( const MapGetIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4452,13 +4410,13 @@
 
 
 // <MapInsertIterator>
-void PrinterVisitor::beginVisit ( const MapInsertIterator& a) {
+void PrinterVisitor::beginVisit( const MapInsertIterator& a) {
   thePrinter.startBeginVisit("MapInsertIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MapInsertIterator& ) {
+void PrinterVisitor::endVisit( const MapInsertIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4466,13 +4424,13 @@
 
 
 // <MapDeleteIterator>
-void PrinterVisitor::beginVisit ( const MapDeleteIterator& a) {
+void PrinterVisitor::beginVisit( const MapDeleteIterator& a) {
   thePrinter.startBeginVisit("MapDeleteIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MapDeleteIterator& ) {
+void PrinterVisitor::endVisit( const MapDeleteIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4480,13 +4438,13 @@
 
 
 // <MapKeysIterator>
-void PrinterVisitor::beginVisit ( const MapKeysIterator& a) {
+void PrinterVisitor::beginVisit( const MapKeysIterator& a) {
   thePrinter.startBeginVisit("MapKeysIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MapKeysIterator& ) {
+void PrinterVisitor::endVisit( const MapKeysIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4494,13 +4452,13 @@
 
 
 // <MapSizeIterator>
-void PrinterVisitor::beginVisit ( const MapSizeIterator& a) {
+void PrinterVisitor::beginVisit( const MapSizeIterator& a) {
   thePrinter.startBeginVisit("MapSizeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MapSizeIterator& ) {
+void PrinterVisitor::endVisit( const MapSizeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4508,13 +4466,13 @@
 
 
 // <AvailableMapsIterator>
-void PrinterVisitor::beginVisit ( const AvailableMapsIterator& a) {
+void PrinterVisitor::beginVisit( const AvailableMapsIterator& a) {
   thePrinter.startBeginVisit("AvailableMapsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const AvailableMapsIterator& ) {
+void PrinterVisitor::endVisit( const AvailableMapsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4522,13 +4480,13 @@
 
 
 // <MapOptionsIterator>
-void PrinterVisitor::beginVisit ( const MapOptionsIterator& a) {
+void PrinterVisitor::beginVisit( const MapOptionsIterator& a) {
   thePrinter.startBeginVisit("MapOptionsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const MapOptionsIterator& ) {
+void PrinterVisitor::endVisit( const MapOptionsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4536,13 +4494,13 @@
 
 
 // <CodepointsToStringIterator>
-void PrinterVisitor::beginVisit ( const CodepointsToStringIterator& a) {
+void PrinterVisitor::beginVisit( const CodepointsToStringIterator& a) {
   thePrinter.startBeginVisit("CodepointsToStringIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const CodepointsToStringIterator& ) {
+void PrinterVisitor::endVisit( const CodepointsToStringIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4550,13 +4508,13 @@
 
 
 // <StringToCodepointsIterator>
-void PrinterVisitor::beginVisit ( const StringToCodepointsIterator& a) {
+void PrinterVisitor::beginVisit( const StringToCodepointsIterator& a) {
   thePrinter.startBeginVisit("StringToCodepointsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const StringToCodepointsIterator& ) {
+void PrinterVisitor::endVisit( const StringToCodepointsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4564,13 +4522,13 @@
 
 
 // <CompareStrIterator>
-void PrinterVisitor::beginVisit ( const CompareStrIterator& a) {
+void PrinterVisitor::beginVisit( const CompareStrIterator& a) {
   thePrinter.startBeginVisit("CompareStrIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const CompareStrIterator& ) {
+void PrinterVisitor::endVisit( const CompareStrIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4578,13 +4536,13 @@
 
 
 // <CodepointEqualIterator>
-void PrinterVisitor::beginVisit ( const CodepointEqualIterator& a) {
+void PrinterVisitor::beginVisit( const CodepointEqualIterator& a) {
   thePrinter.startBeginVisit("CodepointEqualIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const CodepointEqualIterator& ) {
+void PrinterVisitor::endVisit( const CodepointEqualIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4592,13 +4550,13 @@
 
 
 // <ConcatStrIterator>
-void PrinterVisitor::beginVisit ( const ConcatStrIterator& a) {
+void PrinterVisitor::beginVisit( const ConcatStrIterator& a) {
   thePrinter.startBeginVisit("ConcatStrIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ConcatStrIterator& ) {
+void PrinterVisitor::endVisit( const ConcatStrIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4606,13 +4564,13 @@
 
 
 // <StringJoinIterator>
-void PrinterVisitor::beginVisit ( const StringJoinIterator& a) {
+void PrinterVisitor::beginVisit( const StringJoinIterator& a) {
   thePrinter.startBeginVisit("StringJoinIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const StringJoinIterator& ) {
+void PrinterVisitor::endVisit( const StringJoinIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4620,13 +4578,13 @@
 
 
 // <SubstringIterator>
-void PrinterVisitor::beginVisit ( const SubstringIterator& a) {
+void PrinterVisitor::beginVisit( const SubstringIterator& a) {
   thePrinter.startBeginVisit("SubstringIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SubstringIterator& ) {
+void PrinterVisitor::endVisit( const SubstringIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4634,13 +4592,13 @@
 
 
 // <SubstringIntOptIterator>
-void PrinterVisitor::beginVisit ( const SubstringIntOptIterator& a) {
+void PrinterVisitor::beginVisit( const SubstringIntOptIterator& a) {
   thePrinter.startBeginVisit("SubstringIntOptIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SubstringIntOptIterator& ) {
+void PrinterVisitor::endVisit( const SubstringIntOptIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4648,13 +4606,13 @@
 
 
 // <StringLengthIterator>
-void PrinterVisitor::beginVisit ( const StringLengthIterator& a) {
+void PrinterVisitor::beginVisit( const StringLengthIterator& a) {
   thePrinter.startBeginVisit("StringLengthIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const StringLengthIterator& ) {
+void PrinterVisitor::endVisit( const StringLengthIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4662,13 +4620,13 @@
 
 
 // <NormalizeSpaceIterator>
-void PrinterVisitor::beginVisit ( const NormalizeSpaceIterator& a) {
+void PrinterVisitor::beginVisit( const NormalizeSpaceIterator& a) {
   thePrinter.startBeginVisit("NormalizeSpaceIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const NormalizeSpaceIterator& ) {
+void PrinterVisitor::endVisit( const NormalizeSpaceIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4676,13 +4634,13 @@
 
 
 // <NormalizeUnicodeIterator>
-void PrinterVisitor::beginVisit ( const NormalizeUnicodeIterator& a) {
+void PrinterVisitor::beginVisit( const NormalizeUnicodeIterator& a) {
   thePrinter.startBeginVisit("NormalizeUnicodeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const NormalizeUnicodeIterator& ) {
+void PrinterVisitor::endVisit( const NormalizeUnicodeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4690,13 +4648,13 @@
 
 
 // <UpperCaseIterator>
-void PrinterVisitor::beginVisit ( const UpperCaseIterator& a) {
+void PrinterVisitor::beginVisit( const UpperCaseIterator& a) {
   thePrinter.startBeginVisit("UpperCaseIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const UpperCaseIterator& ) {
+void PrinterVisitor::endVisit( const UpperCaseIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4704,13 +4662,13 @@
 
 
 // <LowerCaseIterator>
-void PrinterVisitor::beginVisit ( const LowerCaseIterator& a) {
+void PrinterVisitor::beginVisit( const LowerCaseIterator& a) {
   thePrinter.startBeginVisit("LowerCaseIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const LowerCaseIterator& ) {
+void PrinterVisitor::endVisit( const LowerCaseIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4718,13 +4676,13 @@
 
 
 // <TranslateIterator>
-void PrinterVisitor::beginVisit ( const TranslateIterator& a) {
+void PrinterVisitor::beginVisit( const TranslateIterator& a) {
   thePrinter.startBeginVisit("TranslateIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const TranslateIterator& ) {
+void PrinterVisitor::endVisit( const TranslateIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4732,13 +4690,13 @@
 
 
 // <EncodeForUriIterator>
-void PrinterVisitor::beginVisit ( const EncodeForUriIterator& a) {
+void PrinterVisitor::beginVisit( const EncodeForUriIterator& a) {
   thePrinter.startBeginVisit("EncodeForUriIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const EncodeForUriIterator& ) {
+void PrinterVisitor::endVisit( const EncodeForUriIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4746,13 +4704,13 @@
 
 
 // <IriToUriIterator>
-void PrinterVisitor::beginVisit ( const IriToUriIterator& a) {
+void PrinterVisitor::beginVisit( const IriToUriIterator& a) {
   thePrinter.startBeginVisit("IriToUriIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const IriToUriIterator& ) {
+void PrinterVisitor::endVisit( const IriToUriIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4760,13 +4718,13 @@
 
 
 // <EscapeHtmlUriIterator>
-void PrinterVisitor::beginVisit ( const EscapeHtmlUriIterator& a) {
+void PrinterVisitor::beginVisit( const EscapeHtmlUriIterator& a) {
   thePrinter.startBeginVisit("EscapeHtmlUriIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const EscapeHtmlUriIterator& ) {
+void PrinterVisitor::endVisit( const EscapeHtmlUriIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4774,13 +4732,13 @@
 
 
 // <ContainsIterator>
-void PrinterVisitor::beginVisit ( const ContainsIterator& a) {
+void PrinterVisitor::beginVisit( const ContainsIterator& a) {
   thePrinter.startBeginVisit("ContainsIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ContainsIterator& ) {
+void PrinterVisitor::endVisit( const ContainsIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4788,13 +4746,13 @@
 
 
 // <StartsWithIterator>
-void PrinterVisitor::beginVisit ( const StartsWithIterator& a) {
+void PrinterVisitor::beginVisit( const StartsWithIterator& a) {
   thePrinter.startBeginVisit("StartsWithIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const StartsWithIterator& ) {
+void PrinterVisitor::endVisit( const StartsWithIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4802,13 +4760,13 @@
 
 
 // <EndsWithIterator>
-void PrinterVisitor::beginVisit ( const EndsWithIterator& a) {
+void PrinterVisitor::beginVisit( const EndsWithIterator& a) {
   thePrinter.startBeginVisit("EndsWithIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const EndsWithIterator& ) {
+void PrinterVisitor::endVisit( const EndsWithIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4816,13 +4774,13 @@
 
 
 // <SubstringBeforeIterator>
-void PrinterVisitor::beginVisit ( const SubstringBeforeIterator& a) {
+void PrinterVisitor::beginVisit( const SubstringBeforeIterator& a) {
   thePrinter.startBeginVisit("SubstringBeforeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SubstringBeforeIterator& ) {
+void PrinterVisitor::endVisit( const SubstringBeforeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4830,13 +4788,13 @@
 
 
 // <SubstringAfterIterator>
-void PrinterVisitor::beginVisit ( const SubstringAfterIterator& a) {
+void PrinterVisitor::beginVisit( const SubstringAfterIterator& a) {
   thePrinter.startBeginVisit("SubstringAfterIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SubstringAfterIterator& ) {
+void PrinterVisitor::endVisit( const SubstringAfterIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4844,13 +4802,13 @@
 
 
 // <FnMatchesIterator>
-void PrinterVisitor::beginVisit ( const FnMatchesIterator& a) {
+void PrinterVisitor::beginVisit( const FnMatchesIterator& a) {
   thePrinter.startBeginVisit("FnMatchesIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnMatchesIterator& ) {
+void PrinterVisitor::endVisit( const FnMatchesIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4858,13 +4816,13 @@
 
 
 // <FnReplaceIterator>
-void PrinterVisitor::beginVisit ( const FnReplaceIterator& a) {
+void PrinterVisitor::beginVisit( const FnReplaceIterator& a) {
   thePrinter.startBeginVisit("FnReplaceIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnReplaceIterator& ) {
+void PrinterVisitor::endVisit( const FnReplaceIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4872,13 +4830,13 @@
 
 
 // <FnTokenizeIterator>
-void PrinterVisitor::beginVisit ( const FnTokenizeIterator& a) {
+void PrinterVisitor::beginVisit( const FnTokenizeIterator& a) {
   thePrinter.startBeginVisit("FnTokenizeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnTokenizeIterator& ) {
+void PrinterVisitor::endVisit( const FnTokenizeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4886,13 +4844,13 @@
 
 
 // <FnAnalyzeStringIterator>
-void PrinterVisitor::beginVisit ( const FnAnalyzeStringIterator& a) {
+void PrinterVisitor::beginVisit( const FnAnalyzeStringIterator& a) {
   thePrinter.startBeginVisit("FnAnalyzeStringIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const FnAnalyzeStringIterator& ) {
+void PrinterVisitor::endVisit( const FnAnalyzeStringIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4900,13 +4858,13 @@
 
 
 // <StringAnalyzeStringIterator>
-void PrinterVisitor::beginVisit ( const StringAnalyzeStringIterator& a) {
+void PrinterVisitor::beginVisit( const StringAnalyzeStringIterator& a) {
   thePrinter.startBeginVisit("StringAnalyzeStringIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const StringAnalyzeStringIterator& ) {
+void PrinterVisitor::endVisit( const StringAnalyzeStringIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4914,13 +4872,13 @@
 
 
 // <StringMaterializeIterator>
-void PrinterVisitor::beginVisit ( const StringMaterializeIterator& a) {
+void PrinterVisitor::beginVisit( const StringMaterializeIterator& a) {
   thePrinter.startBeginVisit("StringMaterializeIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const StringMaterializeIterator& ) {
+void PrinterVisitor::endVisit( const StringMaterializeIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4928,13 +4886,13 @@
 
 
 // <StringIsStreamableIterator>
-void PrinterVisitor::beginVisit ( const StringIsStreamableIterator& a) {
+void PrinterVisitor::beginVisit( const StringIsStreamableIterator& a) {
   thePrinter.startBeginVisit("StringIsStreamableIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const StringIsStreamableIterator& ) {
+void PrinterVisitor::endVisit( const StringIsStreamableIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4942,13 +4900,13 @@
 
 
 // <StringIsSeekableIterator>
-void PrinterVisitor::beginVisit ( const StringIsSeekableIterator& a) {
+void PrinterVisitor::beginVisit( const StringIsSeekableIterator& a) {
   thePrinter.startBeginVisit("StringIsSeekableIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const StringIsSeekableIterator& ) {
+void PrinterVisitor::endVisit( const StringIsSeekableIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4956,13 +4914,13 @@
 
 
 // <StringSplitIterator>
-void PrinterVisitor::beginVisit ( const StringSplitIterator& a) {
+void PrinterVisitor::beginVisit( const StringSplitIterator& a) {
   thePrinter.startBeginVisit("StringSplitIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const StringSplitIterator& ) {
+void PrinterVisitor::endVisit( const StringSplitIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4970,13 +4928,13 @@
 
 
 // <DecodeURIIterator>
-void PrinterVisitor::beginVisit ( const DecodeURIIterator& a) {
+void PrinterVisitor::beginVisit( const DecodeURIIterator& a) {
   thePrinter.startBeginVisit("DecodeURIIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const DecodeURIIterator& ) {
+void PrinterVisitor::endVisit( const DecodeURIIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4984,13 +4942,13 @@
 
 
 // <ParseURIIterator>
-void PrinterVisitor::beginVisit ( const ParseURIIterator& a) {
+void PrinterVisitor::beginVisit( const ParseURIIterator& a) {
   thePrinter.startBeginVisit("ParseURIIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const ParseURIIterator& ) {
+void PrinterVisitor::endVisit( const ParseURIIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -4998,13 +4956,13 @@
 
 
 // <SerializeURIIterator>
-void PrinterVisitor::beginVisit ( const SerializeURIIterator& a) {
+void PrinterVisitor::beginVisit( const SerializeURIIterator& a) {
   thePrinter.startBeginVisit("SerializeURIIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const SerializeURIIterator& ) {
+void PrinterVisitor::endVisit( const SerializeURIIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
@@ -5012,17 +4970,17 @@
 
 
 // <XQDocContentIterator>
-void PrinterVisitor::beginVisit ( const XQDocContentIterator& a) {
+void PrinterVisitor::beginVisit( const XQDocContentIterator& a) {
   thePrinter.startBeginVisit("XQDocContentIterator", ++theId);
   printCommons( &a, theId );
   thePrinter.endBeginVisit( theId );
 }
 
-void PrinterVisitor::endVisit ( const XQDocContentIterator& ) {
+void PrinterVisitor::endVisit( const XQDocContentIterator& ) {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();
 }
 // </XQDocContentIterator>
 
 
-}
\ No newline at end of file
+} // namespace zorba
\ No newline at end of file

=== modified file 'src/runtime/visitors/printer_visitor_impl.cpp'
--- src/runtime/visitors/printer_visitor_impl.cpp	2014-02-13 05:30:32 +0000
+++ src/runtime/visitors/printer_visitor_impl.cpp	2014-02-19 00:45:18 +0000
@@ -72,6 +72,50 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
+void PrinterVisitor::print() {
+  thePrinter.start();
+  theIterator->accept(*this);
+  thePrinter.stop();
+}
+
+void PrinterVisitor::printCommons(const PlanIterator* aIter, int theId) {
+  if (! Properties::instance().getNoTreeIDs()) {
+    std::stringstream lStream;
+    if (Properties::instance().getStableIteratorIDs())
+      lStream << theId;
+    else
+      lStream << aIter;
+
+    thePrinter.addAttribute("id", lStream.str());
+  }
+}
+
+void PrinterVisitor::printNameOrKindTest(const AxisIteratorHelper* a) {
+  thePrinter.addAttribute("test kind", toString(a->getTestKind()));
+
+  if (a->getDocTestKind() != match_no_test)
+    thePrinter.addAttribute("doc_test_kind", toString(a->getDocTestKind()));
+
+  if (a->getQName() != 0)
+    thePrinter.addAttribute("qname", a->getQName()->show().str());
+  else
+    thePrinter.addAttribute("qname","*");
+
+  if (a->getType() != 0)
+    thePrinter.addAttribute("typename", a->getType()->toString());
+  else
+    thePrinter.addAttribute("typename","*");
+
+  std::stringstream lStream;
+  lStream << a->nilledAllowed();
+  thePrinter.addAttribute("nill allowed", lStream.str());
+
+  if (a->getTargetPos() >= 0)
+    thePrinter.addAttribute("target_position", ztd::to_string(a->getTargetPos()));
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 #define DEF_END_VISIT(...)                              \
   void PrinterVisitor::endVisit( __VA_ARGS__ const& ) { \
     thePrinter.startEndVisit();                         \
@@ -86,6 +130,25 @@
   }                                                         \
   DEF_END_VISIT(__VA_ARGS__)
 
+#define DEF_NS_VISIT(NS,...)                                    \
+  void PrinterVisitor::beginVisit( NS::__VA_ARGS__ const &i ) { \
+    thePrinter.startBeginVisit( #__VA_ARGS__, ++theId );        \
+    printCommons( &i, theId );                                  \
+    thePrinter.endBeginVisit( theId );                          \
+  }                                                             \
+  DEF_END_VISIT(NS::__VA_ARGS__)
+
+DEF_NS_VISIT( flwor, CountIterator )
+DEF_NS_VISIT( flwor, FLWORIterator )
+DEF_NS_VISIT( flwor, ForIterator )
+DEF_NS_VISIT( flwor, GroupByIterator )
+DEF_NS_VISIT( flwor, LetIterator )
+DEF_NS_VISIT( flwor, OrderByIterator )
+DEF_NS_VISIT( flwor, TupleSourceIterator )
+DEF_NS_VISIT( flwor, TupleStreamIterator )
+DEF_NS_VISIT( flwor, WhereIterator )
+DEF_NS_VISIT( flwor, WindowIterator )
+
 DEF_VISIT( AndIterator )
 DEF_VISIT( ApplyIterator )
 DEF_VISIT( ArgumentPlaceholderIterator )
@@ -105,16 +168,6 @@
 DEF_VISIT( ExitIterator )
 DEF_VISIT( ExtFunctionCallIterator )
 DEF_VISIT( FlowCtlIterator )
-DEF_VISIT( flwor::CountIterator )
-DEF_VISIT( flwor::FLWORIterator )
-DEF_VISIT( flwor::ForIterator )
-DEF_VISIT( flwor::GroupByIterator )
-DEF_VISIT( flwor::LetIterator )
-DEF_VISIT( flwor::OrderByIterator )
-DEF_VISIT( flwor::TupleSourceIterator )
-DEF_VISIT( flwor::TupleStreamIterator )
-DEF_VISIT( flwor::WhereIterator )
-DEF_VISIT( flwor::WindowIterator )
 DEF_VISIT( FnAdjustToTimeZoneIterator_1 )
 DEF_VISIT( FnAdjustToTimeZoneIterator_2 )
 DEF_VISIT( FnBooleanIterator )

=== modified file 'test/iterplans/apitest_args.cpp'
--- test/iterplans/apitest_args.cpp	2014-02-10 05:24:28 +0000
+++ test/iterplans/apitest_args.cpp	2014-02-19 00:45:18 +0000
@@ -426,7 +426,7 @@
     else if ( IS_LONG_OPT( "--print-item-flow" ) )
       z_props.setPrintItemFlow( true );
     else if ( IS_LONG_OPT( "--print-iterator-tree" ) )
-      z_props.setPrintIteratorTree( true );
+      z_props.setPlanFormat( PLAN_FORMAT_XML );
     else if ( IS_LONG_OPT( "--print-locations" ) )
       z_props.setPrintLocations( true );
     else if ( IS_OPT( "--print-optimized", "-P" ) )