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:
Fixed DEBUG-mode compilation problems

Requested reviews:
  Markos Zaharioudakis (markos-za)

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

Fixed DEBUG-mode compilation problems
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/132748
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/compiler/rewriter/rules/index_join_rule.cpp'
--- src/compiler/rewriter/rules/index_join_rule.cpp	2012-10-31 08:02:16 +0000
+++ src/compiler/rewriter/rules/index_join_rule.cpp	2012-11-02 20:14:23 +0000
@@ -823,7 +823,7 @@
     if (rCtx.theFlworStack[i]->get_expr_kind() == trycatch_expr_kind)
       return false;
 
-    assert(rCtx.theFlworStack[i] == flwor_expr_kind);
+    assert(rCtx.theFlworStack[i]->get_expr_kind() == flwor_expr_kind);
 
     flworExpr = static_cast<flwor_expr*>(rCtx.theFlworStack[i]);
 

=== modified file 'src/compiler/rewriter/tools/dataflow_annotations.cpp'
--- src/compiler/rewriter/tools/dataflow_annotations.cpp	2012-10-31 08:02:16 +0000
+++ src/compiler/rewriter/tools/dataflow_annotations.cpp	2012-11-02 20:14:23 +0000
@@ -594,7 +594,7 @@
 
     for (csize i = 1; i < num_steps; ++i)
     {
-      assert((*e)[i]->get_expr_kind() == axist_step_expr_kind);
+      assert((*e)[i]->get_expr_kind() == axis_step_expr_kind);
       axis_step_expr* ase = static_cast<axis_step_expr *>((*e)[i]);
 
       reverse_axes = reverse_axes || ase->is_reverse_axis();