- c_mode must be set before init_types()

[cparser] / type_hash.c

diff --git a/type_hash.c b/type_hash.c
index 49fd88e..9635488 100644 (file)
--- 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)
@@ -84,11 +89,9 @@ 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);
@@ -98,6 +101,7 @@ static unsigned hash_function_type(const function_type_t *type)
                result   ^= hash_ptr(parameter->type);
                parameter = parameter->next;
        }
+       result += type->linkage;
        result += type->calling_convention;
 
        return result;
@@ -105,7 +109,7 @@ static unsigned hash_function_type(const function_type_t *type)
 
 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)
@@ -131,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:
@@ -156,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;
@@ -163,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);
@@ -208,6 +214,8 @@ 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;
 
@@ -228,7 +236,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,
@@ -262,19 +277,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,
@@ -329,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: