zorba-coders team mailing list archive

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

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

Commit message:
Clean-up, mostly visitor-related.

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

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

Clean-up, mostly visitor-related.
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc2/+merge/204147
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-09 19:26:16 +0000
+++ CMakeLists.txt	2014-01-31 01:40:25 +0000
@@ -123,8 +123,7 @@
 CHECK_FUNCTION_EXISTS(pthread_mutex_init          ZORBA_HAVE_PTHREAD_MUTEX)
 SET(CMAKE_REQUIRED_LIBRARIES)  
 
-CHECK_INCLUDE_FILES ("sys/time.h;sys/resource.h"  ZORBA_HAVE_RUSAGE_INCLUDES)
-CHECK_FUNCTION_EXISTS (getrusage                  ZORBA_HAVE_RUSAGE_FUNCTION)
+CHECK_FUNCTION_EXISTS (getrusage                  ZORBA_HAVE_GETRUSAGE)
 
 CHECK_TYPE_SIZE("int32_t" ZORBA_HAVE_INT32_T) 
 CHECK_TYPE_SIZE("uint32_t" ZORBA_HAVE_UINT32_T) 
@@ -229,9 +228,9 @@
 CHECK_LIBRARY_EXISTS(rt clock_gettime ""  _clock_gettime_in_rt)
 IF(_clock_gettime_in_rt)
   SET(requiredlibs ${requiredlibs} rt)
-  SET(ZORBA_HAVE_CLOCKGETTIME_FUNCTION YES CACHE BOOL "Platform has clock_gettime (in librt)")
+  SET(ZORBA_HAVE_CLOCKGETTIME YES CACHE BOOL "Platform has clock_gettime (in librt)")
 ELSE(_clock_gettime_in_rt)
-  CHECK_FUNCTION_EXISTS(clock_gettime   ZORBA_HAVE_CLOCKGETTIME_FUNCTION)
+  CHECK_FUNCTION_EXISTS(clock_gettime ZORBA_HAVE_CLOCKGETTIME)
 ENDIF(_clock_gettime_in_rt)
 
 #

=== modified file 'include/zorba/config.h.cmake'
--- include/zorba/config.h.cmake	2013-11-04 22:21:25 +0000
+++ include/zorba/config.h.cmake	2014-01-31 01:40:25 +0000
@@ -58,8 +58,8 @@
 #cmakedefine ZORBA_HAVE_UUID_H
 
 // Platform functions
-#cmakedefine ZORBA_HAVE_CLOCKGETTIME_FUNCTION
-#cmakedefine ZORBA_HAVE_RUSAGE_FUNCTION
+#cmakedefine ZORBA_HAVE_CLOCKGETTIME
+#cmakedefine ZORBA_HAVE_GETRUSAGE
 #cmakedefine ZORBA_HAVE_STRCAT_S_FUNCTION
 #cmakedefine ZORBA_HAVE_STRCPY_S_FUNCTION
 #cmakedefine ZORBA_HAVE_STRICMP_FUNCTION

=== modified file 'include/zorba/util/time.h'
--- include/zorba/util/time.h	2013-02-07 17:24:36 +0000
+++ include/zorba/util/time.h	2014-01-31 01:40:25 +0000
@@ -49,179 +49,166 @@
  * zorbacmd and the implementation of fn:doc(), so it's not too bad.
  */
 
-namespace zorba 
-{
-
-  namespace time
-  {
-
-    // Large enough to hold number of milliseconds since epoch.
+namespace zorba {
+namespace time {
+
+///////////////////////////////////////////////////////////////////////////////
+
+// Large enough to hold number of milliseconds since epoch.
 #if ZORBA_SIZEOF_LONG <= 4
-    typedef long long msec_type;
+typedef long long msec_type;
 #else
-    typedef long msec_type;
+typedef long msec_type;
 #endif /* ZORBA_SIZEOF_LONG */
 
-    //
-    //
-    // Types and functions for CPU time
-    //
-    //
+//
+//
+// Types and functions for CPU time
+//
+//
 
-#if (defined(ZORBA_HAVE_CLOCKGETTIME_FUNCTION) & defined(_POSIX_CPUTIME))
+#if defined(ZORBA_HAVE_CLOCKGETTIME) && defined(_POSIX_CPUTIME)
 
 #include <time.h>
 
-    typedef struct timespec cputime;
-
-    inline double get_cputime_elapsed (const cputime& t0, const cputime& t1)
-    {
-      return ((t1.tv_sec - t0.tv_sec) * 1000.0) +
-        ((t1.tv_nsec - t0.tv_nsec) / 1000000.0);
-    }
-
-    inline void get_current_cputime (cputime& t)
-    {
-      clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &t);
-    }
-
-#elif defined(ZORBA_HAVE_RUSAGE_FUNCTION)
+typedef struct timespec cputime;
+
+inline double get_cputime_elapsed( cputime const &t0, cputime const &t1 ) {
+  return ((t1.tv_sec - t0.tv_sec) * 1000.0) +
+    ((t1.tv_nsec - t0.tv_nsec) / 1000000.0);
+}
+
+inline void get_current_cputime( cputime &t ) {
+  clock_gettime( CLOCK_PROCESS_CPUTIME_ID, &t );
+}
+
+#elif defined(ZORBA_HAVE_GETRUSAGE)
 
 #include <sys/time.h>
 #include <sys/resource.h>
 
-    typedef struct timeval cputime;
-
-    inline double get_cputime_elapsed (const cputime& t0, const cputime& t1) 
-    {
-      return ((t1.tv_sec - t0.tv_sec) * 1000.0) +
-        ((t1.tv_usec - t0.tv_usec) / 1000.0);
-    }
-
-    inline void get_current_cputime (cputime& t) 
-    {
-      struct rusage ru;
-      getrusage (RUSAGE_SELF, &ru);
-      t = ru.ru_utime;
-    }
+typedef struct timeval cputime;
+
+inline double get_cputime_elapsed( cputime const &t0, cputime const &t1 ) {
+  return ((t1.tv_sec - t0.tv_sec) * 1000.0) +
+    ((t1.tv_usec - t0.tv_usec) / 1000.0);
+}
+
+inline void get_current_cputime( cputime &t ) {
+  struct rusage ru;
+  getrusage( RUSAGE_SELF, &ru );
+  t = ru.ru_utime;
+}
 
 #else /* no rusage, no clock_gettime */
 
 #include <time.h>
 
-    typedef clock_t cputime;
-
-    inline double get_cputime_elapsed (const cputime& t0, const cputime& t1) 
-    {
-      return (double) (t1 - t0) / (CLOCKS_PER_SEC / 1000);
-    }
-
-    inline void get_current_cputime (cputime& t)
-    {
-      t = clock ();
-    }
-
-#endif /* ZORBA_HAVE_CLOCKGETTIME_FUNCTION */
-
-
-    //
-    //
-    // Types and functions for wall-clock time
-    //
-    //
-
-#if defined(ZORBA_HAVE_CLOCKGETTIME_FUNCTION)
+typedef clock_t cputime;
+
+inline double get_cputime_elapsed( cputime const &t0, cputime const &t1 ) {
+  return (double)(t1 - t0) / (CLOCKS_PER_SEC / 1000);
+}
+
+inline void get_current_cputime( cputime &t ) {
+  t = clock();
+}
+
+#endif /* ZORBA_HAVE_CLOCKGETTIME */
+
+///////////////////////////////////////////////////////////////////////////////
+
+//
+//
+// Types and functions for wall-clock time
+//
+//
+
+#if defined(ZORBA_HAVE_CLOCKGETTIME)
 
 #include <time.h>
 
-    typedef struct timespec walltime;
-
-    inline double get_walltime_elapsed (const walltime& t0, const walltime& t1)
-    {
-      return ((t1.tv_sec - t0.tv_sec) * 1000.0) +
-        ((t1.tv_nsec - t0.tv_nsec) / 1000000.0);
-    }
-
-    inline void get_current_walltime (walltime& t)
-    {
+typedef struct timespec walltime;
+
+inline double get_walltime_elapsed( walltime const &t0, walltime const &t1 ) {
+  return ((t1.tv_sec - t0.tv_sec) * 1000.0) +
+    ((t1.tv_nsec - t0.tv_nsec) / 1000000.0);
+}
+
+inline void get_current_walltime( walltime &t ) {
 #ifdef _POSIX_MONOTONIC_CLOCK
-      clock_gettime(CLOCK_MONOTONIC, &t);
+  clock_gettime( CLOCK_MONOTONIC, &t );
 #else
-      clock_gettime(CLOCK_REALTIME, &t);
+  clock_gettime( CLOCK_REALTIME, &t );
 #endif /* _POSIX_MONOTONIC_CLOCK */
-    }
+}
 
-    inline msec_type get_walltime_in_millis(const walltime& t)
-    {
-      return t.tv_sec * (msec_type)1000 + t.tv_nsec / 1000000;
-    }
+inline msec_type get_walltime_in_millis( walltime const &t ) {
+  return t.tv_sec * (msec_type)1000 + t.tv_nsec / 1000000;
+}
 
 #elif defined(WIN32)
 
-    // TODO: Should maybe use QueryPerformanceCounter() or
-    // GetSystemTimeAsFileTime() for this, rather than ftime(), but I
-    // don't know enough about any of these alternatives to choose
-    // one. See http://msdn.microsoft.com/en-us/magazine/cc163996.aspx .
+// TODO: Should maybe use QueryPerformanceCounter() or
+// GetSystemTimeAsFileTime() for this, rather than ftime(), but I
+// don't know enough about any of these alternatives to choose
+// one. See http://msdn.microsoft.com/en-us/magazine/cc163996.aspx .
 
 #include <sys/timeb.h>
 
 #ifdef WINCE
-    typedef struct timeb walltime;
+typedef struct timeb walltime;
 #else
-    typedef struct _timeb walltime;
+typedef struct _timeb walltime;
 #endif /* WINCE */
 
-    inline double get_walltime_elapsed (const walltime& t0, const walltime& t1) 
-    {
-      return ((t1.time - t0.time) * 1000.0) + (t1.millitm - t0.millitm);
-    }
+inline double get_walltime_elapsed(walltime const &t0, walltime const &t1 ) {
+  return ((t1.time - t0.time) * 1000.0) + (t1.millitm - t0.millitm);
+}
 
-    inline void get_current_walltime (walltime& t) 
-    {
+inline void get_current_walltime( walltime &t ) {
 #ifdef WINCE
-      ftime(&t);
+  ftime( &t );
 #else
-      _ftime_s(&t);
+  _ftime_s( &t );
 #endif /* WINCE */
-    }
-	
-    inline msec_type get_walltime_in_millis(const walltime& t)
-    {
-      return t.time * (msec_type)1000 + t.millitm;
-    }
+}
+
+inline msec_type get_walltime_in_millis( walltime const &t ) {
+  return t.time * (msec_type)1000 + t.millitm;
+}
 
 #else /* not Windows, and no clock_gettime() */
 
 #include <time.h>
 #include <sys/time.h>
 
-    typedef struct timeval walltime;
-
-    inline double get_walltime_elapsed (const walltime& t0, const walltime& t1) 
-    {
-      return ((t1.tv_sec - t0.tv_sec) * 1000.0) +
-        ((t1.tv_usec - t0.tv_usec) / 1000.0);
-    }
-
-    inline void get_current_walltime (walltime& t)
-    {
-      gettimeofday(&t, NULL);
-    }
-	
-    inline msec_type get_walltime_in_millis(const walltime& t)
-    {
-      return t.tv_sec * (msec_type)1000 + t.tv_usec / 1000;
-    }
-
-#endif /* ZORBA_HAVE_CLOCKGETTIME_FUNCTION */
-
-  } // namespace time
-} // namesace zorba
+typedef struct timeval walltime;
+
+inline double get_walltime_elapsed( walltime const &t0, walltime const &t1 ) {
+  return ((t1.tv_sec - t0.tv_sec) * 1000.0) +
+    ((t1.tv_usec - t0.tv_usec) / 1000.0);
+}
+
+inline void get_current_walltime( walltime &t ) {
+  gettimeofday( &t, NULL );
+}
+
+inline msec_type get_walltime_in_millis( walltime const &t ) {
+  return t.tv_sec * (msec_type)1000 + t.tv_usec / 1000;
+}
+
+#endif /* ZORBA_HAVE_CLOCKGETTIME */
+
+///////////////////////////////////////////////////////////////////////////////
+
+} // namespace time
+} // namespace zorba
 
 #endif /* ZORBA_UTIL_TIME_H */
 /*
- * Local variables:
- * mode: c++
- * End:
- */
+* Local variables:
+* mode: c++
+* End:
+*/
 /* vim:set et sw=2 ts=2: */

=== modified file 'include/zorba/util/timer.h'
--- include/zorba/util/timer.h	2013-02-07 17:24:36 +0000
+++ include/zorba/util/timer.h	2014-01-31 01:40:25 +0000
@@ -19,41 +19,40 @@
 
 #include <zorba/util/time.h>
 
