zorba-coders team mailing list archive

[Markos Zaharioudakis <markos_za@xxxxxxxxx>]

Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/hof-next into lp:zorba.

Commit message:
renamed DynamicFunctionIterator to FunctionItemIterator

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155635

renamed DynamicFunctionIterator to FunctionItemIterator
-- 
https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/155635
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/compiler/codegen/plan_visitor.cpp'
--- src/compiler/codegen/plan_visitor.cpp	2013-03-26 21:26:20 +0000
+++ src/compiler/codegen/plan_visitor.cpp	2013-03-26 22:32:25 +0000
@@ -549,7 +549,7 @@
     } // for
   }
 
-  push_itstack(new DynamicFunctionIterator(sctx, qloc, fnInfo));
+  push_itstack(new FunctionItemIterator(sctx, qloc, fnInfo));
 }
 
 

=== modified file 'src/runtime/function_item/function_item.cpp'
--- src/runtime/function_item/function_item.cpp	2013-03-26 21:26:20 +0000
+++ src/runtime/function_item/function_item.cpp	2013-03-26 22:32:25 +0000
@@ -47,7 +47,7 @@
 
 SERIALIZABLE_CLASS_VERSIONS(FunctionItem)
 
-SERIALIZABLE_CLASS_VERSIONS(DynamicFunctionIterator)
+SERIALIZABLE_CLASS_VERSIONS(FunctionItemIterator)
 
 
 /*******************************************************************************
@@ -287,31 +287,31 @@
 /*******************************************************************************
 
 ********************************************************************************/
-DynamicFunctionIterator::DynamicFunctionIterator(
+FunctionItemIterator::FunctionItemIterator(
       static_context* sctx,
       const QueryLoc& loc,
       FunctionItemInfo* fnInfo)
   :
-  NaryBaseIterator<DynamicFunctionIterator, PlanIteratorState>(sctx, loc, fnInfo->theScopedVarsIterators),
+  NaryBaseIterator<FunctionItemIterator, PlanIteratorState>(sctx, loc, fnInfo->theScopedVarsIterators),
   theFunctionItemInfo(fnInfo)
 {
 }
 
 
-DynamicFunctionIterator::~DynamicFunctionIterator()
+FunctionItemIterator::~FunctionItemIterator()
 {
 }
 
 
-void DynamicFunctionIterator::serialize(::zorba::serialization::Archiver& ar)
+void FunctionItemIterator::serialize(::zorba::serialization::Archiver& ar)
 {
   serialize_baseclass(ar,
-  (NaryBaseIterator<DynamicFunctionIterator, PlanIteratorState>*)this);
+  (NaryBaseIterator<FunctionItemIterator, PlanIteratorState>*)this);
   ar & theFunctionItemInfo;
 }
 
 
