Merge lp:~zorba-coders/zorba/hof-next into lp:zorba

[Markos Zaharioudakis]

renamed DynamicFunctionInfo to FunctionItemInfo

renamed DynamicFunctionInfo to FunctionItemInfo

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-next-2013-03-26T21-55-43.651Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job hof-next-2013-03-26T21-55-43.651Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/compiler/codegen/plan_visitor.cpp'
--- src/compiler/codegen/plan_visitor.cpp	2013-03-17 13:55:28 +0000
+++ src/compiler/codegen/plan_visitor.cpp	2013-03-26 21:30:30 +0000
@@ -467,7 +467,7 @@
 {
   CODEGEN_TRACE_OUT("");
 
-  DynamicFunctionInfo* fnInfo = v.get_dynamic_fn_info();
+  FunctionItemInfo* fnInfo = v.get_dynamic_fn_info();
   fnInfo->theCCB = theCCB;
   fnInfo->theMustDeleteCCB = false;
   fnInfo->theLoc = qloc;

=== modified file 'src/compiler/expression/expr_clone.cpp'
--- src/compiler/expression/expr_clone.cpp	2013-03-23 15:23:57 +0000
+++ src/compiler/expression/expr_clone.cpp	2013-03-26 21:30:30 +0000
@@ -386,26 +386,26 @@
     create_function_item_expr(theSctx,
                               udf,
                               get_loc(),
-                              e->theDynamicFunctionInfo->theFunction,
-                              e->theDynamicFunctionInfo->theFunction->getName(),
-                              e->theDynamicFunctionInfo->theArity,
+                              e->theFunctionItemInfo->theFunction,
+                              e->theFunctionItemInfo->theFunction->getName(),
+                              e->theFunctionItemInfo->theArity,
                               e->is_inline(),
                               e->needs_context_item(),
                               e->is_coercion());
 
     std::vector<expr*>::const_iterator varIter = 
-    e->theDynamicFunctionInfo->theScopedVarsValues.begin();
+    e->theFunctionItemInfo->theScopedVarsValues.begin();
 
     std::vector<var_expr*>::const_iterator substVarIter = 
-    e->theDynamicFunctionInfo->theSubstVarsValues.begin();
+    e->theFunctionItemInfo->theSubstVarsValues.begin();
 
     std::vector<store::Item_t>::const_iterator nameIter = 
-    e->theDynamicFunctionInfo->theScopedVarsNames.begin();
+    e->theFunctionItemInfo->theScopedVarsNames.begin();
 
     std::vector<int>::const_iterator isGlobalIter =
-    e->theDynamicFunctionInfo->theIsGlobalVar.begin();
+    e->theFunctionItemInfo->theIsGlobalVar.begin();
 
-    for (; varIter != e->theDynamicFunctionInfo->theScopedVarsValues.end();
+    for (; varIter != e->theFunctionItemInfo->theScopedVarsValues.end();
          ++varIter, ++substVarIter, ++nameIter, ++isGlobalIter)
     {
       cloneExpr->add_variable((*varIter) ? (*varIter)->clone(udf, subst) : NULL,

=== modified file 'src/compiler/expression/expr_iter.cpp'
--- src/compiler/expression/expr_iter.cpp	2013-03-16 08:48:16 +0000
+++ src/compiler/expression/expr_iter.cpp	2013-03-26 21:30:30 +0000
@@ -704,8 +704,8 @@
 
     EXPR_ITER_BEGIN();
 
-    theArgsIter = fiExpr->theDynamicFunctionInfo->theScopedVarsValues.begin();
-    theArgsEnd = fiExpr->theDynamicFunctionInfo->theScopedVarsValues.end();
+    theArgsIter = fiExpr->theFunctionItemInfo->theScopedVarsValues.begin();
+    theArgsEnd = fiExpr->theFunctionItemInfo->theScopedVarsValues.end();
     for (; theArgsIter != theArgsEnd; ++theArgsIter)
     {
       if ( ! *theArgsIter) // TODO: the vars values for prolog variables is null, so they have to be skipped, or the optimizer will trip and fall off. Maybe null vars values need not be remembered

=== modified file 'src/compiler/expression/expr_put.cpp'
--- src/compiler/expression/expr_put.cpp	2013-03-17 13:55:28 +0000
+++ src/compiler/expression/expr_put.cpp	2013-03-26 21:30:30 +0000
@@ -537,30 +537,30 @@
 
   if (!is_inline())
   {
-    os << " " << theDynamicFunctionInfo->theQName->getStringValue()
-       << "#" << theDynamicFunctionInfo->theArity;
+    os << " " << theFunctionItemInfo->theQName->getStringValue()
+       << "#" << theFunctionItemInfo->theArity;
     os << dec_indent << endl;
     return os;
   }
   else
   {
-    os << " " << theDynamicFunctionInfo->theQName->getStringValue()
-       << "#" << theDynamicFunctionInfo->theArity << " [\n";
+    os << " " << theFunctionItemInfo->theQName->getStringValue()
+       << "#" << theFunctionItemInfo->theArity << " [\n";
 
-    for (ulong i = 0; i < theDynamicFunctionInfo->theScopedVarsValues.size(); i++)
+    for (ulong i = 0; i < theFunctionItemInfo->theScopedVarsValues.size(); i++)
     {
       os << indent << "using $"
-         << theDynamicFunctionInfo->theScopedVarsNames[i]->getStringValue()
-         << (theDynamicFunctionInfo->theIsGlobalVar[i] ? " global=1" : "") << " := [";
+         << theFunctionItemInfo->theScopedVarsNames[i]->getStringValue()
+         << (theFunctionItemInfo->theIsGlobalVar[i] ? " global=1" : "") << " := [";
       os << endl << inc_indent;
-      if (theDynamicFunctionInfo->theScopedVarsValues[i])
-        theDynamicFunctionInfo->theScopedVarsValues[i]->put(os);
+      if (theFunctionItemInfo->theScopedVarsValues[i])
+        theFunctionItemInfo->theScopedVarsValues[i]->put(os);
       os << dec_indent << indent << "]" << endl;
     }
 
-    if (theDynamicFunctionInfo->theFunction != NULL &&
-        static_cast<user_function*>(theDynamicFunctionInfo->theFunction.getp())->getBody() != NULL)
-      static_cast<user_function*>(theDynamicFunctionInfo->theFunction.getp())->getBody()->put(os);
+    if (theFunctionItemInfo->theFunction != NULL &&
+        static_cast<user_function*>(theFunctionItemInfo->theFunction.getp())->getBody() != NULL)
+      static_cast<user_function*>(theFunctionItemInfo->theFunction.getp())->getBody()->put(os);
 
     END_PUT();
   }

=== modified file 'src/compiler/expression/function_item_expr.cpp'
--- src/compiler/expression/function_item_expr.cpp	2013-03-23 15:20:54 +0000
+++ src/compiler/expression/function_item_expr.cpp	2013-03-26 21:30:30 +0000
@@ -84,7 +84,8 @@
 ********************************************************************************/
 
 
-function_item_expr::function_item_expr(CompilerCB* ccb,
+function_item_expr::function_item_expr(
+    CompilerCB* ccb,
     static_context* sctx,
     user_function* udf,
     const QueryLoc& loc,
@@ -96,21 +97,22 @@
     bool isCoercion)
   :
   expr(ccb, sctx, udf, loc, function_item_expr_kind),
-  theDynamicFunctionInfo(new DynamicFunctionInfo(sctx,
-                                                 loc,
-                                                 f,
-                                                 qname,
-                                                 arity,
-                                                 isInline,
-                                                 needsContextItem,
-                                                 isCoercion))
+  theFunctionItemInfo(new FunctionItemInfo(sctx,
+                                           loc,
+                                           f,
+                                           qname,
+                                           arity,
+                                           isInline,
+                                           needsContextItem,
+                                           isCoercion))
 {
   assert(f != NULL);
   compute_scripting_kind();
 }
 
 
-function_item_expr::function_item_expr(CompilerCB* ccb,
+function_item_expr::function_item_expr(
+    CompilerCB* ccb,
     static_context* sctx,
     user_function* udf,
     const QueryLoc& loc,
@@ -119,14 +121,14 @@
     bool isCoercion)
   :
   expr(ccb, sctx, udf, loc, function_item_expr_kind),
-  theDynamicFunctionInfo(new DynamicFunctionInfo(sctx,
-                                                 loc,
-                                                 NULL,
-                                                 NULL,
-                                                 0,
-                                                 isInline,
-                                                 needsContextItem,
-                                                 isCoercion))
+  theFunctionItemInfo(new FunctionItemInfo(sctx,
+                                           loc,
+                                           NULL,
+                                           NULL,
+                                           0,
+                                           isInline,
+                                           needsContextItem,
+                                           isCoercion))
 {
   theScriptingKind = SIMPLE_EXPR;
 }
@@ -143,15 +145,15 @@
     const store::Item_t& name,
     int isGlobal)
 {
-  theDynamicFunctionInfo->add_variable(var, substVar, name, isGlobal);
+  theFunctionItemInfo->add_variable(var, substVar, name, isGlobal);
 }
 
 
 void function_item_expr::set_function(user_function* udf)
 {
-  theDynamicFunctionInfo->theFunction = udf;
-  theDynamicFunctionInfo->theArity = udf->getArity();
-  theDynamicFunctionInfo->theQName = udf->getName();
+  theFunctionItemInfo->theFunction = udf;
+  theFunctionItemInfo->theArity = udf->getArity();
+  theFunctionItemInfo->theQName = udf->getName();
   // compute_scripting_kind();
 }
 

=== modified file 'src/compiler/expression/function_item_expr.h'
--- src/compiler/expression/function_item_expr.h	2013-03-23 15:20:54 +0000
+++ src/compiler/expression/function_item_expr.h	2013-03-26 21:30:30 +0000
@@ -125,7 +125,7 @@
   friend class ExprManager;
 
 protected:
-  DynamicFunctionInfo_t  theDynamicFunctionInfo;
+  FunctionItemInfo_t  theFunctionItemInfo;
   
 protected:
   function_item_expr(
@@ -152,7 +152,7 @@
   virtual ~function_item_expr();
   
 public:
-  DynamicFunctionInfo* get_dynamic_fn_info() { return theDynamicFunctionInfo; }
+  FunctionItemInfo* get_dynamic_fn_info() { return theFunctionItemInfo; }
 
   void add_variable(
       expr* var,
@@ -162,32 +162,32 @@
 
   const std::vector<var_expr*>& get_subst_vars_values() const
   {
-    return theDynamicFunctionInfo->theSubstVarsValues;
+    return theFunctionItemInfo->theSubstVarsValues;
   }
 
   const std::vector<store::Item_t>& get_scoped_vars_names() const
   {
-    return theDynamicFunctionInfo->theScopedVarsNames;
+    return theFunctionItemInfo->theScopedVarsNames;
   }
 
   const std::vector<int>& get_is_global_var() const
   {
-    return theDynamicFunctionInfo->theIsGlobalVar;
+    return theFunctionItemInfo->theIsGlobalVar;
   }
 
   void set_function(user_function* udf);
 
-  function* get_function() const { return theDynamicFunctionInfo->theFunction; }
-
-  const store::Item_t& get_qname() const { return theDynamicFunctionInfo->theQName; }
-
-  uint32_t get_arity() const { return theDynamicFunctionInfo->theArity; }
-  
-  bool is_inline() const { return theDynamicFunctionInfo->theIsInline; }
-  
-  bool needs_context_item() const { return theDynamicFunctionInfo->theNeedsContextItem; }
-
-  bool is_coercion() const { return theDynamicFunctionInfo->theIsCoercion; }
+  function* get_function() const { return theFunctionItemInfo->theFunction; }
+
+  const store::Item_t& get_qname() const { return theFunctionItemInfo->theQName; }
+
+  uint32_t get_arity() const { return theFunctionItemInfo->theArity; }
+  
+  bool is_inline() const { return theFunctionItemInfo->theIsInline; }
+  
+  bool needs_context_item() const { return theFunctionItemInfo->theNeedsContextItem; }
+
+  bool is_coercion() const { return theFunctionItemInfo->theIsCoercion; }
 
   void compute_scripting_kind();
 

=== modified file 'src/runtime/function_item/function_item.cpp'
--- src/runtime/function_item/function_item.cpp	2013-03-23 15:20:54 +0000
+++ src/runtime/function_item/function_item.cpp	2013-03-26 21:30:30 +0000
@@ -43,7 +43,7 @@
 namespace zorba
 {
 
-SERIALIZABLE_CLASS_VERSIONS(DynamicFunctionInfo)
+SERIALIZABLE_CLASS_VERSIONS(FunctionItemInfo)
 
 SERIALIZABLE_CLASS_VERSIONS(FunctionItem)
 
@@ -53,7 +53,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-DynamicFunctionInfo::DynamicFunctionInfo(
+FunctionItemInfo::FunctionItemInfo(
     static_context* closureSctx,
     const QueryLoc& loc,
     function* func,
@@ -76,19 +76,19 @@
 }
 
 
-DynamicFunctionInfo::DynamicFunctionInfo(::zorba::serialization::Archiver& ar)
+FunctionItemInfo::FunctionItemInfo(::zorba::serialization::Archiver& ar)
 {
 }
 
 
-DynamicFunctionInfo::~DynamicFunctionInfo()
+FunctionItemInfo::~FunctionItemInfo()
 {
   if (theMustDeleteCCB)
     delete theCCB;
 }
 
 
-void DynamicFunctionInfo::serialize(::zorba::serialization::Archiver& ar)
+void FunctionItemInfo::serialize(::zorba::serialization::Archiver& ar)
 {
   ar & theCCB;
   ar & theMustDeleteCCB;
@@ -119,7 +119,7 @@
 }
 
 
-void DynamicFunctionInfo::add_variable(
+void FunctionItemInfo::add_variable(
     expr* var,
     var_expr* substVar,
     const store::Item_t& name,
@@ -144,22 +144,22 @@
 
 
 FunctionItem::FunctionItem(
-    const DynamicFunctionInfo_t& dynamicFunctionInfo,
+    const FunctionItemInfo_t& dynamicFunctionInfo,
     dynamic_context* dctx)
   :
   store::Item(store::Item::FUNCTION),
-  theDynamicFunctionInfo(dynamicFunctionInfo),
+  theFunctionItemInfo(dynamicFunctionInfo),
   theArity(dynamicFunctionInfo->theArity),
   theClosureDctx(dctx)
 {
-  assert(theDynamicFunctionInfo->theFunction->isUdf());
-  theArgumentsValues.resize(theDynamicFunctionInfo->theArity);
+  assert(theFunctionItemInfo->theFunction->isUdf());
+  theArgumentsValues.resize(theFunctionItemInfo->theArity);
 }
 
 
 void FunctionItem::serialize(::zorba::serialization::Archiver& ar)
 {
-  ar & theDynamicFunctionInfo;
+  ar & theFunctionItemInfo;
   ar & theArity;
   ar & theArgumentsValues;
 }
@@ -167,7 +167,7 @@
 
 const store::Item_t FunctionItem::getFunctionName() const
 {
-  return theDynamicFunctionInfo->theQName;
+  return theFunctionItemInfo->theQName;
 }
 
 
@@ -179,13 +179,13 @@
 
 uint32_t FunctionItem::getStartArity() const
 {
-  return theDynamicFunctionInfo->theArity;
+  return theFunctionItemInfo->theArity;
 }
 
 
 const signature& FunctionItem::getSignature() const
 {
-  return theDynamicFunctionInfo->theFunction->getSignature();
+  return theFunctionItemInfo->theFunction->getSignature();
 }
 
 
@@ -252,15 +252,15 @@
   expr* dummy = ccb->theEM->
   create_function_item_expr(NULL,
                             NULL,
-                            theDynamicFunctionInfo->theLoc,
+                            theFunctionItemInfo->theLoc,
                             false,
                             false,
                             false);
   
-  PlanIter_t udfCallIterator = theDynamicFunctionInfo->theFunction->
+  PlanIter_t udfCallIterator = theFunctionItemInfo->theFunction->
   codegen(ccb,
-          theDynamicFunctionInfo->theClosureSctx,
-          theDynamicFunctionInfo->theLoc,
+          theFunctionItemInfo->theClosureSctx,
+          theFunctionItemInfo->theLoc,
           args,
           *dummy);
 
@@ -278,7 +278,7 @@
   std::ostringstream lRes;
   lRes << getFunctionName()->getStringValue();
   if (!isInline())
-    lRes << "#" << getArity() << " (" << theDynamicFunctionInfo->theLoc << ")";
+    lRes << "#" << getArity() << " (" << theFunctionItemInfo->theLoc << ")";
   return lRes.str();
 }
 
@@ -290,10 +290,10 @@
 DynamicFunctionIterator::DynamicFunctionIterator(
       static_context* sctx,
       const QueryLoc& loc,
-      DynamicFunctionInfo* fnInfo)
+      FunctionItemInfo* fnInfo)
   :
   NaryBaseIterator<DynamicFunctionIterator, PlanIteratorState>(sctx, loc, fnInfo->theScopedVarsIterators),
-  theDynamicFunctionInfo(fnInfo)
+  theFunctionItemInfo(fnInfo)
 {
 }
 
@@ -307,7 +307,7 @@
 {
   serialize_baseclass(ar,
   (NaryBaseIterator<DynamicFunctionIterator, PlanIteratorState>*)this);
-  ar & theDynamicFunctionInfo;
+  ar & theFunctionItemInfo;
 }
 
 
@@ -324,18 +324,18 @@
 
     // Import the outer environment.
     importOuterEnv(planState,
-                   theDynamicFunctionInfo->theCCB,
-                   theDynamicFunctionInfo->theClosureSctx,
+                   theFunctionItemInfo->theCCB,
+                   theFunctionItemInfo->theClosureSctx,
                    evalDctx.get());
 
-    if (theDynamicFunctionInfo->theIsCoercion)
+    if (theFunctionItemInfo->theIsCoercion)
     {
       DynamicFunctionIterator* child = dynamic_cast<DynamicFunctionIterator*>(theChildren[0].getp());
       if (child != NULL)
-        theDynamicFunctionInfo->theQName = child->theDynamicFunctionInfo->theQName;
+        theFunctionItemInfo->theQName = child->theFunctionItemInfo->theQName;
     }
 
-    result = new FunctionItem(theDynamicFunctionInfo, evalDctx.release());
+    result = new FunctionItem(theFunctionItemInfo, evalDctx.release());
   }
 
   STACK_PUSH ( result != NULL, state );
@@ -424,24 +424,24 @@
   // (c) If it is not a global one, set its value within the eval dctx.
   csize curChild = -1;
 
-  csize numOuterVars = theDynamicFunctionInfo->theScopedVarsNames.size();
+  csize numOuterVars = theFunctionItemInfo->theScopedVarsNames.size();
 
 
   for (csize i = 0; i < numOuterVars; ++i)
   {
-    if (!theDynamicFunctionInfo->theIsGlobalVar[i])
+    if (!theFunctionItemInfo->theIsGlobalVar[i])
     {
       ++curChild;
 
       store::Iterator_t iter = new PlanIteratorWrapper(theChildren[curChild], planState);
 
-      evalDctx->add_variable(theDynamicFunctionInfo->theVarId[i], iter);
+      evalDctx->add_variable(theFunctionItemInfo->theVarId[i], iter);
     }
   }
 
   // Import the outer-query ns bindings
-  store::NsBindings::const_iterator ite = theDynamicFunctionInfo->theLocalBindings.begin();
-  store::NsBindings::const_iterator end = theDynamicFunctionInfo->theLocalBindings.end();
+  store::NsBindings::const_iterator ite = theFunctionItemInfo->theLocalBindings.begin();
+  store::NsBindings::const_iterator end = theFunctionItemInfo->theLocalBindings.end();
 
   for (; ite != end; ++ite)
   {

=== modified file 'src/runtime/function_item/function_item.h'
--- src/runtime/function_item/function_item.h	2013-03-23 15:20:54 +0000
+++ src/runtime/function_item/function_item.h	2013-03-26 21:30:30 +0000
@@ -30,9 +30,9 @@
 
 class signature;
 class function_item_expr;
-class DynamicFunctionInfo;
+class FunctionItemInfo;
 
-typedef rchandle<DynamicFunctionInfo> DynamicFunctionInfo_t;
+typedef rchandle<FunctionItemInfo> FunctionItemInfo_t;
 
 /*******************************************************************************
   A class to hold information about a dynamic function. This info is shared
@@ -43,7 +43,7 @@
 
   theMustDeleteCCB :
   ------------------
-  This is set to true if the DynamicFunctionInfo is the owner of the CCB,
+  This is set to true if the FunctionItemInfo is the owner of the CCB,
   and must delete it upon destruction.
 
   theLoc:
@@ -110,7 +110,7 @@
   -----------------------
 
 ********************************************************************************/
-class DynamicFunctionInfo : public SimpleRCObject
+class FunctionItemInfo : public SimpleRCObject
 {
 public:
   CompilerCB                  * theCCB;
@@ -136,12 +136,12 @@
   store::NsBindings             theLocalBindings;
 
 public:
-  SERIALIZABLE_CLASS(DynamicFunctionInfo)
-  DynamicFunctionInfo(::zorba::serialization::Archiver& ar);
+  SERIALIZABLE_CLASS(FunctionItemInfo)
+  FunctionItemInfo(::zorba::serialization::Archiver& ar);
   void serialize(::zorba::serialization::Archiver& ar);
 
 public:
-  DynamicFunctionInfo(
+  FunctionItemInfo(
       static_context* closureSctx,
       const QueryLoc& loc,
       function* func,
@@ -151,7 +151,7 @@
       bool needsContextItem,
       bool isCoercion);
 
-  virtual ~DynamicFunctionInfo();
+  virtual ~FunctionItemInfo();
 
   void add_variable(
       expr* var,
@@ -172,7 +172,7 @@
 class FunctionItem : public store::Item, public zorba::serialization::SerializeBaseClass
 {
 protected:
-  DynamicFunctionInfo_t           theDynamicFunctionInfo;
+  FunctionItemInfo_t           theFunctionItemInfo;
 
   unsigned int                    theArity;   // The arity of the function
                                               // item will decrease when a
@@ -191,7 +191,7 @@
 
 public:
   FunctionItem(
-      const DynamicFunctionInfo_t& dynamicFunctionInfo,
+      const FunctionItemInfo_t& dynamicFunctionInfo,
       dynamic_context* dctx);
 
   SYNC_CODE(RCLock* getRCLock() const { return &theRCLock; })
@@ -224,11 +224,11 @@
 
   const signature& getSignature() const;
   
-  bool isInline() const { return theDynamicFunctionInfo->theIsInline; }
+  bool isInline() const { return theFunctionItemInfo->theIsInline; }
   
-  bool needsContextItem() const { return theDynamicFunctionInfo->theNeedsContextItem; }
+  bool needsContextItem() const { return theFunctionItemInfo->theNeedsContextItem; }
 
-  bool isCoercion() const { return theDynamicFunctionInfo->theIsCoercion; }
+  bool isCoercion() const { return theFunctionItemInfo->theIsCoercion; }
 
   zstring show() const;
 };
@@ -240,7 +240,7 @@
 class DynamicFunctionIterator : public NaryBaseIterator<DynamicFunctionIterator, PlanIteratorState>
 {
 protected:
-  DynamicFunctionInfo_t theDynamicFunctionInfo;
+  FunctionItemInfo_t theFunctionItemInfo;
 
 public:
   SERIALIZABLE_CLASS(DynamicFunctionIterator)
@@ -252,14 +252,14 @@
   DynamicFunctionIterator(
       static_context* sctx,
       const QueryLoc& loc,
-      DynamicFunctionInfo* fnInfo);
+      FunctionItemInfo* fnInfo);
 
   virtual ~DynamicFunctionIterator();
 
   // Used for pretty-printing of the iterator tree
-  const DynamicFunctionInfo_t getDynamicFunctionInfo() const
+  const FunctionItemInfo_t getFunctionItemInfo() const
   {
-    return theDynamicFunctionInfo;
+    return theFunctionItemInfo;
   }
 
   void accept(PlanIterVisitor& v) const;

=== modified file 'src/runtime/function_item/function_item_iter_impl.cpp'
--- src/runtime/function_item/function_item_iter_impl.cpp	2013-03-17 13:02:43 +0000
+++ src/runtime/function_item/function_item_iter_impl.cpp	2013-03-26 21:30:30 +0000
@@ -81,7 +81,7 @@
   {
     expr* fiExpr = Translator::translate_literal_function(qname, arity, theCompilerCB, loc, true);
     
-    DynamicFunctionInfo_t dynFnInfo = static_cast<function_item_expr*>(fiExpr)->get_dynamic_fn_info();
+    FunctionItemInfo_t dynFnInfo = static_cast<function_item_expr*>(fiExpr)->get_dynamic_fn_info();
     dynFnInfo->theCCB = theCompilerCB;
     // dynFnInfo->theClosureSctx = NULL;
 

=== modified file 'src/runtime/visitors/printer_visitor_impl.cpp'
--- src/runtime/visitors/printer_visitor_impl.cpp	2013-03-24 20:40:03 +0000
+++ src/runtime/visitors/printer_visitor_impl.cpp	2013-03-26 21:30:30 +0000
@@ -118,8 +118,8 @@
 void PrinterVisitor::beginVisit(const DynamicFunctionIterator& a)
 {
   thePrinter.startBeginVisit("DynamicFunctionIterator", ++theId);
-  if (a.getDynamicFunctionInfo()->theQName.getp() != NULL)
-    thePrinter.addAttribute("function", a.getDynamicFunctionInfo()->theQName->getStringValue().str());
+  if (a.getFunctionItemInfo()->theQName.getp() != NULL)
+    thePrinter.addAttribute("function", a.getFunctionItemInfo()->theQName->getStringValue().str());
   printCommons( &a, theId );
   thePrinter.endBeginVisit(theId);
 }

=== modified file 'src/zorbaserialization/archiver_consts.h'
--- src/zorbaserialization/archiver_consts.h	2013-03-15 08:22:41 +0000
+++ src/zorbaserialization/archiver_consts.h	2013-03-26 21:30:30 +0000
@@ -251,7 +251,7 @@
 #include "runtime/iterator_enum.h"
 
   TYPE_DynamicFunctionIterator,
-  TYPE_DynamicFunctionInfo,
+  TYPE_FunctionItemInfo,
   TYPE_DynamicFnCallIterator,
   TYPE_ArgumentPlaceholderIterator,
 

=== modified file 'test/fots_driver/cli.xq'
--- test/fots_driver/cli.xq	2013-03-16 08:48:16 +0000
+++ test/fots_driver/cli.xq	2013-03-26 21:30:30 +0000
@@ -94,17 +94,20 @@
  : Used by the run-test-sets, run-and-report, and report commands.
  :)
 declare variable $exceptedTestCases as xs:string* := (
-  "instanceof139",
-  "CastAs-UnionType-26",
-  "CastAs-UnionType-30",
-  "fn-unparsed-text-lines-052",
-  "cbcl-subsequence-011",
-  "cbcl-subsequence-012",
-  "cbcl-subsequence-013",
-  "cbcl-subsequence-014"        (:see bug lp:1069794 :)
-, "re00975",
-  "re00976",
-  "re00976a"                    (:see bug lp:1070533 :)
+(: "re00987",
+   "itunes",
+   "raytracer", :)
+   "instanceof139",
+   "CastAs-UnionType-26",
+   "CastAs-UnionType-30",
+   "fn-unparsed-text-lines-052",
+   "cbcl-subsequence-011",
+   "cbcl-subsequence-012",
+   "cbcl-subsequence-013",
+   "cbcl-subsequence-014"        (:see bug lp:1069794 :)
+,  "re00975",
+   "re00976",
+   "re00976a"                    (:see bug lp:1070533 :)
 );