-namespace zorba
-{
-
-  namespace time
-  {
-
-    class Timer {
-    public:
-      void start() {
-        get_current_walltime(theStart);
-      }
-
-      double elapsed() const {
-        walltime lEnd;
-        get_current_walltime(lEnd);
-        return get_walltime_elapsed(theStart, lEnd);
-      }
-
-      time::msec_type getStart() const {
-        return get_walltime_in_millis(theStart);
-      }
-
-    private:
-      walltime theStart;
-    };
-
-  }
-
-}
-
-#endif
-
+namespace zorba {
+namespace time {
+
+///////////////////////////////////////////////////////////////////////////////
+
+class Timer {
+public:
+  void start() {
+    get_current_walltime(theStart);
+  }
+
+  double elapsed() const {
+    walltime lEnd;
+    get_current_walltime(lEnd);
+    return get_walltime_elapsed(theStart, lEnd);
+  }
+
+  time::msec_type getStart() const {
+    return get_walltime_in_millis(theStart);
+  }
+
+private:
+  walltime theStart;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+} // namespace time
+} // namespace zorba
+
+#endif /* ZORBA_UTIL_TIMER_H */
 /*
- * Local variables:
- * mode: c++
- * End:
- */
+* Local variables:
+* mode: c++
+* End:
+*/
 /* vim:set et sw=2 ts=2: */

=== modified file 'include/zorba/xquery.h'
--- include/zorba/xquery.h	2013-07-01 18:59:06 +0000
+++ include/zorba/xquery.h	2014-01-31 01:40:25 +0000
@@ -49,14 +49,6 @@
 {
  public:
   /** 
-   * \brief Destructor.
-   * 
-   * The destructor is called automatically when there are no more XQuery_t
-   * smart pointers pointing to this XQuery instance.
-   */
-  virtual ~XQuery() {}
-
-  /** 
    * \brief Set the filename of a query.
    *
    * This (after URI-encoding) becomes the encapsulating entity's retrieval URI
@@ -435,25 +427,7 @@
    */
   virtual bool
   isDebugMode() const = 0;
-#endif
-  
-  /** 
-   * \brief Set the filename of the profile
-   *
-   * This file will contain the output of Zorba profiler.
-   */
-  virtual void
-  setProfileName(std::string aProfileName) = 0;
-  
-  /**
-   * \brief Get the filename of the profile
-   *
-   * This file will contain the output of Zorba profiler.
-   */
-  virtual std::string
-  getProfileName() const = 0;
-  
-#ifdef ZORBA_WITH_DEBUGGER
+  
   /**
    * \brief Start a debugger server.
    *
@@ -503,7 +477,7 @@
     Zorba_SerializerOptions& serOptions,
     const std::string& host,
     unsigned short port) = 0;
-#endif
+#endif /* ZORBA_WITH_DEBUGGER */
 
   /** \brief Returns a CollectionManager responsible for all collections
    * which are statically declared in the static context of this query

=== modified file 'src/api/xqueryimpl.cpp'
--- src/api/xqueryimpl.cpp	2013-09-17 21:12:49 +0000
+++ src/api/xqueryimpl.cpp	2014-01-31 01:40:25 +0000
@@ -153,7 +153,6 @@
 #ifdef ZORBA_WITH_DEBUGGER
   theIsDebugMode(false),
 #endif
-  theProfileName("xquery_profile.out"),
   theCollMgr(0)
 {
   // TODO ideally, we will have to move the error handler into the error manager
@@ -295,28 +294,6 @@
 
 
 /*******************************************************************************
-
-********************************************************************************/
-void XQueryImpl::setProfileName(std::string aProfileName)
-{
-  SYNC_CODE(AutoMutex lock(&theMutex);)
-
-#ifdef ZORBA_WITH_DEBUGGER
-  checkIsDebugMode();
-#endif
-  theProfileName = aProfileName;
-}
-
-
-std::string XQueryImpl::getProfileName() const
-{
-  SYNC_CODE(AutoMutex lock(&theMutex);)
-
-  return theProfileName;
-}
-
-
-/*******************************************************************************
   Make the given user-provided error handler the error handler of this query
 ********************************************************************************/
 void XQueryImpl::registerDiagnosticHandler(DiagnosticHandler* aDiagnosticHandler)

=== modified file 'src/api/xqueryimpl.h'
--- src/api/xqueryimpl.h	2013-06-27 15:54:27 +0000
+++ src/api/xqueryimpl.h	2014-01-31 01:40:25 +0000
@@ -131,8 +131,6 @@
 
   - theIsDebugMode :
 
-  - theProfileName :
-
   - theStaticCollectionMgr : 
   StaticCollectionManager object for all statically declared collections in this 
   query or any transitively imported module. It's created lazily upon request 
@@ -208,7 +206,6 @@
 #ifdef ZORBA_WITH_DEBUGGER
   bool                               theIsDebugMode;
 #endif
-  std::string                        theProfileName;
 
   mutable StaticCollectionManagerSetImpl* theCollMgr;
 
@@ -238,10 +235,6 @@
   bool isDebugMode() const;
 #endif
 
-  void setProfileName(std::string aProfileName);
-
-  std::string getProfileName() const;
-
   void registerDiagnosticHandler(DiagnosticHandler*);
 
   DiagnosticHandler* getRegisteredDiagnosticHandler();

=== modified file 'src/functions/pregenerated/func_accessors.cpp'
--- src/functions/pregenerated/func_accessors.cpp	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_accessors.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/accessors/accessors.h"
 #include "functions/func_accessors.h"

=== modified file 'src/functions/pregenerated/func_accessors.h'
--- src/functions/pregenerated/func_accessors.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_accessors.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_ACCESSORS_H
 #define ZORBA_FUNCTIONS_ACCESSORS_H
 

=== modified file 'src/functions/pregenerated/func_any_uri.cpp'
--- src/functions/pregenerated/func_any_uri.cpp	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_any_uri.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/any_uri/any_uri.h"
 #include "functions/func_any_uri.h"

=== modified file 'src/functions/pregenerated/func_any_uri.h'
--- src/functions/pregenerated/func_any_uri.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_any_uri.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_ANY_URI_H
 #define ZORBA_FUNCTIONS_ANY_URI_H
 

=== modified file 'src/functions/pregenerated/func_base64.cpp'
--- src/functions/pregenerated/func_base64.cpp	2013-07-17 07:20:31 +0000
+++ src/functions/pregenerated/func_base64.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/base64/base64.h"
 #include "functions/func_base64.h"

=== modified file 'src/functions/pregenerated/func_base64.h'
--- src/functions/pregenerated/func_base64.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_base64.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_BASE64_H
 #define ZORBA_FUNCTIONS_BASE64_H
 

=== modified file 'src/functions/pregenerated/func_booleans.cpp'
--- src/functions/pregenerated/func_booleans.cpp	2013-08-09 09:20:54 +0000
+++ src/functions/pregenerated/func_booleans.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/booleans/booleans.h"
 #include "functions/func_booleans.h"

=== modified file 'src/functions/pregenerated/func_booleans.h'
--- src/functions/pregenerated/func_booleans.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_booleans.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_BOOLEANS_H
 #define ZORBA_FUNCTIONS_BOOLEANS_H
 

=== modified file 'src/functions/pregenerated/func_collections.cpp'
--- src/functions/pregenerated/func_collections.cpp	2013-10-08 16:55:17 +0000
+++ src/functions/pregenerated/func_collections.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/collections/collections.h"
 #include "functions/func_collections.h"

=== modified file 'src/functions/pregenerated/func_collections.h'
--- src/functions/pregenerated/func_collections.h	2013-10-08 16:55:17 +0000
+++ src/functions/pregenerated/func_collections.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_COLLECTIONS_H
 #define ZORBA_FUNCTIONS_COLLECTIONS_H
 

=== modified file 'src/functions/pregenerated/func_context.cpp'
--- src/functions/pregenerated/func_context.cpp	2013-03-12 19:25:07 +0000
+++ src/functions/pregenerated/func_context.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/context/context.h"
 #include "functions/func_context.h"

=== modified file 'src/functions/pregenerated/func_context.h'
--- src/functions/pregenerated/func_context.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_context.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_CONTEXT_H
 #define ZORBA_FUNCTIONS_CONTEXT_H
 

=== modified file 'src/functions/pregenerated/func_csv.cpp'
--- src/functions/pregenerated/func_csv.cpp	2013-08-28 04:15:48 +0000
+++ src/functions/pregenerated/func_csv.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/csv/csv.h"
 #include "functions/func_csv.h"

=== modified file 'src/functions/pregenerated/func_csv.h'
--- src/functions/pregenerated/func_csv.h	2013-08-21 23:52:57 +0000
+++ src/functions/pregenerated/func_csv.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_CSV_H
 #define ZORBA_FUNCTIONS_CSV_H
 

=== modified file 'src/functions/pregenerated/func_datetime.cpp'
--- src/functions/pregenerated/func_datetime.cpp	2013-06-25 23:31:11 +0000
+++ src/functions/pregenerated/func_datetime.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/datetime/datetime.h"
 #include "functions/func_datetime.h"

=== modified file 'src/functions/pregenerated/func_datetime.h'
--- src/functions/pregenerated/func_datetime.h	2013-08-02 19:15:22 +0000
+++ src/functions/pregenerated/func_datetime.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_DATETIME_H
 #define ZORBA_FUNCTIONS_DATETIME_H
 

=== modified file 'src/functions/pregenerated/func_debug_iterator.cpp'
--- src/functions/pregenerated/func_debug_iterator.cpp	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_debug_iterator.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/debug/debug_iterator.h"
 #include "functions/func_debug_iterator.h"

=== modified file 'src/functions/pregenerated/func_debug_iterator.h'
--- src/functions/pregenerated/func_debug_iterator.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_debug_iterator.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_DEBUG_ITERATOR_H
 #define ZORBA_FUNCTIONS_DEBUG_ITERATOR_H
 

=== modified file 'src/functions/pregenerated/func_documents.cpp'
--- src/functions/pregenerated/func_documents.cpp	2013-10-09 14:47:14 +0000
+++ src/functions/pregenerated/func_documents.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/store/documents.h"
 #include "functions/func_documents.h"

=== modified file 'src/functions/pregenerated/func_documents.h'
--- src/functions/pregenerated/func_documents.h	2013-10-09 14:47:14 +0000
+++ src/functions/pregenerated/func_documents.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_DOCUMENTS_H
 #define ZORBA_FUNCTIONS_DOCUMENTS_H
 

=== modified file 'src/functions/pregenerated/func_durations_dates_times.cpp'
--- src/functions/pregenerated/func_durations_dates_times.cpp	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_durations_dates_times.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/durations_dates_times/durations_dates_times.h"
 #include "functions/func_durations_dates_times.h"

=== modified file 'src/functions/pregenerated/func_durations_dates_times.h'
--- src/functions/pregenerated/func_durations_dates_times.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_durations_dates_times.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_DURATIONS_DATES_TIMES_H
 #define ZORBA_FUNCTIONS_DURATIONS_DATES_TIMES_H
 

=== modified file 'src/functions/pregenerated/func_errors_and_diagnostics.cpp'
--- src/functions/pregenerated/func_errors_and_diagnostics.cpp	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_errors_and_diagnostics.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/errors_and_diagnostics/errors_and_diagnostics.h"
 #include "functions/func_errors_and_diagnostics.h"

=== modified file 'src/functions/pregenerated/func_errors_and_diagnostics.h'
--- src/functions/pregenerated/func_errors_and_diagnostics.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_errors_and_diagnostics.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_ERRORS_AND_DIAGNOSTICS_H
 #define ZORBA_FUNCTIONS_ERRORS_AND_DIAGNOSTICS_H
 

=== modified file 'src/functions/pregenerated/func_fetch.cpp'
--- src/functions/pregenerated/func_fetch.cpp	2013-10-16 21:47:22 +0000
+++ src/functions/pregenerated/func_fetch.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/fetch/fetch.h"
 #include "functions/func_fetch.h"

=== modified file 'src/functions/pregenerated/func_fetch.h'
--- src/functions/pregenerated/func_fetch.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_fetch.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_FETCH_H
 #define ZORBA_FUNCTIONS_FETCH_H
 

=== modified file 'src/functions/pregenerated/func_fn_hof_functions.cpp'
--- src/functions/pregenerated/func_fn_hof_functions.cpp	2013-08-09 09:20:54 +0000
+++ src/functions/pregenerated/func_fn_hof_functions.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/hof/fn_hof_functions.h"
 #include "functions/func_fn_hof_functions.h"

=== modified file 'src/functions/pregenerated/func_fn_hof_functions.h'
--- src/functions/pregenerated/func_fn_hof_functions.h	2013-06-04 21:47:40 +0000
+++ src/functions/pregenerated/func_fn_hof_functions.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_FN_HOF_FUNCTIONS_H
 #define ZORBA_FUNCTIONS_FN_HOF_FUNCTIONS_H
 

=== modified file 'src/functions/pregenerated/func_fnput.cpp'
--- src/functions/pregenerated/func_fnput.cpp	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_fnput.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/fnput/fnput.h"
 #include "functions/func_fnput.h"

=== modified file 'src/functions/pregenerated/func_fnput.h'
--- src/functions/pregenerated/func_fnput.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_fnput.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_FNPUT_H
 #define ZORBA_FUNCTIONS_FNPUT_H
 

=== modified file 'src/functions/pregenerated/func_ft_module.cpp'
--- src/functions/pregenerated/func_ft_module.cpp	2013-06-26 20:20:02 +0000
+++ src/functions/pregenerated/func_ft_module.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/full_text/ft_module.h"
 #include "functions/func_ft_module.h"

=== modified file 'src/functions/pregenerated/func_ft_module.h'
--- src/functions/pregenerated/func_ft_module.h	2013-06-26 00:10:23 +0000
+++ src/functions/pregenerated/func_ft_module.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_FT_MODULE_H
 #define ZORBA_FUNCTIONS_FT_MODULE_H
 

=== modified file 'src/functions/pregenerated/func_ic_ddl.cpp'
--- src/functions/pregenerated/func_ic_ddl.cpp	2013-10-10 02:19:44 +0000
+++ src/functions/pregenerated/func_ic_ddl.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/indexing/ic_ddl.h"
 #include "functions/func_ic_ddl.h"

=== modified file 'src/functions/pregenerated/func_ic_ddl.h'
--- src/functions/pregenerated/func_ic_ddl.h	2013-10-10 02:19:44 +0000
+++ src/functions/pregenerated/func_ic_ddl.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_IC_DDL_H
 #define ZORBA_FUNCTIONS_IC_DDL_H
 

=== modified file 'src/functions/pregenerated/func_index_func.cpp'
--- src/functions/pregenerated/func_index_func.cpp	2013-10-08 00:48:47 +0000
+++ src/functions/pregenerated/func_index_func.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/indexing/index_func.h"
 #include "functions/func_index_func.h"

=== modified file 'src/functions/pregenerated/func_index_func.h'
--- src/functions/pregenerated/func_index_func.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_index_func.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_INDEX_FUNC_H
 #define ZORBA_FUNCTIONS_INDEX_FUNC_H
 

=== modified file 'src/functions/pregenerated/func_item.cpp'
--- src/functions/pregenerated/func_item.cpp	2013-08-07 07:58:14 +0000
+++ src/functions/pregenerated/func_item.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/item/item.h"
 #include "functions/func_item.h"

=== modified file 'src/functions/pregenerated/func_item.h'
--- src/functions/pregenerated/func_item.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_item.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_ITEM_H
 #define ZORBA_FUNCTIONS_ITEM_H
 

=== modified file 'src/functions/pregenerated/func_json.cpp'
--- src/functions/pregenerated/func_json.cpp	2013-07-26 23:11:56 +0000
+++ src/functions/pregenerated/func_json.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/json/json.h"
 #include "functions/func_json.h"

=== modified file 'src/functions/pregenerated/func_json.h'
--- src/functions/pregenerated/func_json.h	2013-07-26 05:36:22 +0000
+++ src/functions/pregenerated/func_json.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_JSON_H
 #define ZORBA_FUNCTIONS_JSON_H
 

=== modified file 'src/functions/pregenerated/func_jsoniq_functions.cpp'
--- src/functions/pregenerated/func_jsoniq_functions.cpp	2013-08-21 10:25:42 +0000
+++ src/functions/pregenerated/func_jsoniq_functions.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/json/jsoniq_functions.h"
 #include "functions/func_jsoniq_functions.h"

=== modified file 'src/functions/pregenerated/func_jsoniq_functions.h'
--- src/functions/pregenerated/func_jsoniq_functions.h	2013-08-16 13:00:06 +0000
+++ src/functions/pregenerated/func_jsoniq_functions.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_JSONIQ_FUNCTIONS_H
 #define ZORBA_FUNCTIONS_JSONIQ_FUNCTIONS_H
 

=== modified file 'src/functions/pregenerated/func_jsound.cpp'
--- src/functions/pregenerated/func_jsound.cpp	2013-12-18 23:30:52 +0000
+++ src/functions/pregenerated/func_jsound.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/jsound/jsound.h"
 #include "functions/func_jsound.h"

=== modified file 'src/functions/pregenerated/func_jsound.h'
--- src/functions/pregenerated/func_jsound.h	2013-12-18 01:08:17 +0000
+++ src/functions/pregenerated/func_jsound.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_JSOUND_H
 #define ZORBA_FUNCTIONS_JSOUND_H
 

=== modified file 'src/functions/pregenerated/func_maps.cpp'
--- src/functions/pregenerated/func_maps.cpp	2013-08-24 23:38:45 +0000
+++ src/functions/pregenerated/func_maps.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/store/maps.h"
 #include "functions/func_maps.h"

=== modified file 'src/functions/pregenerated/func_maps.h'
--- src/functions/pregenerated/func_maps.h	2013-08-24 23:38:45 +0000
+++ src/functions/pregenerated/func_maps.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_MAPS_H
 #define ZORBA_FUNCTIONS_MAPS_H
 

=== modified file 'src/functions/pregenerated/func_maths.cpp'
--- src/functions/pregenerated/func_maths.cpp	2013-07-17 07:46:29 +0000
+++ src/functions/pregenerated/func_maths.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/maths/maths.h"
 #include "functions/func_maths.h"

=== modified file 'src/functions/pregenerated/func_maths.h'
--- src/functions/pregenerated/func_maths.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_maths.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_MATHS_H
 #define ZORBA_FUNCTIONS_MATHS_H
 

=== modified file 'src/functions/pregenerated/func_node_position.cpp'
--- src/functions/pregenerated/func_node_position.cpp	2013-07-04 22:17:19 +0000
+++ src/functions/pregenerated/func_node_position.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/nodes/node_position.h"
 #include "functions/func_node_position.h"

=== modified file 'src/functions/pregenerated/func_node_position.h'
--- src/functions/pregenerated/func_node_position.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_node_position.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_NODE_POSITION_H
 #define ZORBA_FUNCTIONS_NODE_POSITION_H
 

=== modified file 'src/functions/pregenerated/func_nodes.cpp'
--- src/functions/pregenerated/func_nodes.cpp	2013-08-07 08:34:01 +0000
+++ src/functions/pregenerated/func_nodes.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/nodes/nodes.h"
 #include "functions/func_nodes.h"

=== modified file 'src/functions/pregenerated/func_nodes.h'
--- src/functions/pregenerated/func_nodes.h	2013-07-24 08:12:12 +0000
+++ src/functions/pregenerated/func_nodes.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_NODES_H
 #define ZORBA_FUNCTIONS_NODES_H
 

=== modified file 'src/functions/pregenerated/func_numerics.cpp'
--- src/functions/pregenerated/func_numerics.cpp	2013-03-15 08:22:41 +0000
+++ src/functions/pregenerated/func_numerics.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/numerics/numerics.h"
 #include "functions/func_numerics.h"

=== modified file 'src/functions/pregenerated/func_numerics.h'
--- src/functions/pregenerated/func_numerics.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_numerics.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_NUMERICS_H
 #define ZORBA_FUNCTIONS_NUMERICS_H
 

=== modified file 'src/functions/pregenerated/func_other_diagnostics.cpp'
--- src/functions/pregenerated/func_other_diagnostics.cpp	2013-08-09 09:20:54 +0000
+++ src/functions/pregenerated/func_other_diagnostics.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/errors_and_diagnostics/other_diagnostics.h"
 #include "functions/func_other_diagnostics.h"

=== modified file 'src/functions/pregenerated/func_other_diagnostics.h'
--- src/functions/pregenerated/func_other_diagnostics.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_other_diagnostics.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_OTHER_DIAGNOSTICS_H
 #define ZORBA_FUNCTIONS_OTHER_DIAGNOSTICS_H
 

=== modified file 'src/functions/pregenerated/func_parse_fragment.cpp'
--- src/functions/pregenerated/func_parse_fragment.cpp	2013-07-24 09:06:02 +0000
+++ src/functions/pregenerated/func_parse_fragment.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/parsing_and_serializing/parse_fragment.h"
 #include "functions/func_parse_fragment.h"

=== modified file 'src/functions/pregenerated/func_parse_fragment.h'
--- src/functions/pregenerated/func_parse_fragment.h	2013-03-06 07:39:18 +0000
+++ src/functions/pregenerated/func_parse_fragment.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_PARSE_FRAGMENT_H
 #define ZORBA_FUNCTIONS_PARSE_FRAGMENT_H
 

=== modified file 'src/functions/pregenerated/func_parsing_and_serializing.cpp'
--- src/functions/pregenerated/func_parsing_and_serializing.cpp	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_parsing_and_serializing.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/parsing_and_serializing/parsing_and_serializing.h"
 #include "functions/func_parsing_and_serializing.h"

=== modified file 'src/functions/pregenerated/func_parsing_and_serializing.h'
--- src/functions/pregenerated/func_parsing_and_serializing.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_parsing_and_serializing.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_PARSING_AND_SERIALIZING_H
 #define ZORBA_FUNCTIONS_PARSING_AND_SERIALIZING_H
 

=== modified file 'src/functions/pregenerated/func_qnames.cpp'
--- src/functions/pregenerated/func_qnames.cpp	2013-08-09 09:20:54 +0000
+++ src/functions/pregenerated/func_qnames.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/qnames/qnames.h"
 #include "functions/func_qnames.h"

=== modified file 'src/functions/pregenerated/func_qnames.h'
--- src/functions/pregenerated/func_qnames.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_qnames.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_QNAMES_H
 #define ZORBA_FUNCTIONS_QNAMES_H
 

=== modified file 'src/functions/pregenerated/func_random.cpp'
--- src/functions/pregenerated/func_random.cpp	2013-08-09 09:11:03 +0000
+++ src/functions/pregenerated/func_random.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/random/random.h"
 #include "functions/func_random.h"

=== modified file 'src/functions/pregenerated/func_random.h'
--- src/functions/pregenerated/func_random.h	2013-12-19 19:35:20 +0000
+++ src/functions/pregenerated/func_random.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_RANDOM_H
 #define ZORBA_FUNCTIONS_RANDOM_H
 

=== modified file 'src/functions/pregenerated/func_reference.cpp'
--- src/functions/pregenerated/func_reference.cpp	2013-07-24 07:29:14 +0000
+++ src/functions/pregenerated/func_reference.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/reference/reference.h"
 #include "functions/func_reference.h"

=== modified file 'src/functions/pregenerated/func_reference.h'
--- src/functions/pregenerated/func_reference.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_reference.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_REFERENCE_H
 #define ZORBA_FUNCTIONS_REFERENCE_H
 

=== modified file 'src/functions/pregenerated/func_schema.cpp'
--- src/functions/pregenerated/func_schema.cpp	2013-09-19 01:09:27 +0000
+++ src/functions/pregenerated/func_schema.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/schema/schema.h"
 #include "functions/func_schema.h"

=== modified file 'src/functions/pregenerated/func_schema.h'
--- src/functions/pregenerated/func_schema.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_schema.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_SCHEMA_H
 #define ZORBA_FUNCTIONS_SCHEMA_H
 

=== modified file 'src/functions/pregenerated/func_sctx.cpp'
--- src/functions/pregenerated/func_sctx.cpp	2013-10-01 03:25:43 +0000
+++ src/functions/pregenerated/func_sctx.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/sctx/sctx.h"
 #include "functions/func_sctx.h"

=== modified file 'src/functions/pregenerated/func_sctx.h'
--- src/functions/pregenerated/func_sctx.h	2013-10-01 03:25:43 +0000
+++ src/functions/pregenerated/func_sctx.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_SCTX_H
 #define ZORBA_FUNCTIONS_SCTX_H
 

=== modified file 'src/functions/pregenerated/func_seq.cpp'
--- src/functions/pregenerated/func_seq.cpp	2013-10-01 23:33:19 +0000
+++ src/functions/pregenerated/func_seq.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/seq/seq.h"
 #include "functions/func_seq.h"

=== modified file 'src/functions/pregenerated/func_seq.h'
--- src/functions/pregenerated/func_seq.h	2013-10-01 23:33:19 +0000
+++ src/functions/pregenerated/func_seq.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_SEQ_H
 #define ZORBA_FUNCTIONS_SEQ_H
 

=== modified file 'src/functions/pregenerated/func_sequences.cpp'
--- src/functions/pregenerated/func_sequences.cpp	2013-08-09 09:20:54 +0000
+++ src/functions/pregenerated/func_sequences.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/sequences/sequences.h"
 #include "functions/func_sequences.h"

=== modified file 'src/functions/pregenerated/func_sequences.h'
--- src/functions/pregenerated/func_sequences.h	2014-01-02 16:15:07 +0000
+++ src/functions/pregenerated/func_sequences.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_SEQUENCES_H
 #define ZORBA_FUNCTIONS_SEQUENCES_H
 

=== modified file 'src/functions/pregenerated/func_strings.cpp'
--- src/functions/pregenerated/func_strings.cpp	2013-09-24 00:48:42 +0000
+++ src/functions/pregenerated/func_strings.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/strings/strings.h"
 #include "functions/func_strings.h"

=== modified file 'src/functions/pregenerated/func_strings.h'
--- src/functions/pregenerated/func_strings.h	2013-09-21 01:27:53 +0000
+++ src/functions/pregenerated/func_strings.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_STRINGS_H
 #define ZORBA_FUNCTIONS_STRINGS_H
 

=== modified file 'src/functions/pregenerated/func_uris.cpp'
--- src/functions/pregenerated/func_uris.cpp	2013-10-15 23:27:57 +0000
+++ src/functions/pregenerated/func_uris.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/uris/uris.h"
 #include "functions/func_uris.h"

=== modified file 'src/functions/pregenerated/func_uris.h'
--- src/functions/pregenerated/func_uris.h	2013-04-12 21:25:35 +0000
+++ src/functions/pregenerated/func_uris.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_URIS_H
 #define ZORBA_FUNCTIONS_URIS_H
 

=== modified file 'src/functions/pregenerated/func_xqdoc.cpp'
--- src/functions/pregenerated/func_xqdoc.cpp	2013-10-07 23:26:13 +0000
+++ src/functions/pregenerated/func_xqdoc.cpp	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #include "stdafx.h"
 #include "runtime/xqdoc/xqdoc.h"
 #include "functions/func_xqdoc.h"

=== modified file 'src/functions/pregenerated/func_xqdoc.h'
--- src/functions/pregenerated/func_xqdoc.h	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_xqdoc.h	2014-01-31 01:40:25 +0000
@@ -22,6 +22,7 @@
 // ******************************************
 
 
+
 #ifndef ZORBA_FUNCTIONS_XQDOC_H
 #define ZORBA_FUNCTIONS_XQDOC_H
 

=== modified file 'src/functions/pregenerated/function_enum.h'
--- src/functions/pregenerated/function_enum.h	2013-12-18 23:30:52 +0000
+++ src/functions/pregenerated/function_enum.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
   FN_NODE_NAME_0,
   FN_NODE_NAME_1,
   FN_NILLED_0,

=== modified file 'src/runtime/accessors/pregenerated/accessors.cpp'
--- src/runtime/accessors/pregenerated/accessors.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/accessors/pregenerated/accessors.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/accessors/pregenerated/accessors.h'
--- src/runtime/accessors/pregenerated/accessors.h	2013-03-05 23:11:50 +0000
+++ src/runtime/accessors/pregenerated/accessors.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_ACCESSORS_ACCESSORS_H
 #define ZORBA_RUNTIME_ACCESSORS_ACCESSORS_H
 

=== modified file 'src/runtime/any_uri/pregenerated/any_uri.cpp'
--- src/runtime/any_uri/pregenerated/any_uri.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/any_uri/pregenerated/any_uri.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/any_uri/pregenerated/any_uri.h'
--- src/runtime/any_uri/pregenerated/any_uri.h	2013-03-05 23:11:50 +0000
+++ src/runtime/any_uri/pregenerated/any_uri.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_ANY_URI_ANY_URI_H
 #define ZORBA_RUNTIME_ANY_URI_ANY_URI_H
 

=== modified file 'src/runtime/base/plan_iterator.h'
--- src/runtime/base/plan_iterator.h	2013-08-16 13:00:06 +0000
+++ src/runtime/base/plan_iterator.h	2014-01-31 01:40:25 +0000
@@ -178,11 +178,6 @@
   {
   }
 
-  /*
-   * It is invoked by the closeImpl() method of each iterator.
-   */
-  ~PlanIteratorState() {}
-
   void setDuffsLine(uint32_t v) { theDuffsLine = v; }
 
   uint32_t getDuffsLine() const { return theDuffsLine; }

=== modified file 'src/runtime/base64/pregenerated/base64.cpp'
--- src/runtime/base64/pregenerated/base64.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/base64/pregenerated/base64.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/base64/pregenerated/base64.h'
--- src/runtime/base64/pregenerated/base64.h	2013-03-05 23:11:50 +0000
+++ src/runtime/base64/pregenerated/base64.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_BASE64_BASE64_H
 #define ZORBA_RUNTIME_BASE64_BASE64_H
 

=== modified file 'src/runtime/booleans/pregenerated/booleans.cpp'
--- src/runtime/booleans/pregenerated/booleans.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/booleans/pregenerated/booleans.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/booleans/pregenerated/booleans.h'
--- src/runtime/booleans/pregenerated/booleans.h	2013-03-05 23:11:50 +0000
+++ src/runtime/booleans/pregenerated/booleans.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_BOOLEANS_BOOLEANS_H
 #define ZORBA_RUNTIME_BOOLEANS_BOOLEANS_H
 

=== modified file 'src/runtime/collections/pregenerated/collections.cpp'
--- src/runtime/collections/pregenerated/collections.cpp	2013-10-08 00:48:47 +0000
+++ src/runtime/collections/pregenerated/collections.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/collections/pregenerated/collections.h'
--- src/runtime/collections/pregenerated/collections.h	2013-10-08 11:34:38 +0000
+++ src/runtime/collections/pregenerated/collections.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_COLLECTIONS_COLLECTIONS_H
 #define ZORBA_RUNTIME_COLLECTIONS_COLLECTIONS_H
 

=== modified file 'src/runtime/context/pregenerated/context.cpp'
--- src/runtime/context/pregenerated/context.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/context/pregenerated/context.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/context/pregenerated/context.h'
--- src/runtime/context/pregenerated/context.h	2013-03-05 23:11:50 +0000
+++ src/runtime/context/pregenerated/context.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_CONTEXT_CONTEXT_H
 #define ZORBA_RUNTIME_CONTEXT_CONTEXT_H
 

=== modified file 'src/runtime/csv/pregenerated/csv.cpp'
--- src/runtime/csv/pregenerated/csv.cpp	2013-08-27 23:56:50 +0000
+++ src/runtime/csv/pregenerated/csv.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/csv/pregenerated/csv.h'
--- src/runtime/csv/pregenerated/csv.h	2013-12-27 15:11:16 +0000
+++ src/runtime/csv/pregenerated/csv.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_CSV_CSV_H
 #define ZORBA_RUNTIME_CSV_CSV_H
 

=== modified file 'src/runtime/datetime/pregenerated/datetime.cpp'
--- src/runtime/datetime/pregenerated/datetime.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/datetime/pregenerated/datetime.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/datetime/pregenerated/datetime.h'
--- src/runtime/datetime/pregenerated/datetime.h	2013-03-05 23:11:50 +0000
+++ src/runtime/datetime/pregenerated/datetime.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_DATETIME_DATETIME_H
 #define ZORBA_RUNTIME_DATETIME_DATETIME_H
 

=== modified file 'src/runtime/debug/pregenerated/debug_iterator.cpp'
--- src/runtime/debug/pregenerated/debug_iterator.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/debug/pregenerated/debug_iterator.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/debug/pregenerated/debug_iterator.h'
--- src/runtime/debug/pregenerated/debug_iterator.h	2013-03-05 23:11:50 +0000
+++ src/runtime/debug/pregenerated/debug_iterator.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_DEBUG_DEBUG_ITERATOR_H
 #define ZORBA_RUNTIME_DEBUG_DEBUG_ITERATOR_H
 

=== modified file 'src/runtime/durations_dates_times/pregenerated/durations_dates_times.cpp'
--- src/runtime/durations_dates_times/pregenerated/durations_dates_times.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/durations_dates_times/pregenerated/durations_dates_times.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/durations_dates_times/pregenerated/durations_dates_times.h'
--- src/runtime/durations_dates_times/pregenerated/durations_dates_times.h	2013-03-05 23:11:50 +0000
+++ src/runtime/durations_dates_times/pregenerated/durations_dates_times.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_DURATIONS_DATES_TIMES_DURATIONS_DATES_TIMES_H
 #define ZORBA_RUNTIME_DURATIONS_DATES_TIMES_DURATIONS_DATES_TIMES_H
 

=== modified file 'src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.cpp'
--- src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.h'
--- src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.h	2013-03-05 23:11:50 +0000
+++ src/runtime/errors_and_diagnostics/pregenerated/errors_and_diagnostics.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_ERRORS_AND_DIAGNOSTICS_ERRORS_AND_DIAGNOSTICS_H
 #define ZORBA_RUNTIME_ERRORS_AND_DIAGNOSTICS_ERRORS_AND_DIAGNOSTICS_H
 

=== modified file 'src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.cpp'
--- src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.h'
--- src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.h	2013-08-28 19:14:53 +0000
+++ src/runtime/errors_and_diagnostics/pregenerated/other_diagnostics.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_ERRORS_AND_DIAGNOSTICS_OTHER_DIAGNOSTICS_H
 #define ZORBA_RUNTIME_ERRORS_AND_DIAGNOSTICS_OTHER_DIAGNOSTICS_H
 

=== modified file 'src/runtime/fetch/pregenerated/fetch.cpp'
--- src/runtime/fetch/pregenerated/fetch.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/fetch/pregenerated/fetch.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/fetch/pregenerated/fetch.h'
--- src/runtime/fetch/pregenerated/fetch.h	2013-03-05 23:11:50 +0000
+++ src/runtime/fetch/pregenerated/fetch.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_FETCH_FETCH_H
 #define ZORBA_RUNTIME_FETCH_FETCH_H
 

=== modified file 'src/runtime/fnput/pregenerated/fnput.cpp'
--- src/runtime/fnput/pregenerated/fnput.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/fnput/pregenerated/fnput.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/fnput/pregenerated/fnput.h'
--- src/runtime/fnput/pregenerated/fnput.h	2013-03-05 23:11:50 +0000
+++ src/runtime/fnput/pregenerated/fnput.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_FNPUT_FNPUT_H
 #define ZORBA_RUNTIME_FNPUT_FNPUT_H
 

=== modified file 'src/runtime/full_text/pregenerated/ft_module.cpp'
--- src/runtime/full_text/pregenerated/ft_module.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/full_text/pregenerated/ft_module.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/full_text/pregenerated/ft_module.h'
--- src/runtime/full_text/pregenerated/ft_module.h	2013-06-25 00:24:35 +0000
+++ src/runtime/full_text/pregenerated/ft_module.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_FULL_TEXT_FT_MODULE_H
 #define ZORBA_RUNTIME_FULL_TEXT_FT_MODULE_H
 

=== modified file 'src/runtime/hof/pregenerated/fn_hof_functions.cpp'
--- src/runtime/hof/pregenerated/fn_hof_functions.cpp	2013-06-04 21:47:40 +0000
+++ src/runtime/hof/pregenerated/fn_hof_functions.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/hof/pregenerated/fn_hof_functions.h'
--- src/runtime/hof/pregenerated/fn_hof_functions.h	2013-06-04 21:47:40 +0000
+++ src/runtime/hof/pregenerated/fn_hof_functions.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_HOF_FN_HOF_FUNCTIONS_H
 #define ZORBA_RUNTIME_HOF_FN_HOF_FUNCTIONS_H
 

=== modified file 'src/runtime/indexing/pregenerated/ic_ddl.cpp'
--- src/runtime/indexing/pregenerated/ic_ddl.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/indexing/pregenerated/ic_ddl.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/indexing/pregenerated/ic_ddl.h'
--- src/runtime/indexing/pregenerated/ic_ddl.h	2013-03-05 23:11:50 +0000
+++ src/runtime/indexing/pregenerated/ic_ddl.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_INDEXING_IC_DDL_H
 #define ZORBA_RUNTIME_INDEXING_IC_DDL_H
 

=== modified file 'src/runtime/indexing/pregenerated/index_func.cpp'
--- src/runtime/indexing/pregenerated/index_func.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/indexing/pregenerated/index_func.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/indexing/pregenerated/index_func.h'
--- src/runtime/indexing/pregenerated/index_func.h	2013-03-05 23:11:50 +0000
+++ src/runtime/indexing/pregenerated/index_func.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_INDEXING_INDEX_FUNC_H
 #define ZORBA_RUNTIME_INDEXING_INDEX_FUNC_H
 

=== modified file 'src/runtime/item/pregenerated/item.cpp'
--- src/runtime/item/pregenerated/item.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/item/pregenerated/item.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/item/pregenerated/item.h'
--- src/runtime/item/pregenerated/item.h	2013-03-05 23:11:50 +0000
+++ src/runtime/item/pregenerated/item.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_ITEM_ITEM_H
 #define ZORBA_RUNTIME_ITEM_ITEM_H
 

=== modified file 'src/runtime/json/pregenerated/json.cpp'
--- src/runtime/json/pregenerated/json.cpp	2013-07-26 05:36:22 +0000
+++ src/runtime/json/pregenerated/json.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/json/pregenerated/json.h'
--- src/runtime/json/pregenerated/json.h	2013-07-26 05:36:22 +0000
+++ src/runtime/json/pregenerated/json.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_JSON_JSON_H
 #define ZORBA_RUNTIME_JSON_JSON_H
 

=== modified file 'src/runtime/json/pregenerated/jsoniq_functions.cpp'
--- src/runtime/json/pregenerated/jsoniq_functions.cpp	2013-08-19 13:00:41 +0000
+++ src/runtime/json/pregenerated/jsoniq_functions.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/json/pregenerated/jsoniq_functions.h'
--- src/runtime/json/pregenerated/jsoniq_functions.h	2013-08-30 08:03:58 +0000
+++ src/runtime/json/pregenerated/jsoniq_functions.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_JSON_JSONIQ_FUNCTIONS_H
 #define ZORBA_RUNTIME_JSON_JSONIQ_FUNCTIONS_H
 

=== modified file 'src/runtime/jsound/pregenerated/jsound.cpp'
--- src/runtime/jsound/pregenerated/jsound.cpp	2013-11-28 17:41:30 +0000
+++ src/runtime/jsound/pregenerated/jsound.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/jsound/pregenerated/jsound.h'
--- src/runtime/jsound/pregenerated/jsound.h	2013-11-28 17:41:30 +0000
+++ src/runtime/jsound/pregenerated/jsound.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_JSOUND_JSOUND_H
 #define ZORBA_RUNTIME_JSOUND_JSOUND_H
 

=== modified file 'src/runtime/maths/pregenerated/maths.cpp'
--- src/runtime/maths/pregenerated/maths.cpp	2013-04-29 14:39:04 +0000
+++ src/runtime/maths/pregenerated/maths.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/maths/pregenerated/maths.h'
--- src/runtime/maths/pregenerated/maths.h	2013-05-08 20:14:47 +0000
+++ src/runtime/maths/pregenerated/maths.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_MATHS_MATHS_H
 #define ZORBA_RUNTIME_MATHS_MATHS_H
 

=== modified file 'src/runtime/nodes/pregenerated/node_position.cpp'
--- src/runtime/nodes/pregenerated/node_position.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/nodes/pregenerated/node_position.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/nodes/pregenerated/node_position.h'
--- src/runtime/nodes/pregenerated/node_position.h	2013-03-05 23:11:50 +0000
+++ src/runtime/nodes/pregenerated/node_position.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_NODES_NODE_POSITION_H
 #define ZORBA_RUNTIME_NODES_NODE_POSITION_H
 

=== modified file 'src/runtime/nodes/pregenerated/nodes.cpp'
--- src/runtime/nodes/pregenerated/nodes.cpp	2013-07-24 08:12:12 +0000
+++ src/runtime/nodes/pregenerated/nodes.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/nodes/pregenerated/nodes.h'
--- src/runtime/nodes/pregenerated/nodes.h	2013-07-24 08:12:12 +0000
+++ src/runtime/nodes/pregenerated/nodes.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_NODES_NODES_H
 #define ZORBA_RUNTIME_NODES_NODES_H
 

=== modified file 'src/runtime/numerics/pregenerated/numerics.cpp'
--- src/runtime/numerics/pregenerated/numerics.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/numerics/pregenerated/numerics.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/numerics/pregenerated/numerics.h'
--- src/runtime/numerics/pregenerated/numerics.h	2013-03-28 05:32:59 +0000
+++ src/runtime/numerics/pregenerated/numerics.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_NUMERICS_NUMERICS_H
 #define ZORBA_RUNTIME_NUMERICS_NUMERICS_H
 

=== modified file 'src/runtime/parsing_and_serializing/pregenerated/parse_fragment.cpp'
--- src/runtime/parsing_and_serializing/pregenerated/parse_fragment.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/parsing_and_serializing/pregenerated/parse_fragment.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/parsing_and_serializing/pregenerated/parse_fragment.h'
--- src/runtime/parsing_and_serializing/pregenerated/parse_fragment.h	2013-03-05 23:11:50 +0000
+++ src/runtime/parsing_and_serializing/pregenerated/parse_fragment.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_PARSING_AND_SERIALIZING_PARSE_FRAGMENT_H
 #define ZORBA_RUNTIME_PARSING_AND_SERIALIZING_PARSE_FRAGMENT_H
 

=== modified file 'src/runtime/parsing_and_serializing/pregenerated/parsing_and_serializing.cpp'
--- src/runtime/parsing_and_serializing/pregenerated/parsing_and_serializing.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/parsing_and_serializing/pregenerated/parsing_and_serializing.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/parsing_and_serializing/pregenerated/parsing_and_serializing.h'
--- src/runtime/parsing_and_serializing/pregenerated/parsing_and_serializing.h	2013-03-05 23:11:50 +0000
+++ src/runtime/parsing_and_serializing/pregenerated/parsing_and_serializing.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_PARSING_AND_SERIALIZING_PARSING_AND_SERIALIZING_H
 #define ZORBA_RUNTIME_PARSING_AND_SERIALIZING_PARSING_AND_SERIALIZING_H
 

=== modified file 'src/runtime/pregenerated/iterator_enum.h'
--- src/runtime/pregenerated/iterator_enum.h	2013-11-28 17:41:30 +0000
+++ src/runtime/pregenerated/iterator_enum.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
   TYPE_NodeNameIterator,
   TYPE_NilledIterator,
   TYPE_FnStringIterator,

=== modified file 'src/runtime/qnames/pregenerated/qnames.cpp'
--- src/runtime/qnames/pregenerated/qnames.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/qnames/pregenerated/qnames.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/qnames/pregenerated/qnames.h'
--- src/runtime/qnames/pregenerated/qnames.h	2013-03-05 23:11:50 +0000
+++ src/runtime/qnames/pregenerated/qnames.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_QNAMES_QNAMES_H
 #define ZORBA_RUNTIME_QNAMES_QNAMES_H
 

=== modified file 'src/runtime/random/pregenerated/random.cpp'
--- src/runtime/random/pregenerated/random.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/random/pregenerated/random.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/random/pregenerated/random.h'
--- src/runtime/random/pregenerated/random.h	2013-05-08 20:14:47 +0000
+++ src/runtime/random/pregenerated/random.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_RANDOM_RANDOM_H
 #define ZORBA_RUNTIME_RANDOM_RANDOM_H
 

=== modified file 'src/runtime/reference/pregenerated/reference.cpp'
--- src/runtime/reference/pregenerated/reference.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/reference/pregenerated/reference.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/reference/pregenerated/reference.h'
--- src/runtime/reference/pregenerated/reference.h	2013-03-05 23:11:50 +0000
+++ src/runtime/reference/pregenerated/reference.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_REFERENCE_REFERENCE_H
 #define ZORBA_RUNTIME_REFERENCE_REFERENCE_H
 

=== modified file 'src/runtime/schema/pregenerated/schema.cpp'
--- src/runtime/schema/pregenerated/schema.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/schema/pregenerated/schema.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/schema/pregenerated/schema.h'
--- src/runtime/schema/pregenerated/schema.h	2013-03-05 23:11:50 +0000
+++ src/runtime/schema/pregenerated/schema.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_SCHEMA_SCHEMA_H
 #define ZORBA_RUNTIME_SCHEMA_SCHEMA_H
 

=== modified file 'src/runtime/sctx/pregenerated/sctx.cpp'
--- src/runtime/sctx/pregenerated/sctx.cpp	2013-10-01 03:25:43 +0000
+++ src/runtime/sctx/pregenerated/sctx.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/sctx/pregenerated/sctx.h'
--- src/runtime/sctx/pregenerated/sctx.h	2013-10-01 03:25:43 +0000
+++ src/runtime/sctx/pregenerated/sctx.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_SCTX_SCTX_H
 #define ZORBA_RUNTIME_SCTX_SCTX_H
 

=== modified file 'src/runtime/seq/pregenerated/seq.cpp'
--- src/runtime/seq/pregenerated/seq.cpp	2013-10-01 23:33:19 +0000
+++ src/runtime/seq/pregenerated/seq.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/seq/pregenerated/seq.h'
--- src/runtime/seq/pregenerated/seq.h	2013-10-01 23:33:19 +0000
+++ src/runtime/seq/pregenerated/seq.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_SEQ_SEQ_H
 #define ZORBA_RUNTIME_SEQ_SEQ_H
 

=== modified file 'src/runtime/sequences/pregenerated/sequences.cpp'
--- src/runtime/sequences/pregenerated/sequences.cpp	2013-04-29 14:39:04 +0000
+++ src/runtime/sequences/pregenerated/sequences.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/sequences/pregenerated/sequences.h'
--- src/runtime/sequences/pregenerated/sequences.h	2013-09-17 21:12:49 +0000
+++ src/runtime/sequences/pregenerated/sequences.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_SEQUENCES_SEQUENCES_H
 #define ZORBA_RUNTIME_SEQUENCES_SEQUENCES_H
 

=== modified file 'src/runtime/spec/iterator_cpp.xq'
--- src/runtime/spec/iterator_cpp.xq	2013-02-07 17:24:36 +0000
+++ src/runtime/spec/iterator_cpp.xq	2014-01-31 01:40:25 +0000
@@ -290,3 +290,5 @@
   ),
   string-join(($gen:newline,$gen:newline),'')
 )
