adapt to latest libfirm

[cparser] / type_hash.c

diff --git a/type_hash.c b/type_hash.c
index 256cdd2..ee7ab60 100644 (file)
--- a/type_hash.c
+++ b/type_hash.c
@@ -29,11 +29,9 @@
 #include <assert.h>
 
 #define HashSet         type_hash_t
-#define HashSetIterator type_hash_iterator_t
 #define ValueType       type_t*
 #include "adt/hashset.h"
 #undef ValueType
-#undef HashSetIterator
 #undef HashSet
 
 typedef struct type_hash_iterator_t  type_hash_iterator_t;
@@ -56,22 +54,6 @@ static unsigned hash_atomic_type(const atomic_type_t *type)
        return result;
 }
 
-static unsigned hash_complex_type(const complex_type_t *type)
-{
-       unsigned some_prime = 27644437;
-       unsigned result     = type->akind * some_prime;
-
-       return result;
-}
-
-static unsigned hash_imaginary_type(const imaginary_type_t *type)
-{
-       unsigned some_prime = 27644437;
-       unsigned result     = type->akind * some_prime;
-
-       return result;
-}
-
 static unsigned hash_pointer_type(const pointer_type_t *type)
 {
        return hash_ptr(type->points_to) ^ hash_ptr(type->base_variable);
@@ -128,15 +110,11 @@ static unsigned hash_type(const type_t *type)
        switch (type->kind) {
        case TYPE_ERROR:
                return 0;
+       case TYPE_IMAGINARY:
+       case TYPE_COMPLEX:
        case TYPE_ATOMIC:
                hash = hash_atomic_type(&type->atomic);
                break;
-       case TYPE_COMPLEX:
-               hash = hash_complex_type(&type->complex);
-               break;
-       case TYPE_IMAGINARY:
-               hash = hash_imaginary_type(&type->imaginary);
-               break;
        case TYPE_ENUM:
                hash = hash_enum_type(&type->enumt);
                break;
@@ -176,18 +154,6 @@ static bool atomic_types_equal(const atomic_type_t *type1,
        return type1->akind == type2->akind;
 }
 
-static bool complex_types_equal(const complex_type_t *type1,
-                                                           const complex_type_t *type2)
-{
-       return type1->akind == type2->akind;
-}
-
-static bool imaginary_types_equal(const imaginary_type_t *type1,
-                                                             const imaginary_type_t *type2)
-{
-       return type1->akind == type2->akind;
-}
-
 static bool function_types_equal(const function_type_t *type1,
                                  const function_type_t *type2)
 {
@@ -298,11 +264,9 @@ static bool types_equal(const type_t *type1, const type_t *type2)
                /* Hmm, the error type is never equal */
                return false;
        case TYPE_ATOMIC:
-               return atomic_types_equal(&type1->atomic, &type2->atomic);
-       case TYPE_COMPLEX:
-               return complex_types_equal(&type1->complex, &type2->complex);
        case TYPE_IMAGINARY:
-               return imaginary_types_equal(&type1->imaginary, &type2->imaginary);
+       case TYPE_COMPLEX:
+               return atomic_types_equal(&type1->atomic, &type2->atomic);
        case TYPE_ENUM:
                return enum_types_equal(&type1->enumt, &type2->enumt);
        case TYPE_COMPOUND_STRUCT:
@@ -326,7 +290,6 @@ static bool types_equal(const type_t *type1, const type_t *type2)
 }
 
 #define HashSet                    type_hash_t
-#define HashSetIterator            type_hash_iterator_t
 #define ValueType                  type_t*
 #define NullValue                  NULL
 #define DeletedValue               ((type_t*)-1)
@@ -334,19 +297,15 @@ static bool types_equal(const type_t *type1, const type_t *type2)
 #define KeysEqual(this,key1,key2)  types_equal(key1, key2)
 #define SetRangeEmpty(ptr,size)    memset(ptr, 0, (size) * sizeof(*(ptr)))
 
+void _typehash_init(type_hash_t *hash);
 #define hashset_init             _typehash_init
-#define hashset_init_size        _typehash_init_size
+void _typehash_destroy(type_hash_t *hash);
 #define hashset_destroy          _typehash_destroy
+type_t *_typehash_insert(type_hash_t *hash, type_t *type);
 #define hashset_insert           _typehash_insert
-#define hashset_remove           typehash_remove
-#define hashset_find             typehash_find
-#define hashset_size             typehash_size
-#define hashset_iterator_init    typehash_iterator_init
-#define hashset_iterator_next    typehash_iterator_next
-#define hashset_remove_iterator  typehash_remove_iterator
 #define SCALAR_RETURN
 
-#include "adt/hashset.c"
+#include "adt/hashset.c.inl"
 
 static type_hash_t typehash;