X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_hash.c;h=ee7ab603e33565a35f68fac3479046d3125d3aa9;hb=10842603c042d3c62f128519d6356b3817b6a0db;hp=f0fe9b5bf5adc131c89c9ba793c9db3e3d646995;hpb=10f7c1a8855a125dd841c2e4037f004ef1fec241;p=cparser diff --git a/type_hash.c b/type_hash.c index f0fe9b5..ee7ab60 100644 --- a/type_hash.c +++ b/type_hash.c @@ -1,6 +1,6 @@ /* * This file is part of cparser. - * Copyright (C) 2007-2008 Matthias Braun + * Copyright (C) 2007-2009 Matthias Braun * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -29,11 +29,9 @@ #include #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,25 +54,14 @@ static unsigned hash_atomic_type(const atomic_type_t *type) return result; } -static unsigned hash_complex_type(const complex_type_t *type) +static unsigned hash_pointer_type(const pointer_type_t *type) { - unsigned some_prime = 27644437; - unsigned result = type->akind * some_prime; - - return result; + return hash_ptr(type->points_to) ^ hash_ptr(type->base_variable); } -static unsigned hash_imaginary_type(const imaginary_type_t *type) +static unsigned hash_reference_type(const reference_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); + return hash_ptr(type->refers_to); } static unsigned hash_array_type(const array_type_t *type) @@ -84,27 +71,28 @@ static unsigned hash_array_type(const array_type_t *type) static unsigned hash_compound_type(const compound_type_t *type) { - return hash_ptr(type->declaration); + return hash_ptr(type->compound); } -static unsigned hash_type(const type_t *type); - static unsigned hash_function_type(const function_type_t *type) { unsigned result = hash_ptr(type->return_type); function_parameter_t *parameter = type->parameters; - while(parameter != NULL) { + while (parameter != NULL) { result ^= hash_ptr(parameter->type); parameter = parameter->next; } + result += type->modifiers; + result += type->linkage; + result += type->calling_convention; return result; } static unsigned hash_enum_type(const enum_type_t *type) { - return hash_ptr(type->declaration); + return hash_ptr(type->enume); } static unsigned hash_typeof_type(const typeof_type_t *type) @@ -115,33 +103,18 @@ static unsigned hash_typeof_type(const typeof_type_t *type) return result; } -static unsigned hash_bitfield_type(const bitfield_type_t *type) -{ - unsigned result = hash_ptr(type->base_type); - result ^= 27172145; - - return result; -} - static unsigned hash_type(const type_t *type) { unsigned hash = 0; switch (type->kind) { - case TYPE_INVALID: - panic("internalizing void or invalid types not possible"); - return 0; 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; @@ -155,21 +128,18 @@ static unsigned hash_type(const type_t *type) case TYPE_POINTER: hash = hash_pointer_type(&type->pointer); break; + case TYPE_REFERENCE: + hash = hash_reference_type(&type->reference); + break; case TYPE_ARRAY: hash = hash_array_type(&type->array); break; - case TYPE_BUILTIN: - hash = hash_ptr(type->builtin.symbol); - break; case TYPE_TYPEDEF: - hash = hash_ptr(type->typedeft.declaration); + hash = hash_ptr(type->typedeft.typedefe); break; case TYPE_TYPEOF: hash = hash_typeof_type(&type->typeoft); break; - case TYPE_BITFIELD: - hash = hash_bitfield_type(&type->bitfield); - break; } unsigned some_prime = 99991; @@ -184,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) { @@ -207,10 +165,16 @@ static bool function_types_equal(const function_type_t *type1, return false; if (type1->kr_style_parameters != type2->kr_style_parameters) return false; + if (type1->linkage != type2->linkage) + return false; + if (type1->modifiers != type2->modifiers) + return false; + if (type1->calling_convention != type2->calling_convention) + return false; function_parameter_t *param1 = type1->parameters; function_parameter_t *param2 = type2->parameters; - while(param1 != NULL && param2 != NULL) { + while (param1 != NULL && param2 != NULL) { if (param1->type != param2->type) return false; param1 = param1->next; @@ -225,7 +189,14 @@ static bool function_types_equal(const function_type_t *type1, static bool pointer_types_equal(const pointer_type_t *type1, const pointer_type_t *type2) { - return type1->points_to == type2->points_to; + return type1->points_to == type2->points_to && + type1->base_variable == type2->base_variable; +} + +static bool reference_types_equal(const reference_type_t *type1, + const reference_type_t *type2) +{ + return type1->refers_to == type2->refers_to; } static bool array_types_equal(const array_type_t *type1, @@ -250,28 +221,22 @@ static bool array_types_equal(const array_type_t *type1, return false; } -static bool builtin_types_equal(const builtin_type_t *type1, - const builtin_type_t *type2) -{ - return type1->symbol == type2->symbol; -} - static bool compound_types_equal(const compound_type_t *type1, const compound_type_t *type2) { - return type1->declaration == type2->declaration; + return type1->compound == type2->compound; } static bool enum_types_equal(const enum_type_t *type1, const enum_type_t *type2) { - return type1->declaration == type2->declaration; + return type1->enume == type2->enume; } static bool typedef_types_equal(const typedef_type_t *type1, const typedef_type_t *type2) { - return type1->declaration == type2->declaration; + return type1->typedefe == type2->typedefe; } static bool typeof_types_equal(const typeof_type_t *type1, @@ -285,15 +250,6 @@ static bool typeof_types_equal(const typeof_type_t *type1, return true; } -static bool bitfield_types_equal(const bitfield_type_t *type1, - const bitfield_type_t *type2) -{ - if (type1->base_type != type2->base_type) - return false; - /* TODO: compare size expression */ - return false; -} - static bool types_equal(const type_t *type1, const type_t *type2) { if (type1 == type2) @@ -302,21 +258,15 @@ static bool types_equal(const type_t *type1, const type_t *type2) return false; if (type1->base.qualifiers != type2->base.qualifiers) return false; - if (type1->base.modifiers != type2->base.modifiers) - return false; switch (type1->kind) { case TYPE_ERROR: /* Hmm, the error type is never equal */ return false; - case TYPE_INVALID: - 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,23 +276,20 @@ static bool types_equal(const type_t *type1, const type_t *type2) return function_types_equal(&type1->function, &type2->function); case TYPE_POINTER: return pointer_types_equal(&type1->pointer, &type2->pointer); + case TYPE_REFERENCE: + return reference_types_equal(&type1->reference, &type2->reference); case TYPE_ARRAY: return array_types_equal(&type1->array, &type2->array); - case TYPE_BUILTIN: - return builtin_types_equal(&type1->builtin, &type2->builtin); case TYPE_TYPEOF: return typeof_types_equal(&type1->typeoft, &type2->typeoft); case TYPE_TYPEDEF: return typedef_types_equal(&type1->typedeft, &type2->typedeft); - case TYPE_BITFIELD: - return bitfield_types_equal(&type1->bitfield, &type2->bitfield); } abort(); } #define HashSet type_hash_t -#define HashSetIterator type_hash_iterator_t #define ValueType type_t* #define NullValue NULL #define DeletedValue ((type_t*)-1) @@ -350,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;