Resolving Conflicts ... Still there're errors that should be fixed

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

diff --git a/src/Collections/structs.h b/src/Collections/structs.h
index 3e08e976a65b4b55367c0362298d5aebc916f096..dc6d66573c4f3c10bd355136dc493dab327941ca 100644 (file)
--- a/src/Collections/structs.h
+++ b/src/Collections/structs.h
@@ -4,16 +4,27 @@
 #include "hashtable.h"
 #include "hashset.h"
 #include "classlist.h"
+#include "array.h"
 
-VectorDef(Int, uint64_t, 4);
-VectorDef(Void, void *, 4);
+ArrayDef(Element, Element *);
+ArrayDef(Boolean, Boolean *);
+ArrayDef(Set, Set *);
+
+
+VectorDef(Table, Table *, 4);
+VectorDef(Set, Set *, 4);
 VectorDef(Boolean, Boolean *, 4);
 VectorDef(Constraint, Constraint *, 4);
-VectorDef(Set, Set *, 4);
+VectorDef(Function, Function *, 4);
+VectorDef(Predicate, Predicate *, 4);
 VectorDef(Element, Element *, 4);
+VectorDef(Order, Order *, 4);
 VectorDef(TableEntry, TableEntry *, 4);
-VectorDef(Predicate, Predicate *, 4);
-VectorDef(Table, Table *, 4);
+VectorDef(ASTNode, ASTNode *, 4);
+VectorDef(FunctionEncoding, FunctionEncoding *, 4);
+VectorDef(ElementEncoding, ElementEncoding *, 4);
+VectorDef(Int, uint64_t, 4);
+
 
 inline unsigned int Ptr_hash_function(void * hash) {
        return (unsigned int)((uint64_t)hash >> 4);
@@ -24,5 +35,10 @@ inline bool Ptr_equals(void * key1, void * key2) {
 }
 
 HashTableDef(Void, void *, void *, Ptr_hash_function, Ptr_equals);
+HashTableDef(ElemToEncod, Element *, ElementEncoding *, Ptr_hash_function, Ptr_equals);
+HashTableDef(VoidToFuncEncod, void *, FunctionEncoding *, Ptr_hash_function, Ptr_equals);
+
 HashSetDef(Void, void *, Ptr_hash_function, Ptr_equals);
+
+
 #endif