type: Make an assert()ion independent of the last entry of an enum.
[cparser] / type.c
diff --git a/type.c b/type.c
index 03c5052..5a71c31 100644 (file)
--- a/type.c
+++ b/type.c
@@ -1,21 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Copyright (C) 2012 Matthias Braun <matze@braunis.de>
  */
 #include <config.h>
 
@@ -33,6 +18,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;
@@ -52,6 +38,8 @@ static size_t get_type_struct_size(type_kind_t kind)
 {
        static const size_t sizes[] = {
                [TYPE_ATOMIC]          = sizeof(atomic_type_t),
+               [TYPE_IMAGINARY]       = sizeof(atomic_type_t),
+               [TYPE_COMPLEX]         = sizeof(atomic_type_t),
                [TYPE_COMPOUND_STRUCT] = sizeof(compound_type_t),
                [TYPE_COMPOUND_UNION]  = sizeof(compound_type_t),
                [TYPE_ENUM]            = sizeof(enum_type_t),
@@ -62,8 +50,7 @@ static size_t get_type_struct_size(type_kind_t kind)
                [TYPE_TYPEDEF]         = sizeof(typedef_type_t),
                [TYPE_TYPEOF]          = sizeof(typeof_type_t),
        };
-       assert(lengthof(sizes) == (int)TYPE_TYPEOF + 1);
-       assert(kind <= TYPE_TYPEOF);
+       assert((size_t)kind < lengthof(sizes));
        assert(sizes[kind] != 0);
        return sizes[kind];
 }
@@ -83,8 +70,8 @@ type_t *allocate_type_zero(type_kind_t kind)
  */
 atomic_type_properties_t atomic_type_properties[ATOMIC_TYPE_LAST+1] = {
        [ATOMIC_TYPE_VOID] = {
-               .size      = 0,
-               .alignment = 0,
+               .size      = 1,
+               .alignment = 1,
                .flags     = ATOMIC_TYPE_FLAG_NONE,
                .rank      = 0,
        },
@@ -239,15 +226,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)
@@ -256,8 +243,7 @@ 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;
+       switch (kind) {
        case ATOMIC_TYPE_VOID:        return "void";
        case ATOMIC_TYPE_WCHAR_T:     return "wchar_t";
        case ATOMIC_TYPE_BOOL:        return c_mode & _CXX ? "bool" : "_Bool";
@@ -309,7 +295,7 @@ static void print_atomic_type(const atomic_type_t *type)
 static void print_complex_type(const atomic_type_t *type)
 {
        print_type_qualifiers(type->base.qualifiers, QUAL_SEP_END);
-       print_string("_Complex");
+       print_string("_Complex ");
        print_atomic_kinds(type->akind);
 }
 
@@ -373,16 +359,12 @@ restart:
 static void print_function_type_post(const function_type_t *type,
                                      const scope_t *parameters)
 {
-       print_string("(");
-       bool first = true;
+       print_char('(');
+       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(", ");
-                       }
+               for ( ; parameter != NULL; parameter = parameter->next) {
+                       print_string(sep_next(&sep));
                        print_type(parameter->type);
                }
        } else {
@@ -391,11 +373,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,17 +383,13 @@ 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_string(")");
+       print_char(')');
 
        intern_print_type_post(type->return_type);
 }
@@ -437,7 +411,7 @@ static void print_pointer_type_pre(const pointer_type_t *type)
                print_string(variable->base.base.symbol->string);
                print_string(") ");
        }
-       print_string("*");
+       print_char('*');
        print_type_qualifiers(type->base.qualifiers, QUAL_SEP_START);
 }
 
@@ -450,7 +424,7 @@ static void print_pointer_type_post(const pointer_type_t *type)
 {
        type_t const *const points_to = type->points_to;
        if (points_to->kind == TYPE_ARRAY || points_to->kind == TYPE_FUNCTION)
-               print_string(")");
+               print_char(')');
        intern_print_type_post(points_to);
 }
 
@@ -465,7 +439,7 @@ static void print_reference_type_pre(const reference_type_t *type)
        intern_print_type_pre(refers_to);
        if (refers_to->kind == TYPE_ARRAY || refers_to->kind == TYPE_FUNCTION)
                print_string(" (");
