Change the return type of Predicate::evaluate

[c11tester.git] / predicate.cc

diff --git a/predicate.cc b/predicate.cc
index a5ba11c928f661176d47c9feb0e9abc5fe379ec2..94eedfd52253382a46e659488346bd596fa397dd 100644 (file)
--- a/predicate.cc
+++ b/predicate.cc
@@ -1,4 +1,5 @@
 #include "predicate.h"
+#include "concretepredicate.h"
 
 Predicate::Predicate(FuncInst * func_inst, bool is_entry) :
        func_inst(func_inst),
@@ -59,9 +60,9 @@ void Predicate::copy_predicate_expr(Predicate * other)
 }
 
 /* Evaluate predicate expressions against the given inst_act_map */
-SnapVector<struct concrete_pred_expr> Predicate::evaluate(inst_act_map_t * inst_act_map)
+ConcretePredicate * Predicate::evaluate(inst_act_map_t * inst_act_map, thread_id_t tid)
 {
-       SnapVector<struct concrete_pred_expr> concrete_exprs;
+       ConcretePredicate * concrete = new ConcretePredicate(tid);
        PredExprSetIter * it = pred_expressions.iterator();
 
        while (it->hasNext()) {
@@ -85,12 +86,13 @@ SnapVector<struct concrete_pred_expr> Predicate::evaluate(inst_act_map_t * inst_
                                break;
                }
 
-               concrete_exprs.push_back(concrete_pred_expr(ptr->token, value, ptr->value));
+               concrete->add_expression(ptr->token, value, ptr->value);
        }
 
-       return concrete_exprs;
+       return concrete;
 }
 
+
 void Predicate::print_predicate()
 {
        model_print("\"%p\" [shape=box, label=\"\n", this);