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

Proposed by Markos Zaharioudakis on 2013-03-26
Status: Merged
Approved by: Markos Zaharioudakis on 2013-03-26
Approved revision: 11317
Merged at revision: 11316
Proposed branch: lp:~zorba-coders/zorba/hof-next
Merge into: lp:zorba
Diff against target: 677 lines (+130/-125)
12 files modified
src/compiler/codegen/plan_visitor.cpp (+1/-1)
src/compiler/expression/expr_clone.cpp (+8/-8)
src/compiler/expression/expr_iter.cpp (+2/-2)
src/compiler/expression/expr_put.cpp (+12/-12)
src/compiler/expression/function_item_expr.cpp (+24/-22)
src/compiler/expression/function_item_expr.h (+16/-16)
src/runtime/function_item/function_item.cpp (+32/-32)
src/runtime/function_item/function_item.h (+17/-17)
src/runtime/function_item/function_item_iter_impl.cpp (+1/-1)
src/runtime/visitors/printer_visitor_impl.cpp (+2/-2)
src/zorbaserialization/archiver_consts.h (+1/-1)
test/fots_driver/cli.xq (+14/-11)
To merge this branch: bzr merge lp:~zorba-coders/zorba/hof-next
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve on 2013-03-26
Review via email: mp+155621@code.launchpad.net

Commit message

renamed DynamicFunctionInfo to FunctionItemInfo

Description of the change

renamed DynamicFunctionInfo to FunctionItemInfo

