Adding support for Integer Encoding ...

[satune.git] / src / Collections / structs.h

diff --git a/src/Collections/structs.h b/src/Collections/structs.h
index 3e08e976a65b4b55367c0362298d5aebc916f096..4ee55494ff4247e4937577970de23f42a0e189fb 100644 (file)
--- a/src/Collections/structs.h
+++ b/src/Collections/structs.h
@@ -4,25 +4,34 @@
 #include "hashtable.h"
 #include "hashset.h"
 #include "classlist.h"
+#include "array.h"
 
-VectorDef(Int, uint64_t, 4);
-VectorDef(Void, void *, 4);
-VectorDef(Boolean, Boolean *, 4);
-VectorDef(Constraint, Constraint *, 4);
-VectorDef(Set, Set *, 4);
-VectorDef(Element, Element *, 4);
-VectorDef(TableEntry, TableEntry *, 4);
-VectorDef(Predicate, Predicate *, 4);
-VectorDef(Table, Table *, 4);
+ArrayDef(Element, Element *);
+ArrayDef(Boolean, Boolean *);
+ArrayDef(Set, Set *);
 
-inline unsigned int Ptr_hash_function(void * hash) {
-       return (unsigned int)((uint64_t)hash >> 4);
-}
+VectorDef(Table, Table *);
+VectorDef(Set, Set *);
+VectorDef(Boolean, Boolean *);
+VectorDef(BooleanOrder, BooleanOrder *);
+VectorDef(Function, Function *);
+VectorDef(Predicate, Predicate *);
+VectorDef(Element, Element *);
+VectorDef(Order, Order *);
+VectorDef(TableEntry, TableEntry *);
+VectorDef(ASTNode, ASTNode *);
+VectorDef(Int, uint64_t);
+VectorDef(OrderNode, OrderNode *);
+VectorDef(OrderGraph, OrderGraph *);
 
-inline bool Ptr_equals(void * key1, void * key2) {
-       return key1 == key2;
-}
+HashTableDef(Void, void *, void *);
+HashTableDef(OrderPair, OrderPair *, OrderPair *);
 
-HashTableDef(Void, void *, void *, Ptr_hash_function, Ptr_equals);
-HashSetDef(Void, void *, Ptr_hash_function, Ptr_equals);
+HashSetDef(Boolean, Boolean *);
+HashSetDef(TableEntry, TableEntry *);
+HashSetDef(OrderNode, OrderNode *);
+HashSetDef(OrderEdge, OrderEdge *);
+HashSetDef(OrderElement, OrderElement *);
+
+HashTableDef(NodeToNodeSet, OrderNode *, HashSetOrderNode *);
 #endif