main: rework preprocessor invocation
[cparser] / type.c
diff --git a/type.c b/type.c
index 58c4a34..c904c7c 100644 (file)
--- a/type.c
+++ b/type.c
@@ -33,6 +33,7 @@
 #include "warning.h"
 #include "diagnostic.h"
 #include "printer.h"
+#include "separator_t.h"
 
 /** The default calling convention. */
 cc_kind_t default_calling_convention = CC_CDECL;
@@ -239,15 +240,15 @@ void print_type_qualifiers(type_qualifiers_t const qualifiers, QualifierSeparato
 {
        size_t sep = q & QUAL_SEP_START ? 0 : 1;
        if (qualifiers & TYPE_QUALIFIER_CONST) {
-               print_string(" const" + sep);
+               print_string(&" const"[sep]);
                sep = 0;
        }
        if (qualifiers & TYPE_QUALIFIER_VOLATILE) {
-               print_string(" volatile" + sep);
+               print_string(&" volatile"[sep]);
                sep = 0;
        }
        if (qualifiers & TYPE_QUALIFIER_RESTRICT) {
-               print_string(" restrict" + sep);
+               print_string(&" restrict"[sep]);
                sep = 0;
        }
        if (sep == 0 && q & QUAL_SEP_END)
@@ -257,7 +258,6 @@ void print_type_qualifiers(type_qualifiers_t const qualifiers, QualifierSeparato
 const char *get_atomic_kind_name(atomic_type_kind_t kind)
 {
        switch(kind) {
-       case ATOMIC_TYPE_INVALID: break;
        case ATOMIC_TYPE_VOID:        return "void";
        case ATOMIC_TYPE_WCHAR_T:     return "wchar_t";
        case ATOMIC_TYPE_BOOL:        return c_mode & _CXX ? "bool" : "_Bool";
@@ -374,15 +374,11 @@ static void print_function_type_post(const function_type_t *type,
                                      const scope_t *parameters)
 {
        print_char('(');
-       bool first = true;
+       separator_t sep = { "", ", " };
        if (parameters == NULL) {
                function_parameter_t *parameter = type->parameters;
                for( ; parameter != NULL; parameter = parameter->next) {
-                       if (first) {
-                               first = false;
-                       } else {
-                               print_string(", ");
-                       }
+                       print_string(sep_next(&sep));
                        print_type(parameter->type);
                }
        } else {
@@ -391,11 +387,7 @@ static void print_function_type_post(const function_type_t *type,
                        if (parameter->kind != ENTITY_PARAMETER)
                                continue;
 
-                       if (first) {
-                               first = false;
-                       } else {
-                               print_string(", ");
-                       }
+                       print_string(sep_next(&sep));
                        const type_t *const param_type = parameter->declaration.type;
                        if (param_type == NULL) {
                                print_string(parameter->base.symbol->string);
@@ -405,14 +397,10 @@ static void print_function_type_post(const function_type_t *type,
                }
        }
        if (type->variadic) {
-               if (first) {
-                       first = false;
-               } else {
-                       print_string(", ");
-               }
+               print_string(sep_next(&sep));
                print_string("...");
        }
-       if (first && !type->unspecified_parameters) {
+       if (sep_at_first(&sep) && !type->unspecified_parameters) {
                print_string("void");
        }
        print_char(')');
@@ -580,18 +568,13 @@ void print_compound_definition(const compound_t *compound)
 /**
  * Prints a compound type.
  *
+ * @param kind  The name of the compound kind.
  * @param type  The compound type.
  */
-static void print_compound_type(const compound_type_t *type)
+static void print_compound_type(char const *const kind, compound_type_t const *const type)
 {
        print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
-
-       if (type->base.kind == TYPE_COMPOUND_STRUCT) {
-               print_string("struct ");
-       } else {
-               assert(type->base.kind == TYPE_COMPOUND_UNION);
-               print_string("union ");
-       }
+       print_string(kind);
 
        compound_t *compound = type->compound;
        symbol_t   *symbol   = compound->base.symbol;
@@ -637,43 +620,19 @@ static void print_typeof_type_pre(const typeof_type_t *const type)
 static void intern_print_type_pre(const type_t *const type)
 {
        switch(type->kind) {
-       case TYPE_ERROR:
-               print_string("<error>");
-               return;
-       case TYPE_ENUM:
-               print_type_enum(&type->enumt);
-               return;
-       case TYPE_ATOMIC:
-               print_atomic_type(&type->atomic);
-               return;
-       case TYPE_COMPLEX:
-               print_complex_type(&type->atomic);
-               return;
-       case TYPE_IMAGINARY:
-               print_imaginary_type(&type->atomic);
-               return;
-       case TYPE_COMPOUND_STRUCT:
-       case TYPE_COMPOUND_UNION:
-               print_compound_type(&type->compound);
-               return;
-       case TYPE_FUNCTION:
-               print_function_type_pre(&type->function);
-               return;
-       case TYPE_POINTER:
-               print_pointer_type_pre(&type->pointer);
-               return;
-       case TYPE_REFERENCE:
-               print_reference_type_pre(&type->reference);
-               return;
-       case TYPE_ARRAY:
-               print_array_type_pre(&type->array);
-               return;
-       case TYPE_TYPEDEF:
-               print_typedef_type_pre(&type->typedeft);
-               return;
-       case TYPE_TYPEOF:
-               print_typeof_type_pre(&type->typeoft);
-               return;
+       case TYPE_ARRAY:           print_array_type_pre(          &type->array);     return;
+       case TYPE_ATOMIC:          print_atomic_type(             &type->atomic);    return;
+       case TYPE_COMPLEX:         print_complex_type(            &type->atomic);    return;
+       case TYPE_COMPOUND_STRUCT: print_compound_type("struct ", &type->compound);  return;
+       case TYPE_COMPOUND_UNION:  print_compound_type("union ",  &type->compound);  return;
+       case TYPE_ENUM:            print_type_enum(               &type->enumt);     return;
+       case TYPE_ERROR:           print_string("<error>");                          return;
+       case TYPE_FUNCTION:        print_function_type_pre(       &type->function);  return;
+       case TYPE_IMAGINARY:       print_imaginary_type(          &type->atomic);    return;
+       case TYPE_POINTER:         print_pointer_type_pre(        &type->pointer);   return;
+       case TYPE_REFERENCE:       print_reference_type_pre(      &type->reference); return;
+       case TYPE_TYPEDEF:         print_typedef_type_pre(        &type->typedeft);  return;
+       case TYPE_TYPEOF:          print_typeof_type_pre(         &type->typeoft);   return;
        }
        print_string("unknown");
 }
@@ -735,8 +694,7 @@ type_t *duplicate_type(const type_t *type)
 {
        size_t size = get_type_struct_size(type->kind);
 
-       type_t *const copy = obstack_alloc(&type_obst, size);
-       memcpy(copy, type, size);
+       type_t *const copy = obstack_copy(&type_obst, type, size);
        copy->base.firm_type = NULL;
 
        return copy;
@@ -903,10 +861,10 @@ bool is_type_incomplete(const type_t *type)
 
        case TYPE_TYPEDEF:
        case TYPE_TYPEOF:
-               panic("is_type_incomplete called without typerefs skipped");
+               panic("typedef not skipped");
        }
 
-       panic("invalid type found");
+       panic("invalid type");
 }
 
 bool is_type_object(const type_t *type)
@@ -995,53 +953,48 @@ 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)
-               return false;
+       if (type1->base.qualifiers == type2->base.qualifiers &&
+           type1->kind            == type2->kind) {
+               switch (type1->kind) {
+               case TYPE_FUNCTION:
+                       return function_types_compatible(&type1->function, &type2->function);
+               case TYPE_ATOMIC:
+               case TYPE_IMAGINARY:
+               case TYPE_COMPLEX:
+                       return type1->atomic.akind == type2->atomic.akind;
+               case TYPE_ARRAY:
+                       return array_types_compatible(&type1->array, &type2->array);
 
-       switch (type1->kind) {
-       case TYPE_FUNCTION:
-               return function_types_compatible(&type1->function, &type2->function);
-       case TYPE_ATOMIC:
-       case TYPE_IMAGINARY:
-       case TYPE_COMPLEX:
-               return type1->atomic.akind == type2->atomic.akind;
-       case TYPE_ARRAY:
-               return array_types_compatible(&type1->array, &type2->array);
+               case TYPE_POINTER: {
+                       const type_t *const to1 = skip_typeref(type1->pointer.points_to);
+                       const type_t *const to2 = skip_typeref(type2->pointer.points_to);
+                       return types_compatible(to1, to2);
+               }
 
-       case TYPE_POINTER: {
-               const type_t *const to1 = skip_typeref(type1->pointer.points_to);
-               const type_t *const to2 = skip_typeref(type2->pointer.points_to);
-               return types_compatible(to1, to2);
-       }
+               case TYPE_REFERENCE: {
+                       const type_t *const to1 = skip_typeref(type1->reference.refers_to);
+                       const type_t *const to2 = skip_typeref(type2->reference.refers_to);
+                       return types_compatible(to1, to2);
+               }
 
-       case TYPE_REFERENCE: {
-               const type_t *const to1 = skip_typeref(type1->reference.refers_to);
-               const type_t *const to2 = skip_typeref(type2->reference.refers_to);
-               return types_compatible(to1, to2);
-       }
+               case TYPE_COMPOUND_STRUCT:
+               case TYPE_COMPOUND_UNION:
+                       break;
 
-       case TYPE_COMPOUND_STRUCT:
-       case TYPE_COMPOUND_UNION: {
-               break;
-       }
-       case TYPE_ENUM:
-               /* TODO: not implemented */
-               break;
+               case TYPE_ENUM:
+                       /* TODO: not implemented */
+                       break;
 
-       case TYPE_ERROR:
-               /* Hmm, the error type should be compatible to all other types */
-               return true;
-       case TYPE_TYPEDEF:
-       case TYPE_TYPEOF:
-               panic("typerefs not skipped in compatible types?!?");
+               case TYPE_ERROR:
+                       /* Hmm, the error type should be compatible to all other types */
+                       return true;
+               case TYPE_TYPEDEF:
+               case TYPE_TYPEOF:
+                       panic("typeref not skipped");
+               }
        }
 
-       return false;
+       return !is_type_valid(type1) || !is_type_valid(type2);
 }
 
 /**
@@ -1114,7 +1067,7 @@ unsigned get_type_size(type_t *type)
                layout_struct_type(&type->compound);
                return type->compound.compound->size;
        case TYPE_FUNCTION:
-               return 0; /* non-const (but "address-const") */
+               return 1; /* strange GNU extensions: sizeof(function) == 1 */
        case TYPE_REFERENCE:
        case TYPE_POINTER:
                return pointer_properties.size;
@@ -1128,7 +1081,7 @@ unsigned get_type_size(type_t *type)
        case TYPE_TYPEOF:
                return get_type_size(type->typeoft.typeof_type);
        }
-       panic("invalid type in get_type_size");
+       panic("invalid type");
 }
 
 unsigned get_type_alignment(type_t *type)
@@ -1166,7 +1119,7 @@ unsigned get_type_alignment(type_t *type)
        case TYPE_TYPEOF:
                return get_type_alignment(type->typeoft.typeof_type);
        }
-       panic("invalid type in get_type_alignment");
+       panic("invalid type");
 }
 
 /**
@@ -1208,7 +1161,7 @@ decl_modifiers_t get_type_modifiers(const type_t *type)
        case TYPE_TYPEOF:
                return get_type_modifiers(type->typeoft.typeof_type);
        }
-       panic("invalid type found in get_type_modifiers");
+       panic("invalid type");
 }
 
 type_qualifiers_t get_type_qualifier(const type_t *type, bool skip_array_type)
@@ -1271,7 +1224,7 @@ atomic_type_kind_t find_signed_int_atomic_type_kind_for_size(unsigned size)
 
        assert(size < 32);
        atomic_type_kind_t kind = kinds[size];
-       if (kind == ATOMIC_TYPE_INVALID) {
+       if (kind == (atomic_type_kind_t)0) {
                static const atomic_type_kind_t possible_kinds[] = {
                        ATOMIC_TYPE_SCHAR,
                        ATOMIC_TYPE_SHORT,
@@ -1299,7 +1252,7 @@ atomic_type_kind_t find_unsigned_int_atomic_type_kind_for_size(unsigned size)
 
        assert(size < 32);
        atomic_type_kind_t kind = kinds[size];
-       if (kind == ATOMIC_TYPE_INVALID) {
+       if (kind == (atomic_type_kind_t)0) {
                static const atomic_type_kind_t possible_kinds[] = {
                        ATOMIC_TYPE_UCHAR,
                        ATOMIC_TYPE_USHORT,
@@ -1504,6 +1457,7 @@ void layout_struct_type(compound_type_t *type)
                return;
        if (type->compound->layouted)
                return;
+       compound->layouted = true;
 
        il_size_t      offset    = 0;
        il_alignment_t alignment = compound->alignment;
@@ -1511,16 +1465,12 @@ void layout_struct_type(compound_type_t *type)
 
        entity_t *entry = compound->members.entities;
        while (entry != NULL) {
-               if (entry->kind != ENTITY_COMPOUND_MEMBER) {
-                       entry = entry->base.next;
-                       continue;
-               }
+               if (entry->kind != ENTITY_COMPOUND_MEMBER)
+                       goto next;
 
-               type_t *const m_type  = skip_typeref(entry->declaration.type);
-               if (!is_type_valid(m_type)) {
-                       entry = entry->base.next;
-                       continue;
-               }
+               type_t *const m_type = skip_typeref(entry->declaration.type);
+               if (!is_type_valid(m_type))
+                       goto next;
 
                if (entry->compound_member.bitfield) {
                        entry = pack_bitfield_members(&offset, &alignment,
@@ -1544,6 +1494,7 @@ void layout_struct_type(compound_type_t *type)
                entry->compound_member.offset = offset;
                offset += get_type_size(m_type);
 
+next:
                entry = entry->base.next;
        }
 
@@ -1564,7 +1515,6 @@ void layout_struct_type(compound_type_t *type)
 
        compound->size      = offset;
        compound->alignment = alignment;
-       compound->layouted  = true;
 }
 
 void layout_union_type(compound_type_t *type)
@@ -1574,6 +1524,9 @@ void layout_union_type(compound_type_t *type)
        compound_t *compound = type->compound;
        if (! compound->complete)
                return;
+       if (compound->layouted)
+               return;
+       compound->layouted = true;
 
        il_size_t      size      = 0;
        il_alignment_t alignment = compound->alignment;