+
+(: vim:set et sw=2 ts=2: :)

=== modified file 'src/runtime/spec/iterator_h.xq'
--- src/runtime/spec/iterator_h.xq	2013-03-24 20:40:03 +0000
+++ src/runtime/spec/iterator_h.xq	2014-01-31 01:40:25 +0000
@@ -439,3 +439,5 @@
              ' */'),
             $gen:newline),
 $gen:newline
+
+(: vim:set et sw=2 ts=2: :)

=== modified file 'src/runtime/spec/plan_iter_visitor_h.xq'
--- src/runtime/spec/plan_iter_visitor_h.xq	2013-08-09 08:27:30 +0000
+++ src/runtime/spec/plan_iter_visitor_h.xq	2014-01-31 01:40:25 +0000
@@ -36,13 +36,15 @@
 
 declare function local:create-class() as xs:string
 {
-  string-join(('/**',$gen:newline,
-  ' * Visitor to visit a PlanIterator tree.',$gen:newline,
-  ' */',$gen:newline,
-  'class PlanIterVisitor {',$gen:newline,
-  'public:',$gen:newline,
-  '  virtual ~PlanIterVisitor() {}',$gen:newline,$gen:newline,
-  '#include "runtime/visitors/planiter_visitor_impl_code.h"'),'')
+  concat(
+    '/**', $gen:newline,
+    ' * Visitor to visit a PlanIterator tree.', $gen:newline,
+    ' */', $gen:newline,
+    'class PlanIterVisitor {', $gen:newline,
+    'public:', $gen:newline,
+    '  virtual ~PlanIterVisitor() { }', $gen:newline, $gen:newline,
+    '#include "runtime/visitors/plan_iter_visitor_decl.h"', $gen:newline
+  )
 };
  
 
