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

[c11tester.git] / predicate.h

diff --git a/predicate.h b/predicate.h
index 6d0dbc4be4232e4a37e0537bde79894db83fecb5..33b2203f50767fcf1e6c3f89e86f1e51fde33ff8 100644 (file)
--- a/predicate.h
+++ b/predicate.h
@@ -6,8 +6,8 @@
 
 unsigned int pred_expr_hash (struct pred_expr *);
 bool pred_expr_equal(struct pred_expr *, struct pred_expr *);
-typedef HashSet<struct pred_expr *, uintptr_t, 0, model_malloc, model_calloc, model_free, pred_expr_hash, pred_expr_equal> PredSet;
-typedef HSIterator<struct pred_expr *, uintptr_t, 0, model_malloc, model_calloc, model_free, pred_expr_hash, pred_expr_equal> PredSetIter;
+typedef HashSet<struct pred_expr *, uintptr_t, 0, model_malloc, model_calloc, model_free, pred_expr_hash, pred_expr_equal> PredExprSet;
+typedef HSIterator<struct pred_expr *, uintptr_t, 0, model_malloc, model_calloc, model_free, pred_expr_hash, pred_expr_equal> PredExprSetIter;
 
 typedef enum predicate_token {
        EQUALITY, NULLITY
@@ -38,9 +38,13 @@ public:
        ~Predicate();
 
        FuncInst * get_func_inst() { return func_inst; }
-       PredSet * get_predicates() { return &predicates; }
+       PredExprSet * get_pred_expressions() { return &pred_expressions; }
        void add_predicate(token_t token, void * location, bool value);
        void add_child(Predicate * child);
+       ModelVector<Predicate *> * get_children() { return &children; }
+
+       bool is_entry_predicate() { return entry_predicate; }
+       void set_entry_predicate() { entry_predicate = true; }
 
        void print_predicate();
        void print_pred_subtree();
@@ -48,8 +52,9 @@ public:
        MEMALLOC
 private:
        FuncInst * func_inst;
-       /* may have multiple precicates */
-       PredSet predicates;
+       bool entry_predicate;
+       /* may have multiple predicates */
+       PredExprSet pred_expressions;
        ModelVector<Predicate *> children;
 };