-bool DynamicFunctionIterator::nextImpl(store::Item_t& result, PlanState& planState) const
+bool FunctionItemIterator::nextImpl(store::Item_t& result, PlanState& planState) const
 {
   PlanIteratorState* state;
   DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
@@ -330,7 +330,7 @@
 
     if (theFunctionItemInfo->theIsCoercion)
     {
-      DynamicFunctionIterator* child = dynamic_cast<DynamicFunctionIterator*>(theChildren[0].getp());
+      FunctionItemIterator* child = dynamic_cast<FunctionItemIterator*>(theChildren[0].getp());
       if (child != NULL)
         theFunctionItemInfo->theQName = child->theFunctionItemInfo->theQName;
     }
@@ -366,7 +366,7 @@
       the varids that will be generated for the eval query will not conflict with
       the varids of the outer vars and the outer-query global vars.
 ********************************************************************************/
-void DynamicFunctionIterator::importOuterEnv(
+void FunctionItemIterator::importOuterEnv(
     PlanState& planState,
     CompilerCB* evalCCB,
     static_context* importSctx,
@@ -453,7 +453,7 @@
 /****************************************************************************//**
 
 ********************************************************************************/
-void DynamicFunctionIterator::setExternalVariables(
+void FunctionItemIterator::setExternalVariables(
     CompilerCB* ccb,
     static_context* importSctx,
     dynamic_context* evalDctx) const
@@ -503,7 +503,7 @@
   }
 }
 
-NARY_ACCEPT(DynamicFunctionIterator)
+NARY_ACCEPT(FunctionItemIterator)
 
 
 } //namespace zorba

=== modified file 'src/runtime/function_item/function_item.h'
--- src/runtime/function_item/function_item.h	2013-03-26 21:26:20 +0000
+++ src/runtime/function_item/function_item.h	2013-03-26 22:32:25 +0000
@@ -36,7 +36,7 @@
 
 /*******************************************************************************
   A class to hold information about a dynamic function. This info is shared
-  between the DynamicFunctionIterator and the FunctionItems it creates.
+  between the FunctionItemIterator and the FunctionItems it creates.
 
   theCCB :
   --------
@@ -237,24 +237,24 @@
 /*******************************************************************************
   An iterator that creates and returns dynamic function items
 ********************************************************************************/
-class DynamicFunctionIterator : public NaryBaseIterator<DynamicFunctionIterator, PlanIteratorState>
+class FunctionItemIterator : public NaryBaseIterator<FunctionItemIterator, PlanIteratorState>
 {
 protected:
   FunctionItemInfo_t theFunctionItemInfo;
 
 public:
-  SERIALIZABLE_CLASS(DynamicFunctionIterator)
-  SERIALIZABLE_CLASS_CONSTRUCTOR2T(DynamicFunctionIterator,
-  NaryBaseIterator<DynamicFunctionIterator, PlanIteratorState>)
+  SERIALIZABLE_CLASS(FunctionItemIterator)
+  SERIALIZABLE_CLASS_CONSTRUCTOR2T(FunctionItemIterator,
+  NaryBaseIterator<FunctionItemIterator, PlanIteratorState>)
   void serialize(::zorba::serialization::Archiver& ar);
 
 public:
-  DynamicFunctionIterator(
+  FunctionItemIterator(
       static_context* sctx,
       const QueryLoc& loc,
       FunctionItemInfo* fnInfo);
 
-  virtual ~DynamicFunctionIterator();
+  virtual ~FunctionItemIterator();
 
   // Used for pretty-printing of the iterator tree
   const FunctionItemInfo_t getFunctionItemInfo() const

=== modified file 'src/runtime/visitors/planiter_visitor_impl_code.h'
--- src/runtime/visitors/planiter_visitor_impl_code.h	2013-03-24 20:40:03 +0000
+++ src/runtime/visitors/planiter_visitor_impl_code.h	2013-03-26 22:32:25 +0000
@@ -51,7 +51,7 @@
 
   PLAN_ITER_VISITOR (SingletonIterator);
 
-  PLAN_ITER_VISITOR (DynamicFunctionIterator);
+  PLAN_ITER_VISITOR (FunctionItemIterator);
 
   PLAN_ITER_VISITOR (EmptyIterator);
 

=== modified file 'src/runtime/visitors/planiter_visitor_impl_include.h'
--- src/runtime/visitors/planiter_visitor_impl_include.h	2013-03-24 20:40:03 +0000
+++ src/runtime/visitors/planiter_visitor_impl_include.h	2013-03-26 22:32:25 +0000
@@ -43,7 +43,7 @@
   class PiIterator;
   class RefIterator;
   class SingletonIterator;
-  class DynamicFunctionIterator;
+  class FunctionItemIterator;
   class EmptyIterator;
   class ForVarIterator;
   typedef rchandle<ForVarIterator> ForVarIter_t;

=== modified file 'src/runtime/visitors/printer_visitor_impl.cpp'
--- src/runtime/visitors/printer_visitor_impl.cpp	2013-03-26 21:26:20 +0000
+++ src/runtime/visitors/printer_visitor_impl.cpp	2013-03-26 22:32:25 +0000
@@ -115,16 +115,16 @@
 }
 
 
-void PrinterVisitor::beginVisit(const DynamicFunctionIterator& a)
+void PrinterVisitor::beginVisit(const FunctionItemIterator& a)
 {
-  thePrinter.startBeginVisit("DynamicFunctionIterator", ++theId);
+  thePrinter.startBeginVisit("FunctionItemIterator", ++theId);
   if (a.getFunctionItemInfo()->theQName.getp() != NULL)
     thePrinter.addAttribute("function", a.getFunctionItemInfo()->theQName->getStringValue().str());
   printCommons( &a, theId );
   thePrinter.endBeginVisit(theId);
 }
 
-void PrinterVisitor::endVisit(const DynamicFunctionIterator&)
+void PrinterVisitor::endVisit(const FunctionItemIterator&)
 {
   thePrinter.startEndVisit();
   thePrinter.endEndVisit();

=== modified file 'src/runtime/visitors/printer_visitor_impl.h'
--- src/runtime/visitors/printer_visitor_impl.h	2013-03-24 20:40:03 +0000
+++ src/runtime/visitors/printer_visitor_impl.h	2013-03-26 22:32:25 +0000
@@ -29,8 +29,8 @@
 void beginVisit(const SingletonIterator& a);
 void endVisit(const SingletonIterator& a);
 
-void beginVisit(const DynamicFunctionIterator& a);
-void endVisit(const DynamicFunctionIterator& a);
+void beginVisit(const FunctionItemIterator& a);
+void endVisit(const FunctionItemIterator& a);
 
 void beginVisit(const EnclosedIterator& a);
 void endVisit(const EnclosedIterator& a);

=== modified file 'src/zorbaserialization/archiver_consts.h'
--- src/zorbaserialization/archiver_consts.h	2013-03-26 21:26:20 +0000
+++ src/zorbaserialization/archiver_consts.h	2013-03-26 22:32:25 +0000
@@ -250,7 +250,7 @@
 
 #include "runtime/iterator_enum.h"
 
-  TYPE_DynamicFunctionIterator,
+  TYPE_FunctionItemIterator,
   TYPE_FunctionItemInfo,
   TYPE_DynamicFnCallIterator,
   TYPE_ArgumentPlaceholderIterator,