Merge lp:~zorba-coders/zorba/concat_operator into lp:zorba

[William Candillon]

Optimize iterator generation for the concat operator.

 Optimize iterator generation for the concat operator.

[Zorba Build Bot (zorba-buildbot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Markos Zaharioudakis (markos-za)]

A small code improvement: rather thah doing a dynamic_cast to check if an expr is an fo_expr, use the get_expr_kind() method. So, the code would look like this:

if (right->get_expr_kind() == fo_expr_kind)
{
  fo_expr* lfoExpr = static_cast<fo_expr*>(right.getp());
  etc....;
}

Also, please respect the coding style of the files you update. In this case, put the "{" in a separate line.

[lp:~zorba-coders/zorba/concat_operator]

10674. By William Candillon on 2012-02-29

Improvement in the concat expr casting.

Unmerged revisions

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2012-02-19 19:43:28 +0000
+++ src/compiler/translator/translator.cpp	2012-02-27 22:07:44 +0000
@@ -9401,7 +9401,26 @@
   expr_t right = pop_nodestack();
   expr_t left  = pop_nodestack();
   concat_args.push_back(left);
-  concat_args.push_back(right);
+ 
+  //If the right leaf is the concat expr,
+  //we add directly its leafs to the new concat expr.
+  fo_expr* lFoExpr = dynamic_cast<fo_expr*>(right.getp());
+  bool rightLeafIsConcatExpr = false;
+  if(lFoExpr != NULL) {
+    if(lFoExpr->get_func() == GET_BUILTIN_FUNCTION(FN_CONCAT_N)) {
+      rightLeafIsConcatExpr = true;
+      csize i = 0;
+      for(i = 0; i < lFoExpr->num_args(); ++i)
+      {
+        concat_args.push_back(lFoExpr->get_arg(i));
+      }
+    }
+  }
+  
+  if(!rightLeafIsConcatExpr){
+    concat_args.push_back(right);
+  }
+
   rchandle<expr> concat = new fo_expr(theRootSctx, loc, GET_BUILTIN_FUNCTION(FN_CONCAT_N), concat_args); 
   push_nodestack(concat);
 }