X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_hash.c;h=96354888029db961d865241f710e035c54b36823;hb=50265ec8cba5da97a1ae57302de27a158f70ad70;hp=8ec417136d938abeb09c4cd22c68a8b43fa9d71b;hpb=70abad8ade78c811d76cc79741fccfc6bd7d58ab;p=cparser

diff --git a/type_hash.c b/type_hash.c
index 8ec4171..9635488 100644
--- a/type_hash.c
+++ b/type_hash.c
@@ -36,6 +36,9 @@
 #undef HashSetIterator
 #undef HashSet
 
+typedef struct type_hash_iterator_t  type_hash_iterator_t;
+typedef struct type_hash_t           type_hash_t;
+
 /* TODO: ^= is a bad way of combining hashes since most addresses are very
  * similar */
 
@@ -53,9 +56,30 @@ 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);
+	return hash_ptr(type->points_to) ^ hash_ptr(type->base_variable);
+}
+
+static unsigned hash_reference_type(const reference_type_t *type)
+{
+	return hash_ptr(type->refers_to);
 }
 
 static unsigned hash_array_type(const array_type_t *type)
@@ -65,27 +89,27 @@ 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->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)
@@ -108,15 +132,20 @@ static unsigned hash_type(const type_t *type)
 {
 	unsigned hash = 0;
 
-	switch(type->kind) {
+	switch (type->kind) {
 	case TYPE_INVALID:
 		panic("internalizing void or invalid types not possible");
-		return 0;
 	case TYPE_ERROR:
 		return 0;
 	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;
@@ -130,6 +159,9 @@ 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;
@@ -137,7 +169,7 @@ static unsigned hash_type(const type_t *type)
 		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);
@@ -154,7 +186,19 @@ static unsigned hash_type(const type_t *type)
 }
 
 static bool atomic_types_equal(const atomic_type_t *type1,
-                               const atomic_type_t *type2)
+							   const atomic_type_t *type2)
+{
+	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;
 }
@@ -162,24 +206,28 @@ static bool atomic_types_equal(const atomic_type_t *type1,
 static bool function_types_equal(const function_type_t *type1,
                                  const function_type_t *type2)
 {
-	if(type1->return_type != type2->return_type)
+	if (type1->return_type != type2->return_type)
+		return false;
+	if (type1->variadic != type2->variadic)
+		return false;
+	if (type1->unspecified_parameters != type2->unspecified_parameters)
 		return false;
-	if(type1->variadic != type2->variadic)
+	if (type1->kr_style_parameters != type2->kr_style_parameters)
 		return false;
-	if(type1->unspecified_parameters != type2->unspecified_parameters)
+	if (type1->linkage != type2->linkage)
 		return false;
-	if(type1->kr_style_parameters != type2->kr_style_parameters)
+	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) {
-		if(param1->type != param2->type)
+	while (param1 != NULL && param2 != NULL) {
+		if (param1->type != param2->type)
 			return false;
 		param1 = param1->next;
 		param2 = param2->next;
 	}
-	if(param1 != NULL || param2 != NULL)
+	if (param1 != NULL || param2 != NULL)
 		return false;
 
 	return true;
@@ -188,24 +236,31 @@ 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,
                               const array_type_t *type2)
 {
-	if(type1->element_type != type2->element_type)
+	if (type1->element_type != type2->element_type)
 		return false;
-	if(type1->is_variable != type2->is_variable)
+	if (type1->is_variable != type2->is_variable)
 		return false;
-	if(type1->is_static != type2->is_static)
+	if (type1->is_static != type2->is_static)
 		return false;
-	if(type1->size_constant != type2->size_constant)
+	if (type1->size_constant != type2->size_constant)
 		return false;
 
 	/* never identify vla types, because we need them for caching calculated
 	 * sizes later in ast2firm */
-	if(type1->is_vla || type2->is_vla)
+	if (type1->is_vla || type2->is_vla)
 		return false;
 
 	/* TODO: compare size expressions for equality... */
@@ -222,27 +277,27 @@ static bool builtin_types_equal(const builtin_type_t *type1,
 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,
                                const typeof_type_t *type2)
 {
-	if(type1->expression != type2->expression)
+	if (type1->expression != type2->expression)
 		return false;
-	if(type1->typeof_type != type2->typeof_type)
+	if (type1->typeof_type != type2->typeof_type)
 		return false;
 
 	return true;
@@ -251,7 +306,7 @@ static bool typeof_types_equal(const typeof_type_t *type1,
 static bool bitfield_types_equal(const bitfield_type_t *type1,
                                  const bitfield_type_t *type2)
 {
-	if(type1->base_type != type2->base_type)
+	if (type1->base_type != type2->base_type)
 		return false;
 	/* TODO: compare size expression */
 	return false;
@@ -259,14 +314,16 @@ static bool bitfield_types_equal(const bitfield_type_t *type1,
 
 static bool types_equal(const type_t *type1, const type_t *type2)
 {
-	if(type1 == type2)
+	if (type1 == type2)
 		return true;
-	if(type1->kind != type2->kind)
+	if (type1->kind != type2->kind)
+		return false;
+	if (type1->base.qualifiers != type2->base.qualifiers)
 		return false;
-	if(type1->base.qualifiers != type2->base.qualifiers)
+	if (type1->base.modifiers != type2->base.modifiers)
 		return false;
 
-	switch(type1->kind) {
+	switch (type1->kind) {
 	case TYPE_ERROR:
 		/* Hmm, the error type is never equal */
 		return false;
@@ -274,6 +331,10 @@ static bool types_equal(const type_t *type1, const type_t *type2)
 		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_ENUM:
 		return enum_types_equal(&type1->enumt, &type2->enumt);
 	case TYPE_COMPOUND_STRUCT:
@@ -283,6 +344,8 @@ 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:
@@ -317,6 +380,7 @@ static bool types_equal(const type_t *type1, const type_t *type2)
 #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"