- better (and hopefully correct) implementation of __based pointer

[cparser] / type_hash.c

diff --git a/type_hash.c b/type_hash.c
index f0fe9b5..aa5aa21 100644 (file)
--- a/type_hash.c
+++ b/type_hash.c
@@ -77,6 +77,11 @@ static unsigned hash_pointer_type(const pointer_type_t *type)
        return hash_ptr(type->points_to);
 }
 
+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)
 {
        return hash_ptr(type->element_type);
@@ -84,7 +89,7 @@ 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);
@@ -94,17 +99,19 @@ 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)
@@ -155,6 +162,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;
@@ -162,7 +172,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);
@@ -207,10 +217,14 @@ 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->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 +239,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,
@@ -259,19 +280,19 @@ 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,
@@ -326,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: