fix a bug and print predicate tree in xdot syntax

[c11tester.git] / predicate.h

diff --git a/predicate.h b/predicate.h
index 3849e2d88e0e4b2c519c4bd61717597a0d53f2e3..6d0dbc4be4232e4a37e0537bde79894db83fecb5 100644 (file)
--- a/predicate.h
+++ b/predicate.h
@@ -2,10 +2,12 @@
 #define __PREDICATE_H__
 
 #include "funcinst.h"
+#include "hashset.h"
 
 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> PredicateSet;
+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 enum predicate_token {
        EQUALITY, NULLITY
@@ -16,9 +18,17 @@ typedef enum predicate_token {
  * read at memory location specified in predicate_expr.
  */
 struct pred_expr {
+       pred_expr(token_t token, void * location, bool value) :
+               token(token),
+               location(location),
+               value(value)
+       {}
+
        token_t token;
        void * location;
        bool value;
+
+       MEMALLOC
 };
 
 
@@ -28,14 +38,18 @@ public:
        ~Predicate();
 
        FuncInst * get_func_inst() { return func_inst; }
-       PredicateSet * get_predicates() { return &predicates; }
+       PredSet * get_predicates() { return &predicates; }
        void add_predicate(token_t token, void * location, bool value);
+       void add_child(Predicate * child);
+
+       void print_predicate();
+       void print_pred_subtree();
 
        MEMALLOC
 private:
        FuncInst * func_inst;
        /* may have multiple precicates */
-       PredicateSet predicates;
+       PredSet predicates;
        ModelVector<Predicate *> children;
 };