disable fix for parsetest/fehler053.c for now (as it breaks more common use cases)

[cparser] / type.c

diff --git a/type.c b/type.c
index a8705a4..56e0af5 100644 (file)
--- a/type.c
+++ b/type.c
@@ -435,7 +435,7 @@ static void print_array_type_post(const array_type_t *type)
 static void print_bitfield_type_post(const bitfield_type_t *type)
 {
        fputs(" : ", out);
-       print_expression(type->size);
+       print_expression(type->size_expression);
        intern_print_type_post(type->base_type, false);
 }
 
@@ -747,6 +747,8 @@ type_t *duplicate_type(const type_t *type)
  */
 type_t *get_unqualified_type(type_t *type)
 {
+       assert(!is_typeref(type));
+
        if (type->base.qualifiers == TYPE_QUALIFIER_NONE)
                return type;
 
@@ -776,12 +778,14 @@ type_t *get_qualified_type(type_t *orig_type, type_qualifiers_t const qual)
 
                copy                     = duplicate_type(type);
                copy->array.element_type = qual_element_type;
-       } else {
+       } else if (is_type_valid(type)) {
                if ((type->base.qualifiers & qual) == qual)
                        return orig_type;
 
                copy                   = duplicate_type(type);
                copy->base.qualifiers |= qual;
+       } else {
+               return type;
        }
 
        type = typehash_insert(copy);
@@ -929,9 +933,8 @@ bool is_type_arithmetic(const type_t *type)
  */
 bool is_type_real(const type_t *type)
 {
-       /* 6.2.5.17 */
-       return is_type_integer(type)
-               || (type->kind == TYPE_ATOMIC && is_type_float(type));
+       /* 6.2.5 (17) */
+       return is_type_integer(type) || is_type_float(type);
 }
 
 /**
@@ -1022,6 +1025,9 @@ static bool function_types_compatible(const function_type_t *func1,
        if (!types_compatible(ret1, ret2))
                return false;
 
+       if (func1->calling_convention != func2->calling_convention)
+               return false;
+
        /* can parameters be compared? */
        if (func1->unspecified_parameters || func2->unspecified_parameters)
                return true;
@@ -1029,9 +1035,6 @@ static bool function_types_compatible(const function_type_t *func1,
        if (func1->variadic != func2->variadic)
                return false;
 
-       if (func1->calling_convention != func2->calling_convention)
-               return false;
-
        /* TODO: handling of unspecified parameters not correct yet */
 
        /* all argument types must be compatible */
@@ -1084,6 +1087,9 @@ bool types_compatible(const type_t *type1, const type_t *type2)
        if (type1 == type2)
                return true;
 
+       if (!is_type_valid(type1) || !is_type_valid(type2))
+               return true;
+
        if (type1->base.qualifiers != type2->base.qualifiers)
                return false;
        if (type1->kind != type2->kind)
@@ -1196,6 +1202,44 @@ type_t *skip_typeref(type_t *type)
        return type;
 }
 
+type_qualifiers_t get_type_qualifier(const type_t *type, bool skip_array_type) {
+       type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE;
+
+       while (true) {
+               switch (type->base.kind) {
+               case TYPE_ERROR:
+                       return TYPE_QUALIFIER_NONE;
+               case TYPE_TYPEDEF:
+                       qualifiers |= type->base.qualifiers;
+                       const typedef_type_t *typedef_type = &type->typedeft;
+                       if (typedef_type->resolved_type != NULL)
+                               type = typedef_type->resolved_type;
+                       else
+                               type = typedef_type->declaration->type;
+                       continue;
+               case TYPE_TYPEOF: {
+                       const typeof_type_t *typeof_type = &type->typeoft;
+                       if (typeof_type->typeof_type != NULL) {
+                               type = typeof_type->typeof_type;
+                       } else {
+                               type = typeof_type->expression->base.type;
+                       }
+                       continue;
+               }
+               case TYPE_ARRAY:
+                       if (skip_array_type) {
+                               type = type->array.element_type;
+                               continue;
+                       }
+                       break;
+               default:
+                       break;
+               }
+               break;
+       }
+       return type->base.qualifiers | qualifiers;
+}
+
 unsigned get_atomic_type_size(atomic_type_kind_t kind)
 {
        assert(kind <= ATOMIC_TYPE_LAST);