restructrue code of funcnode.cc, and planning for adding back edges in predicate...

[c11tester.git] / predicate.cc

diff --git a/predicate.cc b/predicate.cc
index 42c63100f07a75b74118265010d1f9ffbf6e13a1..9726fb3a18aaa0ae0e06cee15ed3ce809adb5872 100644 (file)
--- a/predicate.cc
+++ b/predicate.cc
@@ -2,7 +2,8 @@
 
 Predicate::Predicate(FuncInst * func_inst) :
        func_inst(func_inst),
-       predicates(),
+       entry_predicate(false),
+       pred_expressions(),
        children()
 {}
 
@@ -25,7 +26,7 @@ bool pred_expr_equal(struct pred_expr * p1, struct pred_expr * p2)
 void Predicate::add_predicate(token_t token, void * location, bool value)
 {
        struct pred_expr *ptr = new pred_expr(token, location, value);
-       predicates.add(ptr);
+       pred_expressions.add(ptr);
 }
 
 void Predicate::add_child(Predicate * child)
@@ -36,11 +37,11 @@ void Predicate::add_child(Predicate * child)
 
 void Predicate::print_predicate()
 {
-       model_print("\"%p\" [shape=box, label=\"%p\n", this, this);
+       model_print("\"%p\" [shape=box, label=\"\n", this);
        func_inst->print();
-       PredSetIter * it = predicates.iterator();
+       PredExprSetIter * it = pred_expressions.iterator();
 
-       if (predicates.getSize() == 0)
+       if (pred_expressions.getSize() == 0)
                model_print("no predicate\n");
 
        while (it->hasNext()) {