X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2FASTAnalyses%2FEncoding%2Fencodinggraph.h;h=2fd4b3748896f11ca44bfb1e92ee0aeb2ba50326;hp=f452dac2fc7660940bed0fa351695ec0abdd3bbd;hb=effcb0cac2350f338c4cd42c04194c0a0f0a8e90;hpb=958d329cfd52dd9a1f3e1ca21c1ac40c7114ea63

diff --git a/src/ASTAnalyses/Encoding/encodinggraph.h b/src/ASTAnalyses/Encoding/encodinggraph.h
index f452dac..2fd4b37 100644
--- a/src/ASTAnalyses/Encoding/encodinggraph.h
+++ b/src/ASTAnalyses/Encoding/encodinggraph.h
@@ -2,19 +2,7 @@
 #define ENCODINGGRAPH_H
 #include "classlist.h"
 #include "structs.h"
-
-uint hashEncodingEdge(EncodingEdge *edge);
-bool equalsEncodingEdge(EncodingEdge *e1, EncodingEdge *e2);
-class EncodingSubGraph;
-
-
-typedef Hashtable<EncodingEdge *, EncodingEdge *, uintptr_t, PTRSHIFT, hashEncodingEdge, equalsEncodingEdge> HashtableEdge;
-typedef Hashset<EncodingNode *, uintptr_t, PTRSHIFT> HashsetEncodingNode;
-typedef SetIterator<EncodingNode *, uintptr_t, PTRSHIFT> SetIteratorEncodingNode;
-typedef Hashset<EncodingEdge *, uintptr_t, PTRSHIFT> HashsetEncodingEdge;
-typedef SetIterator<EncodingEdge *, uintptr_t, PTRSHIFT> SetIteratorEncodingEdge;
-
-typedef Hashtable<EncodingNode *, EncodingSubGraph *, uintptr_t, PTRSHIFT> HashtableNodeToSubGraph;
+#include "graphstructs.h"
 
 class EncodingGraph {
  public:
@@ -57,24 +45,6 @@ class EncodingNode {
 	friend class EncodingSubGraph;
 };
 
-class EncodingSubGraph {
- public:
-	EncodingSubGraph();
-	void addNode(EncodingNode *n);
-	SetIteratorEncodingNode * nodeIterator();
-	
-	CMEMALLOC;
- private:
-	uint estimateNewSize(EncodingNode *n);
-	uint estimateNewSize(EncodingSubGraph *sg);
-
-	HashsetEncodingNode nodes;
-	uint encodingSize;
-	uint numElements;
-
-	friend class EncodingGraph;
-};
-
 enum EdgeEncodingType { EDGE_UNASSIGNED, EDGE_BREAK, EDGE_MATCH};
 typedef enum EdgeEncodingType EdgeEncodingType;