@@ -96,7 +98,7 @@
   variable $temp := local:process-files($files,'fwd-decl');
 
   string-join(($temp, $gen:newline, $gen:newline,
-               '#include "runtime/visitors/planiter_visitor_impl_include.h"'),'')
+               '#include "runtime/visitors/plan_iter_visitor_types.h"'),'')
 };
 
 
@@ -136,3 +138,4 @@
   )
 }
 
+(: vim:set et sw=2 ts=2: :)

=== modified file 'src/runtime/spec/printer_visitor_h.xq'
--- src/runtime/spec/printer_visitor_h.xq	2013-08-09 08:27:30 +0000
+++ src/runtime/spec/printer_visitor_h.xq	2014-01-31 01:40:25 +0000
@@ -74,7 +74,7 @@
     gen:indent(2),'void print();',$gen:newline,
     gen:indent(2),'void printCommons(const PlanIterator* aIter, int theId);',$gen:newline, $gen:newline,
     (: temporarily included until all iterators are generated :)
-    '#include "runtime/visitors/printer_visitor_impl.h"'
+    '#include "runtime/visitors/plan_iter_visitor_impl.h"'
   )
 };
 

=== modified file 'src/runtime/spec/utils.xq'
--- src/runtime/spec/utils.xq	2013-02-07 17:24:36 +0000
+++ src/runtime/spec/utils.xq	2014-01-31 01:40:25 +0000
@@ -60,7 +60,8 @@
 // * THIS IS A GENERATED FILE. DO NOT EDIT! *
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
-// ******************************************"
+// ******************************************
+"
 };
 
 declare function zi:add-guard-close() as xs:string

=== modified file 'src/runtime/store/pregenerated/documents.cpp'
--- src/runtime/store/pregenerated/documents.cpp	2013-10-08 00:48:47 +0000
+++ src/runtime/store/pregenerated/documents.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/store/pregenerated/documents.h'
--- src/runtime/store/pregenerated/documents.h	2013-10-08 00:48:47 +0000
+++ src/runtime/store/pregenerated/documents.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_STORE_DOCUMENTS_H
 #define ZORBA_RUNTIME_STORE_DOCUMENTS_H
 

=== modified file 'src/runtime/store/pregenerated/maps.cpp'
--- src/runtime/store/pregenerated/maps.cpp	2013-08-24 23:38:45 +0000
+++ src/runtime/store/pregenerated/maps.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/store/pregenerated/maps.h'
--- src/runtime/store/pregenerated/maps.h	2013-08-24 23:38:45 +0000
+++ src/runtime/store/pregenerated/maps.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_STORE_MAPS_H
 #define ZORBA_RUNTIME_STORE_MAPS_H
 

=== modified file 'src/runtime/strings/pregenerated/strings.cpp'
--- src/runtime/strings/pregenerated/strings.cpp	2013-09-19 16:09:35 +0000
+++ src/runtime/strings/pregenerated/strings.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/strings/pregenerated/strings.h'
--- src/runtime/strings/pregenerated/strings.h	2013-09-19 16:09:35 +0000
+++ src/runtime/strings/pregenerated/strings.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_STRINGS_STRINGS_H
 #define ZORBA_RUNTIME_STRINGS_STRINGS_H
 

=== modified file 'src/runtime/uris/pregenerated/uris.cpp'
--- src/runtime/uris/pregenerated/uris.cpp	2013-03-07 22:46:02 +0000
+++ src/runtime/uris/pregenerated/uris.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/uris/pregenerated/uris.h'
--- src/runtime/uris/pregenerated/uris.h	2013-05-02 06:24:16 +0000
+++ src/runtime/uris/pregenerated/uris.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_URIS_URIS_H
 #define ZORBA_RUNTIME_URIS_URIS_H
 

=== renamed file 'src/runtime/visitors/planiter_visitor_impl_code.h' => 'src/runtime/visitors/plan_iter_visitor_decl.h'
--- src/runtime/visitors/planiter_visitor_impl_code.h	2013-08-16 13:00:06 +0000
+++ src/runtime/visitors/plan_iter_visitor_decl.h	2014-01-31 01:40:25 +0000
@@ -15,355 +15,211 @@
  */
 #pragma once
 
