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.

Requested reviews:
  Markos Zaharioudakis (markos-za)

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

fixed wrong assertion in var_expr::remove_set_expr
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/87478
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/compiler/expression/var_expr.cpp'
--- src/compiler/expression/var_expr.cpp	2012-01-03 12:10:06 +0000
+++ src/compiler/expression/var_expr.cpp	2012-01-04 14:32:24 +0000
@@ -244,6 +244,7 @@
 {
   assert(theKind == local_var || theKind == prolog_var);
 
+  bool found = false;
   std::vector<expr*>::iterator ite = theSetExprs.begin();
   std::vector<expr*>::iterator end = theSetExprs.end();
   for (; ite != end; ++ite)
@@ -251,11 +252,12 @@
     if (*ite == e)
     {
       theSetExprs.erase(ite);
+      found = true;
       break;
     }
   }
 
-  assert(ite != end);
+  ZORBA_ASSERT(found);
 }