zorba-coders team mailing list archive

[Markos Zaharioudakis <markos_za@xxxxxxxxx>]

Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba.

Commit message:
fixes for bugs 1186114 and 1186110

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/166866

fixes for bugs 1186114 and 1186110
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/166866
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2013-05-30 22:25:30 +0000
+++ src/compiler/translator/translator.cpp	2013-05-31 17:59:29 +0000
@@ -1638,7 +1638,7 @@
 
   // for $fi in argExpr
   flwor_expr* coersionFlwor = CREATE(flwor)(theRootSctx, theUDF, loc);
-  for_clause* fiClause = wrap_in_forclause(argExpr, NULL);
+  for_clause* fiClause = wrap_in_forclause(argExpr, false);
   var_expr* fiVar = fiClause->get_var();
   coersionFlwor->add_clause(fiClause);
 

=== modified file 'src/store/naive/simple_store.cpp'
--- src/store/naive/simple_store.cpp	2013-02-26 04:12:43 +0000
+++ src/store/naive/simple_store.cpp	2013-05-31 17:59:29 +0000
@@ -92,8 +92,8 @@
         std::cerr << "Reference: " << (*iter).second
                   << "is still in the nodes to references map" << std::endl;
       }
-      ZORBA_FATAL(0, theNodeToReferencesMap.size() +
-                     " node references still in the nodes to references map");
+
+      ZORBA_FATAL(0, theNodeToReferencesMap.size() << " node references still in the nodes to references map");
     }
 
     if (theReferencesToNodeMap.size() > 0)
@@ -105,8 +105,8 @@
         std::cerr << "Reference: " << (*iter).first
                   << "is still in the references to nodes map" << std::endl;
       }
-      ZORBA_FATAL(0, theReferencesToNodeMap.size() +
-                     " node references still in the references to nodes map");
+
+      ZORBA_FATAL(0, theNodeToReferencesMap.size() << " node references still in the references to nodes map");
     }
   }
 }