X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_hash.c;h=1e07c1f3ce5275c7d290717f27238a9261025e06;hb=23e9b60ddf7642b66def2665bb799dc12d464cee;hp=b3ae80199ee445480f61ee1d08f91564667cddc1;hpb=daab1c4b9ec9146053f6d4f16ca2b92222104ddc;p=cparser diff --git a/type_hash.c b/type_hash.c index b3ae801..1e07c1f 100644 --- a/type_hash.c +++ b/type_hash.c @@ -1,5 +1,7 @@ #include +#include + #include "type_hash.h" #include "adt/error.h" @@ -15,67 +17,69 @@ #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 = (ptr - NULL); + 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) { - unsigned result = hash_ptr(type->symbol); + return hash_ptr(type->element_type); +} - return result; +static unsigned hash_compound_type(const compound_type_t *type) +{ + return hash_ptr(type->declaration); } -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_function_type(const function_type_t *type) { unsigned result = hash_ptr(type->result_type); - method_parameter_type_t *parameter = type->parameter_types; + function_parameter_t *parameter = type->parameters; while(parameter != NULL) { - result ^= hash_ptr(parameter->type); + result ^= hash_ptr(parameter->type); parameter = parameter->next; } - result ^= hash_ptr(type->abi_style); 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); + return hash_ptr(type->declaration); +} - /* TODO */ +static unsigned hash_typeof_type(const typeof_type_t *type) +{ + unsigned result = hash_ptr(type->expression); + result ^= hash_ptr(type->typeof_type); return result; } -static -unsigned hash_type(const type_t *type) +static unsigned hash_type(const type_t *type) { - unsigned hash; + unsigned hash = 0; switch(type->type) { case TYPE_INVALID: @@ -91,12 +95,24 @@ unsigned hash_type(const type_t *type) case TYPE_COMPOUND_UNION: hash = hash_compound_type((const compound_type_t*) type); break; - case TYPE_METHOD: - hash = hash_method_type((const method_type_t*) type); + case TYPE_FUNCTION: + hash = hash_function_type((const function_type_t*) type); break; 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; + case TYPE_TYPEDEF: + hash = hash_ptr(((const compound_type_t*) type)->declaration); + break; + case TYPE_TYPEOF: + hash = hash_typeof_type((const typeof_type_t*) type); + break; } unsigned some_prime = 99991; @@ -105,102 +121,133 @@ 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) -{ - if(type1->symbol != type2->symbol) - return 0; - -#if 0 - struct_entry_t *entry1 = type1->entries; - struct_entry_t *entry2 = type2->entries; - - while(entry1 != NULL && entry2 != NULL) { - if(entry1->type != entry2->type) - return 0; - entry1 = entry1->next; - entry2 = entry2->next; - } - if(entry1 != NULL || entry2 != NULL) - return 0; -#endif - - return 1; -} - -static -int method_types_equal(const method_type_t *type1, const method_type_t *type2) +static bool function_types_equal(const function_type_t *type1, + const function_type_t *type2) { if(type1->result_type != type2->result_type) - return 0; - - if(type1->abi_style != type2->abi_style) - 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; + + function_parameter_t *param1 = type1->parameters; + function_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->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 bool builtin_types_equal(const builtin_type_t *type1, + const builtin_type_t *type2) { - /* TODO */ return type1->symbol == type2->symbol; } -static -int types_equal(const type_t *type1, const type_t *type2) +static bool compound_types_equal(const compound_type_t *type1, + const compound_type_t *type2) +{ + return type1->declaration == type2->declaration; +} + +static bool enum_types_equal(const enum_type_t *type1, + const enum_type_t *type2) +{ + return type1->declaration == type2->declaration; +} + +static bool typedef_types_equal(const typedef_type_t *type1, + const typedef_type_t *type2) +{ + return type1->declaration == type2->declaration; +} + +static bool typeof_types_equal(const typeof_type_t *type1, + const typeof_type_t *type2) +{ + if(type1->expression != type2->expression) + return false; + if(type1->typeof_type != type2->typeof_type) + return false; + + return true; +} + +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); + case TYPE_ENUM: + return enum_types_equal((const enum_type_t*) type1, + (const enum_type_t*) type2); case TYPE_COMPOUND_STRUCT: case TYPE_COMPOUND_UNION: return compound_types_equal((const compound_type_t*) type1, (const compound_type_t*) type2); - case TYPE_ENUM: - return enum_types_equal((const enum_type_t*) type1, - (const enum_type_t*) type2); - case TYPE_METHOD: - return method_types_equal((const method_type_t*) type1, - (const method_type_t*) type2); + case TYPE_FUNCTION: + return function_types_equal((const function_type_t*) type1, + (const function_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); + case TYPE_TYPEOF: + return typeof_types_equal((const typeof_type_t*) type1, + (const typeof_type_t*) type2); + case TYPE_TYPEDEF: + return typedef_types_equal((const typedef_type_t*) type1, + (const typedef_type_t*) type2); } abort();