-PLAN_ITER_VISITOR (FnBooleanIterator);
-
-PLAN_ITER_VISITOR (OrIterator);
-
-PLAN_ITER_VISITOR (AndIterator);
-
-  PLAN_ITER_VISITOR (CompareIterator);
-
-  PLAN_ITER_VISITOR (AtomicValuesEquivalenceIterator);
-
-  PLAN_ITER_VISITOR (ElementIterator);
-
-  PLAN_ITER_VISITOR (AttributeIterator);
-
-  PLAN_ITER_VISITOR (NamespaceIterator);
-
-  PLAN_ITER_VISITOR (DocumentIterator);
-
-  PLAN_ITER_VISITOR (JSONArrayIterator);
-
-  PLAN_ITER_VISITOR (JSONObjectIterator);
-
-  PLAN_ITER_VISITOR (JSONDirectObjectIterator);
-
-  PLAN_ITER_VISITOR (UDFunctionCallIterator);
-
-  PLAN_ITER_VISITOR (ExtFunctionCallIterator);
-
-  PLAN_ITER_VISITOR (CommentIterator);
-
-  PLAN_ITER_VISITOR (PiIterator);
-
-  PLAN_ITER_VISITOR (SingletonIterator);
-
-  PLAN_ITER_VISITOR (FunctionItemIterator);
-
-  PLAN_ITER_VISITOR (EmptyIterator);
-
-  PLAN_ITER_VISITOR (ForVarIterator);
-
-  PLAN_ITER_VISITOR (LetVarIterator);
-
-  PLAN_ITER_VISITOR (EnclosedIterator);
-
-  PLAN_ITER_VISITOR (IfThenElseIterator);
-
-  PLAN_ITER_VISITOR (TryCatchIterator);
-
-  PLAN_ITER_VISITOR (NodeDistinctIterator);
-
-  PLAN_ITER_VISITOR (NodeSortIterator);
-
-  //PLAN_ITER_VISITOR (PathIterator);
-
-  PLAN_ITER_VISITOR (SelfAxisIterator);
-
-  PLAN_ITER_VISITOR (AttributeAxisIterator);
-
-  PLAN_ITER_VISITOR (ParentAxisIterator);
-
-  PLAN_ITER_VISITOR (AncestorAxisIterator);
-
-  PLAN_ITER_VISITOR (AncestorReverseAxisIterator);
-
-  PLAN_ITER_VISITOR (AncestorSelfAxisIterator);
-
-  PLAN_ITER_VISITOR (AncestorSelfReverseAxisIterator);
-
-  PLAN_ITER_VISITOR (RSiblingAxisIterator);
-
-  PLAN_ITER_VISITOR (LSiblingAxisIterator);
-
-  PLAN_ITER_VISITOR (LSiblingReverseAxisIterator);
-
-  PLAN_ITER_VISITOR (ChildAxisIterator);
-
-  PLAN_ITER_VISITOR (DescendantAxisIterator);
-
-  PLAN_ITER_VISITOR (DescendantSelfAxisIterator);
-
-  PLAN_ITER_VISITOR (PrecedingAxisIterator);
-
-  PLAN_ITER_VISITOR (PrecedingReverseAxisIterator);
-
-  PLAN_ITER_VISITOR (FollowingAxisIterator);
-
-  PLAN_ITER_VISITOR (InstanceOfIterator);
-
-  PLAN_ITER_VISITOR (TreatIterator);
-
-  PLAN_ITER_VISITOR (EitherNodesOrAtomicsIterator);
-
-  virtual void beginVisit ( const NumArithIterator<AddOperation>& ) = 0;
-  virtual void beginVisit ( const NumArithIterator<SubtractOperation>& ) = 0;
-  virtual void beginVisit ( const NumArithIterator<MultiplyOperation>& ) = 0;
-  virtual void beginVisit ( const NumArithIterator<DivideOperation>& ) = 0;
-  virtual void beginVisit ( const NumArithIterator<IntegerDivideOperation>& ) = 0;
-  virtual void beginVisit ( const NumArithIterator<ModOperation>& ) = 0;
-  virtual void endVisit ( const NumArithIterator<AddOperation>& ) = 0;
-  virtual void endVisit ( const NumArithIterator<SubtractOperation>& ) = 0;
-  virtual void endVisit ( const NumArithIterator<MultiplyOperation>& ) = 0;
-  virtual void endVisit ( const NumArithIterator<DivideOperation>& ) = 0;
-  virtual void endVisit ( const NumArithIterator<IntegerDivideOperation>& ) = 0;
-  virtual void endVisit ( const NumArithIterator<ModOperation>& ) = 0;
-
-  virtual void beginVisit ( const GenericArithIterator<AddOperation>& ) = 0;
-  virtual void beginVisit ( const GenericArithIterator<SubtractOperation>& ) = 0;
-  virtual void beginVisit ( const GenericArithIterator<MultiplyOperation>& ) = 0;
-  virtual void beginVisit ( const GenericArithIterator<DivideOperation>& ) = 0;
-  virtual void beginVisit ( const GenericArithIterator<IntegerDivideOperation>& ) = 0;
-  virtual void beginVisit ( const GenericArithIterator<ModOperation>& ) = 0;
-  virtual void endVisit ( const GenericArithIterator<AddOperation>& ) = 0;
-  virtual void endVisit ( const GenericArithIterator<SubtractOperation>& ) = 0;
-  virtual void endVisit ( const GenericArithIterator<MultiplyOperation>& ) = 0;
-  virtual void endVisit ( const GenericArithIterator<DivideOperation>& ) = 0;
-  virtual void endVisit ( const GenericArithIterator<IntegerDivideOperation>& ) = 0;
-  virtual void endVisit ( const GenericArithIterator<ModOperation>& ) = 0;
-
-  virtual void beginVisit ( const SpecificNumArithIterator<AddOperation, store::XS_DECIMAL>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<AddOperation, store::XS_INTEGER>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<AddOperation, store::XS_FLOAT>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<AddOperation, store::XS_DOUBLE>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<SubtractOperation, store::XS_DECIMAL>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<SubtractOperation, store::XS_INTEGER>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<SubtractOperation, store::XS_FLOAT>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<SubtractOperation, store::XS_DOUBLE>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<MultiplyOperation, store::XS_DECIMAL>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<MultiplyOperation, store::XS_INTEGER>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<MultiplyOperation, store::XS_FLOAT>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<MultiplyOperation, store::XS_DOUBLE>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<DivideOperation, store::XS_DECIMAL>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<DivideOperation, store::XS_INTEGER>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<DivideOperation, store::XS_FLOAT>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<DivideOperation, store::XS_DOUBLE>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<ModOperation, store::XS_DECIMAL>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<ModOperation, store::XS_INTEGER>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<ModOperation, store::XS_FLOAT>& ) = 0;
-  virtual void beginVisit ( const SpecificNumArithIterator<ModOperation, store::XS_DOUBLE>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<AddOperation, store::XS_DECIMAL>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<AddOperation, store::XS_INTEGER>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<AddOperation, store::XS_FLOAT>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<AddOperation, store::XS_DOUBLE>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<SubtractOperation, store::XS_DECIMAL>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<SubtractOperation, store::XS_INTEGER>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<SubtractOperation, store::XS_FLOAT>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<SubtractOperation, store::XS_DOUBLE>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<MultiplyOperation, store::XS_DECIMAL>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<MultiplyOperation, store::XS_INTEGER>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<MultiplyOperation, store::XS_FLOAT>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<MultiplyOperation, store::XS_DOUBLE>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<DivideOperation, store::XS_DECIMAL>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<DivideOperation, store::XS_INTEGER>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<DivideOperation, store::XS_FLOAT>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<DivideOperation, store::XS_DOUBLE>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<ModOperation, store::XS_DECIMAL>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<ModOperation, store::XS_INTEGER>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<ModOperation, store::XS_FLOAT>& ) = 0;
-  virtual void endVisit ( const SpecificNumArithIterator<ModOperation, store::XS_DOUBLE>& ) = 0;
-
-  virtual void beginVisit ( const TypedValueCompareIterator<store::XS_DOUBLE>& ) = 0;
-  virtual void endVisit ( const TypedValueCompareIterator<store::XS_DOUBLE>& ) = 0;
-  virtual void beginVisit ( const TypedValueCompareIterator<store::XS_FLOAT>& ) = 0;
-  virtual void endVisit ( const TypedValueCompareIterator<store::XS_FLOAT>& ) = 0;
-  virtual void beginVisit ( const TypedValueCompareIterator<store::XS_DECIMAL>& ) = 0;
-  virtual void endVisit ( const TypedValueCompareIterator<store::XS_DECIMAL>& ) = 0;
-  virtual void beginVisit ( const TypedValueCompareIterator<store::XS_INTEGER>& ) = 0;
-  virtual void endVisit ( const TypedValueCompareIterator<store::XS_INTEGER>& ) = 0;
-  virtual void beginVisit ( const TypedValueCompareIterator<store::XS_STRING>& ) = 0;
-  virtual void endVisit ( const TypedValueCompareIterator<store::XS_STRING>& ) = 0;
-
-  PLAN_ITER_VISITOR (OpNumericUnaryIterator);
-
-  PLAN_ITER_VISITOR (OpDoubleUnaryIterator);
-
-  PLAN_ITER_VISITOR (FnMinMaxIterator);
-
-  PLAN_ITER_VISITOR (TextIterator);
-
-  PLAN_ITER_VISITOR (flwor::FLWORIterator);
-
-  PLAN_ITER_VISITOR (flwor::TupleStreamIterator);
-
-  PLAN_ITER_VISITOR (flwor::TupleSourceIterator);
-
-  PLAN_ITER_VISITOR (flwor::ForIterator);
-
-  PLAN_ITER_VISITOR (flwor::OuterForIterator);
-
-  PLAN_ITER_VISITOR (flwor::LetIterator);
-
-  PLAN_ITER_VISITOR (flwor::GroupByIterator);
-
-  PLAN_ITER_VISITOR (flwor::OrderByIterator);
-
-  PLAN_ITER_VISITOR (flwor::WhereIterator);
-
-  PLAN_ITER_VISITOR (flwor::CountIterator);
-
-  PLAN_ITER_VISITOR (flwor::WindowIterator);
-
-  virtual void beginVisitFlworWhereClause(const PlanIterator&) = 0;
-
-  virtual void endVisitFlworWhereClause(const PlanIterator&) = 0;
-
-  virtual void beginVisitFlworLetVariable(
-        bool,
-        const zstring&,
-        const std::vector<PlanIter_t>&) = 0;
-
-  virtual void endVisitFlworLetVariable() = 0;
-
-  virtual void beginVisitFlworForVariable(
-       const zstring&,
-       const std::vector<PlanIter_t>&,
-       const std::vector<PlanIter_t>&) = 0;
-
-  virtual void endVisitFlworForVariable() = 0;
-
-  virtual void beginVisitMaterializeClause() = 0;
-
-  virtual void endVisitMaterializeClause() = 0;
-
-  virtual void beginVisitMaterializeVariable(
-      bool isForVar,
-      PlanIter_t inputVar,
-      const std::vector<PlanIter_t>& varRefs) = 0;
-
-  virtual void endVisitMaterializeVariable() = 0;
-
-  virtual void beginVisitGroupByClause() = 0;
-
-  virtual void endVisitGroupByClause() = 0;
-
-  virtual void beginVisitGroupBySpec() = 0;
-
-  virtual void endVisitGroupBySpec() = 0;
-
-  virtual void beginVisitGroupByOuter() = 0;
-
-  virtual void endVisitGroupByOuter() = 0;
-
-  virtual void beginVisitGroupVariable(const std::vector<ForVarIter_t>&) = 0;
-
-  virtual void endVisitGroupVariable() = 0;
-
-  virtual void beginVisitNonGroupVariable(const std::vector<LetVarIter_t>&) = 0;
-
-  virtual void endVisitNonGroupVariable() = 0;
-
-  virtual void beginVisitOrderBySpec(const PlanIterator&) = 0;
-
-  virtual void endVisitOrderBySpec(const PlanIterator&) = 0;
-
-  virtual void beginVisitOrderByForVariable(
-        ForVarIter_t inputVar,
-        const std::vector<PlanIter_t>& varRefs) = 0;
-
-  virtual void endVisitOrderByForVariable() = 0;
-
-  virtual void beginVisitOrderByLetVariable(
-        LetVarIter_t inputVar,
-        const std::vector<PlanIter_t>& varRefs) = 0;
-
-  virtual void endVisitOrderByLetVariable() = 0;
-
-  virtual void beginVisitWindowVariable(
-        const std::string& varName,
-        const std::vector<LetVarIter_t>& varRefs) = 0;
-
-  virtual void endVisitWindowVariable() = 0;
-
-  virtual void beginVisitWinCondVariable(
-        const zstring& varName,
-        const std::vector<PlanIter_t>& varRefs) = 0;
-
-  virtual void endVisitWinCondVariable() = 0;
-
-  virtual void beginVisitFlworReturn(const PlanIterator&) = 0;
-
-  virtual void endVisitFlworReturn(const PlanIterator&) = 0;
-
-  PLAN_ITER_VISITOR (CastIterator);
-
-  PLAN_ITER_VISITOR (NameCastIterator);
-
-  PLAN_ITER_VISITOR (PromoteIterator);
-
-  PLAN_ITER_VISITOR (CastableIterator);
-
-  PLAN_ITER_VISITOR (FnDateTimeConstructorIterator);
-
-  PLAN_ITER_VISITOR (CtxVarIterator);
-
-  PLAN_ITER_VISITOR (CtxVarDeclareIterator);
-
-  PLAN_ITER_VISITOR (CtxVarAssignIterator);
-
-  PLAN_ITER_VISITOR (CtxVarIsSetIterator);
-
-  PLAN_ITER_VISITOR(FnAdjustToTimeZoneIterator_1);
-
-  PLAN_ITER_VISITOR(FnAdjustToTimeZoneIterator_2);
-
-  PLAN_ITER_VISITOR(FnFormatDateTimeIterator);
-
-  PLAN_ITER_VISITOR(InsertIterator);
-
-  PLAN_ITER_VISITOR(DeleteIterator);
-
-  PLAN_ITER_VISITOR(ReplaceIterator);
-
-  PLAN_ITER_VISITOR(RenameIterator);
-
-  PLAN_ITER_VISITOR(TransformIterator);
-
-  PLAN_ITER_VISITOR(ApplyIterator);
-
-  PLAN_ITER_VISITOR(FTContainsIterator);
-
+// PlanIterVisitor *Visit() member-function declarations
+#define PIV_VISIT_DECL(...)                           \
+  virtual void beginVisit( __VA_ARGS__ const& ) = 0;  \
+  virtual void endVisit( __VA_ARGS__ const& ) = 0
+
+PIV_VISIT_DECL( AncestorAxisIterator );
+PIV_VISIT_DECL( AncestorReverseAxisIterator );
+PIV_VISIT_DECL( AncestorSelfAxisIterator );
+PIV_VISIT_DECL( AncestorSelfReverseAxisIterator );
+PIV_VISIT_DECL( AndIterator );
+PIV_VISIT_DECL( ApplyIterator );
+PIV_VISIT_DECL( ArgumentPlaceholderIterator );
+PIV_VISIT_DECL( AtomicValuesEquivalenceIterator );
+PIV_VISIT_DECL( AttributeAxisIterator );
+PIV_VISIT_DECL( AttributeIterator );
+PIV_VISIT_DECL( CastableIterator );
+PIV_VISIT_DECL( CastIterator );
+PIV_VISIT_DECL( ChildAxisIterator );
+PIV_VISIT_DECL( CommentIterator );
+PIV_VISIT_DECL( CompareIterator );
+PIV_VISIT_DECL( CreateIndexIterator );
+PIV_VISIT_DECL( CreateInternalIndexIterator );
+PIV_VISIT_DECL( CtxVarAssignIterator );
+PIV_VISIT_DECL( CtxVarDeclareIterator );
+PIV_VISIT_DECL( CtxVarIsSetIterator );
+PIV_VISIT_DECL( CtxVarIterator );
 #ifdef ZORBA_WITH_DEBUGGER
-  PLAN_ITER_VISITOR ( DebuggerSingletonIterator );
+PIV_VISIT_DECL( DebuggerSingletonIterator );
 #endif
