- started implementation of size and alignment for types
[cparser] / parser.c
index d403755..c11906c 100644 (file)
--- a/parser.c
+++ b/parser.c
 #include "adt/error.h"
 #include "adt/array.h"
 
+/** if wchar_t is equal to unsigned short. */
+bool opt_short_wchar_t =
+#ifdef _WIN32
+       true;
+#else
+       false;
+#endif
+
 //#define PRINT_TOKENS
 #define MAX_LOOKAHEAD 2
 
@@ -95,7 +103,7 @@ typedef struct parse_initializer_env_t {
        bool           must_be_constant;
 } parse_initializer_env_t;
 
-typedef declaration_t* (*parsed_declaration_func) (declaration_t *declaration);
+typedef declaration_t* (*parsed_declaration_func) (declaration_t *declaration, bool is_definition);
 
 static token_t             token;
 static token_t             lookahead_buffer[MAX_LOOKAHEAD];
@@ -106,6 +114,7 @@ static scope_t            *global_scope      = NULL;
 static scope_t            *scope             = NULL;
 static declaration_t      *last_declaration  = NULL;
 static declaration_t      *current_function  = NULL;
+static declaration_t      *current_init_decl = NULL;
 static switch_statement_t *current_switch    = NULL;
 static statement_t        *current_loop      = NULL;
 static statement_t        *current_parent    = NULL;
@@ -162,7 +171,7 @@ static type_t       *parse_typename(void);
 static void parse_compound_type_entries(declaration_t *compound_declaration);
 static declaration_t *parse_declarator(
                const declaration_specifiers_t *specifiers, bool may_be_abstract);
-static declaration_t *record_declaration(declaration_t *declaration);
+static declaration_t *record_declaration(declaration_t *declaration, bool is_definition);
 
 static void semantic_comparison(binary_expression_t *expression);
 
@@ -839,6 +848,10 @@ static void label_pop_to(size_t new_top)
        stack_pop_to(&label_stack, new_top);
 }
 
+static int get_akind_rank(atomic_type_kind_t akind)
+{
+       return (int) akind;
+}
 
 static int get_rank(const type_t *type)
 {
@@ -849,10 +862,10 @@ static int get_rank(const type_t *type)
         * (unsigned int would be preferable when possible... for stuff like
         *  struct { enum { ... } bla : 4; } ) */
        if (type->kind == TYPE_ENUM)
-               return ATOMIC_TYPE_INT;
+               return get_akind_rank(ATOMIC_TYPE_INT);
 
        assert(type->kind == TYPE_ATOMIC);
-       return type->atomic.akind;
+       return get_akind_rank(type->atomic.akind);
 }
 
 static type_t *promote_integer(type_t *type)
@@ -860,7 +873,7 @@ static type_t *promote_integer(type_t *type)
        if (type->kind == TYPE_BITFIELD)
                type = type->bitfield.base_type;
 
-       if (get_rank(type) < ATOMIC_TYPE_INT)
+       if (get_rank(type) < get_akind_rank(ATOMIC_TYPE_INT))
                type = type_int;
 
        return type;
@@ -959,9 +972,9 @@ static void report_assign_error(assign_error_t error, type_t *orig_type_left,
                /* the left type has all qualifiers from the right type */
                unsigned missing_qualifiers
                        = points_to_right->base.qualifiers & ~points_to_left->base.qualifiers;
-               errorf(source_position,
-                      "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointed-to type",
-                      orig_type_left, context, orig_type_right, missing_qualifiers);
+               warningf(source_position,
+                        "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointer target type",
+                        orig_type_left, context, orig_type_right, missing_qualifiers);
                return;
        }
 
@@ -1004,12 +1017,13 @@ static assign_error_t semantic_assign(type_t *orig_type_left,
                                = skip_typeref(type_left->pointer.points_to);
                        type_t *points_to_right
                                = skip_typeref(type_right->pointer.points_to);
+                       assign_error_t res = ASSIGN_SUCCESS;
 
                        /* the left type has all qualifiers from the right type */
                        unsigned missing_qualifiers
                                = points_to_right->base.qualifiers & ~points_to_left->base.qualifiers;
                        if (missing_qualifiers != 0) {
-                               return ASSIGN_ERROR_POINTER_QUALIFIER_MISSING;
+                               res = ASSIGN_ERROR_POINTER_QUALIFIER_MISSING;
                        }
 
                        points_to_left  = get_unqualified_type(points_to_left);
@@ -1017,14 +1031,14 @@ static assign_error_t semantic_assign(type_t *orig_type_left,
 
                        if (is_type_atomic(points_to_left, ATOMIC_TYPE_VOID) ||
                                        is_type_atomic(points_to_right, ATOMIC_TYPE_VOID)) {
-                               return ASSIGN_SUCCESS;
+                               return res;
                        }
 
                        if (!types_compatible(points_to_left, points_to_right)) {
                                return ASSIGN_WARNING_POINTER_INCOMPATIBLE;
                        }
 
-                       return ASSIGN_SUCCESS;
+                       return res;
                } else if (is_type_integer(type_right)) {
                        return ASSIGN_WARNING_POINTER_FROM_INT;
                }
@@ -1079,8 +1093,9 @@ static type_t *make_global_typedef(const char *name, type_t *type)
        declaration->type                   = type;
        declaration->symbol                 = symbol;
        declaration->source_position        = builtin_source_position;
+       declaration->implicit               = true;
 
-       record_declaration(declaration);
+       record_declaration(declaration, false);
 
        type_t *typedef_type               = allocate_type_zero(TYPE_TYPEDEF, &builtin_source_position);
        typedef_type->typedeft.declaration = declaration;
@@ -2712,7 +2727,7 @@ static void parse_enum_entries(type_t *const enum_type)
                        /* TODO semantic */
                }
 
-               record_declaration(entry);
+               record_declaration(entry, false);
 
                if (token.type != ',')
                        break;
@@ -3047,13 +3062,117 @@ end_error:
        return;
 }
 
+static declaration_t *create_error_declaration(symbol_t *symbol, storage_class_tag_t storage_class)
+{
+       declaration_t *const decl    = allocate_declaration_zero();
+       decl->source_position        = *HERE;
+       decl->declared_storage_class = storage_class;
+       decl->storage_class          =
+               storage_class != STORAGE_CLASS_NONE || scope == global_scope ?
+                       storage_class : STORAGE_CLASS_AUTO;
+       decl->symbol                 = symbol;
+       decl->implicit               = true;
+       record_declaration(decl, false);
+       return decl;
+}
+
+/**
+ * Finish the construction of a struct type by calculating
+ * its size, offsets, alignment.
+ */
+static void finish_struct_type(compound_type_t *type) {
+       if (type->declaration == NULL)
+               return;
+       declaration_t *struct_decl = type->declaration;
+       if (! struct_decl->init.complete)
+               return;
+
+       il_size_t      size      = 0;
+       il_size_t      new_size;
+       il_alignment_t alignment = 1;
+       bool           need_pad  = false;
+
+       declaration_t *entry = struct_decl->scope.declarations;
+       for (; entry != NULL; entry = entry->next) {
+               if (entry->namespc != NAMESPACE_NORMAL)
+                       continue;
+
+               type_t         *m_type      = skip_typeref(entry->type);
+               il_alignment_t  m_alignment = m_type->base.alignment;
+
+               new_size = (size + m_alignment - 1) & -m_alignment;
+               if (m_alignment > alignment)
+                       alignment = m_alignment;
+               if (new_size > size)
+                       need_pad = true;
+               entry->offset = new_size;
+               size = new_size + m_type->base.size;
+       }
+       if (type->base.alignment != 0) {
+               alignment = type->base.alignment;
+       }
+
+       new_size = (size + alignment - 1) & -alignment;
+       if (new_size > size)
+               need_pad = true;
+
+       if (warning.padded && need_pad) {
+               warningf(&struct_decl->source_position,
+                       "'%#T' needs padding", type, struct_decl->symbol);
+       }
+       if (warning.packed && !need_pad) {
+               warningf(&struct_decl->source_position,
+                       "superfluous packed attribute on '%#T'",
+                       type, struct_decl->symbol);
+       }
+
+       type->base.size      = new_size;
+       type->base.alignment = alignment;
+}
+
+/**
+ * Finish the construction of an union type by calculating
+ * its size and alignment.
+ */
+static void finish_union_type(compound_type_t *type) {
+       if (type->declaration == NULL)
+               return;
+       declaration_t *union_decl = type->declaration;
+       if (! union_decl->init.complete)
+               return;
+
+       il_size_t      size      = 0;
+       il_alignment_t alignment = 1;
+
+       declaration_t *entry = union_decl->scope.declarations;
+       for (; entry != NULL; entry = entry->next) {
+               if (entry->namespc != NAMESPACE_NORMAL)
+                       continue;
+
+               type_t *m_type = skip_typeref(entry->type);
+
+               entry->offset = 0;
+               if (m_type->base.size > size)
+                       size = m_type->base.size;
+               if (m_type->base.alignment > alignment)
+                       alignment = m_type->base.alignment;
+       }
+       if (type->base.alignment != 0) {
+               alignment = type->base.alignment;
+       }
+       size = (size + alignment - 1) & -alignment;
+       type->base.size      = size;
+       type->base.alignment = alignment;
+}
+
 static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
 {
        type_t            *type            = NULL;
        type_qualifiers_t  qualifiers      = TYPE_QUALIFIER_NONE;
        type_modifiers_t   modifiers       = TYPE_MODIFIER_NONE;
        unsigned           type_specifiers = 0;
-       int                newtype         = 0;
+       bool               newtype         = false;
+       bool               saw_error       = false;
 
        specifiers->source_position = token.source_position;
 
@@ -3185,6 +3304,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
                        type = allocate_type_zero(TYPE_COMPOUND_STRUCT, HERE);
 
                        type->compound.declaration = parse_compound_type_specifier(true);
+                       finish_struct_type(&type->compound);
                        break;
                }
                case T_union: {
@@ -3193,6 +3313,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
                        if (type->compound.declaration->modifiers & DM_TRANSPARENT_UNION)
                                modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION;
                        break;
+                       finish_union_type(&type->compound);
                }
                case T_enum:
                        type = parse_enum_specifier();
