X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type_hash.c;h=7f2e30a365e66510937c64dd157233c4857e05bf;hb=b532880c7cfe1c5e69040f4e365c30e13d7c4c7d;hp=ad0732f8164783b0996f2b05daf26cc06a40e615;hpb=a6c7a5b4a77d9a9581a6c79b3810229c5b8fce5d;p=cparser

diff --git a/type_hash.c b/type_hash.c
index ad0732f..7f2e30a 100644
--- a/type_hash.c
+++ b/type_hash.c
@@ -74,7 +74,12 @@ static unsigned hash_imaginary_type(const imaginary_type_t *type)
 
 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)
@@ -87,8 +92,6 @@ static unsigned hash_compound_type(const compound_type_t *type)
 	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);
@@ -132,7 +135,6 @@ static unsigned hash_type(const type_t *type)
 	switch (type->kind) {
 	case TYPE_INVALID:
 		panic("internalizing void or invalid types not possible");
-		return 0;
 	case TYPE_ERROR:
 		return 0;
 	case TYPE_ATOMIC:
@@ -157,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;
@@ -176,6 +181,7 @@ static unsigned hash_type(const type_t *type)
 
 	unsigned some_prime = 99991;
 	hash ^= some_prime * type->base.qualifiers;
+	hash ^= some_prime * type->base.alignment;
 
 	return hash;
 }
@@ -231,7 +237,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,
@@ -310,6 +323,8 @@ static bool types_equal(const type_t *type1, const type_t *type2)
 		return false;
 	if (type1->base.modifiers != type2->base.modifiers)
 		return false;
+	if (type1->base.alignment != type2->base.alignment)
+		return false;
 
 	switch (type1->kind) {
 	case TYPE_ERROR:
@@ -332,6 +347,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: