recovered branch

2 files changed, 2 insertions, 7 deletions

diff --git a/lib/chillcg/src/CG_chillBuilder.cc b/lib/chillcg/src/CG_chillBuilder.cc
index 74622d7..2613910 100755
--- a/lib/chillcg/src/CG_chillBuilder.cc
+++ b/lib/chillcg/src/CG_chillBuilder.cc
@@ -60,7 +60,7 @@ namespace omega {
         // No op
         break;
       default:
-        CHILL_ERROR("UNHANDLED statement of type %s %s\n",n->getTypeString());
+        CG_ERROR("UNHANDLED statement of type %s %s\n",n->getTypeString());
         exit(-1);
     }
     return r;
@@ -213,7 +213,7 @@ namespace omega {
                                                        CG_outputRepr *lhs,
                                                        CG_outputRepr *rhs) const {
     if(lhs == NULL || rhs == NULL) {
-      CHILL_ERROR("Code generation: Missing lhs or rhs\n");
+      CG_ERROR("Code generation: Missing lhs or rhs\n");
       return NULL;
     }
     
diff --git a/lib/codegen/src/CG_utils.cc b/lib/codegen/src/CG_utils.cc
index 95f94ec..839343f 100755
--- a/lib/codegen/src/CG_utils.cc
+++ b/lib/codegen/src/CG_utils.cc
@@ -2607,7 +2607,6 @@ namespace omega {
     }
     
     Relation then_cond = find_best_guard(R, loops, start, end);
-    fprintf(stderr, "then_cond  "); then_cond.print(stderr); 
     assert(!then_cond.is_obvious_tautology());
     Relation else_cond = Complement(copy(then_cond));
     else_cond.simplify();
@@ -2640,11 +2639,7 @@ namespace omega {
     else if (j == i && end > j) {
       int new_indent = (guard_repr==NULL)?indent:indent+1;
       Relation new_guard = Intersection(copy(guard), copy(then_cond));
-      new_guard.print(stderr); 
-      new_guard.print_with_subs(stderr); 
       new_guard.simplify();
-      new_guard.print(stderr); 
-      new_guard.print_with_subs(stderr); 
       CG_outputRepr *stmt_list = loop_print_repr(active,
                                                  loops, 
                                                  start,