-       print_string("&");
+       print_char('&');
 }
 
 /**
@@ -477,7 +451,7 @@ static void print_reference_type_post(const reference_type_t *type)
 {
        type_t const *const refers_to = type->refers_to;
        if (refers_to->kind == TYPE_ARRAY || refers_to->kind == TYPE_FUNCTION)
-               print_string(")");
+               print_char(')');
        intern_print_type_post(refers_to);
 }
 
@@ -498,7 +472,7 @@ static void print_array_type_pre(const array_type_t *type)
  */
 static void print_array_type_post(const array_type_t *type)
 {
-       print_string("[");
+       print_char('[');
        if (type->is_static) {
                print_string("static ");
        }
@@ -507,15 +481,10 @@ static void print_array_type_post(const array_type_t *type)
                        && (print_implicit_array_size || !type->has_implicit_size)) {
                print_expression(type->size_expression);
        }
-       print_string("]");
+       print_char(']');
        intern_print_type_post(type->element_type);
 }
 
-/**
- * Prints an enum definition.
- *
- * @param declaration  The enum's type declaration.
- */
 void print_enum_definition(const enum_t *enume)
 {
        print_string("{\n");
@@ -523,24 +492,21 @@ void print_enum_definition(const enum_t *enume)
        change_indent(1);
 
        entity_t *entry = enume->base.next;
-       for( ; entry != NULL && entry->kind == ENTITY_ENUM_VALUE;
+       for ( ; entry != NULL && entry->kind == ENTITY_ENUM_VALUE;
               entry = entry->base.next) {
 
                print_indent();
                print_string(entry->base.symbol->string);
                if (entry->enum_value.value != NULL) {
                        print_string(" = ");
-
-                       /* skip the implicit cast */
-                       expression_t *expression = entry->enum_value.value;
-                       print_expression(expression);
+                       print_expression(entry->enum_value.value);
                }
                print_string(",\n");
        }
 
        change_indent(-1);
        print_indent();
-       print_string("}");
+       print_char('}');
 }
 
 /**
@@ -562,27 +528,24 @@ static void print_type_enum(const enum_type_t *type)
        }
 }
 
-/**
- * Print the compound part of a compound type.
- */
 void print_compound_definition(const compound_t *compound)
 {
        print_string("{\n");
        change_indent(1);
 
        entity_t *entity = compound->members.entities;
-       for( ; entity != NULL; entity = entity->base.next) {
+       for ( ; entity != NULL; entity = entity->base.next) {
                if (entity->kind != ENTITY_COMPOUND_MEMBER)
                        continue;
 
                print_indent();
                print_entity(entity);
-               print_string("\n");
+               print_char('\n');
        }
 
        change_indent(-1);
        print_indent();
-       print_string("}");
+       print_char('}');
        if (compound->modifiers & DM_TRANSPARENT_UNION) {
                print_string("__attribute__((__transparent_union__))");
        }
@@ -591,18 +554,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,7 +595,7 @@ static void print_typeof_type_pre(const typeof_type_t *const type)
        } else {
                print_type(type->typeof_type);
        }
-       print_string(")");
+       print_char(')');
 }
 
 /**
@@ -647,44 +605,20 @@ 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;
+       switch (type->kind) {
+       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");
 }
@@ -696,7 +630,7 @@ static void intern_print_type_pre(const type_t *const type)
  */
 static void intern_print_type_post(const type_t *const type)
 {
-       switch(type->kind) {
+       switch (type->kind) {
        case TYPE_FUNCTION:
                print_function_type_post(&type->function, NULL);
                return;
@@ -722,11 +656,6 @@ static void intern_print_type_post(const type_t *const type)
        }
 }
 
-/**
- * Prints a type.
- *
- * @param type   The type.
- */
 void print_type(const type_t *const type)
 {
        print_type_ext(type, NULL, NULL);
@@ -737,7 +666,7 @@ void print_type_ext(const type_t *const type, const symbol_t *symbol,
 {
        intern_print_type_pre(type);
        if (symbol != NULL) {
-               print_string(" ");
+               print_char(' ');
                print_string(symbol->string);
        }
        if (type->kind == TYPE_FUNCTION) {
@@ -747,31 +676,16 @@ void print_type_ext(const type_t *const type, const symbol_t *symbol,
        }
 }
 
-/**
- * Duplicates a type.
- *
- * @param type  The type to copy.
- * @return A copy of the type.
- *
- * @note This does not produce a deep copy!
- */
 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;
 }
 
-/**
- * Returns the unqualified type of a given type.
- *
- * @param type  The type.
- * @returns The unqualified type.
- */
 type_t *get_unqualified_type(type_t *type)
 {
        assert(!is_typeref(type));
@@ -820,42 +734,20 @@ static bool test_atomic_type_flag(atomic_type_kind_t kind,
        return (atomic_type_properties[kind].flags & flag) != 0;
 }
 
-/**
- * Returns true if the given type is an integer type.
- *
- * @param type  The type to check.
- * @return True if type is an integer type.
- */
 bool is_type_integer(const type_t *type)
 {
        assert(!is_typeref(type));
-
-       if (type->kind == TYPE_ENUM)
-               return true;
-       if (type->kind != TYPE_ATOMIC)
+       if (!is_type_arithmetic(type))
                return false;
-
        return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_INTEGER);
 }
 
-/**
- * Returns true if the given type is an enum type.
- *
- * @param type  The type to check.
- * @return True if type is an enum type.
- */
 bool is_type_enum(const type_t *type)
 {
        assert(!is_typeref(type));
        return type->kind == TYPE_ENUM;
 }
 
-/**
- * Returns true if the given type is an floating point type.
- *
- * @param type  The type to check.
- * @return True if type is a floating point type.
- */
 bool is_type_float(const type_t *type)
 {
        assert(!is_typeref(type));
@@ -866,52 +758,25 @@ bool is_type_float(const type_t *type)
        return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_FLOAT);
 }
 
-/**
- * Returns true if the given type is an complex type.
- *
- * @param type  The type to check.
- * @return True if type is a complex type.
- */
 bool is_type_complex(const type_t *type)
 {
        assert(!is_typeref(type));
-
-       if (type->kind != TYPE_ATOMIC)
-               return false;
-
-       return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_COMPLEX);
+       return type->kind == TYPE_COMPLEX;
 }
 
-/**
- * Returns true if the given type is a signed type.
- *
- * @param type  The type to check.
- * @return True if type is a signed type.
- */
 bool is_type_signed(const type_t *type)
 {
        assert(!is_typeref(type));
-
-       /* enum types are int for now */
-       if (type->kind == TYPE_ENUM)
-               return true;
-       if (type->kind != TYPE_ATOMIC)
+       if (!is_type_arithmetic(type))
                return false;
-
        return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_SIGNED);
 }
 
-/**
- * Returns true if the given type represents an arithmetic type.
- *
- * @param type  The type to check.
- * @return True if type represents an arithmetic type.
- */
 bool is_type_arithmetic(const type_t *type)
 {
        assert(!is_typeref(type));
 
-       switch(type->kind) {
+       switch (type->kind) {
        case TYPE_ENUM:
                return true;
        case TYPE_ATOMIC:
@@ -923,45 +788,34 @@ bool is_type_arithmetic(const type_t *type)
        }
 }
 
-/**
- * Returns true if the given type is an integer or float type.
- *
- * @param type  The type to check.
- * @return True if type is an integer or float type.
- */
 bool is_type_real(const type_t *type)
 {
        /* 6.2.5 (17) */
        return is_type_integer(type) || is_type_float(type);
 }
 
-/**
- * Returns true if the given type represents a scalar type.
- *
- * @param type  The type to check.
- * @return True if type represents a scalar type.
- */
 bool is_type_scalar(const type_t *type)
 {
        assert(!is_typeref(type));
 
-       if (type->kind == TYPE_POINTER)
+       switch (type->kind) {
+       case TYPE_POINTER:
+       case TYPE_ENUM:
                return true;
-
-       return is_type_arithmetic(type);
+       case TYPE_ATOMIC:
+       case TYPE_COMPLEX:
+       case TYPE_IMAGINARY:
+               return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_ARITHMETIC);
+       default:
+               return false;
+       }
 }
 
-/**
- * Check if a given type is incomplete.
- *
- * @param type  The type to check.
- * @return True if the given type is incomplete (ie. just forward).
- */
 bool is_type_incomplete(const type_t *type)
 {
        assert(!is_typeref(type));
 
-       switch(type->kind) {
+       switch (type->kind) {
        case TYPE_COMPOUND_STRUCT:
        case TYPE_COMPOUND_UNION: {
                const compound_type_t *compound_type = &type->compound;
@@ -987,10 +841,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)
@@ -1070,9 +924,6 @@ static bool array_types_compatible(const array_type_t *array1,
        return array1->size == array2->size;
 }
 
-/**
- * Check if two types are compatible.
- */
 bool types_compatible(const type_t *type1, const type_t *type2)
 {
        assert(!is_typeref(type1));
@@ -1082,53 +933,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);
 }
 
 /**
@@ -1201,7 +1047,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;
@@ -1213,13 +1059,9 @@ unsigned get_type_size(type_t *type)
        case TYPE_TYPEDEF:
                return get_type_size(type->typedeft.typedefe->type);
        case TYPE_TYPEOF:
-               if (type->typeoft.typeof_type) {
-                       return get_type_size(type->typeoft.typeof_type);
-               } else {
-                       return get_type_size(type->typeoft.expression->base.type);
-               }
+               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)
@@ -1255,17 +1097,19 @@ unsigned get_type_alignment(type_t *type)
                return alignment;
        }
        case TYPE_TYPEOF:
-               if (type->typeoft.typeof_type) {
-                       return get_type_alignment(type->typeoft.typeof_type);
-               } else {
-                       return get_type_alignment(type->typeoft.expression->base.type);
-               }
+               return get_type_alignment(type->typeoft.typeof_type);
        }
-       panic("invalid type in get_type_alignment");
+       panic("invalid type");
 }
 
-unsigned get_type_alignment_compound(type_t *type)
+/**
+ * get alignment of a type when used inside a compound.
+ * Some ABIs are broken and alignment inside a compound is different from
+ * recommended alignment of a type
+ */
+static unsigned get_type_alignment_compound(type_t *const type)
 {
+       assert(!is_typeref(type));
        if (type->kind == TYPE_ATOMIC)
                return atomic_type_properties[type->atomic.akind].struct_alignment;
        return get_type_alignment(type);
@@ -1273,7 +1117,7 @@ unsigned get_type_alignment_compound(type_t *type)
 
 decl_modifiers_t get_type_modifiers(const type_t *type)
 {
-       switch(type->kind) {
+       switch (type->kind) {
        case TYPE_ERROR:
                break;
        case TYPE_COMPOUND_STRUCT:
@@ -1295,13 +1139,9 @@ decl_modifiers_t get_type_modifiers(const type_t *type)
                return modifiers;
        }
        case TYPE_TYPEOF:
-               if (type->typeoft.typeof_type) {
-                       return get_type_modifiers(type->typeoft.typeof_type);
-               } else {
-                       return get_type_modifiers(type->typeoft.expression->base.type);
-               }
+               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)
@@ -1364,7 +1204,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,
@@ -1392,7 +1232,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,
@@ -1547,7 +1387,7 @@ static entity_t *pack_bitfield_members(il_size_t *struct_offset,
                if (!member->compound_member.bitfield)
                        break;
 
-               type_t *base_type = member->declaration.type;
+               type_t *const base_type = skip_typeref(member->declaration.type);
                il_alignment_t base_alignment = get_type_alignment_compound(base_type);
                il_alignment_t alignment_mask = base_alignment-1;
                if (base_alignment > alignment)
@@ -1597,6 +1437,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;
@@ -1604,17 +1445,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 *m_type  = entry->declaration.type;
-               type_t *skipped = skip_typeref(m_type);
-               if (! is_type_valid(skipped)) {
-                       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,
@@ -1638,6 +1474,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;
        }
 
@@ -1649,7 +1486,7 @@ void layout_struct_type(compound_type_t *type)
                }
        }
 
-       source_position_t const *const pos = &compound->base.source_position;
+       position_t const *const pos = &compound->base.pos;
        if (need_pad) {
                warningf(WARN_PADDED, pos, "'%T' needs padding", type);
        } else if (compound->packed) {
@@ -1658,7 +1495,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)
@@ -1668,6 +1504,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;
@@ -1677,7 +1516,7 @@ void layout_union_type(compound_type_t *type)
                if (entry->kind != ENTITY_COMPOUND_MEMBER)
                        continue;
 
-               type_t *m_type = entry->declaration.type;
+               type_t *m_type = skip_typeref(entry->declaration.type);
                if (! is_type_valid(skip_typeref(m_type)))
                        continue;
 
@@ -1787,6 +1626,6 @@ void dbg_type(const type_t *type)
 {
        print_to_file(stderr);
        print_type(type);
-       print_string("\n");
+       print_char('\n');
        fflush(stderr);
 }