X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_hash.c;h=4120940271ef3ae183f80c84dfa0ed3ba8449ec7;hb=4eade33d45008f90c8952a65a92cdda17d9598f9;hp=59baecd6562553f0cb89a4df491d0ad9f5273c4a;hpb=d1d999b6563a06706be2500a02217986c54ec13f;p=cparser diff --git a/type_hash.c b/type_hash.c index 59baecd..4120940 100644 --- a/type_hash.c +++ b/type_hash.c @@ -1,5 +1,7 @@ #include +#include + #include "type_hash.h" #include "adt/error.h" @@ -15,64 +17,63 @@ #undef HashSetIterator #undef HashSet -static -unsigned hash_ptr(const void *ptr) +/* TODO: ^= is a bad way of combining hashes since most addresses are very + * similar */ + +static unsigned hash_ptr(const void *ptr) { unsigned ptr_int = ((char*) ptr - (char*) NULL); return ptr_int >> 3; } -static -unsigned hash_atomic_type(const atomic_type_t *type) +static unsigned hash_atomic_type(const atomic_type_t *type) { unsigned some_prime = 27644437; + unsigned result = type->atype * some_prime; - return type->atype * some_prime; + return result; } -static -unsigned hash_pointer_type(const pointer_type_t *type) +static unsigned hash_pointer_type(const pointer_type_t *type) { return hash_ptr(type->points_to); } -static -unsigned hash_compound_type(const compound_type_t *type) +static unsigned hash_array_type(const array_type_t *type) +{ + return hash_ptr(type->element_type); +} + +static unsigned hash_compound_type(const compound_type_t *type) { unsigned result = hash_ptr(type->symbol); return result; } -static -unsigned hash_type(const type_t *type); +static unsigned hash_type(const type_t *type); -static -unsigned hash_method_type(const method_type_t *type) +static unsigned hash_method_type(const method_type_t *type) { unsigned result = hash_ptr(type->result_type); - method_parameter_type_t *parameter = type->parameter_types; + method_parameter_t *parameter = type->parameters; while(parameter != NULL) { - result ^= hash_ptr(parameter->type); + result ^= hash_ptr(parameter->type); parameter = parameter->next; } return result; } -static -unsigned hash_enum_type(const enum_type_t *type) +static unsigned hash_enum_type(const enum_type_t *type) { unsigned result = hash_ptr(type->symbol); - /* TODO */ - return result; } -static -unsigned hash_type(const type_t *type) +static unsigned hash_type(const type_t *type) { unsigned hash; @@ -96,6 +97,9 @@ unsigned hash_type(const type_t *type) case TYPE_POINTER: hash = hash_pointer_type((const pointer_type_t*) type); break; + case TYPE_ARRAY: + hash = hash_array_type((const array_type_t*) type); + break; case TYPE_BUILTIN: hash = hash_ptr(((const builtin_type_t*) type)->symbol); break; @@ -107,106 +111,113 @@ unsigned hash_type(const type_t *type) return hash; } -static -int atomic_types_equal(const atomic_type_t *type1, const atomic_type_t *type2) +static bool atomic_types_equal(const atomic_type_t *type1, + const atomic_type_t *type2) { return type1->atype == type2->atype; } -static -int compound_types_equal(const compound_type_t *type1, - const compound_type_t *type2) +static bool compound_types_equal(const compound_type_t *type1, + const compound_type_t *type2) { if(type1->type.type != type2->type.type) - return 0; + return false; if(type1->symbol != type2->symbol) - return 0; + return false; + + /* anonymous types? */ + if(type1->symbol == NULL) { + /* previous tests should already have checked for this */ + assert(type1 != type2); + /* anonymous types are only equal if they are the very same type */ + return false; + } - declaration_t *entry1 = type1->context.declarations; - declaration_t *entry2 = type2->context.declarations; + /* non-anonymous types with same symbol are equal */ + return true; +} - while(entry1 != NULL && entry2 != NULL) { - if(entry1->type != entry2->type) - return 0; - if(entry1->symbol != entry2->symbol) - return 0; - entry1 = entry1->next; - entry2 = entry2->next; +static bool enum_types_equal(const enum_type_t *type1, const enum_type_t *type2) +{ + if(type1->symbol != type2->symbol) + return false; + + /* anonymous types? */ + if(type1->symbol == NULL) { + /* previous tests should already have checked for this */ + assert(type1 != type2); + /* 2 anonymous enums are never equal */ + return false; } - if(entry1 != NULL || entry2 != NULL) - return 0; - return 1; + /* non-anonymous types with same symbol are equal */ + return true; } -static -int method_types_equal(const method_type_t *type1, const method_type_t *type2) +static bool method_types_equal(const method_type_t *type1, + const method_type_t *type2) { if(type1->result_type != type2->result_type) - return 0; - - method_parameter_type_t *param1 = type1->parameter_types; - method_parameter_type_t *param2 = type2->parameter_types; + return false; + if(type1->variadic != type2->variadic) + return false; + if(type1->unspecified_parameters != type2->unspecified_parameters) + return false; + + method_parameter_t *param1 = type1->parameters; + method_parameter_t *param2 = type2->parameters; while(param1 != NULL && param2 != NULL) { if(param1->type != param2->type) - return 0; + return false; param1 = param1->next; param2 = param2->next; } if(param1 != NULL || param2 != NULL) - return 0; + return false; - return 1; + return true; } -static -int pointer_types_equal(const pointer_type_t *type1, - const pointer_type_t *type2) +static bool pointer_types_equal(const pointer_type_t *type1, + const pointer_type_t *type2) { return type1->points_to == type2->points_to; } -static -int enum_types_equal(const enum_type_t *type1, const enum_type_t *type2) +static bool array_types_equal(const array_type_t *type1, + const array_type_t *type2) { - if(type1->symbol != NULL && type1->symbol == type2->symbol) - return 1; - - enum_entry_t *entry1 = type1->entries; - enum_entry_t *entry2 = type2->entries; - while(entry1 != NULL && entry2 != NULL) { - if(entry1->symbol != entry2->symbol) - return 0; - /* TODO: compare expressions */ - entry1 = entry1->next; - entry2 = entry2->next; - } - if(entry1 != NULL || entry2 != NULL) - return 0; - - return 1; + if(type1->element_type != type2->element_type) + return false; + if(type1->is_variable != type2->is_variable) + return false; + if(type1->is_static != type2->is_static) + return false; + /* TODO: compare expressions for equality... */ + if(type1->size != type2->size) + return false; + + return true; } -static -int builtin_types_equal(const builtin_type_t *type1, - const builtin_type_t *type2) +static bool builtin_types_equal(const builtin_type_t *type1, + const builtin_type_t *type2) { return type1->symbol == type2->symbol; } -static -int types_equal(const type_t *type1, const type_t *type2) +static bool types_equal(const type_t *type1, const type_t *type2) { if(type1 == type2) - return 1; + return true; if(type1->type != type2->type) - return 0; + return false; if(type1->qualifiers != type2->qualifiers) - return 0; + return false; switch(type1->type) { case TYPE_INVALID: - return 0; + return false; case TYPE_ATOMIC: return atomic_types_equal((const atomic_type_t*) type1, (const atomic_type_t*) type2); @@ -223,6 +234,9 @@ int types_equal(const type_t *type1, const type_t *type2) case TYPE_POINTER: return pointer_types_equal((const pointer_type_t*) type1, (const pointer_type_t*) type2); + case TYPE_ARRAY: + return array_types_equal((const array_type_t*) type1, + (const array_type_t*) type2); case TYPE_BUILTIN: return builtin_types_equal((const builtin_type_t*) type1, (const builtin_type_t*) type2);