@@ -3207,13 +3328,58 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
 
                case T_IDENTIFIER: {
                        /* only parse identifier if we haven't found a type yet */
-                       if (type != NULL || type_specifiers != 0)
-                               goto finish_specifiers;
+                       if (type != NULL || type_specifiers != 0) {
+                               /* Be somewhat resilient to typos like 'unsigned lng* f()' in a
+                                * declaration, so it doesn't generate errors about expecting '(' or
+                                * '{' later on. */
+                               switch (look_ahead(1)->type) {
+                                       STORAGE_CLASSES
+                                       TYPE_SPECIFIERS
+                                       case T_const:
+                                       case T_restrict:
+                                       case T_volatile:
+                                       case T_inline:
+                                       case T__forceinline: /* ^ DECLARATION_START except for __attribute__ */
+                                       case T_IDENTIFIER:
+                                       case '*':
+                                               errorf(HERE, "discarding stray %K in declaration specifier", &token);
+                                               next_token();
+                                               continue;
+
+                                       default:
+                                               goto finish_specifiers;
+                               }
+                       }
+
+                       type_t *const typedef_type = get_typedef_type(token.v.symbol);
+                       if (typedef_type == NULL) {
+                               /* Be somewhat resilient to typos like 'vodi f()' at the beginning of a
+                                * declaration, so it doesn't generate 'implicit int' followed by more
+                                * errors later on. */
+                               token_type_t const la1_type = (token_type_t)look_ahead(1)->type;
+                               switch (la1_type) {
+                                       DECLARATION_START
+                                       case T_IDENTIFIER:
+                                       case '*': {
+                                               errorf(HERE, "%K does not name a type", &token);
+
+                                               declaration_t *const decl =
+                                                       create_error_declaration(token.v.symbol, STORAGE_CLASS_TYPEDEF);
 
-                       type_t *typedef_type = get_typedef_type(token.v.symbol);
+                                               type = allocate_type_zero(TYPE_TYPEDEF, HERE);
+                                               type->typedeft.declaration = decl;
 
-                       if (typedef_type == NULL)
-                               goto finish_specifiers;
+                                               next_token();
+                                               saw_error = true;
+                                               if (la1_type == '*')
+                                                       goto finish_specifiers;
+                                               continue;
+                                       }
+
+                                       default:
+                                               goto finish_specifiers;
+                               }
+                       }
 
                        next_token();
                        type = typedef_type;
@@ -3227,8 +3393,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
        }
 
 finish_specifiers:
