X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=predicate.h;h=3efd89056261298074eff295c0d246559eb7eb35;hb=f8a45d8d10f16533c926096c7538b4d9be73240b;hp=dbb959ea4b0cb84cee1bcbc198f71bf741547654;hpb=6b105d0bea24fa7a534d7f83e4c34dadc9d4b02d;p=c11tester.git

diff --git a/predicate.h b/predicate.h
index dbb959ea..3efd8905 100644
--- a/predicate.h
+++ b/predicate.h
@@ -18,14 +18,14 @@ typedef enum predicate_token {
  * read at memory location specified in predicate_expr.
  */
 struct pred_expr {
-	pred_expr(token_t token, void * location, bool value) :
+	pred_expr(token_t token, FuncInst * inst, bool value) :
 		token(token),
-		location(location),
+		func_inst(inst),
 		value(value)
 	{}
 
 	token_t token;
-	void * location;
+	FuncInst * func_inst;
 	bool value;
 
 	MEMALLOC
@@ -39,10 +39,12 @@ public:
 
 	FuncInst * get_func_inst() { return func_inst; }
 	PredExprSet * get_pred_expressions() { return &pred_expressions; }
-	void add_predicate(token_t token, void * location, bool value);
+
+	void add_predicate_expr(token_t token, FuncInst * func_inst, bool value);
 	void add_child(Predicate * child);
 	void set_parent(Predicate * parent_pred) { parent = parent_pred; }
 	void set_backedge(Predicate * back_pred) { backedge = back_pred; }
+	void copy_predicate_expr(Predicate * other);
 
 	ModelVector<Predicate *> * get_children() { return &children; }
 	Predicate * get_parent() { return parent; }