-
-  PLAN_ITER_VISITOR(HoistIterator);
-  PLAN_ITER_VISITOR(UnhoistIterator);
-
-  PLAN_ITER_VISITOR(ProbeIndexPointValueIterator);
-  PLAN_ITER_VISITOR(ProbeIndexPointGeneralIterator);
-  PLAN_ITER_VISITOR(ProbeIndexRangeValueIterator);
-  PLAN_ITER_VISITOR(ProbeIndexRangeGeneralIterator);
-  PLAN_ITER_VISITOR(ValueIndexEntryBuilderIterator);
-  PLAN_ITER_VISITOR(GeneralIndexEntryBuilderIterator);
-  PLAN_ITER_VISITOR(RefreshIndexIterator);
-  PLAN_ITER_VISITOR(CreateIndexIterator);
-  PLAN_ITER_VISITOR(CreateInternalIndexIterator);
-  PLAN_ITER_VISITOR(DeleteIndexIterator);
-
-  PLAN_ITER_VISITOR(SingleDynamicFnCallIterator);
-  PLAN_ITER_VISITOR(MultiDynamicFnCallIterator);
-  PLAN_ITER_VISITOR(ArgumentPlaceholderIterator);
-
-  PLAN_ITER_VISITOR(EvalIterator);
-
-  PLAN_ITER_VISITOR(MaterializeIterator);
-
-PLAN_ITER_VISITOR(SequentialIterator);
-PLAN_ITER_VISITOR(LoopIterator);
-PLAN_ITER_VISITOR(ExitIterator);
-PLAN_ITER_VISITOR(ExitCatcherIterator);
-PLAN_ITER_VISITOR(FlowCtlIterator);
+PIV_VISIT_DECL( DeleteIndexIterator );
+PIV_VISIT_DECL( DeleteIterator );
+PIV_VISIT_DECL( DescendantAxisIterator );
+PIV_VISIT_DECL( DescendantSelfAxisIterator );
+PIV_VISIT_DECL( DocumentIterator );
+PIV_VISIT_DECL( EitherNodesOrAtomicsIterator );
+PIV_VISIT_DECL( ElementIterator );
+PIV_VISIT_DECL( EmptyIterator );
+PIV_VISIT_DECL( EnclosedIterator );
+PIV_VISIT_DECL( EvalIterator );
+PIV_VISIT_DECL( ExitCatcherIterator );
+PIV_VISIT_DECL( ExitIterator );
+PIV_VISIT_DECL( ExtFunctionCallIterator );
+PIV_VISIT_DECL( FlowCtlIterator );
+PIV_VISIT_DECL( flwor::CountIterator );
+PIV_VISIT_DECL( flwor::FLWORIterator );
+PIV_VISIT_DECL( flwor::ForIterator );
+PIV_VISIT_DECL( flwor::GroupByIterator );
+PIV_VISIT_DECL( flwor::LetIterator );
+PIV_VISIT_DECL( flwor::OrderByIterator );
+PIV_VISIT_DECL( flwor::OuterForIterator );
+PIV_VISIT_DECL( flwor::TupleSourceIterator );
+PIV_VISIT_DECL( flwor::TupleStreamIterator );
+PIV_VISIT_DECL( flwor::WhereIterator );
+PIV_VISIT_DECL( flwor::WindowIterator );
+PIV_VISIT_DECL( FnAdjustToTimeZoneIterator_1 );
+PIV_VISIT_DECL( FnAdjustToTimeZoneIterator_2 );
+PIV_VISIT_DECL( FnBooleanIterator );
+PIV_VISIT_DECL( FnDateTimeConstructorIterator );
+PIV_VISIT_DECL( FnFormatDateTimeIterator );
+PIV_VISIT_DECL( FnMinMaxIterator );
+PIV_VISIT_DECL( FollowingAxisIterator );
+PIV_VISIT_DECL( ForVarIterator );
+PIV_VISIT_DECL( FTContainsIterator );
+PIV_VISIT_DECL( FunctionItemIterator );
+PIV_VISIT_DECL( GeneralIndexEntryBuilderIterator );
+PIV_VISIT_DECL( GenericArithIterator<AddOperation> );
+PIV_VISIT_DECL( GenericArithIterator<DivideOperation> );
+PIV_VISIT_DECL( GenericArithIterator<IntegerDivideOperation> );
+PIV_VISIT_DECL( GenericArithIterator<ModOperation> );
+PIV_VISIT_DECL( GenericArithIterator<MultiplyOperation> );
+PIV_VISIT_DECL( GenericArithIterator<SubtractOperation> );
+PIV_VISIT_DECL( HoistIterator );
+PIV_VISIT_DECL( IfThenElseIterator );
+PIV_VISIT_DECL( InsertIterator );
+PIV_VISIT_DECL( InstanceOfIterator );
+PIV_VISIT_DECL( JSONArrayIterator );
+PIV_VISIT_DECL( JSONDirectObjectIterator );
+PIV_VISIT_DECL( JSONObjectIterator );
+PIV_VISIT_DECL( LetVarIterator );
+PIV_VISIT_DECL( LoopIterator );
+PIV_VISIT_DECL( LSiblingAxisIterator );
+PIV_VISIT_DECL( LSiblingReverseAxisIterator );
+PIV_VISIT_DECL( MaterializeIterator );
+PIV_VISIT_DECL( MultiDynamicFnCallIterator );
+PIV_VISIT_DECL( NameCastIterator );
+PIV_VISIT_DECL( NamespaceIterator );
+PIV_VISIT_DECL( NodeDistinctIterator );
+PIV_VISIT_DECL( NodeSortIterator );
+PIV_VISIT_DECL( NumArithIterator<AddOperation> );
+PIV_VISIT_DECL( NumArithIterator<DivideOperation> );
+PIV_VISIT_DECL( NumArithIterator<IntegerDivideOperation> );
+PIV_VISIT_DECL( NumArithIterator<ModOperation> );
+PIV_VISIT_DECL( NumArithIterator<MultiplyOperation> );
+PIV_VISIT_DECL( NumArithIterator<SubtractOperation> );
+PIV_VISIT_DECL( OpDoubleUnaryIterator );
+PIV_VISIT_DECL( OpNumericUnaryIterator );
+PIV_VISIT_DECL( OrIterator );
+PIV_VISIT_DECL( ParentAxisIterator );
+//PIV_VISIT_DECL( PathIterator );
+PIV_VISIT_DECL( PiIterator );
+PIV_VISIT_DECL( PrecedingAxisIterator );
+PIV_VISIT_DECL( PrecedingReverseAxisIterator );
+PIV_VISIT_DECL( ProbeIndexPointGeneralIterator );
+PIV_VISIT_DECL( ProbeIndexPointValueIterator );
+PIV_VISIT_DECL( ProbeIndexRangeGeneralIterator );
+PIV_VISIT_DECL( ProbeIndexRangeValueIterator );
+PIV_VISIT_DECL( PromoteIterator );
+PIV_VISIT_DECL( RefreshIndexIterator );
+PIV_VISIT_DECL( RenameIterator );
+PIV_VISIT_DECL( ReplaceIterator );
+PIV_VISIT_DECL( RSiblingAxisIterator );
+PIV_VISIT_DECL( SelfAxisIterator );
+PIV_VISIT_DECL( SequentialIterator );
+PIV_VISIT_DECL( SingleDynamicFnCallIterator );
+PIV_VISIT_DECL( SingletonIterator );
+PIV_VISIT_DECL( SpecificNumArithIterator<AddOperation,store::XS_DECIMAL> );
+PIV_VISIT_DECL( SpecificNumArithIterator<AddOperation,store::XS_DOUBLE> );
+PIV_VISIT_DECL( SpecificNumArithIterator<AddOperation,store::XS_FLOAT> );
+PIV_VISIT_DECL( SpecificNumArithIterator<AddOperation,store::XS_INTEGER> );
+PIV_VISIT_DECL( SpecificNumArithIterator<DivideOperation,store::XS_DECIMAL> );
+PIV_VISIT_DECL( SpecificNumArithIterator<DivideOperation,store::XS_DOUBLE> );
+PIV_VISIT_DECL( SpecificNumArithIterator<DivideOperation,store::XS_FLOAT> );
+PIV_VISIT_DECL( SpecificNumArithIterator<DivideOperation,store::XS_INTEGER> );
+PIV_VISIT_DECL( SpecificNumArithIterator<ModOperation,store::XS_DECIMAL> );
+PIV_VISIT_DECL( SpecificNumArithIterator<ModOperation,store::XS_DOUBLE> );
+PIV_VISIT_DECL( SpecificNumArithIterator<ModOperation,store::XS_FLOAT> );
+PIV_VISIT_DECL( SpecificNumArithIterator<ModOperation,store::XS_INTEGER> );
+PIV_VISIT_DECL( SpecificNumArithIterator<MultiplyOperation,store::XS_DECIMAL> );
+PIV_VISIT_DECL( SpecificNumArithIterator<MultiplyOperation,store::XS_DOUBLE> );
+PIV_VISIT_DECL( SpecificNumArithIterator<MultiplyOperation,store::XS_FLOAT> );
+PIV_VISIT_DECL( SpecificNumArithIterator<MultiplyOperation,store::XS_INTEGER> );
+PIV_VISIT_DECL( SpecificNumArithIterator<SubtractOperation,store::XS_DECIMAL> );
+PIV_VISIT_DECL( SpecificNumArithIterator<SubtractOperation,store::XS_DOUBLE> );
+PIV_VISIT_DECL( SpecificNumArithIterator<SubtractOperation,store::XS_FLOAT> );
+PIV_VISIT_DECL( SpecificNumArithIterator<SubtractOperation,store::XS_INTEGER> );
+PIV_VISIT_DECL( TextIterator );
+PIV_VISIT_DECL( TransformIterator );
+PIV_VISIT_DECL( TreatIterator );
+PIV_VISIT_DECL( TryCatchIterator );
+PIV_VISIT_DECL( TypedValueCompareIterator<store::XS_DECIMAL> );
+PIV_VISIT_DECL( TypedValueCompareIterator<store::XS_DOUBLE> );
+PIV_VISIT_DECL( TypedValueCompareIterator<store::XS_FLOAT> );
+PIV_VISIT_DECL( TypedValueCompareIterator<store::XS_INTEGER> );
+PIV_VISIT_DECL( TypedValueCompareIterator<store::XS_STRING> );
+PIV_VISIT_DECL( UDFunctionCallIterator );
+PIV_VISIT_DECL( UnhoistIterator );
+PIV_VISIT_DECL( ValueIndexEntryBuilderIterator );
+
+#undef PIV_VISIT_DECL
+
+virtual void beginVisitFlworWhereClause( PlanIterator const& ) = 0;
+virtual void endVisitFlworWhereClause( PlanIterator const& ) = 0;
+
+virtual void beginVisitFlworLetVariable( bool, zstring const&,
+                                         std::vector<PlanIter_t> const& ) = 0;
+virtual void endVisitFlworLetVariable() = 0;
+
+virtual void beginVisitFlworForVariable( zstring const&,
+                                         std::vector<PlanIter_t> const&,
+                                         std::vector<PlanIter_t> const& ) = 0;
+virtual void endVisitFlworForVariable() = 0;
+
+virtual void beginVisitMaterializeClause() = 0;
+virtual void endVisitMaterializeClause() = 0;
+
+virtual void beginVisitMaterializeVariable( bool, PlanIter_t,
+                                            std::vector<PlanIter_t> const& ) = 0;
+virtual void endVisitMaterializeVariable() = 0;
+
+virtual void beginVisitGroupByClause() = 0;
+virtual void endVisitGroupByClause() = 0;
+
+virtual void beginVisitGroupBySpec() = 0;
+virtual void endVisitGroupBySpec() = 0;
+
+virtual void beginVisitGroupByOuter() = 0;
+virtual void endVisitGroupByOuter() = 0;
+
+virtual void beginVisitGroupVariable( std::vector<ForVarIter_t> const& ) = 0;
+virtual void endVisitGroupVariable() = 0;
+
+virtual void beginVisitNonGroupVariable( std::vector<LetVarIter_t> const& ) = 0;
+virtual void endVisitNonGroupVariable() = 0;
+
+virtual void beginVisitOrderBySpec( PlanIterator const& ) = 0;
+virtual void endVisitOrderBySpec( PlanIterator const& ) = 0;
+
+virtual void beginVisitOrderByForVariable( ForVarIter_t,
+                                           std::vector<PlanIter_t> const& ) = 0;
+
+virtual void endVisitOrderByForVariable() = 0;
+
+virtual void beginVisitOrderByLetVariable( LetVarIter_t,
+                                           std::vector<PlanIter_t> const& ) = 0;
+virtual void endVisitOrderByLetVariable() = 0;
+
+virtual void beginVisitWindowVariable( std::string const&,
+                                       std::vector<LetVarIter_t> const& ) = 0;
+virtual void endVisitWindowVariable() = 0;
+
+virtual void beginVisitWinCondVariable( zstring const&,
+                                        std::vector<PlanIter_t> const& ) = 0;
+virtual void endVisitWinCondVariable() = 0;
+
+virtual void beginVisitFlworReturn( PlanIterator const& ) = 0;
+virtual void endVisitFlworReturn( PlanIterator const& ) = 0;
 
 /* vim:set et sw=2 ts=2: */

=== renamed file 'src/runtime/visitors/printer_visitor_impl.h' => 'src/runtime/visitors/plan_iter_visitor_impl.h'
--- src/runtime/visitors/printer_visitor_impl.h	2013-08-16 13:00:06 +0000
+++ src/runtime/visitors/plan_iter_visitor_impl.h	2014-01-31 01:40:25 +0000
@@ -20,305 +20,209 @@
 // That file defines the PrinterVisitor class as a subclass of PlanIterVisitor.
 //
 