To post a comment you must log in.
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

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

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/compiler/codegen/plan_visitor.cpp'
2--- src/compiler/codegen/plan_visitor.cpp 2013-03-17 13:55:28 +0000
3+++ src/compiler/codegen/plan_visitor.cpp 2013-03-26 21:30:30 +0000
4@@ -467,7 +467,7 @@
5 {
6 CODEGEN_TRACE_OUT("");
7
8- DynamicFunctionInfo* fnInfo = v.get_dynamic_fn_info();
9+ FunctionItemInfo* fnInfo = v.get_dynamic_fn_info();
10 fnInfo->theCCB = theCCB;
11 fnInfo->theMustDeleteCCB = false;
12 fnInfo->theLoc = qloc;
13
14=== modified file 'src/compiler/expression/expr_clone.cpp'
15--- src/compiler/expression/expr_clone.cpp 2013-03-23 15:23:57 +0000
16+++ src/compiler/expression/expr_clone.cpp 2013-03-26 21:30:30 +0000
17@@ -386,26 +386,26 @@
18 create_function_item_expr(theSctx,
19 udf,
20 get_loc(),
21- e->theDynamicFunctionInfo->theFunction,
22- e->theDynamicFunctionInfo->theFunction->getName(),
23- e->theDynamicFunctionInfo->theArity,
24+ e->theFunctionItemInfo->theFunction,
25+ e->theFunctionItemInfo->theFunction->getName(),
26+ e->theFunctionItemInfo->theArity,
27 e->is_inline(),
28 e->needs_context_item(),
29 e->is_coercion());
30
31 std::vector<expr*>::const_iterator varIter =
32- e->theDynamicFunctionInfo->theScopedVarsValues.begin();
33+ e->theFunctionItemInfo->theScopedVarsValues.begin();
34
35 std::vector<var_expr*>::const_iterator substVarIter =
36- e->theDynamicFunctionInfo->theSubstVarsValues.begin();
37+ e->theFunctionItemInfo->theSubstVarsValues.begin();
38
39 std::vector<store::Item_t>::const_iterator nameIter =
40- e->theDynamicFunctionInfo->theScopedVarsNames.begin();
41+ e->theFunctionItemInfo->theScopedVarsNames.begin();
42
43 std::vector<int>::const_iterator isGlobalIter =
44- e->theDynamicFunctionInfo->theIsGlobalVar.begin();
45+ e->theFunctionItemInfo->theIsGlobalVar.begin();
46
47- for (; varIter != e->theDynamicFunctionInfo->theScopedVarsValues.end();
48+ for (; varIter != e->theFunctionItemInfo->theScopedVarsValues.end();
49 ++varIter, ++substVarIter, ++nameIter, ++isGlobalIter)
50 {
51 cloneExpr->add_variable((*varIter) ? (*varIter)->clone(udf, subst) : NULL,
52
53=== modified file 'src/compiler/expression/expr_iter.cpp'
54--- src/compiler/expression/expr_iter.cpp 2013-03-16 08:48:16 +0000
55+++ src/compiler/expression/expr_iter.cpp 2013-03-26 21:30:30 +0000
56@@ -704,8 +704,8 @@
57
58 EXPR_ITER_BEGIN();
59
60- theArgsIter = fiExpr->theDynamicFunctionInfo->theScopedVarsValues.begin();
61- theArgsEnd = fiExpr->theDynamicFunctionInfo->theScopedVarsValues.end();
62+ theArgsIter = fiExpr->theFunctionItemInfo->theScopedVarsValues.begin();
63+ theArgsEnd = fiExpr->theFunctionItemInfo->theScopedVarsValues.end();
64 for (; theArgsIter != theArgsEnd; ++theArgsIter)
65 {
66 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
67
68=== modified file 'src/compiler/expression/expr_put.cpp'
69--- src/compiler/expression/expr_put.cpp 2013-03-17 13:55:28 +0000
70+++ src/compiler/expression/expr_put.cpp 2013-03-26 21:30:30 +0000
71@@ -537,30 +537,30 @@
72
73 if (!is_inline())
74 {
75- os << " " << theDynamicFunctionInfo->theQName->getStringValue()
76- << "#" << theDynamicFunctionInfo->theArity;
77+ os << " " << theFunctionItemInfo->theQName->getStringValue()
78+ << "#" << theFunctionItemInfo->theArity;
79 os << dec_indent << endl;
80 return os;
81 }
82 else
83 {
84- os << " " << theDynamicFunctionInfo->theQName->getStringValue()
85- << "#" << theDynamicFunctionInfo->theArity << " [\n";
86+ os << " " << theFunctionItemInfo->theQName->getStringValue()
87+ << "#" << theFunctionItemInfo->theArity << " [\n";
88
89- for (ulong i = 0; i < theDynamicFunctionInfo->theScopedVarsValues.size(); i++)
90+ for (ulong i = 0; i < theFunctionItemInfo->theScopedVarsValues.size(); i++)
91 {
92 os << indent << "using $"
93- << theDynamicFunctionInfo->theScopedVarsNames[i]->getStringValue()
94- << (theDynamicFunctionInfo->theIsGlobalVar[i] ? " global=1" : "") << " := [";
95+ << theFunctionItemInfo->theScopedVarsNames[i]->getStringValue()
96+ << (theFunctionItemInfo->theIsGlobalVar[i] ? " global=1" : "") << " := [";
97 os << endl << inc_indent;
98- if (theDynamicFunctionInfo->theScopedVarsValues[i])
99- theDynamicFunctionInfo->theScopedVarsValues[i]->put(os);
100+ if (theFunctionItemInfo->theScopedVarsValues[i])
101+ theFunctionItemInfo->theScopedVarsValues[i]->put(os);
102 os << dec_indent << indent << "]" << endl;
103 }
104
105- if (theDynamicFunctionInfo->theFunction != NULL &&
106- static_cast<user_function*>(theDynamicFunctionInfo->theFunction.getp())->getBody() != NULL)
107- static_cast<user_function*>(theDynamicFunctionInfo->theFunction.getp())->getBody()->put(os);
108+ if (theFunctionItemInfo->theFunction != NULL &&
109+ static_cast<user_function*>(theFunctionItemInfo->theFunction.getp())->getBody() != NULL)
110+ static_cast<user_function*>(theFunctionItemInfo->theFunction.getp())->getBody()->put(os);
111
112 END_PUT();
113 }
114
115=== modified file 'src/compiler/expression/function_item_expr.cpp'
116--- src/compiler/expression/function_item_expr.cpp 2013-03-23 15:20:54 +0000
117+++ src/compiler/expression/function_item_expr.cpp 2013-03-26 21:30:30 +0000
118@@ -84,7 +84,8 @@
119 ********************************************************************************/
120
121
122-function_item_expr::function_item_expr(CompilerCB* ccb,
123+function_item_expr::function_item_expr(
124+ CompilerCB* ccb,
125 static_context* sctx,
126 user_function* udf,
127 const QueryLoc& loc,
128@@ -96,21 +97,22 @@
129 bool isCoercion)
130 :
131 expr(ccb, sctx, udf, loc, function_item_expr_kind),
132- theDynamicFunctionInfo(new DynamicFunctionInfo(sctx,
133- loc,
134- f,
135- qname,
136- arity,
137- isInline,
138- needsContextItem,
139- isCoercion))
140+ theFunctionItemInfo(new FunctionItemInfo(sctx,
141+ loc,
142+ f,
143+ qname,
144+ arity,
145+ isInline,
146+ needsContextItem,
147+ isCoercion))
148 {
149 assert(f != NULL);
150 compute_scripting_kind();
151 }
152
153
154-function_item_expr::function_item_expr(CompilerCB* ccb,
155+function_item_expr::function_item_expr(
156+ CompilerCB* ccb,
157 static_context* sctx,
158 user_function* udf,
159 const QueryLoc& loc,
160@@ -119,14 +121,14 @@
161 bool isCoercion)
162 :
163 expr(ccb, sctx, udf, loc, function_item_expr_kind),
164- theDynamicFunctionInfo(new DynamicFunctionInfo(sctx,
165- loc,
166- NULL,
167- NULL,
168- 0,
169- isInline,
170- needsContextItem,
171- isCoercion))
172+ theFunctionItemInfo(new FunctionItemInfo(sctx,
173+ loc,
174+ NULL,
175+ NULL,
176+ 0,
177+ isInline,
178+ needsContextItem,
179+ isCoercion))
180 {
181 theScriptingKind = SIMPLE_EXPR;
182 }
183@@ -143,15 +145,15 @@
184 const store::Item_t& name,
185 int isGlobal)
186 {
187- theDynamicFunctionInfo->add_variable(var, substVar, name, isGlobal);
188+ theFunctionItemInfo->add_variable(var, substVar, name, isGlobal);
189 }
190
191
192 void function_item_expr::set_function(user_function* udf)
193 {
194- theDynamicFunctionInfo->theFunction = udf;
195- theDynamicFunctionInfo->theArity = udf->getArity();
196- theDynamicFunctionInfo->theQName = udf->getName();
197+ theFunctionItemInfo->theFunction = udf;
198+ theFunctionItemInfo->theArity = udf->getArity();
199+ theFunctionItemInfo->theQName = udf->getName();
200 // compute_scripting_kind();
201 }
202
203
204=== modified file 'src/compiler/expression/function_item_expr.h'
205--- src/compiler/expression/function_item_expr.h 2013-03-23 15:20:54 +0000
206+++ src/compiler/expression/function_item_expr.h 2013-03-26 21:30:30 +0000
207@@ -125,7 +125,7 @@
208 friend class ExprManager;
209
210 protected:
211- DynamicFunctionInfo_t theDynamicFunctionInfo;
212+ FunctionItemInfo_t theFunctionItemInfo;
213
214 protected:
215 function_item_expr(
216@@ -152,7 +152,7 @@
217 virtual ~function_item_expr();
218
219 public:
220- DynamicFunctionInfo* get_dynamic_fn_info() { return theDynamicFunctionInfo; }
221+ FunctionItemInfo* get_dynamic_fn_info() { return theFunctionItemInfo; }
222
223 void add_variable(
224 expr* var,
225@@ -162,32 +162,32 @@
226
227 const std::vector<var_expr*>& get_subst_vars_values() const
228 {
229- return theDynamicFunctionInfo->theSubstVarsValues;
230+ return theFunctionItemInfo->theSubstVarsValues;
231 }
232
233 const std::vector<store::Item_t>& get_scoped_vars_names() const
234 {
235- return theDynamicFunctionInfo->theScopedVarsNames;
236+ return theFunctionItemInfo->theScopedVarsNames;
237 }
238
239 const std::vector<int>& get_is_global_var() const
240 {
241- return theDynamicFunctionInfo->theIsGlobalVar;
242+ return theFunctionItemInfo->theIsGlobalVar;
243 }
244
245 void set_function(user_function* udf);
246
247- function* get_function() const { return theDynamicFunctionInfo->theFunction; }
248-
249- const store::Item_t& get_qname() const { return theDynamicFunctionInfo->theQName; }
250-
251- uint32_t get_arity() const { return theDynamicFunctionInfo->theArity; }
252-
253- bool is_inline() const { return theDynamicFunctionInfo->theIsInline; }
254-
255- bool needs_context_item() const { return theDynamicFunctionInfo->theNeedsContextItem; }
256-
257- bool is_coercion() const { return theDynamicFunctionInfo->theIsCoercion; }
258+ function* get_function() const { return theFunctionItemInfo->theFunction; }
259+
260+ const store::Item_t& get_qname() const { return theFunctionItemInfo->theQName; }
261+
262+ uint32_t get_arity() const { return theFunctionItemInfo->theArity; }
263+
264+ bool is_inline() const { return theFunctionItemInfo->theIsInline; }
265+
266+ bool needs_context_item() const { return theFunctionItemInfo->theNeedsContextItem; }
267+
268+ bool is_coercion() const { return theFunctionItemInfo->theIsCoercion; }
269
270 void compute_scripting_kind();
271
272
273=== modified file 'src/runtime/function_item/function_item.cpp'
274--- src/runtime/function_item/function_item.cpp 2013-03-23 15:20:54 +0000
275+++ src/runtime/function_item/function_item.cpp 2013-03-26 21:30:30 +0000
276@@ -43,7 +43,7 @@
277 namespace zorba
278 {
279
280-SERIALIZABLE_CLASS_VERSIONS(DynamicFunctionInfo)
281+SERIALIZABLE_CLASS_VERSIONS(FunctionItemInfo)
282
283 SERIALIZABLE_CLASS_VERSIONS(FunctionItem)
284
285@@ -53,7 +53,7 @@
286 /*******************************************************************************
287
288 ********************************************************************************/
289-DynamicFunctionInfo::DynamicFunctionInfo(
290+FunctionItemInfo::FunctionItemInfo(
291 static_context* closureSctx,
292 const QueryLoc& loc,
293 function* func,
294@@ -76,19 +76,19 @@
295 }
296
297
298-DynamicFunctionInfo::DynamicFunctionInfo(::zorba::serialization::Archiver& ar)
299+FunctionItemInfo::FunctionItemInfo(::zorba::serialization::Archiver& ar)
300 {
301 }
302
303
304-DynamicFunctionInfo::~DynamicFunctionInfo()
305+FunctionItemInfo::~FunctionItemInfo()
306 {
307 if (theMustDeleteCCB)
308 delete theCCB;
309 }
310
311
312-void DynamicFunctionInfo::serialize(::zorba::serialization::Archiver& ar)
313+void FunctionItemInfo::serialize(::zorba::serialization::Archiver& ar)
314 {
315 ar & theCCB;
316 ar & theMustDeleteCCB;
317@@ -119,7 +119,7 @@
318 }
319
320
321-void DynamicFunctionInfo::add_variable(
322+void FunctionItemInfo::add_variable(
323 expr* var,
324 var_expr* substVar,
325 const store::Item_t& name,
326@@ -144,22 +144,22 @@
327
328
329 FunctionItem::FunctionItem(
330- const DynamicFunctionInfo_t& dynamicFunctionInfo,
331+ const FunctionItemInfo_t& dynamicFunctionInfo,
332 dynamic_context* dctx)
333 :
334 store::Item(store::Item::FUNCTION),
335- theDynamicFunctionInfo(dynamicFunctionInfo),
336+ theFunctionItemInfo(dynamicFunctionInfo),
337 theArity(dynamicFunctionInfo->theArity),
338 theClosureDctx(dctx)
339 {
340- assert(theDynamicFunctionInfo->theFunction->isUdf());
341- theArgumentsValues.resize(theDynamicFunctionInfo->theArity);
342+ assert(theFunctionItemInfo->theFunction->isUdf());
343+ theArgumentsValues.resize(theFunctionItemInfo->theArity);
344 }
345
346
347 void FunctionItem::serialize(::zorba::serialization::Archiver& ar)
348 {
349- ar & theDynamicFunctionInfo;
350+ ar & theFunctionItemInfo;
351 ar & theArity;
352 ar & theArgumentsValues;
353 }
354@@ -167,7 +167,7 @@
355
356 const store::Item_t FunctionItem::getFunctionName() const
357 {
358- return theDynamicFunctionInfo->theQName;
359+ return theFunctionItemInfo->theQName;
360 }
361
362
363@@ -179,13 +179,13 @@
364
365 uint32_t FunctionItem::getStartArity() const
366 {
367- return theDynamicFunctionInfo->theArity;
368+ return theFunctionItemInfo->theArity;
369 }
370
371
372 const signature& FunctionItem::getSignature() const
373 {
374- return theDynamicFunctionInfo->theFunction->getSignature();
375+ return theFunctionItemInfo->theFunction->getSignature();
376 }
377
378
379@@ -252,15 +252,15 @@
380 expr* dummy = ccb->theEM->
381 create_function_item_expr(NULL,
382 NULL,
383- theDynamicFunctionInfo->theLoc,
384+ theFunctionItemInfo->theLoc,
385 false,
386 false,
387 false);
388
389- PlanIter_t udfCallIterator = theDynamicFunctionInfo->theFunction->
390+ PlanIter_t udfCallIterator = theFunctionItemInfo->theFunction->
391 codegen(ccb,
392- theDynamicFunctionInfo->theClosureSctx,
393- theDynamicFunctionInfo->theLoc,
394+ theFunctionItemInfo->theClosureSctx,
395+ theFunctionItemInfo->theLoc,
396 args,
397 *dummy);
398
399@@ -278,7 +278,7 @@
400 std::ostringstream lRes;
401 lRes << getFunctionName()->getStringValue();
402 if (!isInline())
403- lRes << "#" << getArity() << " (" << theDynamicFunctionInfo->theLoc << ")";
404+ lRes << "#" << getArity() << " (" << theFunctionItemInfo->theLoc << ")";
405 return lRes.str();
406 }
407
408@@ -290,10 +290,10 @@
409 DynamicFunctionIterator::DynamicFunctionIterator(
410 static_context* sctx,
411 const QueryLoc& loc,
412- DynamicFunctionInfo* fnInfo)
413+ FunctionItemInfo* fnInfo)
414 :
415 NaryBaseIterator<DynamicFunctionIterator, PlanIteratorState>(sctx, loc, fnInfo->theScopedVarsIterators),
416- theDynamicFunctionInfo(fnInfo)
417+ theFunctionItemInfo(fnInfo)
418 {
419 }
420
421@@ -307,7 +307,7 @@
422 {
423 serialize_baseclass(ar,
424 (NaryBaseIterator<DynamicFunctionIterator, PlanIteratorState>*)this);
425- ar & theDynamicFunctionInfo;
426+ ar & theFunctionItemInfo;
427 }
428
429
430@@ -324,18 +324,18 @@
431
432 // Import the outer environment.
433 importOuterEnv(planState,
434- theDynamicFunctionInfo->theCCB,
435- theDynamicFunctionInfo->theClosureSctx,
436+ theFunctionItemInfo->theCCB,
437+ theFunctionItemInfo->theClosureSctx,
438 evalDctx.get());
439
440- if (theDynamicFunctionInfo->theIsCoercion)
441+ if (theFunctionItemInfo->theIsCoercion)
442 {
443 DynamicFunctionIterator* child = dynamic_cast<DynamicFunctionIterator*>(theChildren[0].getp());
444 if (child != NULL)
445- theDynamicFunctionInfo->theQName = child->theDynamicFunctionInfo->theQName;
446+ theFunctionItemInfo->theQName = child->theFunctionItemInfo->theQName;
447 }
448
449- result = new FunctionItem(theDynamicFunctionInfo, evalDctx.release());
450+ result = new FunctionItem(theFunctionItemInfo, evalDctx.release());
451 }
452
453 STACK_PUSH ( result != NULL, state );
454@@ -424,24 +424,24 @@
455 // (c) If it is not a global one, set its value within the eval dctx.
456 csize curChild = -1;
457
458- csize numOuterVars = theDynamicFunctionInfo->theScopedVarsNames.size();
459+ csize numOuterVars = theFunctionItemInfo->theScopedVarsNames.size();
460
461
462 for (csize i = 0; i < numOuterVars; ++i)
463 {
464- if (!theDynamicFunctionInfo->theIsGlobalVar[i])
465+ if (!theFunctionItemInfo->theIsGlobalVar[i])
466 {
467 ++curChild;
468
469 store::Iterator_t iter = new PlanIteratorWrapper(theChildren[curChild], planState);
470
471- evalDctx->add_variable(theDynamicFunctionInfo->theVarId[i], iter);
472+ evalDctx->add_variable(theFunctionItemInfo->theVarId[i], iter);
473 }
474 }
475
476 // Import the outer-query ns bindings
477- store::NsBindings::const_iterator ite = theDynamicFunctionInfo->theLocalBindings.begin();
478- store::NsBindings::const_iterator end = theDynamicFunctionInfo->theLocalBindings.end();
479+ store::NsBindings::const_iterator ite = theFunctionItemInfo->theLocalBindings.begin();
480+ store::NsBindings::const_iterator end = theFunctionItemInfo->theLocalBindings.end();
481
482 for (; ite != end; ++ite)
483 {
484
485=== modified file 'src/runtime/function_item/function_item.h'
486--- src/runtime/function_item/function_item.h 2013-03-23 15:20:54 +0000
487+++ src/runtime/function_item/function_item.h 2013-03-26 21:30:30 +0000
488@@ -30,9 +30,9 @@
489
490 class signature;
491 class function_item_expr;
492-class DynamicFunctionInfo;
493+class FunctionItemInfo;
494
495-typedef rchandle<DynamicFunctionInfo> DynamicFunctionInfo_t;
496+typedef rchandle<FunctionItemInfo> FunctionItemInfo_t;
497
498 /*******************************************************************************
499 A class to hold information about a dynamic function. This info is shared
500@@ -43,7 +43,7 @@
501
502 theMustDeleteCCB :
503 ------------------
504- This is set to true if the DynamicFunctionInfo is the owner of the CCB,
505+ This is set to true if the FunctionItemInfo is the owner of the CCB,
506 and must delete it upon destruction.
507
508 theLoc:
509@@ -110,7 +110,7 @@
510 -----------------------
511
512 ********************************************************************************/
513-class DynamicFunctionInfo : public SimpleRCObject
514+class FunctionItemInfo : public SimpleRCObject
515 {
516 public:
517 CompilerCB * theCCB;
518@@ -136,12 +136,12 @@
519 store::NsBindings theLocalBindings;
520
521 public:
522- SERIALIZABLE_CLASS(DynamicFunctionInfo)
523- DynamicFunctionInfo(::zorba::serialization::Archiver& ar);
524+ SERIALIZABLE_CLASS(FunctionItemInfo)
525+ FunctionItemInfo(::zorba::serialization::Archiver& ar);
526 void serialize(::zorba::serialization::Archiver& ar);
527
528 public:
529- DynamicFunctionInfo(
530+ FunctionItemInfo(
531 static_context* closureSctx,
532 const QueryLoc& loc,
533 function* func,
534@@ -151,7 +151,7 @@
535 bool needsContextItem,
536 bool isCoercion);
537
538- virtual ~DynamicFunctionInfo();
539+ virtual ~FunctionItemInfo();
540
541 void add_variable(
542 expr* var,
543@@ -172,7 +172,7 @@
544 class FunctionItem : public store::Item, public zorba::serialization::SerializeBaseClass
545 {
546 protected:
547- DynamicFunctionInfo_t theDynamicFunctionInfo;
548+ FunctionItemInfo_t theFunctionItemInfo;
549
550 unsigned int theArity; // The arity of the function
551 // item will decrease when a
552@@ -191,7 +191,7 @@
553
554 public:
555 FunctionItem(
556- const DynamicFunctionInfo_t& dynamicFunctionInfo,
557+ const FunctionItemInfo_t& dynamicFunctionInfo,
558 dynamic_context* dctx);
559
560 SYNC_CODE(RCLock* getRCLock() const { return &theRCLock; })
561@@ -224,11 +224,11 @@
562
563 const signature& getSignature() const;
564
565- bool isInline() const { return theDynamicFunctionInfo->theIsInline; }
566+ bool isInline() const { return theFunctionItemInfo->theIsInline; }
567
568- bool needsContextItem() const { return theDynamicFunctionInfo->theNeedsContextItem; }
569+ bool needsContextItem() const { return theFunctionItemInfo->theNeedsContextItem; }
570
571- bool isCoercion() const { return theDynamicFunctionInfo->theIsCoercion; }
572+ bool isCoercion() const { return theFunctionItemInfo->theIsCoercion; }
573
574 zstring show() const;
575 };
576@@ -240,7 +240,7 @@
577 class DynamicFunctionIterator : public NaryBaseIterator<DynamicFunctionIterator, PlanIteratorState>
578 {
579 protected:
580- DynamicFunctionInfo_t theDynamicFunctionInfo;
581+ FunctionItemInfo_t theFunctionItemInfo;
582
583 public:
584 SERIALIZABLE_CLASS(DynamicFunctionIterator)
585@@ -252,14 +252,14 @@
586 DynamicFunctionIterator(
587 static_context* sctx,
588 const QueryLoc& loc,
589- DynamicFunctionInfo* fnInfo);
590+ FunctionItemInfo* fnInfo);
591
592 virtual ~DynamicFunctionIterator();
593
594 // Used for pretty-printing of the iterator tree
595- const DynamicFunctionInfo_t getDynamicFunctionInfo() const
596+ const FunctionItemInfo_t getFunctionItemInfo() const
597 {
598- return theDynamicFunctionInfo;
599+ return theFunctionItemInfo;
600 }
601
602 void accept(PlanIterVisitor& v) const;
603
604=== modified file 'src/runtime/function_item/function_item_iter_impl.cpp'
605--- src/runtime/function_item/function_item_iter_impl.cpp 2013-03-17 13:02:43 +0000
606+++ src/runtime/function_item/function_item_iter_impl.cpp 2013-03-26 21:30:30 +0000
607@@ -81,7 +81,7 @@
608 {
609 expr* fiExpr = Translator::translate_literal_function(qname, arity, theCompilerCB, loc, true);
610
611- DynamicFunctionInfo_t dynFnInfo = static_cast<function_item_expr*>(fiExpr)->get_dynamic_fn_info();
612+ FunctionItemInfo_t dynFnInfo = static_cast<function_item_expr*>(fiExpr)->get_dynamic_fn_info();
613 dynFnInfo->theCCB = theCompilerCB;
614 // dynFnInfo->theClosureSctx = NULL;
615
616
617=== modified file 'src/runtime/visitors/printer_visitor_impl.cpp'
618--- src/runtime/visitors/printer_visitor_impl.cpp 2013-03-24 20:40:03 +0000
619+++ src/runtime/visitors/printer_visitor_impl.cpp 2013-03-26 21:30:30 +0000
620@@ -118,8 +118,8 @@
621 void PrinterVisitor::beginVisit(const DynamicFunctionIterator& a)
622 {
623 thePrinter.startBeginVisit("DynamicFunctionIterator", ++theId);
624- if (a.getDynamicFunctionInfo()->theQName.getp() != NULL)
625- thePrinter.addAttribute("function", a.getDynamicFunctionInfo()->theQName->getStringValue().str());
626+ if (a.getFunctionItemInfo()->theQName.getp() != NULL)
627+ thePrinter.addAttribute("function", a.getFunctionItemInfo()->theQName->getStringValue().str());
628 printCommons( &a, theId );
629 thePrinter.endBeginVisit(theId);
630 }
631
632=== modified file 'src/zorbaserialization/archiver_consts.h'
633--- src/zorbaserialization/archiver_consts.h 2013-03-15 08:22:41 +0000
634+++ src/zorbaserialization/archiver_consts.h 2013-03-26 21:30:30 +0000
635@@ -251,7 +251,7 @@
636 #include "runtime/iterator_enum.h"
637
638 TYPE_DynamicFunctionIterator,
639- TYPE_DynamicFunctionInfo,
640+ TYPE_FunctionItemInfo,
641 TYPE_DynamicFnCallIterator,
642 TYPE_ArgumentPlaceholderIterator,
643
644
645=== modified file 'test/fots_driver/cli.xq'
646--- test/fots_driver/cli.xq 2013-03-16 08:48:16 +0000
647+++ test/fots_driver/cli.xq 2013-03-26 21:30:30 +0000
648@@ -94,17 +94,20 @@
649 : Used by the run-test-sets, run-and-report, and report commands.
650 :)
651 declare variable $exceptedTestCases as xs:string* := (
652- "instanceof139",
653- "CastAs-UnionType-26",
654- "CastAs-UnionType-30",
655- "fn-unparsed-text-lines-052",
656- "cbcl-subsequence-011",
657- "cbcl-subsequence-012",
658- "cbcl-subsequence-013",
659- "cbcl-subsequence-014" (:see bug lp:1069794 :)
660-, "re00975",
661- "re00976",
662- "re00976a" (:see bug lp:1070533 :)
663+(: "re00987",
664+ "itunes",
665+ "raytracer", :)
666+ "instanceof139",
667+ "CastAs-UnionType-26",
668+ "CastAs-UnionType-30",
669+ "fn-unparsed-text-lines-052",
670+ "cbcl-subsequence-011",
671+ "cbcl-subsequence-012",
672+ "cbcl-subsequence-013",
673+ "cbcl-subsequence-014" (:see bug lp:1069794 :)
674+, "re00975",
675+ "re00976",
676+ "re00976a" (:see bug lp:1070533 :)
677 );
678
679

Subscribers

People subscribed via source and target branches