Fix some of the memory leaks

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

diff --git a/src/Collections/structs.c b/src/Collections/structs.c
index 4da4995028eb8458b5087757bae2eabc17754f5a..045323143c9402ba9533a42b9903efab38e8b60f 100644 (file)
--- a/src/Collections/structs.c
+++ b/src/Collections/structs.c
@@ -1,11 +1,33 @@
 #include "structs.h"
 #include "mymemory.h"
+#include "orderpair.h"
 
-VectorImpl(Int, uint64_t, 4);
+VectorImpl(Table, Table *, 4);
+VectorImpl(Set, Set *, 4);
 VectorImpl(Boolean, Boolean *, 4);
 VectorImpl(Constraint, Constraint *, 4);
-VectorImpl(Set, Set *, 4);
+VectorImpl(Function, Function *, 4);
+VectorImpl(Predicate, Predicate *, 4);
 VectorImpl(Element, Element *, 4);
+VectorImpl(Order, Order *, 4);
+VectorImpl(TableEntry, TableEntry *, 4);
 VectorImpl(ASTNode, ASTNode *, 4);
-HashTableImpl(Void, void *, void *, Ptr_hash_function, Ptr_equals);
-HashSetImpl(Void, void *, Ptr_hash_function, Ptr_equals);
+VectorImpl(Int, uint64_t, 4);
+
+inline unsigned int Ptr_hash_function(void * hash) {
+       return (unsigned int)((uint64_t)hash >> 4);
+}
+
+inline bool Ptr_equals(void * key1, void * key2) {
+       return key1 == key2;
+}
+
+static inline unsigned int order_pair_hash_Function(OrderPair* This){
+       return (uint) (This->first << 2) ^ This->second;
+}
+
+static inline unsigned int order_pair_equals(OrderPair* key1, OrderPair* key2){
+       return key1->first== key2->first && key1->second == key2->second;
+}
+
+HashTableImpl(BoolConst, OrderPair *, OrderPair *, order_pair_hash_Function, order_pair_equals, ourfree);