-#define DECLARE_VISITOR(class)          \
-  void beginVisit(const class& a);      \
-  void endVisit(const class& );
-
-void printNameOrKindTest(const AxisIteratorHelper* a);
-
-void beginVisit(const SingletonIterator& a);
-void endVisit(const SingletonIterator& a);
-
-void beginVisit(const FunctionItemIterator& a);
-void endVisit(const FunctionItemIterator& a);
-
-void beginVisit(const EnclosedIterator& a);
-void endVisit(const EnclosedIterator& a);
-
-void beginVisit(const NodeSortIterator& a);
-void endVisit(const NodeSortIterator& a);
-
-void beginVisit(const SelfAxisIterator& a);
-void endVisit(const SelfAxisIterator& a);
-
-void beginVisit(const TreatIterator& a );
-void endVisit(const TreatIterator& );
-
-void beginVisit(const NumArithIterator<AddOperation>& a);
-void endVisit(const NumArithIterator<AddOperation>& );
-
-void beginVisit(const NumArithIterator<SubtractOperation>& a);
-void endVisit(const NumArithIterator<SubtractOperation>&);
-
-void beginVisit(const NumArithIterator<MultiplyOperation>& a);
-void endVisit(const NumArithIterator<MultiplyOperation>& a);
-
-void beginVisit(const NumArithIterator<DivideOperation>& a);
-void endVisit(const NumArithIterator<DivideOperation>& a);
-
-void beginVisit(const NumArithIterator<IntegerDivideOperation>& a);
-void endVisit(const NumArithIterator<IntegerDivideOperation>& a);
-
-void beginVisit(const NumArithIterator<ModOperation>& a);
-void endVisit(const NumArithIterator<ModOperation>& a);
-
-void beginVisit(const GenericArithIterator<AddOperation>& a );
-void beginVisit(const GenericArithIterator<SubtractOperation>& a );
-void beginVisit(const GenericArithIterator<MultiplyOperation>& a );
-void beginVisit(const GenericArithIterator<DivideOperation>& a );
-void beginVisit(const GenericArithIterator<IntegerDivideOperation>& a );
-void beginVisit(const GenericArithIterator<ModOperation>& a );
-void endVisit  (const GenericArithIterator<AddOperation>& );
-void endVisit  (const GenericArithIterator<SubtractOperation>& );
-void endVisit  (const GenericArithIterator<MultiplyOperation>& );
-void endVisit  (const GenericArithIterator<DivideOperation>& );
-void endVisit  (const GenericArithIterator<IntegerDivideOperation>& );
-void endVisit  (const GenericArithIterator<ModOperation>& );
-
-void beginVisit( const SpecificNumArithIterator<AddOperation, store::XS_DECIMAL>& a);
-void beginVisit( const SpecificNumArithIterator<AddOperation, store::XS_INTEGER>& a);
-void beginVisit( const SpecificNumArithIterator<AddOperation, store::XS_FLOAT>& a);
-void beginVisit( const SpecificNumArithIterator<AddOperation, store::XS_DOUBLE>& a);
-void beginVisit( const SpecificNumArithIterator<SubtractOperation, store::XS_DECIMAL>& a);
-void beginVisit( const SpecificNumArithIterator<SubtractOperation, store::XS_INTEGER>& a);
-void beginVisit( const SpecificNumArithIterator<SubtractOperation, store::XS_FLOAT>& a);
-void beginVisit( const SpecificNumArithIterator<SubtractOperation, store::XS_DOUBLE>& a);
-void beginVisit( const SpecificNumArithIterator<MultiplyOperation, store::XS_DECIMAL>& a);
-void beginVisit( const SpecificNumArithIterator<MultiplyOperation, store::XS_INTEGER>& a);
-void beginVisit( const SpecificNumArithIterator<MultiplyOperation, store::XS_FLOAT>& a);
-void beginVisit( const SpecificNumArithIterator<MultiplyOperation, store::XS_DOUBLE>& a);
-void beginVisit( const SpecificNumArithIterator<DivideOperation, store::XS_DECIMAL>& a);
-void beginVisit( const SpecificNumArithIterator<DivideOperation, store::XS_INTEGER>& a);
-void beginVisit(const SpecificNumArithIterator<DivideOperation, store::XS_FLOAT>& a);
-void beginVisit(const SpecificNumArithIterator<DivideOperation, store::XS_DOUBLE>& a);
-void beginVisit(const SpecificNumArithIterator<ModOperation, store::XS_DECIMAL>& a);
-void beginVisit(const SpecificNumArithIterator<ModOperation, store::XS_INTEGER>& a);
-void beginVisit(const SpecificNumArithIterator<ModOperation, store::XS_FLOAT>& a);
-void beginVisit(const SpecificNumArithIterator<ModOperation, store::XS_DOUBLE>& a);
-void endVisit(const SpecificNumArithIterator<AddOperation, store::XS_DECIMAL>& );
-void endVisit(const SpecificNumArithIterator<AddOperation, store::XS_INTEGER>& );
-void endVisit(const SpecificNumArithIterator<AddOperation, store::XS_FLOAT>& );
-void endVisit(const SpecificNumArithIterator<AddOperation, store::XS_DOUBLE>& );
-void endVisit(const SpecificNumArithIterator<SubtractOperation, store::XS_DECIMAL>& );
-void endVisit(const SpecificNumArithIterator<SubtractOperation, store::XS_INTEGER>& );
-void endVisit(const SpecificNumArithIterator<SubtractOperation, store::XS_FLOAT>& );
-void endVisit(const SpecificNumArithIterator<SubtractOperation, store::XS_DOUBLE>& );
-void endVisit(const SpecificNumArithIterator<MultiplyOperation, store::XS_DECIMAL>& );
-void endVisit(const SpecificNumArithIterator<MultiplyOperation, store::XS_INTEGER>& );
-void endVisit(const SpecificNumArithIterator<MultiplyOperation, store::XS_FLOAT>& );
-void endVisit(const SpecificNumArithIterator<MultiplyOperation, store::XS_DOUBLE>& );
-void endVisit(const SpecificNumArithIterator<DivideOperation, store::XS_DECIMAL>& );
-void endVisit(const SpecificNumArithIterator<DivideOperation, store::XS_INTEGER>& );
-void endVisit(const SpecificNumArithIterator<DivideOperation, store::XS_FLOAT>& );
-void endVisit(const SpecificNumArithIterator<DivideOperation, store::XS_DOUBLE>& );
-void endVisit(const SpecificNumArithIterator<ModOperation, store::XS_DECIMAL>& );
-void endVisit(const SpecificNumArithIterator<ModOperation, store::XS_INTEGER>& );
-void endVisit(const SpecificNumArithIterator<ModOperation, store::XS_FLOAT>& );
-void endVisit(const SpecificNumArithIterator<ModOperation, store::XS_DOUBLE>& );
-
-void beginVisit ( const FnMinMaxIterator& a);
-void endVisit   ( const FnMinMaxIterator& );
-
-void beginVisit(const FTContainsIterator& a);
-void endVisit  (const FTContainsIterator& );
-
-void beginVisit(const ForVarIterator& a);
-void endVisit(const ForVarIterator& );
-
-void beginVisit(const LetVarIterator& a);
-void endVisit(const LetVarIterator& );
-
-void beginVisitFlworWhereClause(const PlanIterator& a);
+// PlanIterVisitor *Visit() member-function declarations
+#define PIV_VISIT_DECL(...)      \
+  void beginVisit( __VA_ARGS__ const& );  \
+  void endVisit( __VA_ARGS__ const& )
+
+PIV_VISIT_DECL( AncestorAxisIterator );
+PIV_VISIT_DECL( AncestorReverseAxisIterator );
+PIV_VISIT_DECL( AncestorSelfAxisIterator );
+PIV_VISIT_DECL( AncestorSelfReverseAxisIterator );
+PIV_VISIT_DECL( AndIterator );
+PIV_VISIT_DECL( ApplyIterator );
+PIV_VISIT_DECL( ArgumentPlaceholderIterator );
+PIV_VISIT_DECL( AtomicValuesEquivalenceIterator );
+PIV_VISIT_DECL( AttributeAxisIterator );
+PIV_VISIT_DECL( AttributeIterator );
+PIV_VISIT_DECL( CastableIterator );
+PIV_VISIT_DECL( CastIterator );
+PIV_VISIT_DECL( ChildAxisIterator );
+PIV_VISIT_DECL( CommentIterator );
+PIV_VISIT_DECL( CompareIterator );
+PIV_VISIT_DECL( CreateIndexIterator );
+PIV_VISIT_DECL( CreateInternalIndexIterator );
+PIV_VISIT_DECL( CtxVarAssignIterator );
+PIV_VISIT_DECL( CtxVarDeclareIterator );
+PIV_VISIT_DECL( CtxVarIsSetIterator );
+PIV_VISIT_DECL( CtxVarIterator );
+#ifdef ZORBA_WITH_DEBUGGER
+PIV_VISIT_DECL( DebuggerSingletonIterator );
+#endif
+PIV_VISIT_DECL( DeleteIndexIterator );
+PIV_VISIT_DECL( DeleteIterator );
+PIV_VISIT_DECL( DescendantAxisIterator );
+PIV_VISIT_DECL( DescendantSelfAxisIterator );
+PIV_VISIT_DECL( DocumentIterator );
+PIV_VISIT_DECL( EitherNodesOrAtomicsIterator );
+PIV_VISIT_DECL( ElementIterator );
+PIV_VISIT_DECL( EmptyIterator );
+PIV_VISIT_DECL( EnclosedIterator );
+PIV_VISIT_DECL( EvalIterator );
+PIV_VISIT_DECL( ExitCatcherIterator );
+PIV_VISIT_DECL( ExitIterator );
+PIV_VISIT_DECL( ExtFunctionCallIterator );
+PIV_VISIT_DECL( FlowCtlIterator );
+PIV_VISIT_DECL( flwor::CountIterator );
+PIV_VISIT_DECL( flwor::FLWORIterator );
+PIV_VISIT_DECL( flwor::ForIterator );
+PIV_VISIT_DECL( flwor::GroupByIterator );
+PIV_VISIT_DECL( flwor::LetIterator );
+PIV_VISIT_DECL( flwor::OrderByIterator );
+PIV_VISIT_DECL( flwor::OuterForIterator );
+PIV_VISIT_DECL( flwor::TupleSourceIterator );
+PIV_VISIT_DECL( flwor::TupleStreamIterator );
+PIV_VISIT_DECL( flwor::WhereIterator );
+PIV_VISIT_DECL( flwor::WindowIterator );
+PIV_VISIT_DECL( FnAdjustToTimeZoneIterator_1 );
+PIV_VISIT_DECL( FnAdjustToTimeZoneIterator_2 );
+PIV_VISIT_DECL( FnBooleanIterator );
+PIV_VISIT_DECL( FnDateTimeConstructorIterator );
+PIV_VISIT_DECL( FnFormatDateTimeIterator );
+PIV_VISIT_DECL( FnMinMaxIterator );
+PIV_VISIT_DECL( FollowingAxisIterator );
+PIV_VISIT_DECL( ForVarIterator );
+PIV_VISIT_DECL( FTContainsIterator );
+PIV_VISIT_DECL( FunctionItemIterator );
+PIV_VISIT_DECL( GeneralIndexEntryBuilderIterator );
+PIV_VISIT_DECL( GenericArithIterator<AddOperation> );
+PIV_VISIT_DECL( GenericArithIterator<DivideOperation> );
+PIV_VISIT_DECL( GenericArithIterator<IntegerDivideOperation> );
+PIV_VISIT_DECL( GenericArithIterator<ModOperation> );
+PIV_VISIT_DECL( GenericArithIterator<MultiplyOperation> );
+PIV_VISIT_DECL( GenericArithIterator<SubtractOperation> );
+PIV_VISIT_DECL( HoistIterator );
+PIV_VISIT_DECL( IfThenElseIterator );
+PIV_VISIT_DECL( InsertIterator );
+PIV_VISIT_DECL( InstanceOfIterator );
+PIV_VISIT_DECL( JSONArrayIterator );
+PIV_VISIT_DECL( JSONDirectObjectIterator );
+PIV_VISIT_DECL( JSONObjectIterator );
+PIV_VISIT_DECL( LetVarIterator );
+PIV_VISIT_DECL( LoopIterator );
+PIV_VISIT_DECL( LSiblingAxisIterator );
+PIV_VISIT_DECL( LSiblingReverseAxisIterator );
+PIV_VISIT_DECL( MaterializeIterator );
+PIV_VISIT_DECL( MultiDynamicFnCallIterator );
+PIV_VISIT_DECL( NameCastIterator );
+PIV_VISIT_DECL( NamespaceIterator );
+PIV_VISIT_DECL( NodeDistinctIterator );
+PIV_VISIT_DECL( NodeSortIterator );
+PIV_VISIT_DECL( NumArithIterator<AddOperation> );
+PIV_VISIT_DECL( NumArithIterator<DivideOperation> );
+PIV_VISIT_DECL( NumArithIterator<IntegerDivideOperation> );
+PIV_VISIT_DECL( NumArithIterator<ModOperation> );
+PIV_VISIT_DECL( NumArithIterator<MultiplyOperation> );
+PIV_VISIT_DECL( NumArithIterator<SubtractOperation> );
+PIV_VISIT_DECL( OpDoubleUnaryIterator );
+PIV_VISIT_DECL( OpNumericUnaryIterator );
+PIV_VISIT_DECL( OrIterator );
+PIV_VISIT_DECL( ParentAxisIterator );
+PIV_VISIT_DECL( PiIterator );
+PIV_VISIT_DECL( PlanIterator );
+PIV_VISIT_DECL( PrecedingAxisIterator );
+PIV_VISIT_DECL( PrecedingReverseAxisIterator );
+PIV_VISIT_DECL( ProbeIndexPointGeneralIterator );
+PIV_VISIT_DECL( ProbeIndexPointValueIterator );
+PIV_VISIT_DECL( ProbeIndexRangeGeneralIterator );
+PIV_VISIT_DECL( ProbeIndexRangeValueIterator );
+PIV_VISIT_DECL( PromoteIterator );
+PIV_VISIT_DECL( RefreshIndexIterator );
+PIV_VISIT_DECL( RenameIterator );
+PIV_VISIT_DECL( ReplaceIterator );
+PIV_VISIT_DECL( RSiblingAxisIterator );
+PIV_VISIT_DECL( SelfAxisIterator );
+PIV_VISIT_DECL( SequentialIterator );
+PIV_VISIT_DECL( SingleDynamicFnCallIterator );
+PIV_VISIT_DECL( SingletonIterator );
+PIV_VISIT_DECL( SpecificNumArithIterator<AddOperation,store::XS_DECIMAL> );
+PIV_VISIT_DECL( SpecificNumArithIterator<AddOperation,store::XS_DOUBLE> );
+PIV_VISIT_DECL( SpecificNumArithIterator<AddOperation,store::XS_FLOAT> );
+PIV_VISIT_DECL( SpecificNumArithIterator<AddOperation,store::XS_INTEGER> );
+PIV_VISIT_DECL( SpecificNumArithIterator<DivideOperation,store::XS_DECIMAL> );
+PIV_VISIT_DECL( SpecificNumArithIterator<DivideOperation,store::XS_DOUBLE> );
+PIV_VISIT_DECL( SpecificNumArithIterator<DivideOperation,store::XS_FLOAT> );
+PIV_VISIT_DECL( SpecificNumArithIterator<DivideOperation,store::XS_INTEGER> );
+PIV_VISIT_DECL( SpecificNumArithIterator<ModOperation,store::XS_DECIMAL> );
+PIV_VISIT_DECL( SpecificNumArithIterator<ModOperation,store::XS_DOUBLE> );
+PIV_VISIT_DECL( SpecificNumArithIterator<ModOperation,store::XS_FLOAT> );
+PIV_VISIT_DECL( SpecificNumArithIterator<ModOperation,store::XS_INTEGER> );
+PIV_VISIT_DECL( SpecificNumArithIterator<MultiplyOperation,store::XS_DECIMAL> );
+PIV_VISIT_DECL( SpecificNumArithIterator<MultiplyOperation,store::XS_DOUBLE> );
+PIV_VISIT_DECL( SpecificNumArithIterator<MultiplyOperation,store::XS_FLOAT> );
+PIV_VISIT_DECL( SpecificNumArithIterator<MultiplyOperation,store::XS_INTEGER> );
+PIV_VISIT_DECL( SpecificNumArithIterator<SubtractOperation,store::XS_DECIMAL> );
+PIV_VISIT_DECL( SpecificNumArithIterator<SubtractOperation,store::XS_DOUBLE> );
+PIV_VISIT_DECL( SpecificNumArithIterator<SubtractOperation,store::XS_FLOAT> );
+PIV_VISIT_DECL( SpecificNumArithIterator<SubtractOperation,store::XS_INTEGER> );
+PIV_VISIT_DECL( TextIterator );
+PIV_VISIT_DECL( TransformIterator );
+PIV_VISIT_DECL( TreatIterator );
+PIV_VISIT_DECL( TryCatchIterator );
+PIV_VISIT_DECL( TypedValueCompareIterator<store::XS_DECIMAL> );
+PIV_VISIT_DECL( TypedValueCompareIterator<store::XS_DOUBLE> );
+PIV_VISIT_DECL( TypedValueCompareIterator<store::XS_FLOAT> );
+PIV_VISIT_DECL( TypedValueCompareIterator<store::XS_INTEGER> );
+PIV_VISIT_DECL( TypedValueCompareIterator<store::XS_STRING> );
+PIV_VISIT_DECL( UDFunctionCallIterator );
+PIV_VISIT_DECL( UnhoistIterator );
+PIV_VISIT_DECL( ValueIndexEntryBuilderIterator );
+
+#undef PIV_VISIT_DECL
+
+void beginVisitFlworReturn(const PlanIterator& a);
+void endVisitFlworReturn  (const PlanIterator& );
+
+void beginVisitFlworWhereClause(const PlanIterator& );
 void endVisitFlworWhereClause(const PlanIterator& );
 
-void beginVisitFlworLetVariable(
-        bool materialize,
-        const zstring& varName,
-        const std::vector<PlanIter_t>& varRefs);
-
+void beginVisitFlworLetVariable( bool, const zstring&,
+                                 const std::vector<PlanIter_t>& );
 void endVisitFlworLetVariable();
 
-void beginVisitFlworForVariable(
-        const zstring& varName,
-        const std::vector<PlanIter_t>& varRefs,
-        const std::vector<PlanIter_t>& posRefs);
-
+void beginVisitFlworForVariable( const zstring&, const std::vector<PlanIter_t>&,
+                                 const std::vector<PlanIter_t>& );
 void endVisitFlworForVariable();
 
 void beginVisitMaterializeClause();
-
 void endVisitMaterializeClause();
 
-void beginVisitMaterializeVariable(
-      bool isForVar,
-      PlanIter_t inputVar,
-      const std::vector<PlanIter_t>& varRefs);
-
+void beginVisitMaterializeVariable( bool, PlanIter_t,
+                                    const std::vector<PlanIter_t>& );
 void endVisitMaterializeVariable();
 
 void beginVisitGroupByClause();
-
 void endVisitGroupByClause();
 
 void beginVisitGroupBySpec();
-
 void endVisitGroupBySpec();
 
 void beginVisitGroupByOuter();
-
 void endVisitGroupByOuter();
 
-void beginVisitGroupVariable(const std::vector<ForVarIter_t>& varRefs);
-
+void beginVisitGroupVariable( const std::vector<ForVarIter_t>& );
 void endVisitGroupVariable();
 
-void beginVisitNonGroupVariable(const std::vector<LetVarIter_t>& varRefs);
-
+void beginVisitNonGroupVariable( const std::vector<LetVarIter_t>& );
 void endVisitNonGroupVariable();
 
-void beginVisitOrderBySpec(const PlanIterator& a);
-
-void endVisitOrderBySpec(const PlanIterator& );
-
-void beginVisitOrderByForVariable(
-        ForVarIter_t inputVar,
-        const std::vector<PlanIter_t>& varRefs);
-
+void beginVisitOrderBySpec( const PlanIterator& );
+void endVisitOrderBySpec( const PlanIterator& );
+
+void beginVisitOrderByForVariable( ForVarIter_t, const std::vector<PlanIter_t>& );
 void endVisitOrderByForVariable();
 
-void beginVisitOrderByLetVariable(
-        LetVarIter_t inputVar,
-        const std::vector<PlanIter_t>& varRefs);
-
+void beginVisitOrderByLetVariable( LetVarIter_t , const std::vector<PlanIter_t>& );
 void endVisitOrderByLetVariable();
 
-void beginVisitWindowVariable(
-        const std::string& varName,
-        const std::vector<LetVarIter_t>& varRefs);
-
+void beginVisitWindowVariable( const std::string&,
+                               const std::vector<LetVarIter_t>& );
 void endVisitWindowVariable();
 
-    void beginVisitWinCondVariable(
-        const zstring& varName,
-        const std::vector<PlanIter_t>& varRefs);
-
-    void endVisitWinCondVariable();
-
-    void beginVisitFlworReturn(const PlanIterator& a);
-
-    void endVisitFlworReturn  (const PlanIterator& );
-    void beginVisit(const CastIterator& a);
-    void endVisit  (const CastIterator&);
-    void beginVisit(const PromoteIterator& a);
-    void endVisit  (const PromoteIterator& );
-    void beginVisit(const CastableIterator& a);
-    void endVisit  (const CastableIterator& );
-    void beginVisit ( const TypedValueCompareIterator<store::XS_DECIMAL>& a);
-    void beginVisit ( const TypedValueCompareIterator<store::XS_INTEGER>& a);
-    void beginVisit ( const TypedValueCompareIterator<store::XS_DOUBLE>& a);
-    void beginVisit ( const TypedValueCompareIterator<store::XS_FLOAT>& a);
-    void beginVisit ( const TypedValueCompareIterator<store::XS_STRING>& a);
-    void endVisit ( const TypedValueCompareIterator<store::XS_DECIMAL>& a);
-    void endVisit ( const TypedValueCompareIterator<store::XS_INTEGER>& a);
-    void endVisit ( const TypedValueCompareIterator<store::XS_DOUBLE>& a);
-    void endVisit ( const TypedValueCompareIterator<store::XS_FLOAT>& a);
-    void endVisit ( const TypedValueCompareIterator<store::XS_STRING>& a);
-
-  DECLARE_VISITOR (UDFunctionCallIterator)
-  DECLARE_VISITOR (ExtFunctionCallIterator)
-  DECLARE_VISITOR (FnBooleanIterator)
-  DECLARE_VISITOR (OrIterator)
-  DECLARE_VISITOR (AndIterator)
-  DECLARE_VISITOR (CompareIterator)
-  DECLARE_VISITOR (AtomicValuesEquivalenceIterator)
-  DECLARE_VISITOR (ElementIterator)
-  DECLARE_VISITOR (AttributeIterator)
-  DECLARE_VISITOR (NamespaceIterator)
-  DECLARE_VISITOR (DocumentIterator)
-  DECLARE_VISITOR (CommentIterator)
-  DECLARE_VISITOR (PiIterator)
-  DECLARE_VISITOR(JSONArrayIterator)
-  DECLARE_VISITOR(JSONObjectIterator)
-  DECLARE_VISITOR(JSONDirectObjectIterator)
-  DECLARE_VISITOR (EmptyIterator)
-  DECLARE_VISITOR (IfThenElseIterator)
-  DECLARE_VISITOR (NodeDistinctIterator)
-  DECLARE_VISITOR (InstanceOfIterator)
-  DECLARE_VISITOR (EitherNodesOrAtomicsIterator)
-  DECLARE_VISITOR (OpNumericUnaryIterator)
-  DECLARE_VISITOR (OpDoubleUnaryIterator)
-  DECLARE_VISITOR (TextIterator)
-  DECLARE_VISITOR (FnDateTimeConstructorIterator)
-  DECLARE_VISITOR (TryCatchIterator)
-  DECLARE_VISITOR (flwor::FLWORIterator)
-  DECLARE_VISITOR (flwor::TupleStreamIterator)
-  DECLARE_VISITOR (flwor::TupleSourceIterator)
-  DECLARE_VISITOR (flwor::ForIterator)
-  DECLARE_VISITOR (flwor::OuterForIterator)
-  DECLARE_VISITOR (flwor::LetIterator)
-  DECLARE_VISITOR (flwor::WhereIterator)
-  DECLARE_VISITOR (flwor::CountIterator)
-  DECLARE_VISITOR (flwor::GroupByIterator)
-  DECLARE_VISITOR (flwor::OrderByIterator)
-  DECLARE_VISITOR (flwor::WindowIterator)
-  DECLARE_VISITOR (NameCastIterator)
-  DECLARE_VISITOR (CtxVarIterator)
-  DECLARE_VISITOR (CtxVarDeclareIterator)
-  DECLARE_VISITOR (CtxVarAssignIterator)
-  DECLARE_VISITOR (CtxVarIsSetIterator)
-  DECLARE_VISITOR (FnAdjustToTimeZoneIterator_1);
-  DECLARE_VISITOR (FnAdjustToTimeZoneIterator_2);
-  DECLARE_VISITOR (FnFormatDateTimeIterator);
-  DECLARE_VISITOR (InsertIterator);
-  DECLARE_VISITOR (DeleteIterator);
-  DECLARE_VISITOR (ReplaceIterator);
-  DECLARE_VISITOR (RenameIterator);
-  DECLARE_VISITOR (TransformIterator);
-  DECLARE_VISITOR (ApplyIterator);
-#ifdef ZORBA_WITH_DEBUGGER
-  DECLARE_VISITOR (DebuggerSingletonIterator);
-#endif
-  DECLARE_VISITOR (HoistIterator);
-  DECLARE_VISITOR (UnhoistIterator);
-
-  DECLARE_VISITOR (AttributeAxisIterator)
-  DECLARE_VISITOR (ParentAxisIterator)
-  DECLARE_VISITOR (AncestorAxisIterator)
-  DECLARE_VISITOR (AncestorReverseAxisIterator)
-  DECLARE_VISITOR (AncestorSelfAxisIterator)
-  DECLARE_VISITOR (AncestorSelfReverseAxisIterator)
-  DECLARE_VISITOR (RSiblingAxisIterator)
-  DECLARE_VISITOR (LSiblingAxisIterator)
-  DECLARE_VISITOR (LSiblingReverseAxisIterator)
-  DECLARE_VISITOR (ChildAxisIterator)
-  DECLARE_VISITOR (DescendantAxisIterator)
-  DECLARE_VISITOR (DescendantSelfAxisIterator)
-  DECLARE_VISITOR (PrecedingAxisIterator)
-  DECLARE_VISITOR (PrecedingReverseAxisIterator)
-  DECLARE_VISITOR (FollowingAxisIterator)
-  DECLARE_VISITOR(ProbeIndexPointValueIterator);
-  DECLARE_VISITOR(ProbeIndexPointGeneralIterator);
-  DECLARE_VISITOR(ProbeIndexRangeValueIterator);
-  DECLARE_VISITOR(ProbeIndexRangeGeneralIterator);
-  DECLARE_VISITOR(ValueIndexEntryBuilderIterator);
-  DECLARE_VISITOR(GeneralIndexEntryBuilderIterator);
-  DECLARE_VISITOR(RefreshIndexIterator);
-  DECLARE_VISITOR(CreateIndexIterator);
-  DECLARE_VISITOR(CreateInternalIndexIterator);
-  DECLARE_VISITOR(DeleteIndexIterator);
-
-  DECLARE_VISITOR(SingleDynamicFnCallIterator);
-  DECLARE_VISITOR(MultiDynamicFnCallIterator);
-  DECLARE_VISITOR(ArgumentPlaceholderIterator);
-
-  DECLARE_VISITOR(EvalIterator);
-
-  DECLARE_VISITOR(MaterializeIterator);
-
-  DECLARE_VISITOR(SequentialIterator);
-  DECLARE_VISITOR(ExitIterator);
-  DECLARE_VISITOR(ExitCatcherIterator);
-  DECLARE_VISITOR(LoopIterator);
-  DECLARE_VISITOR(FlowCtlIterator);
+void beginVisitWinCondVariable( const zstring&,
+                                const std::vector<PlanIter_t>& );
+void endVisitWinCondVariable();
+
+void printNameOrKindTest( const AxisIteratorHelper* );
 
 /* vim:set et sw=2 ts=2: */

