X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=ad63d4dfc999f3ee5beec28c258c9facf5c8d9b0;hb=87d1cbc6f5149794253614a9f4b435ccd339e04e;hp=59e545783a4f570ff852105f5d08792d562d2b03;hpb=1667e1f8017bd3f4bf5b1ef5712e3156577f99a2;p=model-checker.git

diff --git a/nodestack.h b/nodestack.h
index 59e5457..ad63d4d 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -7,14 +7,13 @@
 
 #include <list>
 #include <vector>
-#include <set>
 #include <cstddef>
 #include "threads.h"
 #include "mymemory.h"
 
 class ModelAction;
 
-typedef std::set< ModelAction *, std::less< ModelAction *>, MyAlloc< ModelAction * > > action_set_t;
+typedef std::list< const ModelAction *, MyAlloc< const ModelAction * > > readfrom_set_t;
 
 /**
  * @brief A single node in a NodeStack
@@ -44,9 +43,11 @@ public:
 	 * occurred previously in the stack. */
 	Node * get_parent() const { return parent; }
 
-	void add_read_from(ModelAction *act);
+	void add_read_from(const ModelAction *act);
+	const ModelAction * get_next_read_from();
 
 	void print();
+	void print_may_read_from();
 
 	MEMALLOC
 private:
@@ -61,7 +62,7 @@ private:
 
 	/** The set of ModelActions that this the action at this Node may read
 	 *  from. Only meaningful if this Node represents a 'read' action. */
-	action_set_t may_read_from;
+	readfrom_set_t may_read_from;
 };
 
 typedef std::list< Node *, MyAlloc< Node * > > node_list_t;
@@ -82,7 +83,7 @@ public:
 	Node * get_head();
 	Node * get_next();
 	void reset_execution();
-
+	void pop_restofstack();
 	int get_total_nodes() { return total_nodes; }
 
 	void print();