-
-       if (type == NULL) {
+       if (type == NULL || (saw_error && type_specifiers != 0)) {
                atomic_type_kind_t atomic_type;
 
                /* match valid basic types */
@@ -3366,7 +3531,12 @@ warn_about_long_long:
                default:
                        /* invalid specifier combination, give an error message */
                        if (type_specifiers == 0) {
-                               if (! strict_mode) {
+                               if (saw_error) {
+                                       specifiers->type = type_error_type;
+                                       return;
+                               }
+
+                               if (!strict_mode) {
                                        if (warning.implicit_int) {
                                                warningf(HERE, "no type specifiers in declaration, using 'int'");
                                        }
@@ -3377,7 +3547,7 @@ warn_about_long_long:
                                }
                        } else if ((type_specifiers & SPECIFIER_SIGNED) &&
                                  (type_specifiers & SPECIFIER_UNSIGNED)) {
-                               errorf(HERE, "signed and unsigned specifiers gives");
+                               errorf(HERE, "signed and unsigned specifiers given");
                        } else if (type_specifiers & (SPECIFIER_SIGNED | SPECIFIER_UNSIGNED)) {
                                errorf(HERE, "only integer types can be signed or unsigned");
                        } else {
@@ -3398,11 +3568,9 @@ warn_about_long_long:
                        type               = allocate_type_zero(TYPE_ATOMIC, &builtin_source_position);
                        type->atomic.akind = atomic_type;
                }
-               newtype = 1;
-       } else {
-               if (type_specifiers != 0) {
-                       errorf(HERE, "multiple datatypes in declaration");
-               }
+               newtype = true;
+       } else if (type_specifiers != 0) {
+               errorf(HERE, "multiple datatypes in declaration");
        }
 
        /* FIXME: check type qualifiers here */
@@ -3475,12 +3643,21 @@ static type_t *automatic_type_conversion(type_t *orig_type);
 static void semantic_parameter(declaration_t *declaration)
 {
        /* TODO: improve error messages */
+       source_position_t const* const pos = &declaration->source_position;
 
-       if (declaration->declared_storage_class == STORAGE_CLASS_TYPEDEF) {
-               errorf(HERE, "typedef not allowed in parameter list");
-       } else if (declaration->declared_storage_class != STORAGE_CLASS_NONE
-                       && declaration->declared_storage_class != STORAGE_CLASS_REGISTER) {
-               errorf(HERE, "parameter may only have none or register storage class");
+       switch (declaration->declared_storage_class) {
+               case STORAGE_CLASS_TYPEDEF:
+                       errorf(pos, "typedef not allowed in parameter list");
+                       break;
+
+               /* Allowed storage classes */
+               case STORAGE_CLASS_NONE:
+               case STORAGE_CLASS_REGISTER:
+                       break;
+
+               default:
+                       errorf(pos, "parameter may only have none or register storage class");
+                       break;
        }
 
        type_t *const orig_type = declaration->type;
@@ -3493,7 +3670,7 @@ static void semantic_parameter(declaration_t *declaration)
        declaration->type = type;
 
        if (is_type_incomplete(skip_typeref(type))) {
-               errorf(HERE, "incomplete type '%T' not allowed for parameter '%Y'",
+               errorf(pos, "parameter '%#T' is of incomplete type",
                       orig_type, declaration->symbol);
        }
 }
@@ -3518,9 +3695,10 @@ static declaration_t *parse_parameters(function_type_t *type)
        add_anchor_token(')');
        int saved_comma_state = save_and_reset_anchor_state(',');
 
-       if (token.type == T_IDENTIFIER) {
-               symbol_t *symbol = token.v.symbol;
-               if (!is_typedef_symbol(symbol)) {
+       if (token.type == T_IDENTIFIER &&
+           !is_typedef_symbol(token.v.symbol)) {
+               token_type_t la1_type = (token_type_t)look_ahead(1)->type;
+               if (la1_type == ',' || la1_type == ')') {
                        type->kr_style_parameters = true;
                        declarations = parse_identifier_list();
                        goto parameters_finished;
@@ -3706,7 +3884,7 @@ static construct_type_t *parse_function_declarator(declaration_t *declaration)
                                else if (second == NULL) second = "stdcall";
                        }
                        if (declaration->modifiers & DM_FASTCALL) {
-                               if (first == NULL)       first = "faslcall";
+                               if (first == NULL)       first = "fastcall";
                                else if (second == NULL) second = "fastcall";
                        }
                        if (declaration->modifiers & DM_THISCALL) {
@@ -3810,6 +3988,8 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration,
                next_token();
                add_anchor_token(')');
                inner_types = parse_inner_declarator(declaration, may_be_abstract);
+               /* All later declarators only modify the return type, not declaration */
+               declaration = NULL;
                rem_anchor_token(')');
                expect(')');
                break;
@@ -3999,6 +4179,7 @@ static declaration_t *parse_declarator(
                const declaration_specifiers_t *specifiers, bool may_be_abstract)
 {
        declaration_t *const declaration    = allocate_declaration_zero();
+       declaration->source_position        = specifiers->source_position;
        declaration->declared_storage_class = specifiers->declared_storage_class;
        declaration->modifiers              = specifiers->modifiers;
        declaration->deprecated_string      = specifiers->deprecated_string;
@@ -4117,7 +4298,7 @@ static bool is_sym_main(const symbol_t *const sym)
        return strcmp(sym->string, "main") == 0;
 }
 
-static declaration_t *internal_record_declaration(
+static declaration_t *record_declaration(
        declaration_t *const declaration,
        const bool is_definition)
 {
@@ -4290,16 +4471,6 @@ warn_redundant_declaration:
        return append_declaration(declaration);
 }
 
-static declaration_t *record_declaration(declaration_t *declaration)
-{
-       return internal_record_declaration(declaration, false);
-}
-
-static declaration_t *record_definition(declaration_t *declaration)
-{
-       return internal_record_declaration(declaration, true);
-}
-
 static void parser_error_multiple_definition(declaration_t *declaration,
                const source_position_t *source_position)
 {
@@ -4344,32 +4515,32 @@ static void parse_init_declarator_rest(declaration_t *declaration)
                must_be_constant = true;
        }
 
+       if (is_type_function(type)) {
+               errorf(&declaration->source_position,
+                      "function '%#T' is initialized like a variable",
+                      orig_type, declaration->symbol);
+               orig_type = type_error_type;
+       }
+
        parse_initializer_env_t env;
        env.type             = orig_type;
        env.must_be_constant = must_be_constant;
-       env.declaration      = declaration;
+       env.declaration      = current_init_decl = declaration;
 
        initializer_t *initializer = parse_initializer(&env);
+       current_init_decl = NULL;
 
-       if (env.type != orig_type) {
-               orig_type         = env.type;
-               type              = skip_typeref(orig_type);
-               declaration->type = env.type;
-       }
-
-       if (is_type_function(type)) {
-               errorf(&declaration->source_position,
-                      "initializers not allowed for function types at declator '%Y' (type '%T')",
-                      declaration->symbol, orig_type);
-       } else {
+       if (!is_type_function(type)) {
+               /* Â§ 6.7.5 (22)  array initializers for arrays with unknown size determine
+                * the array type size */
+               declaration->type             = env.type;
                declaration->init.initializer = initializer;
        }
 }
 
 /* parse rest of a declaration without any declarator */
 static void parse_anonymous_declaration_rest(
-               const declaration_specifiers_t *specifiers,
-               parsed_declaration_func finished_declaration)
+               const declaration_specifiers_t *specifiers)
 {
        eat(';');
 
@@ -4404,7 +4575,7 @@ static void parse_anonymous_declaration_rest(
                        break;
        }
 
-       finished_declaration(declaration);
+       append_declaration(declaration);
 }
 
 static void parse_declaration_rest(declaration_t *ndeclaration,
@@ -4415,7 +4586,8 @@ static void parse_declaration_rest(declaration_t *ndeclaration,
        add_anchor_token('=');
        add_anchor_token(',');
        while(true) {
-               declaration_t *declaration = finished_declaration(ndeclaration);
+               declaration_t *declaration =
+                       finished_declaration(ndeclaration, token.type == '=');
 
                type_t *orig_type = declaration->type;
                type_t *type      = skip_typeref(orig_type);
@@ -4445,7 +4617,7 @@ end_error:
        rem_anchor_token(',');
 }
 
-static declaration_t *finished_kr_declaration(declaration_t *declaration)
+static declaration_t *finished_kr_declaration(declaration_t *declaration, bool is_definition)
 {
        symbol_t *symbol  = declaration->symbol;
        if (symbol == NULL) {
@@ -4454,7 +4626,7 @@ static declaration_t *finished_kr_declaration(declaration_t *declaration)
        }
        namespace_t namespc = (namespace_t) declaration->namespc;
        if (namespc != NAMESPACE_NORMAL) {
-               return record_declaration(declaration);
+               return record_declaration(declaration, false);
        }
 
        declaration_t *previous_declaration = get_declaration(symbol, namespc);
@@ -4465,6 +4637,10 @@ static declaration_t *finished_kr_declaration(declaration_t *declaration)
                return declaration;
        }
 
+       if (is_definition) {
+               errorf(HERE, "parameter %Y is initialised", declaration->symbol);
+       }
+
        if (previous_declaration->type == NULL) {
                previous_declaration->type          = declaration->type;
                previous_declaration->declared_storage_class = declaration->declared_storage_class;
@@ -4472,7 +4648,7 @@ static declaration_t *finished_kr_declaration(declaration_t *declaration)
                previous_declaration->parent_scope  = scope;
                return previous_declaration;
        } else {
-               return record_declaration(declaration);
+               return record_declaration(declaration, false);
        }
 }
 
@@ -4483,7 +4659,7 @@ static void parse_declaration(parsed_declaration_func finished_declaration)
        parse_declaration_specifiers(&specifiers);
 
        if (token.type == ';') {
-               parse_anonymous_declaration_rest(&specifiers, append_declaration);
+               parse_anonymous_declaration_rest(&specifiers);
        } else {
                declaration_t *declaration = parse_declarator(&specifiers, /*may_be_abstract=*/false);
                parse_declaration_rest(declaration, &specifiers, finished_declaration);
@@ -4653,6 +4829,10 @@ static void check_declarations(void)
        if (warning.unused_parameter) {
                const scope_t *scope = &current_function->scope;
 
+               if (is_sym_main(current_function->symbol)) {
+                       /* do not issue unused warnings for main */
+                       return;
+               }
                const declaration_t *parameter = scope->declarations;
                for (; parameter != NULL; parameter = parameter->next) {
                        if (! parameter->used) {
@@ -4733,9 +4913,7 @@ static void check_reachable(statement_t *const stmt)
                                                continue;
                                        }
 
-                                       expression_t *const case_expr = i->expression;
-                                       if (is_constant_expression(case_expr) &&
-                                           fold_constant(case_expr) == val) {
+                                       if (i->first_case <= val && val <= i->last_case) {
                                                check_reachable((statement_t*)i);
                                                return;
                                        }
@@ -4873,9 +5051,28 @@ found_break_parent:
                        break;
                }
 
-               case STATEMENT_MS_TRY:
-               case STATEMENT_LEAVE:
-                       panic("unimplemented");
+               case STATEMENT_MS_TRY: {
+                       ms_try_statement_t const *const ms_try = &stmt->ms_try;
+                       check_reachable(ms_try->try_statement);
+                       next = ms_try->final_statement;
+                       break;
+               }
+
+               case STATEMENT_LEAVE: {
+                       statement_t *parent = stmt;
+                       for (;;) {
+                               parent = parent->base.parent;
+                               if (parent == NULL) /* __leave not within __try */
+                                       return;
+
+                               if (parent->kind == STATEMENT_MS_TRY) {
+                                       last = parent;
+                                       next = parent->ms_try.final_statement;
+                                       break;
+                               }
+                       }
+                       break;
+               }
        }
 
        while (next == NULL) {
@@ -4888,6 +5085,7 @@ found_break_parent:
                        type_t *const ret  = skip_typeref(type->function.return_type);
                        if (warning.return_type                    &&
                            !is_type_atomic(ret, ATOMIC_TYPE_VOID) &&
+                           is_type_valid(ret)                     &&
                            !is_sym_main(current_function->symbol)) {
                                warningf(&stmt->base.source_position,
                                         "control reaches end of non-void function");
@@ -4983,7 +5181,9 @@ continue_for:;
                        }
 
                        case STATEMENT_MS_TRY:
-                               panic("unimplemented");
+                               last = next;
+                               next = next->ms_try.final_statement;
+                               break;
                }
        }
 
@@ -5001,11 +5201,10 @@ continue_for:;
 static void check_unreachable(statement_t const* const stmt)
 {
        if (!stmt->base.reachable            &&
-           stmt->kind != STATEMENT_COMPOUND &&
            stmt->kind != STATEMENT_DO_WHILE &&
-           stmt->kind != STATEMENT_FOR) {
-               warningf(&stmt->base.source_position,
-                        "statement is unreachable");
+           stmt->kind != STATEMENT_FOR      &&
+           (stmt->kind != STATEMENT_COMPOUND || stmt->compound.statements == NULL)) {
+               warningf(&stmt->base.source_position, "statement is unreachable");
        }
 
        switch (stmt->kind) {
@@ -5062,27 +5261,35 @@ static void check_unreachable(statement_t const* const stmt)
                case STATEMENT_FOR: {
                        for_statement_t const* const fors = &stmt->fors;
 
-                       if (!stmt->base.reachable && fors->initialisation != NULL) {
-                               warningf(&fors->initialisation->base.source_position,
-                                        "initialisation of for-statement is unreachable");
-                       }
+                       // if init and step are unreachable, cond is unreachable, too
+                       if (!stmt->base.reachable && !fors->step_reachable) {
+                               warningf(&stmt->base.source_position, "statement is unreachable");
+                       } else {
+                               if (!stmt->base.reachable && fors->initialisation != NULL) {
+                                       warningf(&fors->initialisation->base.source_position,
+                                                "initialisation of for-statement is unreachable");
+                               }
 
-                       if (!fors->condition_reachable && fors->condition != NULL) {
-                               warningf(&fors->condition->base.source_position,
-                                        "condition of for-statement is unreachable");
-                       }
+                               if (!fors->condition_reachable && fors->condition != NULL) {
+                                       warningf(&fors->condition->base.source_position,
+                                                "condition of for-statement is unreachable");
+                               }
 
-                       if (!fors->step_reachable && fors->step != NULL) {
-                               warningf(&fors->step->base.source_position,
-                                        "step of for-statement is unreachable");
+                               if (!fors->step_reachable && fors->step != NULL) {
+                                       warningf(&fors->step->base.source_position,
+                                                "step of for-statement is unreachable");
+                               }
                        }
 
-                       check_unreachable(stmt->fors.body);
+                       check_unreachable(fors->body);
                        break;
                }
 
-               case STATEMENT_MS_TRY:
-                       panic("unimplemented");
+               case STATEMENT_MS_TRY: {
+                       ms_try_statement_t const *const ms_try = &stmt->ms_try;
+                       check_unreachable(ms_try->try_statement);
+                       check_unreachable(ms_try->final_statement);
+               }
        }
 
        if (stmt->base.next)
@@ -5102,7 +5309,7 @@ static void parse_external_declaration(void)
 
        /* must be a declaration */
        if (token.type == ';') {
-               parse_anonymous_declaration_rest(&specifiers, append_declaration);
+               parse_anonymous_declaration_rest(&specifiers);
                return;
        }
 
@@ -5121,11 +5328,8 @@ static void parse_external_declaration(void)
        switch (token.type) {
                case ',':
                case ';':
-                       parse_declaration_rest(ndeclaration, &specifiers, record_declaration);
-                       return;
-
                case '=':
-                       parse_declaration_rest(ndeclaration, &specifiers, record_definition);
+                       parse_declaration_rest(ndeclaration, &specifiers, record_declaration);
                        return;
        }
 
@@ -5151,6 +5355,20 @@ static void parse_external_declaration(void)
                return;
        }
 
+       if (warning.aggregate_return &&
+           is_type_compound(skip_typeref(type->function.return_type))) {
+               warningf(HERE, "function '%Y' returns an aggregate",
+                        ndeclaration->symbol);
+       }
+       if (warning.traditional && !type->function.unspecified_parameters) {
+               warningf(HERE, "traditional C rejects ISO C style function definition of function '%Y'",
+                       ndeclaration->symbol);
+       }
+       if (warning.old_style_definition && type->function.unspecified_parameters) {
+               warningf(HERE, "old-style function definition '%Y'",
+                       ndeclaration->symbol);
+       }
+
        /* Â§ 6.7.5.3 (14) a function definition with () means no
         * parameters (and not unspecified parameters) */
        if (type->function.unspecified_parameters
@@ -5166,7 +5384,7 @@ static void parse_external_declaration(void)
                ndeclaration->type = type;
        }
 
-       declaration_t *const declaration = record_definition(ndeclaration);
+       declaration_t *const declaration = record_declaration(ndeclaration, true);
        if (ndeclaration != declaration) {
                declaration->scope = ndeclaration->scope;
        }
@@ -5186,7 +5404,7 @@ static void parse_external_declaration(void)
                                || parameter->parent_scope == scope);
                parameter->parent_scope = scope;
                if (parameter->symbol == NULL) {
-                       errorf(&ndeclaration->source_position, "parameter name omitted");
+                       errorf(&parameter->source_position, "parameter name omitted");
                        continue;
                }
                environment_push(parameter);
@@ -5277,12 +5495,12 @@ static void parse_compound_declarators(declaration_t *struct_declaration,
 {
        declaration_t *last_declaration = struct_declaration->scope.declarations;
        if (last_declaration != NULL) {
-               while(last_declaration->next != NULL) {
+               while (last_declaration->next != NULL) {
                        last_declaration = last_declaration->next;
                }
        }
 
-       while(1) {
+       while (true) {
                declaration_t *declaration;
 
                if (token.type == ':') {
@@ -5318,8 +5536,8 @@ static void parse_compound_declarators(declaration_t *struct_declaration,
                                expression_t *size = parse_constant_expression();
 
                                if (!is_type_integer(type)) {
-                                       errorf(HERE, "bitfield base type '%T' is not an "
-                                              "integer type", orig_type);
+                                       errorf(HERE, "bitfield base type '%T' is not an integer type",
+                                              orig_type);
                                }
 
                                type_t *bitfield_type = make_bitfield_type(orig_type, size, &source_position);
@@ -5332,8 +5550,8 @@ static void parse_compound_declarators(declaration_t *struct_declaration,
                                               "compound member '%Y' has incomplete type '%T'",
                                               declaration->symbol, orig_type);
                                } else if (is_type_function(type)) {
-                                       errorf(HERE, "compound member '%Y' must not have function "
-                                              "type '%T'", declaration->symbol, orig_type);
+                                       errorf(HERE, "compound member '%Y' must not have function type '%T'",
+                                              declaration->symbol, orig_type);
                                }
                        }
                }
@@ -5375,7 +5593,7 @@ static void parse_compound_type_entries(declaration_t *compound_declaration)
        eat('{');
        add_anchor_token('}');
 
-       while(token.type != '}' && token.type != T_EOF) {
+       while (token.type != '}' && token.type != T_EOF) {
                declaration_specifiers_t specifiers;
                memset(&specifiers, 0, sizeof(specifiers));
                parse_declaration_specifiers(&specifiers);
@@ -5456,7 +5674,7 @@ static expression_t *parse_string_const(void)
                        /* note: that we use type_char_ptr here, which is already the
                         * automatic converted type. revert_automatic_type_conversion
                         * will construct the array type */
-                       cnst->base.type    = type_char_ptr;
+                       cnst->base.type    = warning.write_strings ? type_const_char_ptr : type_char_ptr;
                        cnst->string.value = res;
                        return cnst;
                }
@@ -5479,7 +5697,7 @@ static expression_t *parse_string_const(void)
 
                        default: {
                                expression_t *const cnst = allocate_expression_zero(EXPR_WIDE_STRING_LITERAL);
-                               cnst->base.type         = type_wchar_t_ptr;
+                               cnst->base.type         = warning.write_strings ? type_const_wchar_t_ptr : type_wchar_t_ptr;
                                cnst->wide_string.value = wres;
                                return cnst;
                        }
@@ -5583,10 +5801,11 @@ static declaration_t *create_implicit_function(symbol_t *symbol,
        declaration->type                   = type;
        declaration->symbol                 = symbol;
        declaration->source_position        = *source_position;
+       declaration->implicit               = true;
 
        bool strict_prototypes_old = warning.strict_prototypes;
        warning.strict_prototypes  = false;
-       record_declaration(declaration);
+       record_declaration(declaration, false);
        warning.strict_prototypes = strict_prototypes_old;
 
        return declaration;
@@ -5720,7 +5939,10 @@ type_t *revert_automatic_type_conversion(const expression_t *expression)
 {
        switch (expression->kind) {
                case EXPR_REFERENCE: return expression->reference.declaration->type;
-               case EXPR_SELECT:    return expression->select.compound_entry->type;
+
+               case EXPR_SELECT:
+                       return get_qualified_type(expression->select.compound_entry->type,
+                                                 expression->base.type->base.qualifiers);
 
                case EXPR_UNARY_DEREFERENCE: {
                        const expression_t *const value = expression->unary.value;
@@ -5773,9 +5995,11 @@ static expression_t *parse_reference(void)
        next_token();
 
        if (declaration == NULL) {
-               if (! strict_mode && token.type == '(') {
-                       /* an implicitly defined function */
-                       if (warning.implicit_function_declaration) {
+               if (token.type == '(') {
+                       /* an implicitly declared function */
+                       if (strict_mode) {
+                               errorf(HERE, "unknown symbol '%Y' found.", symbol);
+                       } else if (warning.implicit_function_declaration) {
                                warningf(HERE, "implicit declaration of function '%Y'",
                                        symbol);
                        }
@@ -5784,11 +6008,11 @@ static expression_t *parse_reference(void)
                                                               &source_position);
                } else {
                        errorf(HERE, "unknown symbol '%Y' found.", symbol);
-                       return create_invalid_expression();
+                       declaration = create_error_declaration(symbol, STORAGE_CLASS_NONE);
                }
        }
 
-       type_t *type         = declaration->type;
+       type_t *type = declaration->type;
 
        /* we always do the auto-type conversions; the & and sizeof parser contains
         * code to revert this! */
@@ -5817,15 +6041,62 @@ static expression_t *parse_reference(void)
                                declaration->symbol, &declaration->source_position);
                }
        }
+       if (warning.init_self && declaration == current_init_decl) {
+               current_init_decl = NULL;
+               warningf(&source_position,
+                       "variable '%#T' is initialized by itself",
+                       declaration->type, declaration->symbol);
+       }
 
        return expression;
 }
 
-static void check_cast_allowed(expression_t *expression, type_t *dest_type)
+static bool semantic_cast(expression_t *cast)
 {
-       (void) expression;
-       (void) dest_type;
-       /* TODO check if explicit cast is allowed and issue warnings/errors */
+       expression_t            *expression      = cast->unary.value;
+       type_t                  *orig_dest_type  = cast->base.type;
+       type_t                  *orig_type_right = expression->base.type;
+       type_t            const *dst_type        = skip_typeref(orig_dest_type);
+       type_t            const *src_type        = skip_typeref(orig_type_right);
+       source_position_t const *pos             = &cast->base.source_position;
+
+       /* Â§6.5.4 A (void) cast is explicitly permitted, more for documentation than for utility. */
+       if (dst_type == type_void)
+               return true;
+
+       /* only integer and pointer can be casted to pointer */
+       if (is_type_pointer(dst_type)  &&
+           !is_type_pointer(src_type) &&
+           !is_type_integer(src_type) &&
+           is_type_valid(src_type)) {
+               errorf(pos, "cannot convert type '%T' to a pointer type", orig_type_right);
+               return false;
+       }
+
+       if (!is_type_scalar(dst_type) && is_type_valid(dst_type)) {
+               errorf(pos, "conversion to non-scalar type '%T' requested", orig_dest_type);
+               return false;
+       }
+
+       if (!is_type_scalar(src_type) && is_type_valid(src_type)) {
+               errorf(pos, "conversion from non-scalar type '%T' requested", orig_type_right);
+               return false;
+       }
+
+       if (warning.cast_qual &&
+           is_type_pointer(src_type) &&
+           is_type_pointer(dst_type)) {
+               type_t *src = skip_typeref(src_type->pointer.points_to);
+               type_t *dst = skip_typeref(dst_type->pointer.points_to);
+               unsigned missing_qualifiers =
+                       src->base.qualifiers & ~dst->base.qualifiers;
+               if (missing_qualifiers != 0) {
+                       warningf(pos,
+                                "cast discards qualifiers '%Q' in pointer target type of '%T'",
+                                missing_qualifiers, orig_type_right);
+               }
+       }
+       return true;
 }
 
 static expression_t *parse_compound_literal(type_t *type)
@@ -5867,12 +6138,13 @@ static expression_t *parse_cast(void)
        cast->base.source_position = source_position;
 
        expression_t *value = parse_sub_expression(20);
-
-       check_cast_allowed(value, type);
-
        cast->base.type   = type;
        cast->unary.value = value;
 
+       if (! semantic_cast(cast)) {
+               /* TODO: record the error in the AST. else it is impossible to detect it */
+       }
+
        return cast;
 end_error:
        return create_invalid_expression();
@@ -5912,9 +6184,9 @@ end_error:
 }
 
 /**
- * Parse a braced expression.
+ * Parse a parenthesized expression.
  */
-static expression_t *parse_brace_expression(void)
+static expression_t *parse_parenthesized_expression(void)
 {
        eat('(');
        add_anchor_token(')');
@@ -6400,7 +6672,7 @@ static expression_t *parse_primary_expression(void)
                case T___builtin_prefetch:       return parse_builtin_prefetch();
                case T__assume:                  return parse_assume();
 
-               case '(':                        return parse_brace_expression();
+               case '(':                        return parse_parenthesized_expression();
                case T___noop:                   return parse_noop_expression();
        }
 
@@ -6562,56 +6834,67 @@ static expression_t *parse_select_expression(unsigned precedence,
                parse_error_expected("while parsing select", T_IDENTIFIER, NULL);
                return select;
        }
-       symbol_t *symbol      = token.v.symbol;
-       select->select.symbol = symbol;
+       symbol_t *symbol = token.v.symbol;
        next_token();
 
        type_t *const orig_type = compound->base.type;
        type_t *const type      = skip_typeref(orig_type);
 
-       type_t *type_left = type;
-       if (is_pointer) {
-               if (!is_type_pointer(type)) {
-                       if (is_type_valid(type)) {
-                               errorf(HERE, "left hand side of '->' is not a pointer, but '%T'", orig_type);
-                       }
-                       return create_invalid_expression();
+       type_t *type_left;
+       bool    saw_error = false;
+       if (is_type_pointer(type)) {
+               if (!is_pointer) {
+                       errorf(HERE,
+                              "request for member '%Y' in something not a struct or union, but '%T'",
+                              symbol, orig_type);
+                       saw_error = true;
                }
-               type_left = type->pointer.points_to;
-       }
-       type_left = skip_typeref(type_left);
-
-       if (type_left->kind != TYPE_COMPOUND_STRUCT &&
-           type_left->kind != TYPE_COMPOUND_UNION) {
-               if (is_type_valid(type_left)) {
-                       errorf(HERE, "request for member '%Y' in something not a struct or "
-                              "union, but '%T'", symbol, type_left);
+               type_left = skip_typeref(type->pointer.points_to);
+       } else {
+               if (is_pointer && is_type_valid(type)) {
+                       errorf(HERE, "left hand side of '->' is not a pointer, but '%T'", orig_type);
+                       saw_error = true;
                }
-               return create_invalid_expression();
+               type_left = type;
        }
 
-       declaration_t *const declaration = type_left->compound.declaration;
+       declaration_t *entry;
+       if (type_left->kind == TYPE_COMPOUND_STRUCT ||
+           type_left->kind == TYPE_COMPOUND_UNION) {
+               declaration_t *const declaration = type_left->compound.declaration;
 
-       if (!declaration->init.complete) {
-               errorf(HERE, "request for member '%Y' of incomplete type '%T'",
-                      symbol, type_left);
-               return create_invalid_expression();
-       }
+               if (!declaration->init.complete) {
+                       errorf(HERE, "request for member '%Y' of incomplete type '%T'",
+                              symbol, type_left);
+                       return create_invalid_expression();
+               }
 
-       declaration_t *iter = find_compound_entry(declaration, symbol);
-       if (iter == NULL) {
-               errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol);
-               return create_invalid_expression();
+               entry = find_compound_entry(declaration, symbol);
+               if (entry == NULL) {
+                       errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol);
+                       goto create_error_entry;
+               }
+       } else {
+               if (is_type_valid(type_left) && !saw_error) {
+                       errorf(HERE,
+                              "request for member '%Y' in something not a struct or union, but '%T'",
+                              symbol, type_left);
+               }
+create_error_entry:
+               entry         = allocate_declaration_zero();
+               entry->symbol = symbol;
        }
 
+       select->select.compound_entry = entry;
+
+       type_t *const res_type =
+               get_qualified_type(entry->type, type_left->base.qualifiers);
+
        /* we always do the auto-type conversions; the & and sizeof parser contains
         * code to revert this! */
-       type_t *expression_type = automatic_type_conversion(iter->type);
-
-       select->select.compound_entry = iter;
-       select->base.type             = expression_type;
+       select->base.type = automatic_type_conversion(res_type);
 
-       type_t *skipped = skip_typeref(iter->type);
+       type_t *skipped = skip_typeref(res_type);
        if (skipped->kind == TYPE_BITFIELD) {
                select->base.type = skipped->bitfield.base_type;
        }
@@ -6620,12 +6903,13 @@ static expression_t *parse_select_expression(unsigned precedence,
 }
 
 static void check_call_argument(const function_parameter_t *parameter,
-                                call_argument_t *argument)
+                                call_argument_t *argument, unsigned pos)
 {
        type_t         *expected_type      = parameter->type;
        type_t         *expected_type_skip = skip_typeref(expected_type);
        assign_error_t  error              = ASSIGN_ERROR_INCOMPATIBLE;
        expression_t   *arg_expr           = argument->expression;
+       type_t         *arg_type           = skip_typeref(arg_expr->base.type);
 
        /* handle transparent union gnu extension */
        if (is_type_union(expected_type_skip)
@@ -6658,9 +6942,34 @@ static void check_call_argument(const function_parameter_t *parameter,
        argument->expression = create_implicit_cast(argument->expression,
                                                    expected_type);
 
-       /* TODO report exact scope in error messages (like "in 3rd parameter") */
-       report_assign_error(error, expected_type, arg_expr,     "function call",
-                           &arg_expr->base.source_position);
+       if (error != ASSIGN_SUCCESS) {
+               /* report exact scope in error messages (like "in argument 3") */
+               char buf[64];
+               snprintf(buf, sizeof(buf), "call argument %u", pos);
+               report_assign_error(error, expected_type, arg_expr,     buf,
+                                                       &arg_expr->base.source_position);
+       } else if (warning.traditional | warning.conversion) {
+               if (
+                   /* passing as integer instead of float or complex */
+                   (is_type_integer(expected_type) &&
+                    (is_type_float(arg_type) || is_type_complex(arg_type))) ||
+                   /* passing as complex instead of integer or float */
+                   (is_type_complex(expected_type) &&
+                    (is_type_integer(arg_type) || is_type_float(arg_type))) ||
+                   /* passing as float instead of integer or complex */
+                   (is_type_float(expected_type) &&
+                    (is_type_integer(arg_type) || is_type_complex(arg_type))) ||
+                   /* passing as float instead of double */
+                   (is_type_float(expected_type) && expected_type != type_double &&
+                    is_type_float(arg_type))) {
+                       warningf(&arg_expr->base.source_position,
+                               "passing call argument %u as '%T' rather than '%T' due to prototype",
+                               pos, expected_type, arg_type);
+               }
+               if (is_type_integer(expected_type) && is_type_integer(arg_type)) {
+                       /* TODO check for size HERE */
+               }
+       }
 }
 
 /**
@@ -6703,7 +7012,7 @@ static expression_t *parse_call_expression(unsigned precedence,
        if (token.type != ')') {
                call_argument_t *last_argument = NULL;
 
-               while(true) {
+               while (true) {
                        call_argument_t *argument = allocate_ast_zero(sizeof(argument[0]));
 
                        argument->expression = parse_assignment_expression();
@@ -6729,9 +7038,9 @@ static expression_t *parse_call_expression(unsigned precedence,
        function_parameter_t *parameter = function_type->parameters;
        call_argument_t      *argument  = call->arguments;
        if (!function_type->unspecified_parameters) {
-               for; parameter != NULL && argument != NULL;
+               for (unsigned pos = 0; parameter != NULL && argument != NULL;
                                parameter = parameter->next, argument = argument->next) {
-                       check_call_argument(parameter, argument);
+                       check_call_argument(parameter, argument, ++pos);
                }
 
                if (parameter != NULL) {
@@ -6753,6 +7062,12 @@ static expression_t *parse_call_expression(unsigned precedence,
 
        check_format(&result->call);
 
+       if (warning.aggregate_return &&
+           is_type_compound(skip_typeref(function_type->return_type))) {
+               warningf(&result->base.source_position,
+                        "function call has aggregate value");
+       }
+
        return result;
 end_error:
        return create_invalid_expression();
@@ -6776,13 +7091,14 @@ static bool same_compound_type(const type_t *type1, const type_t *type2)
 static expression_t *parse_conditional_expression(unsigned precedence,
                                                   expression_t *expression)
 {
-       eat('?');
-       add_anchor_token(':');
-
        expression_t *result = allocate_expression_zero(EXPR_CONDITIONAL);
 
        conditional_expression_t *conditional = &result->conditional;
-       conditional->condition = expression;
+       conditional->base.source_position = *HERE;
+       conditional->condition            = expression;
+
+       eat('?');
+       add_anchor_token(':');
 
        /* 6.5.15.2 */
        type_t *const condition_type_orig = expression->base.type;
@@ -6792,7 +7108,12 @@ static expression_t *parse_conditional_expression(unsigned precedence,
                           &expression->base.source_position, condition_type_orig);
        }
 
-       expression_t *true_expression = parse_expression();
+       expression_t *true_expression = expression;
+       bool          gnu_cond = false;
+       if ((c_mode & _GNUC) && token.type == ':') {
+               gnu_cond = true;
+       } else
+               true_expression = parse_expression();
        rem_anchor_token(':');
        expect(':');
        expression_t *false_expression = parse_sub_expression(precedence);
@@ -6808,7 +7129,7 @@ static expression_t *parse_conditional_expression(unsigned precedence,
                is_type_atomic(false_type, ATOMIC_TYPE_VOID)) {
                if (!is_type_atomic(true_type, ATOMIC_TYPE_VOID)
                    || !is_type_atomic(false_type, ATOMIC_TYPE_VOID)) {
-                       warningf(&expression->base.source_position,
+                       warningf(&conditional->base.source_position,
                                        "ISO C forbids conditional expression with only one void side");
                }
                result_type = type_void;
@@ -6854,22 +7175,17 @@ static expression_t *parse_conditional_expression(unsigned precedence,
                                                    get_unqualified_type(to2))) {
                                to = to1;
                        } else {
-                               warningf(&expression->base.source_position,
+                               warningf(&conditional->base.source_position,
                                        "pointer types '%T' and '%T' in conditional expression are incompatible",
                                        true_type, false_type);
                                to = type_void;
                        }
 
-                       type_t *const copy = duplicate_type(to);
-                       copy->base.qualifiers = to1->base.qualifiers | to2->base.qualifiers;
-
-                       type_t *const type = typehash_insert(copy);
-                       if (type != copy)
-                               free_type(copy);
-
+                       type_t *const type =
+                               get_qualified_type(to, to1->base.qualifiers | to2->base.qualifiers);
                        result_type = make_pointer_type(type, TYPE_QUALIFIER_NONE);
                } else if (is_type_integer(other_type)) {
-                       warningf(&expression->base.source_position,
+                       warningf(&conditional->base.source_position,
                                        "pointer/integer type mismatch in conditional expression ('%T' and '%T')", true_type, false_type);
                        result_type = pointer_type;
                } else {
@@ -6882,14 +7198,14 @@ static expression_t *parse_conditional_expression(unsigned precedence,
 
                if (is_type_valid(true_type) && is_type_valid(false_type)) {
                        type_error_incompatible("while parsing conditional",
-                                               &expression->base.source_position, true_type,
+                                               &conditional->base.source_position, true_type,
                                                false_type);
                }
                result_type = type_error_type;
        }
 
        conditional->true_expression
-               = create_implicit_cast(true_expression, result_type);
+               = gnu_cond ? NULL : create_implicit_cast(true_expression, result_type);
        conditional->false_expression
                = create_implicit_cast(false_expression, result_type);
        conditional->base.type = result_type;
@@ -6933,23 +7249,50 @@ end_error:
        return create_invalid_expression();
 }
 
-static void check_pointer_arithmetic(const source_position_t *source_position,
+static bool check_pointer_arithmetic(const source_position_t *source_position,
                                      type_t *pointer_type,
                                      type_t *orig_pointer_type)
 {
        type_t *points_to = pointer_type->pointer.points_to;
        points_to = skip_typeref(points_to);
 
-       if (is_type_incomplete(points_to) &&
-                       (! (c_mode & _GNUC)
-                        || !is_type_atomic(points_to, ATOMIC_TYPE_VOID))) {
-               errorf(source_position,
-                          "arithmetic with pointer to incomplete type '%T' not allowed",
-                          orig_pointer_type);
+       if (is_type_incomplete(points_to)) {
+               if (!(c_mode & _GNUC) || !is_type_atomic(points_to, ATOMIC_TYPE_VOID)) {
+                       errorf(source_position,
+                              "arithmetic with pointer to incomplete type '%T' not allowed",
+                              orig_pointer_type);
+                       return false;
+               } else if (warning.pointer_arith) {
+                       warningf(source_position,
+                                "pointer of type '%T' used in arithmetic",
+                                orig_pointer_type);
+               }
        } else if (is_type_function(points_to)) {
-               errorf(source_position,
-                          "arithmetic with pointer to function type '%T' not allowed",
-                          orig_pointer_type);
+               if (!(c_mode && _GNUC)) {
+                       errorf(source_position,
+                              "arithmetic with pointer to function type '%T' not allowed",
+                              orig_pointer_type);
+                       return false;
+               } else if (warning.pointer_arith) {
+                       warningf(source_position,
+                                "pointer to a function '%T' used in arithmetic",
+                                orig_pointer_type);
+               }
+       }
+       return true;
+}
+
+static bool is_lvalue(const expression_t *expression)
+{
+       switch (expression->kind) {
+       case EXPR_REFERENCE:
+       case EXPR_ARRAY_ACCESS:
+       case EXPR_SELECT:
+       case EXPR_UNARY_DEREFERENCE:
+               return true;
+
+       default:
+               return false;
        }
 }
 
@@ -6958,11 +7301,19 @@ static void semantic_incdec(unary_expression_t *expression)
        type_t *const orig_type = expression->value->base.type;
        type_t *const type      = skip_typeref(orig_type);
        if (is_type_pointer(type)) {
-               check_pointer_arithmetic(&expression->base.source_position,
-                                        type, orig_type);
+               if (!check_pointer_arithmetic(&expression->base.source_position,
+                                             type, orig_type)) {
+                       return;
+               }
        } else if (!is_type_real(type) && is_type_valid(type)) {
                /* TODO: improve error message */
-               errorf(HERE, "operation needs an arithmetic or pointer type");
+               errorf(&expression->base.source_position,
+                      "operation needs an arithmetic or pointer type");
+               return;
+       }
+       if (!is_lvalue(expression->value)) {
+               /* TODO: improve error message */
+               errorf(&expression->base.source_position, "lvalue required as operand");
        }
        expression->base.type = orig_type;
 }
@@ -6974,7 +7325,8 @@ static void semantic_unexpr_arithmetic(unary_expression_t *expression)
        if (!is_type_arithmetic(type)) {
                if (is_type_valid(type)) {
                        /* TODO: improve error message */
-                       errorf(HERE, "operation needs an arithmetic type");
+                       errorf(&expression->base.source_position,
+                               "operation needs an arithmetic type");
                }
                return;
        }
@@ -6982,18 +7334,24 @@ static void semantic_unexpr_arithmetic(unary_expression_t *expression)
        expression->base.type = orig_type;
 }
 
-static void semantic_unexpr_scalar(unary_expression_t *expression)
+static void semantic_unexpr_plus(unary_expression_t *expression)
+{
+       semantic_unexpr_arithmetic(expression);
+       if (warning.traditional)
+               warningf(&expression->base.source_position,
+                       "traditional C rejects the unary plus operator");
+}
+
+static void semantic_not(unary_expression_t *expression)
 {
        type_t *const orig_type = expression->value->base.type;
        type_t *const type      = skip_typeref(orig_type);
-       if (!is_type_scalar(type)) {
-               if (is_type_valid(type)) {
-                       errorf(HERE, "operand of ! must be of scalar type");
-               }
-               return;
+       if (!is_type_scalar(type) && is_type_valid(type)) {
+               errorf(&expression->base.source_position,
+                      "operand of ! must be of scalar type");
        }
 
-       expression->base.type = orig_type;
+       expression->base.type = type_int;
 }
 
 static void semantic_unexpr_integer(unary_expression_t *expression)
@@ -7002,7 +7360,8 @@ static void semantic_unexpr_integer(unary_expression_t *expression)
        type_t *const type      = skip_typeref(orig_type);
        if (!is_type_integer(type)) {
                if (is_type_valid(type)) {
-                       errorf(HERE, "operand of ~ must be of integer type");
+                       errorf(&expression->base.source_position,
+                              "operand of ~ must be of integer type");
                }
                return;
        }
@@ -7016,7 +7375,8 @@ static void semantic_dereference(unary_expression_t *expression)
        type_t *const type      = skip_typeref(orig_type);
        if (!is_type_pointer(type)) {
                if (is_type_valid(type)) {
-                       errorf(HERE, "Unary '*' needs pointer or arrray type, but type '%T' given", orig_type);
+                       errorf(&expression->base.source_position,
+                              "Unary '*' needs pointer or arrray type, but type '%T' given", orig_type);
                }
                return;
        }
@@ -7026,6 +7386,12 @@ static void semantic_dereference(unary_expression_t *expression)
        expression->base.type = result_type;
 }
 
+/**
+ * Record that an address is taken (expression represents an lvalue).
+ *
+ * @param expression       the expression
+ * @param may_be_register  if true, the expression might be an register
+ */
 static void set_address_taken(expression_t *expression, bool may_be_register)
 {
        if (expression->kind != EXPR_REFERENCE)
@@ -7065,11 +7431,10 @@ static void semantic_take_addr(unary_expression_t *expression)
 #define CREATE_UNARY_EXPRESSION_PARSER(token_type, unexpression_type, sfunc)   \
 static expression_t *parse_##unexpression_type(unsigned precedence)            \
 {                                                                              \
-       eat(token_type);                                                           \
-                                                                                  \
        expression_t *unary_expression                                             \
                = allocate_expression_zero(unexpression_type);                         \
        unary_expression->base.source_position = *HERE;                            \
+       eat(token_type);                                                           \
        unary_expression->unary.value = parse_sub_expression(precedence);          \
                                                                                   \
        sfunc(&unary_expression->unary);                                           \
@@ -7080,9 +7445,9 @@ static expression_t *parse_##unexpression_type(unsigned precedence)            \
 CREATE_UNARY_EXPRESSION_PARSER('-', EXPR_UNARY_NEGATE,
                                semantic_unexpr_arithmetic)
 CREATE_UNARY_EXPRESSION_PARSER('+', EXPR_UNARY_PLUS,
-                               semantic_unexpr_arithmetic)
+                               semantic_unexpr_plus)
 CREATE_UNARY_EXPRESSION_PARSER('!', EXPR_UNARY_NOT,
-                               semantic_unexpr_scalar)
+                               semantic_not)
 CREATE_UNARY_EXPRESSION_PARSER('*', EXPR_UNARY_DEREFERENCE,
                                semantic_dereference)
 CREATE_UNARY_EXPRESSION_PARSER('&', EXPR_UNARY_TAKE_ADDRESS,
@@ -7100,11 +7465,12 @@ static expression_t *parse_##unexpression_type(unsigned precedence,           \
                                                expression_t *left)            \
 {                                                                             \
        (void) precedence;                                                        \
-       eat(token_type);                                                          \
                                                                               \
        expression_t *unary_expression                                            \
                = allocate_expression_zero(unexpression_type);                        \
-       unary_expression->unary.value = left;                                     \
+       unary_expression->base.source_position = *HERE;                           \
+       eat(token_type);                                                          \
+       unary_expression->unary.value          = left;                            \
                                                                                  \
        sfunc(&unary_expression->unary);                                          \
                                                                               \
@@ -7139,8 +7505,8 @@ static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right)
 
        bool const signed_left  = is_type_signed(type_left);
        bool const signed_right = is_type_signed(type_right);
-       int  const rank_left    = get_rank(type_left);
-       int  const rank_right   = get_rank(type_right);
+       int const  rank_left    = get_rank(type_left);
+       int const  rank_right   = get_rank(type_right);
 
        if (signed_left == signed_right)
                return rank_left >= rank_right ? type_left : type_right;
@@ -7164,24 +7530,19 @@ static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right)
        if (u_rank >= s_rank)
                return u_type;
 
-       if (get_atomic_type_size(s_rank) > get_atomic_type_size(u_rank))
+       /* casting rank to atomic_type_kind is a bit hacky, but makes things
+        * easier here... */
+       if (get_atomic_type_size((atomic_type_kind_t) s_rank)
+                       > get_atomic_type_size((atomic_type_kind_t) u_rank))
                return s_type;
 
-       /* FIXME ugly */
-       type_t *const type = allocate_type_zero(TYPE_ATOMIC, &builtin_source_position);
        switch (s_rank) {
-               case ATOMIC_TYPE_INT:      type->atomic.akind = ATOMIC_TYPE_UINT;      break;
-               case ATOMIC_TYPE_LONG:     type->atomic.akind = ATOMIC_TYPE_ULONG;     break;
-               case ATOMIC_TYPE_LONGLONG: type->atomic.akind = ATOMIC_TYPE_ULONGLONG; break;
+               case ATOMIC_TYPE_INT:      return type_unsigned_int;
+               case ATOMIC_TYPE_LONG:     return type_unsigned_long;
+               case ATOMIC_TYPE_LONGLONG: return type_unsigned_long_long;
 
                default: panic("invalid atomic type");
        }
-
-       type_t* const result = typehash_insert(type);
-       if (result != type)
-               free_type(type);
-
-       return result;
 }
 
 /**
@@ -7199,7 +7560,8 @@ static void semantic_binexpr_arithmetic(binary_expression_t *expression)
        if (!is_type_arithmetic(type_left) || !is_type_arithmetic(type_right)) {
                /* TODO: improve error message */
                if (is_type_valid(type_left) && is_type_valid(type_right)) {
-                       errorf(HERE, "operation needs arithmetic types");
+                       errorf(&expression->base.source_position,
+                              "operation needs arithmetic types");
                }
                return;
        }
@@ -7210,6 +7572,24 @@ static void semantic_binexpr_arithmetic(binary_expression_t *expression)
        expression->base.type = arithmetic_type;
 }
 
+static void warn_div_by_zero(binary_expression_t const *const expression)
+{
+       if (warning.div_by_zero                       &&
+           is_type_integer(expression->base.type)    &&
+           is_constant_expression(expression->right) &&
+           fold_constant(expression->right) == 0) {
+               warningf(&expression->base.source_position, "division by zero");
+       }
+}
+
+/**
+ * Check the semantic restrictions for a div/mod expression.
+ */
+static void semantic_divmod_arithmetic(binary_expression_t *expression) {
+       semantic_binexpr_arithmetic(expression);
+       warn_div_by_zero(expression);
+}
+
 static void semantic_shift_op(binary_expression_t *expression)
 {
        expression_t *const left            = expression->left;
@@ -7222,7 +7602,8 @@ static void semantic_shift_op(binary_expression_t *expression)
        if (!is_type_integer(type_left) || !is_type_integer(type_right)) {
                /* TODO: improve error message */
                if (is_type_valid(type_left) && is_type_valid(type_right)) {
-                       errorf(HERE, "operation needs integer types");
+                       errorf(&expression->base.source_position,
+                              "operands of shift operation must have integer types");
                }
                return;
        }
@@ -7268,12 +7649,13 @@ static void semantic_add(binary_expression_t *expression)
 
 static void semantic_sub(binary_expression_t *expression)
 {
-       expression_t *const left            = expression->left;
-       expression_t *const right           = expression->right;
-       type_t       *const orig_type_left  = left->base.type;
-       type_t       *const orig_type_right = right->base.type;
-       type_t       *const type_left       = skip_typeref(orig_type_left);
-       type_t       *const type_right      = skip_typeref(orig_type_right);
+       expression_t            *const left            = expression->left;
+       expression_t            *const right           = expression->right;
+       type_t                  *const orig_type_left  = left->base.type;
+       type_t                  *const orig_type_right = right->base.type;
+       type_t                  *const type_left       = skip_typeref(orig_type_left);
+       type_t                  *const type_right      = skip_typeref(orig_type_right);
+       source_position_t const *const pos             = &expression->base.source_position;
 
        /* Â§ 5.6.5 */
        if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
@@ -7290,22 +7672,20 @@ static void semantic_sub(binary_expression_t *expression)
                type_t *const unqual_left  = get_unqualified_type(skip_typeref(type_left->pointer.points_to));
                type_t *const unqual_right = get_unqualified_type(skip_typeref(type_right->pointer.points_to));
                if (!types_compatible(unqual_left, unqual_right)) {
-                       errorf(&expression->base.source_position,
+                       errorf(pos,
                               "subtracting pointers to incompatible types '%T' and '%T'",
                               orig_type_left, orig_type_right);
                } else if (!is_type_object(unqual_left)) {
                        if (is_type_atomic(unqual_left, ATOMIC_TYPE_VOID)) {
-                               warningf(&expression->base.source_position,
-                                        "subtracting pointers to void");
+                               warningf(pos, "subtracting pointers to void");
                        } else {
-                               errorf(&expression->base.source_position,
-                                      "subtracting pointers to non-object types '%T'",
+                               errorf(pos, "subtracting pointers to non-object types '%T'",
                                       orig_type_left);
                        }
                }
                expression->base.type = type_ptrdiff_t;
        } else if (is_type_valid(type_left) && is_type_valid(type_right)) {
-               errorf(HERE, "invalid operands of types '%T' and '%T' to binary '-'",
+               errorf(pos, "invalid operands of types '%T' and '%T' to binary '-'",
                       orig_type_left, orig_type_right);
        }
 }
@@ -7402,20 +7782,6 @@ static bool has_const_fields(const compound_type_t *type)
        return false;
 }
 
-static bool is_lvalue(const expression_t *expression)
-{
-       switch (expression->kind) {
-       case EXPR_REFERENCE:
-       case EXPR_ARRAY_ACCESS:
-       case EXPR_SELECT:
-       case EXPR_UNARY_DEREFERENCE:
-               return true;
-
-       default:
-               return false;
-       }
-}
-
 static bool is_valid_assignment_lhs(expression_t const* const left)
 {
        type_t *const orig_type_left = revert_automatic_type_conversion(left);
@@ -7466,7 +7832,8 @@ static void semantic_arithmetic_assign(binary_expression_t *expression)
        if (!is_type_arithmetic(type_left) || !is_type_arithmetic(type_right)) {
                /* TODO: improve error message */
                if (is_type_valid(type_left) && is_type_valid(type_right)) {
-                       errorf(HERE, "operation needs arithmetic types");
+                       errorf(&expression->base.source_position,
+                              "operation needs arithmetic types");
                }
                return;
        }
@@ -7480,6 +7847,12 @@ static void semantic_arithmetic_assign(binary_expression_t *expression)
        expression->base.type   = type_left;
 }
 
+static void semantic_divmod_assign(binary_expression_t *expression)
+{
+       semantic_arithmetic_assign(expression);
+       warn_div_by_zero(expression);
+}
+
 static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression)
 {
        expression_t *const left            = expression->left;
@@ -7505,7 +7878,9 @@ static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression)
                                         type_left, orig_type_left);
                expression->base.type = type_left;
        } else if (is_type_valid(type_left) && is_type_valid(type_right)) {
-               errorf(HERE, "incompatible types '%T' and '%T' in assignment", orig_type_left, orig_type_right);
+               errorf(&expression->base.source_position,
+                      "incompatible types '%T' and '%T' in assignment",
+                      orig_type_left, orig_type_right);
        }
 }
 
@@ -7524,7 +7899,8 @@ static void semantic_logical_op(binary_expression_t *expression)
        if (!is_type_scalar(type_left) || !is_type_scalar(type_right)) {
                /* TODO: improve error message */
                if (is_type_valid(type_left) && is_type_valid(type_right)) {
-                       errorf(HERE, "operation needs scalar types");
+                       errorf(&expression->base.source_position,
+                              "operation needs scalar types");
                }
                return;
        }
@@ -7540,9 +7916,6 @@ static void semantic_binexpr_assign(binary_expression_t *expression)
        expression_t *left           = expression->left;
        type_t       *orig_type_left = left->base.type;
 
-       type_t *type_left = revert_automatic_type_conversion(left);
-       type_left         = skip_typeref(orig_type_left);
-
        if (!is_valid_assignment_lhs(left))
                return;
 
@@ -7701,14 +8074,13 @@ static void semantic_comma(binary_expression_t *expression)
 static expression_t *parse_##binexpression_type(unsigned precedence,      \
                                                 expression_t *left)       \
 {                                                                         \
+       expression_t *binexpr = allocate_expression_zero(binexpression_type); \
+       binexpr->base.source_position = *HERE;                                \
+       binexpr->binary.left          = left;                                 \
        eat(token_type);                                                      \
-       source_position_t pos = *HERE;                                        \
                                                                           \
        expression_t *right = parse_sub_expression(precedence + lr);          \
                                                                           \
-       expression_t *binexpr = allocate_expression_zero(binexpression_type); \
-       binexpr->base.source_position = pos;                                  \
-       binexpr->binary.left  = left;                                         \
        binexpr->binary.right = right;                                        \
        sfunc(&binexpr->binary);                                              \
                                                                           \
@@ -7717,8 +8089,8 @@ static expression_t *parse_##binexpression_type(unsigned precedence,      \
 
 CREATE_BINEXPR_PARSER(',', EXPR_BINARY_COMMA,    semantic_comma, 1)
 CREATE_BINEXPR_PARSER('*', EXPR_BINARY_MUL,      semantic_binexpr_arithmetic, 1)
-CREATE_BINEXPR_PARSER('/', EXPR_BINARY_DIV,      semantic_binexpr_arithmetic, 1)
-CREATE_BINEXPR_PARSER('%', EXPR_BINARY_MOD,      semantic_binexpr_arithmetic, 1)
+CREATE_BINEXPR_PARSER('/', EXPR_BINARY_DIV,      semantic_divmod_arithmetic, 1)
+CREATE_BINEXPR_PARSER('%', EXPR_BINARY_MOD,      semantic_divmod_arithmetic, 1)
 CREATE_BINEXPR_PARSER('+', EXPR_BINARY_ADD,      semantic_add, 1)
 CREATE_BINEXPR_PARSER('-', EXPR_BINARY_SUB,      semantic_sub, 1)
 CREATE_BINEXPR_PARSER('<', EXPR_BINARY_LESS,     semantic_comparison, 1)
@@ -7755,9 +8127,9 @@ CREATE_BINEXPR_PARSER(T_MINUSEQUAL, EXPR_BINARY_SUB_ASSIGN,
 CREATE_BINEXPR_PARSER(T_ASTERISKEQUAL, EXPR_BINARY_MUL_ASSIGN,
                       semantic_arithmetic_assign, 0)
 CREATE_BINEXPR_PARSER(T_SLASHEQUAL, EXPR_BINARY_DIV_ASSIGN,
-                      semantic_arithmetic_assign, 0)
+                      semantic_divmod_assign, 0)
 CREATE_BINEXPR_PARSER(T_PERCENTEQUAL, EXPR_BINARY_MOD_ASSIGN,
-                      semantic_arithmetic_assign, 0)
+                      semantic_divmod_assign, 0)
 CREATE_BINEXPR_PARSER(T_LESSLESSEQUAL, EXPR_BINARY_SHIFTLEFT_ASSIGN,
                       semantic_arithmetic_assign, 0)
 CREATE_BINEXPR_PARSER(T_GREATERGREATEREQUAL, EXPR_BINARY_SHIFTRIGHT_ASSIGN,
@@ -8131,34 +8503,54 @@ static statement_t *parse_case_statement(void)
 
        *pos                             = token.source_position;
        statement->case_label.expression = parse_expression();
-
-       PUSH_PARENT(statement);
+       if (! is_constant_expression(statement->case_label.expression)) {
+               errorf(pos, "case label does not reduce to an integer constant");
+               statement->case_label.is_bad = true;
+       } else {
+               long const val = fold_constant(statement->case_label.expression);
+               statement->case_label.first_case = val;
+               statement->case_label.last_case  = val;
+       }
 
        if (c_mode & _GNUC) {
                if (token.type == T_DOTDOTDOT) {
                        next_token();
                        statement->case_label.end_range = parse_expression();
+                       if (! is_constant_expression(statement->case_label.end_range)) {
+                               errorf(pos, "case range does not reduce to an integer constant");
+                               statement->case_label.is_bad = true;
+                       } else {
+                               long const val = fold_constant(statement->case_label.end_range);
+                               statement->case_label.last_case = val;
+
+                               if (val < statement->case_label.first_case) {
+                                       statement->case_label.is_empty = true;
+                                       warningf(pos, "empty range specified");
+                               }
+                       }
                }
        }
 
+       PUSH_PARENT(statement);
+
        expect(':');
 
-       if (! is_constant_expression(statement->case_label.expression)) {
-               errorf(pos, "case label does not reduce to an integer constant");
-       } else if (current_switch != NULL) {
-               /* Check for duplicate case values */
-               /* FIXME slow */
-               long const val = fold_constant(statement->case_label.expression);
-               for (case_label_statement_t *l = current_switch->first_case; l != NULL; l = l->next) {
-                       expression_t const* const e = l->expression;
-                       if (e == NULL || !is_constant_expression(e) || fold_constant(e) != val)
-                               continue;
+       if (current_switch != NULL) {
+               if (! statement->case_label.is_bad) {
+                       /* Check for duplicate case values */
+                       case_label_statement_t *c = &statement->case_label;
+                       for (case_label_statement_t *l = current_switch->first_case; l != NULL; l = l->next) {
+                               if (l->is_bad || l->is_empty || l->expression == NULL)
+                                       continue;
 
-                       errorf(pos, "duplicate case value");
-                       errorf(&l->base.source_position, "previously used here");
-                       break;
-               }
+                               if (c->last_case < l->first_case || c->first_case > l->last_case)
+                                       continue;
 
+                               errorf(pos, "duplicate case value (previously used %P)",
+                                      &l->base.source_position);
+                               break;
+                       }
+               }
                /* link all cases into the switch statement */
                if (current_switch->last_case == NULL) {
                        current_switch->first_case      = &statement->case_label;
@@ -8183,20 +8575,6 @@ end_error:
        return create_invalid_statement();
 }
 
-/**
- * Finds an existing default label of a switch statement.
- */
-static case_label_statement_t *
-find_default_label(const switch_statement_t *statement)
-{
-       case_label_statement_t *label = statement->first_case;
-       for ( ; label != NULL; label = label->next) {
-               if (label->expression == NULL)
-                       return label;
-       }
-       return NULL;
-}
-
 /**
  * Parse a default statement.
  */
@@ -8211,11 +8589,13 @@ static statement_t *parse_default_statement(void)
 
        expect(':');
        if (current_switch != NULL) {
-               const case_label_statement_t *def_label = find_default_label(current_switch);
+               const case_label_statement_t *def_label = current_switch->default_label;
                if (def_label != NULL) {
                        errorf(HERE, "multiple default labels in one switch (previous declared %P)",
                               &def_label->base.source_position);
                } else {
+                       current_switch->default_label = &statement->case_label;
+
                        /* link all cases into the switch statement */
                        if (current_switch->last_case == NULL) {
                                current_switch->first_case      = &statement->case_label;
@@ -8366,6 +8746,46 @@ end_error:
        return create_invalid_statement();
 }
 
+/**
+ * Check that all enums are handled in a switch.
+ *
+ * @param statement  the switch statement to check
+ */
+static void check_enum_cases(const switch_statement_t *statement) {
+       const type_t *type = skip_typeref(statement->expression->base.type);
+       if (! is_type_enum(type))
+               return;
+       const enum_type_t *enumt = &type->enumt;
+
+       /* if we have a default, no warnings */
+       if (statement->default_label != NULL)
+               return;
+
+       /* FIXME: calculation of value should be done while parsing */
+       const declaration_t *declaration;
+       long last_value = -1;
+       for (declaration = enumt->declaration->next;
+            declaration != NULL && declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY;
+                declaration = declaration->next) {
+               const expression_t *expression = declaration->init.enum_value;
+               long                value      = expression != NULL ? fold_constant(expression) : last_value + 1;
+               bool                found      = false;
+               for (const case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) {
+                       if (l->expression == NULL)
+                               continue;
+                       if (l->first_case <= value && value <= l->last_case) {
+                               found = true;
+                               break;
+                       }
+               }
+               if (! found) {
+                       warningf(&statement->base.source_position,
+                               "enumeration value '%Y' not handled in switch", declaration->symbol);
+               }
+               last_value = value;
+       }
+}
+
 /**
  * Parse a switch statement.
  */
@@ -8379,10 +8799,18 @@ static statement_t *parse_switch(void)
        PUSH_PARENT(statement);
 
        expect('(');
+       add_anchor_token(')');
        expression_t *const expr = parse_expression();
        type_t       *      type = skip_typeref(expr->base.type);
        if (is_type_integer(type)) {
                type = promote_integer(type);
+               if (warning.traditional) {
+                       if (get_rank(type) >= get_akind_rank(ATOMIC_TYPE_LONG)) {
+                               warningf(&expr->base.source_position,
+                                       "'%T' switch expression not converted to '%T' in ISO C",
+                                       type, type_int);
+                       }
+               }
        } else if (is_type_valid(type)) {
                errorf(&expr->base.source_position,
                       "switch quantity is not an integer, but '%T'", type);
@@ -8390,6 +8818,7 @@ static statement_t *parse_switch(void)
        }
        statement->switchs.expression = create_implicit_cast(expr, type);
        expect(')');
+       rem_anchor_token(')');
 
        switch_statement_t *rem = current_switch;
        current_switch          = &statement->switchs;
@@ -8397,9 +8826,11 @@ static statement_t *parse_switch(void)
        current_switch          = rem;
 
        if (warning.switch_default &&
-          find_default_label(&statement->switchs) == NULL) {
+           statement->switchs.default_label == NULL) {
                warningf(&statement->base.source_position, "switch has no default case");
        }
+       if (warning.switch_enum)
+               check_enum_cases(&statement->switchs);
 
        POP_PARENT;
        return statement;
@@ -8591,22 +9022,18 @@ end_error:
  */
 static statement_t *parse_continue(void)
 {
-       statement_t *statement;
        if (current_loop == NULL) {
                errorf(HERE, "continue statement not within loop");
-               statement = create_invalid_statement();
-       } else {
-               statement = allocate_statement_zero(STATEMENT_CONTINUE);
-
-               statement->base.source_position = token.source_position;
        }
 
+       statement_t *statement = allocate_statement_zero(STATEMENT_CONTINUE);
+       statement->base.source_position = token.source_position;
+
        eat(T_continue);
        expect(';');
 
-       return statement;
 end_error:
-       return create_invalid_statement();
+       return statement;
 }
 
 /**
@@ -8614,22 +9041,18 @@ end_error:
  */
 static statement_t *parse_break(void)
 {
-       statement_t *statement;
        if (current_switch == NULL && current_loop == NULL) {
                errorf(HERE, "break statement not within loop or switch");
-               statement = create_invalid_statement();
-       } else {
-               statement = allocate_statement_zero(STATEMENT_BREAK);
-
-               statement->base.source_position = token.source_position;
        }
 
+       statement_t *statement = allocate_statement_zero(STATEMENT_BREAK);
+       statement->base.source_position = token.source_position;
+
        eat(T_break);
        expect(';');
 
-       return statement;
 end_error:
-       return create_invalid_statement();
+       return statement;
 }
 
 /**
@@ -8637,22 +9060,18 @@ end_error:
  */
 static statement_t *parse_leave(void)
 {
-       statement_t *statement;
        if (current_try == NULL) {
                errorf(HERE, "__leave statement not within __try");
-               statement = create_invalid_statement();
-       } else {
-               statement = allocate_statement_zero(STATEMENT_LEAVE);
-
-               statement->base.source_position = token.source_position;
        }
 
+       statement_t *statement = allocate_statement_zero(STATEMENT_LEAVE);
+       statement->base.source_position = token.source_position;
+
        eat(T___leave);
        expect(';');
 
-       return statement;
 end_error:
-       return create_invalid_statement();
+       return statement;
 }
 
 /**
@@ -8728,7 +9147,6 @@ static statement_t *parse_return(void)
        if (token.type != ';') {
                return_value = parse_expression();
        }
-       expect(';');
 
        const type_t *const func_type = current_function->type;
        assert(is_type_function(func_type));
@@ -8765,9 +9183,10 @@ static statement_t *parse_return(void)
        }
        statement->returns.value = return_value;
 
-       return statement;
+       expect(';');
+
 end_error:
-       return create_invalid_statement();
+       return statement;
 }
 
 /**
@@ -8805,9 +9224,8 @@ static statement_t *parse_expression_statement(void)
 
        expect(';');
 
-       return statement;
 end_error:
-       return create_invalid_statement();
+       return statement;
 }
 
 /**
@@ -8817,15 +9235,18 @@ end_error:
 static statement_t *parse_ms_try_statment(void)
 {
        statement_t *statement = allocate_statement_zero(STATEMENT_MS_TRY);
-
        statement->base.source_position  = token.source_position;
        eat(T___try);
 
+       PUSH_PARENT(statement);
+
        ms_try_statement_t *rem = current_try;
        current_try = &statement->ms_try;
        statement->ms_try.try_statement = parse_compound_statement(false);
        current_try = rem;
 
+       POP_PARENT;
+
        if (token.type == T___except) {
                eat(T___except);
                expect('(');
@@ -8860,8 +9281,9 @@ static statement_t *parse_empty_statement(void)
        if (warning.empty_statement) {
                warningf(HERE, "statement is empty");
        }
+       statement_t *const statement = create_empty_statement();
        eat(';');
-       return create_empty_statement();
+       return statement;
 }
 
 /**
@@ -8876,15 +9298,25 @@ static statement_t *intern_parse_statement(void)
        /* declaration or statement */
        add_anchor_token(';');
        switch (token.type) {
-       case T_IDENTIFIER:
-               if (look_ahead(1)->type == ':') {
+       case T_IDENTIFIER: {
+               token_type_t la1_type = (token_type_t)look_ahead(1)->type;
+               if (la1_type == ':') {
                        statement = parse_label_statement();
                } else if (is_typedef_symbol(token.v.symbol)) {
                        statement = parse_declaration_statement();
-               } else {
-                       statement = parse_expression_statement();
+               } else switch (la1_type) {
+                       DECLARATION_START
+                       case T_IDENTIFIER:
+                       case '*':
+                               statement = parse_declaration_statement();
+                               break;
+
+                       default:
+                               statement = parse_expression_statement();
+                               break;
                }
                break;
+       }
 
        case T___extension__:
                /* This can be a prefix to a declaration or an expression statement.
@@ -8963,9 +9395,8 @@ static statement_t *parse_compound_statement(bool inside_expression_statement)
        scope_t *last_scope = scope;
        set_scope(&statement->compound.scope);
 
-       statement_t *last_statement = NULL;
-
-       bool only_decls_so_far = true;
+       statement_t **anchor            = &statement->compound.statements;
+       bool          only_decls_so_far = true;
        while (token.type != '}' && token.type != T_EOF) {
                statement_t *sub_statement = intern_parse_statement();
                if (is_invalid_statement(sub_statement)) {
@@ -8984,16 +9415,12 @@ static statement_t *parse_compound_statement(bool inside_expression_statement)
                        }
                }
 
-               if (last_statement != NULL) {
-                       last_statement->base.next = sub_statement;
-               } else {
-                       statement->compound.statements = sub_statement;
-               }
+               *anchor = sub_statement;
 
                while (sub_statement->base.next != NULL)
                        sub_statement = sub_statement->base.next;
 
-               last_statement = sub_statement;
+               anchor = &sub_statement->base.next;
        }
 
        if (token.type == '}') {
@@ -9043,13 +9470,20 @@ static void initialize_builtin_types(void)
        type_ptrdiff_t   = make_global_typedef("__PTRDIFF_TYPE__",  type_long);
        type_uintmax_t   = make_global_typedef("__uintmax_t__",     type_unsigned_long_long);
        type_uptrdiff_t  = make_global_typedef("__UPTRDIFF_TYPE__", type_unsigned_long);
-       type_wchar_t     = make_global_typedef("__WCHAR_TYPE__",    type_int);
+       type_wchar_t     = make_global_typedef("__WCHAR_TYPE__",    opt_short_wchar_t ? type_unsigned_short : type_int);
        type_wint_t      = make_global_typedef("__WINT_TYPE__",     type_int);
 
        type_intmax_t_ptr  = make_pointer_type(type_intmax_t,  TYPE_QUALIFIER_NONE);
        type_ptrdiff_t_ptr = make_pointer_type(type_ptrdiff_t, TYPE_QUALIFIER_NONE);
        type_ssize_t_ptr   = make_pointer_type(type_ssize_t,   TYPE_QUALIFIER_NONE);
        type_wchar_t_ptr   = make_pointer_type(type_wchar_t,   TYPE_QUALIFIER_NONE);
+
+       /* const version of wchar_t */
+       type_const_wchar_t = allocate_type_zero(TYPE_TYPEDEF, &builtin_source_position);
+       type_const_wchar_t->typedeft.declaration  = type_wchar_t->typedeft.declaration;
+       type_const_wchar_t->base.qualifiers      |= TYPE_QUALIFIER_CONST;
+
+       type_const_wchar_t_ptr = make_pointer_type(type_const_wchar_t, TYPE_QUALIFIER_NONE);
 }
 
 /**