=== renamed file 'src/runtime/visitors/planiter_visitor_impl_include.h' => 'src/runtime/visitors/plan_iter_visitor_types.h'
--- src/runtime/visitors/planiter_visitor_impl_include.h	2013-08-16 13:00:06 +0000
+++ src/runtime/visitors/plan_iter_visitor_types.h	2014-01-31 01:40:25 +0000
@@ -15,179 +15,160 @@
  */
 #pragma once
 
-class PlanIterator;
-typedef rchandle<PlanIterator> PlanIter_t;
-
-class FnBooleanIterator;
-#ifndef ZORBA_NO_XMLSCHEMA
-class ValidateIterator;
-#endif
-class OrIterator;
+class AddOperation;
+class AncestorAxisIterator;
+class AncestorReverseAxisIterator;
+class AncestorSelfAxisIterator;
+class AncestorSelfReverseAxisIterator;
 class AndIterator;
-class CompareIterator;
+class ApplyIterator;
+class ArgumentPlaceholderIterator;
 class AtomicValuesEquivalenceIterator;
-class UDFunctionCallIterator;
-class ExtFunctionCallIterator;
-class ElementIterator;
+class AttributeAxisIterator;
 class AttributeIterator;
-class NamespaceIterator;
+class AxisIteratorHelper;
+class CastableIterator;
+class CastIterator;
+class ChildAxisIterator;
 class CommentIterator;
-
-class JSONObjectIterator;
+class CompareIterator;
+class CreateIndexIterator;
+class CreateInternalIndexIterator;
+class CtxVarAssignIterator;
+class CtxVarDeclareIterator;
+class CtxVarIsSetIterator;
+class CtxVarIterator;
+#ifdef ZORBA_WITH_DEBUGGER
+class DebugIterator;
+class DebuggerSingletonIterator;
+#endif
+class DeleteIndexIterator;
+class DeleteIterator;
+class DescendantAxisIterator;
+class DescendantSelfAxisIterator;
+class DivideOperation;
+class DocumentIterator;
+class EitherNodesOrAtomicsIterator;
+class ElementIterator;
+class EmptyIterator;
+class EnclosedIterator;
+class EvalIterator;
+class ExitCatcherIterator;
+class ExitIterator;
+class ExtFunctionCallIterator;
+class FlowCtlIterator;
+class FnAdjustToTimeZoneIterator_1;
+class FnAdjustToTimeZoneIterator_2;
+class FnBooleanIterator;
+class FnDateTimeConstructorIterator;
+class FnDistinctValuesIterator;
+class FnElementWithIdIterator;
+class FnFormatDateTimeIterator;
+class FnIdIterator;
+class FnIdRefIterator;
+class FnMinMaxIterator;
+class FollowingAxisIterator;
+class ForVarIterator;
+class FTContainsIterator;
+class FunctionItemIterator;
+class GeneralIndexEntryBuilderIterator;
+class HoistIterator;
+class IfThenElseIterator;
+class InsertIterator;
+class InstanceOfIterator;
+class IntegerDivideOperation;
 class JSONArrayIterator;
 class JSONDirectObjectIterator;
 class JSONObjectInsertIterator;
-
-  class PiIterator;
-  class RefIterator;
-  class SingletonIterator;
-  class FunctionItemIterator;
-  class EmptyIterator;
-  class ForVarIterator;
-  typedef rchandle<ForVarIterator> ForVarIter_t;
-  class LetVarIterator;
-  typedef rchandle<LetVarIterator> LetVarIter_t;
-  class EnclosedIterator;
-  class IfThenElseIterator;
-  class TryCatchIterator;
-  class NodeDistinctIterator;
-  class NodeSortIterator;
-  class AxisIteratorHelper;
-  template <class Object, class State> class AxisIterator;
-  class SelfAxisIterator;
-  class AttributeAxisIterator;
-  class ParentAxisIterator;
-  class AncestorAxisIterator;
-  class AncestorReverseAxisIterator;
-  class AncestorSelfAxisIterator;
-  class AncestorSelfReverseAxisIterator;
-  class RSiblingAxisIterator;
-  class LSiblingAxisIterator;
-  class LSiblingReverseAxisIterator;
-  class ChildAxisIterator;
-  class DescendantAxisIterator;
-  class DescendantSelfAxisIterator;
-  class PrecedingAxisIterator;
-  class PrecedingReverseAxisIterator;
-  class FollowingAxisIterator;
-  class PathIterator;
-  class InstanceOfIterator;
-  class TreatIterator;
-  class EitherNodesOrAtomicsIterator;
-  class AddOperation;
-  class SubtractOperation;
-  class MultiplyOperation;
-  class DivideOperation;
-  class IntegerDivideOperation;
-  class ModOperation;
-  template < class AddOperation> class NumArithIterator;
-  template < class SubtractOperation> class NumArithIterator;
-  template < class MultiplyOperation> class NumArithIterator;
-  template < class DivideOperation> class NumArithIterator;
-  template < class IntegerDivideOperation> class NumArithIterator;
-  template < class ModOperation> class NumArithIterator;
-  template < class AddOperation> class GenericArithIterator;
-  template < class SubtractOperation> class GenericArithIterator;
-  template < class MultiplyOperation> class GenericArithIterator;
-  template < class DivideOperation> class GenericArithIterator;
-  template < class IntegerDivideOperation> class GenericArithIterator;
-  template < class ModOperation> class GenericArithIterator;
-  template < class AddOperation, store::SchemaTypeCode > class SpecificNumArithIterator;
-  template < class SubtractOperation, store::SchemaTypeCode > class SpecificNumArithIterator;
-  template < class MultiplyOperation, store::SchemaTypeCode > class SpecificNumArithIterator;
-  template < class DivideOperation, store::SchemaTypeCode > class SpecificNumArithIterator;
-  template < store::SchemaTypeCode > class TypedValueCompareIterator;
-
-  class OpNumericUnaryIterator;
-  class OpDoubleUnaryIterator;
-
-  class FnIdIterator;
-  class FnElementWithIdIterator;
-  class FnIdRefIterator;
-  class FnDistinctValuesIterator;
-  class FnMinMaxIterator;
-  class TextIterator;
-  class DocumentIterator;
-  class CastIterator;
-  class NameCastIterator;
-  class CastableIterator;
-  class PromoteIterator;
-
-  class CtxVarIterator;
-  class CtxVarDeclareIterator;
-  class CtxVarAssignIterator;
-  class CtxVarIsSetIterator;
-
-  class FnDateTimeConstructorIterator;
-  class FnAdjustToTimeZoneIterator_1;
-  class FnAdjustToTimeZoneIterator_2;
-  class FnFormatDateTimeIterator;
-
-  class InsertIterator;
-  class DeleteIterator;
-  class ReplaceIterator;
-  class RenameIterator;
-  class TransformIterator;
-  class ApplyIterator;
-
-  class FTContainsIterator;
-
-  class ZorbaSchemaTypeIterator;
-//   class ZorbaRandomIterator;
+class JSONObjectIterator;
+class LetVarIterator;
+class LoopIterator;
+class LSiblingAxisIterator;
+class LSiblingReverseAxisIterator;
+class MaterializeIterator;
+class ModOperation;
+class MultiDynamicFnCallIterator;
+class MultiplyOperation;
+class NameCastIterator;
+class NamespaceIterator;
+class NodeDistinctIterator;
+class NodeSortIterator;
+class OpDoubleUnaryIterator;
+class OpNumericUnaryIterator;
+class OrIterator;
+class ParentAxisIterator;
+class PathIterator;
+class PiIterator;
+class PlanIterator;
+class PrecedingAxisIterator;
+class PrecedingReverseAxisIterator;
+class ProbeIndexPointGeneralIterator;
+class ProbeIndexPointValueIterator;
+class ProbeIndexRangeGeneralIterator;
+class ProbeIndexRangeValueIterator;
+class PromoteIterator;
+class RefIterator;
+class RefreshIndexIterator;
+class RenameIterator;
+class ReplaceIterator;
+class RSiblingAxisIterator;
+class SelfAxisIterator;
+class SequentialIterator;
+class SingleDynamicFnCallIterator;
+class SingletonIterator;
+class SubtractOperation;
+class TextIterator;
+class TransformIterator;
+class TreatIterator;
+class TryCatchIterator;
+class UDFunctionCallIterator;
+class UnhoistIterator;
+#ifndef ZORBA_NO_XMLSCHEMA
+class ValidateIterator;
+#endif
+class ValueIndexEntryBuilderIterator;
 #ifdef ZORBA_WITH_FOP
-  class ZorbaFopIterator;
+class ZorbaFopIterator;
 #endif
+//class ZorbaRandomIterator;
+class ZorbaSchemaTypeIterator;
 
 namespace flwor
 {
+  class CountIterator;
   class FLWORIterator;
-  class TupleStreamIterator;
-  class TupleSourceIterator;
   class ForIterator;
+  class GroupByIterator;
+  class LetIterator;
+  class OrderByIterator;
   class OuterForIterator;
-  class LetIterator;
+  class TupleSourceIterator;
+  class TupleStreamIterator;
   class WhereIterator;
-  class CountIterator;
-  class GroupByIterator;
-  class OrderByIterator;
   class WindowIterator;
 }
 
-#ifdef ZORBA_WITH_DEBUGGER
-class DebugIterator;
-class DebuggerSingletonIterator;
-#endif
-
-class HoistIterator;
-class UnhoistIterator;
-
-class ProbeIndexPointValueIterator;
-class ProbeIndexPointGeneralIterator;
-class ProbeIndexRangeValueIterator;
-class ProbeIndexRangeGeneralIterator;
-class ValueIndexEntryBuilderIterator;
-class GeneralIndexEntryBuilderIterator;
-class RefreshIndexIterator;
-class CreateIndexIterator;
-class CreateInternalIndexIterator;
-class DeleteIndexIterator;
-
-class SingleDynamicFnCallIterator;
-class MultiDynamicFnCallIterator;
-class ArgumentPlaceholderIterator;
-
-class EvalIterator;
-
-class MaterializeIterator;
-
-class SequentialIterator;
-class ExitIterator;
-class ExitCatcherIterator;
-class LoopIterator;
-class FlowCtlIterator;
-
-#define PLAN_ITER_VISITOR(class)                \
-virtual void beginVisit ( const class& ) = 0;  \
-virtual void endVisit ( const class& ) = 0
+template<class Object,class State> class AxisIterator;
+template<class AddOperation> class NumArithIterator;
+template<class SubtractOperation> class NumArithIterator;
+template<class MultiplyOperation> class NumArithIterator;
+template<class DivideOperation> class NumArithIterator;
+template<class IntegerDivideOperation> class NumArithIterator;
+template<class ModOperation> class NumArithIterator;
+template<class AddOperation> class GenericArithIterator;
+template<class SubtractOperation> class GenericArithIterator;
+template<class MultiplyOperation> class GenericArithIterator;
+template<class DivideOperation> class GenericArithIterator;
+template<class IntegerDivideOperation> class GenericArithIterator;
+template<class ModOperation> class GenericArithIterator;
+template<class AddOperation,store::SchemaTypeCode> class SpecificNumArithIterator;
+template<class SubtractOperation,store::SchemaTypeCode> class SpecificNumArithIterator;
+template<class MultiplyOperation,store::SchemaTypeCode> class SpecificNumArithIterator;
+template<class DivideOperation,store::SchemaTypeCode> class SpecificNumArithIterator;
+template<store::SchemaTypeCode> class TypedValueCompareIterator;
+
+typedef rchandle<LetVarIterator> LetVarIter_t;
+typedef rchandle<ForVarIterator> ForVarIter_t;
+typedef rchandle<PlanIterator> PlanIter_t;
 
 /* vim:set et sw=2 ts=2: */

=== modified file 'src/runtime/visitors/pregenerated/planiter_visitor.h'
--- src/runtime/visitors/pregenerated/planiter_visitor.h	2013-11-28 17:41:30 +0000
+++ src/runtime/visitors/pregenerated/planiter_visitor.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_VISITORS_PLAN_ITER_VISITOR_H
 #define ZORBA_RUNTIME_VISITORS_PLAN_ITER_VISITOR_H
 #include <vector>
@@ -766,15 +767,16 @@
     class XQDocContentIterator;
 
 
-#include "runtime/visitors/planiter_visitor_impl_include.h"
+#include "runtime/visitors/plan_iter_visitor_types.h"
 /**
  * Visitor to visit a PlanIterator tree.
  */
 class PlanIterVisitor {
 public:
-  virtual ~PlanIterVisitor() {}
-
-#include "runtime/visitors/planiter_visitor_impl_code.h"
+  virtual ~PlanIterVisitor() { }
+
+#include "runtime/visitors/plan_iter_visitor_decl.h"
+
     virtual void beginVisit ( const NodeNameIterator& ) = 0;
     virtual void endVisit   ( const NodeNameIterator& ) = 0;
 

=== modified file 'src/runtime/visitors/pregenerated/printer_visitor.cpp'
--- src/runtime/visitors/pregenerated/printer_visitor.cpp	2013-11-28 17:41:30 +0000
+++ src/runtime/visitors/pregenerated/printer_visitor.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 
 #include "runtime/visitors/printer_visitor.h"

=== modified file 'src/runtime/visitors/pregenerated/printer_visitor.h'
--- src/runtime/visitors/pregenerated/printer_visitor.h	2013-11-28 17:41:30 +0000
+++ src/runtime/visitors/pregenerated/printer_visitor.h	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #ifndef ZORBA_RUNTIME_PRINTER_VISITOR_H
 #define ZORBA_RUNTIME_PRINTER_VISITOR_H
 
@@ -45,7 +46,7 @@
     void print();
     void printCommons(const PlanIterator* aIter, int theId);
 
-#include "runtime/visitors/printer_visitor_impl.h"
+#include "runtime/visitors/plan_iter_visitor_impl.h"
 
     void beginVisit( const NodeNameIterator& );
     void endVisit  ( const NodeNameIterator& );

=== modified file 'src/runtime/xqdoc/pregenerated/xqdoc.cpp'
--- src/runtime/xqdoc/pregenerated/xqdoc.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/xqdoc/pregenerated/xqdoc.cpp	2014-01-31 01:40:25 +0000
@@ -21,6 +21,7 @@
 // *                                        *
 // ******************************************
 
+
 #include "stdafx.h"
 #include "zorbatypes/rchandle.h"
 #include "zorbatypes/zstring.h"

=== modified file 'src/runtime/xqdoc/pregenerated/xqdoc.h'
--- src/runtime/xqdoc/pregenerated/xqdoc.h	2013-03-05 23:11:50 +0000
+++ src/runtime/xqdoc/pregenerated/xqdoc.h	2014-01-31 01:40:25 +0000
@@ -20,6 +20,7 @@
 // * SEE .xml FILE WITH SAME NAME           *
 // *                                        *
 // ******************************************
+
 #ifndef ZORBA_RUNTIME_XQDOC_XQDOC_H
 #define ZORBA_RUNTIME_XQDOC_XQDOC_H