fixed crash with unclosed string literal
[cparser] / parser.c
index 3c37a9c..1550ee7 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -13,6 +13,7 @@
 #include "type_t.h"
 #include "type_hash.h"
 #include "ast_t.h"
+#include "lang_features.h"
 #include "adt/bitfiddle.h"
 #include "adt/error.h"
 #include "adt/array.h"
@@ -20,7 +21,6 @@
 //#define PRINT_TOKENS
 //#define ABORT_ON_ERROR
 #define MAX_LOOKAHEAD 2
-//#define STRICT_C99
 
 typedef struct {
        declaration_t *old_declaration;
@@ -39,17 +39,22 @@ struct declaration_specifiers_t {
 
 typedef declaration_t* (*parsed_declaration_func) (declaration_t *declaration);
 
-static token_t         token;
-static token_t         lookahead_buffer[MAX_LOOKAHEAD];
-static int             lookahead_bufpos;
-static stack_entry_t  *environment_stack = NULL;
-static stack_entry_t  *label_stack       = NULL;
-static context_t      *global_context    = NULL;
-static context_t      *context           = NULL;
-static declaration_t  *last_declaration  = NULL;
-static declaration_t  *current_function  = NULL;
+static token_t             token;
+static token_t             lookahead_buffer[MAX_LOOKAHEAD];
+static int                 lookahead_bufpos;
+static stack_entry_t      *environment_stack = NULL;
+static stack_entry_t      *label_stack       = NULL;
+static context_t          *global_context    = NULL;
+static context_t          *context           = NULL;
+static declaration_t      *last_declaration  = NULL;
+static declaration_t      *current_function  = NULL;
+static switch_statement_t *current_switch    = NULL;
+static statement_t        *current_loop      = NULL;
+static goto_statement_t   *goto_first        = NULL;
+static goto_statement_t   *goto_last         = NULL;
 static struct obstack  temp_obst;
 
+/** The current source position. */
 #define HERE token.source_position
 
 static type_t *type_valist;
@@ -131,6 +136,11 @@ static void *allocate_ast_zero(size_t size)
        return res;
 }
 
+static declaration_t *allocate_declaration_zero(void)
+{
+       return allocate_ast_zero(sizeof(*allocate_declaration_zero()));
+}
+
 /**
  * Returns the size of a statement node.
  *
@@ -237,6 +247,7 @@ static size_t get_type_struct_size(type_kind_t kind)
 {
        static const size_t sizes[] = {
                [TYPE_ATOMIC]          = sizeof(atomic_type_t),
+               [TYPE_BITFIELD]        = sizeof(bitfield_type_t),
                [TYPE_COMPOUND_STRUCT] = sizeof(compound_type_t),
                [TYPE_COMPOUND_UNION]  = sizeof(compound_type_t),
                [TYPE_ENUM]            = sizeof(enum_type_t),
@@ -485,30 +496,11 @@ static void set_context(context_t *new_context)
        }
 }
 
-/**
- * Called when we find a 2nd declarator for an identifier we already have a
- * declarator for.
- */
-static bool is_compatible_declaration(declaration_t *declaration,
-                                      declaration_t *previous)
-{
-       /* happens for K&R style function parameters */
-       if(previous->type == NULL) {
-               previous->type = declaration->type;
-               return true;
-       }
-
-       type_t *type1 = skip_typeref(declaration->type);
-       type_t *type2 = skip_typeref(previous->type);
-
-       return types_compatible(type1, type2);
-}
-
 /**
  * Search a symbol in a given namespace and returns its declaration or
  * NULL if this symbol was not found.
  */
-static declaration_t *get_declaration(symbol_t *symbol, namespace_t namespc)
+static declaration_t *get_declaration(const symbol_t *const symbol, const namespace_t namespc)
 {
        declaration_t *declaration = symbol->declaration;
        for( ; declaration != NULL; declaration = declaration->symbol_next) {
@@ -519,86 +511,15 @@ static declaration_t *get_declaration(symbol_t *symbol, namespace_t namespc)
        return NULL;
 }
 
-/**
- * Return the "prefix" of a given namespace.
- */
-static const char *get_namespace_prefix(namespace_t namespc)
-{
-       switch(namespc) {
-       case NAMESPACE_NORMAL:
-               return "";
-       case NAMESPACE_UNION:
-               return "union ";
-       case NAMESPACE_STRUCT:
-               return "struct ";
-       case NAMESPACE_ENUM:
-               return "enum ";
-       case NAMESPACE_LABEL:
-               return "label ";
-       }
-       panic("invalid namespace found");
-}
-
 /**
  * pushs an environment_entry on the environment stack and links the
  * corresponding symbol to the new entry
  */
-static declaration_t *stack_push(stack_entry_t **stack_ptr,
-                                 declaration_t *declaration,
-                                 context_t *parent_context)
+static void stack_push(stack_entry_t **stack_ptr, declaration_t *declaration)
 {
        symbol_t    *symbol    = declaration->symbol;
        namespace_t  namespc = (namespace_t)declaration->namespc;
 
-       /* a declaration should be only pushed once */
-       declaration->parent_context = parent_context;
-
-       declaration_t *previous_declaration = get_declaration(symbol, namespc);
-       assert(declaration != previous_declaration);
-       if(previous_declaration != NULL
-                       && previous_declaration->parent_context == context) {
-               if(!is_compatible_declaration(declaration, previous_declaration)) {
-                       errorf(declaration->source_position, "definition of symbol '%s%s' with type '%T'", get_namespace_prefix(namespc), symbol->string, declaration->type);
-                       errorf(previous_declaration->source_position, "is incompatible with previous declaration of type '%T'", previous_declaration->type);
-               } else {
-                       unsigned  old_storage_class = previous_declaration->storage_class;
-                       unsigned  new_storage_class = declaration->storage_class;
-                       type_t   *type              = previous_declaration->type;
-                       type = skip_typeref(type);
-
-                       if (current_function == NULL) {
-                               if (old_storage_class != STORAGE_CLASS_STATIC &&
-                                   new_storage_class == STORAGE_CLASS_STATIC) {
-                                       errorf(declaration->source_position, "static declaration of '%s' follows non-static declaration", symbol->string);
-                                       errorf(previous_declaration->source_position, "previous declaration of '%s' was here\n", symbol->string);
-                               } else {
-                                       if (old_storage_class == STORAGE_CLASS_EXTERN) {
-                                               if (new_storage_class == STORAGE_CLASS_NONE) {
-                                                       previous_declaration->storage_class = STORAGE_CLASS_NONE;
-                                               }
-                                       } else if(!is_type_function(type)) {
-                                               warningf(declaration->source_position, "redundant declaration for '%s'\n", symbol->string);
-                                               warningf(previous_declaration->source_position, "previous declaration of '%s' was here\n", symbol->string);
-                                       }
-                               }
-                       } else {
-                               if (old_storage_class == STORAGE_CLASS_EXTERN &&
-                                               new_storage_class == STORAGE_CLASS_EXTERN) {
-                                       warningf(declaration->source_position, "redundant extern declaration for '%s'\n", symbol->string);
-                                       warningf(previous_declaration->source_position, "previous declaration of '%s' was here\n", symbol->string);
-                               } else {
-                                       if (old_storage_class == new_storage_class) {
-                                               errorf(declaration->source_position, "redeclaration of '%s'\n", symbol->string);
-                                       } else {
-                                               errorf(declaration->source_position, "redeclaration of '%s' with different linkage\n", symbol->string);
-                                       }
-                                       errorf(previous_declaration->source_position, "previous declaration of '%s' was here", symbol->string);
-                               }
-                       }
-               }
-               return previous_declaration;
-       }
-
        /* remember old declaration */
        stack_entry_t entry;
        entry.symbol          = symbol;
@@ -629,19 +550,19 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr,
                        iter_last->symbol_next = declaration;
                }
        }
-
-       return declaration;
 }
 
-static declaration_t *environment_push(declaration_t *declaration)
+static void environment_push(declaration_t *declaration)
 {
        assert(declaration->source_position.input_name != NULL);
-       return stack_push(&environment_stack, declaration, context);
+       assert(declaration->parent_context != NULL);
+       stack_push(&environment_stack, declaration);
 }
 
-static declaration_t *label_push(declaration_t *declaration)
+static void label_push(declaration_t *declaration)
 {
-       return stack_push(&label_stack, declaration, &current_function->context);
+       declaration->parent_context = &current_function->context;
+       stack_push(&label_stack, declaration);
 }
 
 /**
@@ -716,12 +637,15 @@ static int get_rank(const type_t *type)
 
        assert(type->kind == TYPE_ATOMIC);
        const atomic_type_t *atomic_type = &type->atomic;
-       atomic_type_type_t   atype       = atomic_type->atype;
+       atomic_type_kind_t   atype       = atomic_type->akind;
        return atype;
 }
 
 static type_t *promote_integer(type_t *type)
 {
+       if(type->kind == TYPE_BITFIELD)
+               return promote_integer(type->bitfield.base);
+
        if(get_rank(type) < ATOMIC_TYPE_INT)
                type = type_int;
 
@@ -791,9 +715,11 @@ static expression_t *create_implicit_cast(expression_t *expression,
        switch (dest_type->kind) {
                case TYPE_ENUM:
                        /* TODO warning for implicitly converting to enum */
+               case TYPE_BITFIELD:
                case TYPE_ATOMIC:
                        if (source_type->kind != TYPE_ATOMIC &&
-                                       source_type->kind != TYPE_ENUM) {
+                                       source_type->kind != TYPE_ENUM &&
+                                       source_type->kind != TYPE_BITFIELD) {
                                panic("casting of non-atomic types not implemented yet");
                        }
 
@@ -901,8 +827,8 @@ static void semantic_assign(type_t *orig_type_left, expression_t **right,
 
 incompatible_assign_types:
        /* TODO: improve error message */
-       errorf(HERE, "incompatible types in %s", context);
-       errorf(HERE, "'%T' <- '%T'", orig_type_left, orig_type_right);
+       errorf(HERE, "incompatible types in %s: '%T' <- '%T'",
+              context, orig_type_left, orig_type_right);
 }
 
 static expression_t *parse_constant_expression(void)
@@ -927,7 +853,7 @@ static type_t *make_global_typedef(const char *name, type_t *type)
 {
        symbol_t *const symbol       = symbol_table_insert(name);
 
-       declaration_t *declaration   = allocate_ast_zero(sizeof(declaration[0]));
+       declaration_t *const declaration = allocate_declaration_zero();
        declaration->namespc         = NAMESPACE_NORMAL;
        declaration->storage_class   = STORAGE_CLASS_TYPEDEF;
        declaration->type            = type;
@@ -942,15 +868,15 @@ static type_t *make_global_typedef(const char *name, type_t *type)
        return typedef_type;
 }
 
-static const char *parse_string_literals(void)
+static string_t parse_string_literals(void)
 {
        assert(token.type == T_STRING_LITERAL);
-       const char *result = token.v.string;
+       string_t result = token.v.string;
 
        next_token();
 
-       while(token.type == T_STRING_LITERAL) {
-               result = concat_strings(result, token.v.string);
+       while (token.type == T_STRING_LITERAL) {
+               result = concat_strings(&result, &token.v.string);
                next_token();
        }
 
@@ -1053,13 +979,13 @@ static designator_t *parse_designation(void)
 #endif
 
 static initializer_t *initializer_from_string(array_type_t *type,
-                                              const char *string)
+                                              const string_t *const string)
 {
        /* TODO: check len vs. size of array type */
        (void) type;
 
        initializer_t *initializer = allocate_initializer_zero(INITIALIZER_STRING);
-       initializer->string.string = string;
+       initializer->string.string = *string;
 
        return initializer;
 }
@@ -1085,15 +1011,15 @@ static initializer_t *initializer_from_expression(type_t *type,
        /* ยง 6.7.8.14/15 char array may be initialized by string literals */
        type_t *const expr_type = expression->base.datatype;
        if (is_type_array(type) && expr_type->kind == TYPE_POINTER) {
-               array_type_t *const array_type     = &type->array;
-               type_t       *const element_type   = skip_typeref(array_type->element_type);
+               array_type_t *const array_type   = &type->array;
+               type_t       *const element_type = skip_typeref(array_type->element_type);
 
                if (element_type->kind == TYPE_ATOMIC) {
                        switch (expression->kind) {
                                case EXPR_STRING_LITERAL:
-                                       if (element_type->atomic.atype == ATOMIC_TYPE_CHAR) {
+                                       if (element_type->atomic.akind == ATOMIC_TYPE_CHAR) {
                                                return initializer_from_string(array_type,
-                                                       expression->string.value);
+                                                       &expression->string.value);
                                        }
 
                                case EXPR_WIDE_STRING_LITERAL: {
@@ -1104,7 +1030,8 @@ static initializer_t *initializer_from_expression(type_t *type,
                                        }
                                }
 
-                               default: break;
+                               default:
+                                       break;
                        }
                }
        }
@@ -1140,6 +1067,24 @@ static initializer_t *parse_sub_initializer_elem(type_t *type)
 
 static bool had_initializer_brace_warning;
 
+static void skip_designator(void)
+{
+       while(1) {
+               if(token.type == '.') {
+                       next_token();
+                       if(token.type == T_IDENTIFIER)
+                               next_token();
+               } else if(token.type == '[') {
+                       next_token();
+                       parse_constant_expression();
+                       if(token.type == ']')
+                               next_token();
+               } else {
+                       break;
+               }
+       }
+}
+
 static initializer_t *parse_sub_initializer(type_t *type,
                                             expression_t *expression,
                                             type_t *expression_type)
@@ -1188,6 +1133,13 @@ static initializer_t *parse_sub_initializer(type_t *type,
                type_t       *element_type = array_type->element_type;
                element_type               = skip_typeref(element_type);
 
+               if(token.type == '.') {
+                       errorf(HERE,
+                              "compound designator in initializer for array type '%T'",
+                              type);
+                       skip_designator();
+               }
+
                initializer_t *sub;
                had_initializer_brace_warning = false;
                if(expression == NULL) {
@@ -1227,6 +1179,13 @@ static initializer_t *parse_sub_initializer(type_t *type,
                compound_type_t *compound_type = &type->compound;
                context_t       *context       = &compound_type->declaration->context;
 
+               if(token.type == '[') {
+                       errorf(HERE,
+                              "array designator in initializer for compound type '%T'",
+                              type);
+                       skip_designator();
+               }
+
                declaration_t *first = context->declarations;
                if(first == NULL)
                        return NULL;
@@ -1305,9 +1264,15 @@ static initializer_t *parse_initializer(type_t *type)
 
        if(token.type != '{') {
                expression_t  *expression  = parse_assignment_expression();
+               if (expression->base.datatype == NULL) {
+                       /* something bad happens, don't produce further errors */
+                       return NULL;
+               }
                initializer_t *initializer = initializer_from_expression(type, expression);
                if(initializer == NULL) {
-                       errorf(HERE, "initializer expression '%E', type '%T' is incompatible with type '%T'", expression, expression->base.datatype, type);
+                       errorf(HERE,
+                               "initializer expression '%E' of type '%T' is incompatible with type '%T'",
+                               expression, expression->base.datatype, type);
                }
                return initializer;
        }
@@ -1331,7 +1296,7 @@ static initializer_t *parse_initializer(type_t *type)
        return result;
 }
 
-
+static declaration_t *append_declaration(declaration_t *declaration);
 
 static declaration_t *parse_compound_type_specifier(bool is_struct)
 {
@@ -1371,22 +1336,23 @@ static declaration_t *parse_compound_type_specifier(bool is_struct)
        }
 
        if(declaration == NULL) {
-               declaration = allocate_ast_zero(sizeof(declaration[0]));
-
-               if(is_struct) {
-                       declaration->namespc = NAMESPACE_STRUCT;
-               } else {
-                       declaration->namespc = NAMESPACE_UNION;
-               }
+               declaration = allocate_declaration_zero();
+               declaration->namespc         =
+                       (is_struct ? NAMESPACE_STRUCT : NAMESPACE_UNION);
                declaration->source_position = token.source_position;
                declaration->symbol          = symbol;
-               record_declaration(declaration);
+               declaration->parent_context  = context;
+               if (symbol != NULL) {
+                       environment_push(declaration);
+               }
+               append_declaration(declaration);
        }
 
        if(token.type == '{') {
                if(declaration->init.is_defined) {
                        assert(symbol != NULL);
-                       errorf(HERE, "multiple definition of %s %s", is_struct ? "struct" : "union", symbol->string);
+                       errorf(HERE, "multiple definition of '%s %Y'",
+                              is_struct ? "struct" : "union", symbol);
                        declaration->context.declarations = NULL;
                }
                declaration->init.is_defined = true;
@@ -1406,7 +1372,7 @@ static declaration_t *parse_compound_type_specifier(bool is_struct)
        return declaration;
 }
 
-static void parse_enum_entries(enum_type_t *const enum_type)
+static void parse_enum_entries(type_t *const enum_type)
 {
        eat('{');
 
@@ -1417,15 +1383,15 @@ static void parse_enum_entries(enum_type_t *const enum_type)
        }
 
        do {
-               declaration_t *entry = allocate_ast_zero(sizeof(entry[0]));
-
                if(token.type != T_IDENTIFIER) {
                        parse_error_expected("while parsing enum entry", T_IDENTIFIER, 0);
                        eat_block();
                        return;
                }
+
+               declaration_t *const entry = allocate_declaration_zero();
                entry->storage_class   = STORAGE_CLASS_ENUM_ENTRY;
-               entry->type            = (type_t*) enum_type;
+               entry->type            = enum_type;
                entry->symbol          = token.v.symbol;
                entry->source_position = token.source_position;
                next_token();
@@ -1469,11 +1435,11 @@ static type_t *parse_enum_specifier(void)
        }
 
        if(declaration == NULL) {
-               declaration = allocate_ast_zero(sizeof(declaration[0]));
-
-               declaration->namespc       = NAMESPACE_ENUM;
+               declaration = allocate_declaration_zero();
+               declaration->namespc         = NAMESPACE_ENUM;
                declaration->source_position = token.source_position;
                declaration->symbol          = symbol;
+               declaration->parent_context  = context;
        }
 
        type_t *const type      = allocate_type_zero(TYPE_ENUM);
@@ -1481,12 +1447,15 @@ static type_t *parse_enum_specifier(void)
 
        if(token.type == '{') {
                if(declaration->init.is_defined) {
-                       errorf(HERE, "multiple definitions of enum %s", symbol->string);
+                       errorf(HERE, "multiple definitions of enum %Y", symbol);
                }
-               record_declaration(declaration);
+               if (symbol != NULL) {
+                       environment_push(declaration);
+               }
+               append_declaration(declaration);
                declaration->init.is_defined = 1;
 
-               parse_enum_entries(&type->enumt);
+               parse_enum_entries(type);
                parse_attributes();
        }
 
@@ -1758,7 +1727,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
 finish_specifiers:
 
        if(type == NULL) {
-               atomic_type_type_t atomic_type;
+               atomic_type_kind_t atomic_type;
 
                /* match valid basic types */
                switch(type_specifiers) {
@@ -1850,13 +1819,13 @@ finish_specifiers:
                default:
                        /* invalid specifier combination, give an error message */
                        if(type_specifiers == 0) {
-#ifndef STRICT_C99
-                               warningf(HERE, "no type specifiers in declaration, using int");
-                               atomic_type = ATOMIC_TYPE_INT;
-                               break;
-#else
-                               errorf(HERE, "no type specifiers given in declaration");
-#endif
+                               if (! strict_mode) {
+                                       warningf(HERE, "no type specifiers in declaration, using int");
+                                       atomic_type = ATOMIC_TYPE_INT;
+                                       break;
+                               } else {
+                                       errorf(HERE, "no type specifiers given in declaration");
+                               }
                        } else if((type_specifiers & SPECIFIER_SIGNED) &&
                                  (type_specifiers & SPECIFIER_UNSIGNED)) {
                                errorf(HERE, "signed and unsigned specifiers gives");
@@ -1869,7 +1838,7 @@ finish_specifiers:
                }
 
                type               = allocate_type_zero(TYPE_ATOMIC);
-               type->atomic.atype = atomic_type;
+               type->atomic.akind = atomic_type;
                newtype            = 1;
        } else {
                if(type_specifiers != 0) {
@@ -1909,8 +1878,7 @@ static declaration_t *parse_identifier_list(void)
        declaration_t *declarations     = NULL;
        declaration_t *last_declaration = NULL;
        do {
-               declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0]));
-
+               declaration_t *const declaration = allocate_declaration_zero();
                declaration->source_position = token.source_position;
                declaration->symbol          = token.v.symbol;
                next_token();
@@ -1958,7 +1926,8 @@ static void semantic_parameter(declaration_t *declaration)
        }
 
        if(is_type_incomplete(type)) {
-               errorf(HERE, "incomplete type ('%T') not allowed for parameter '%s'", orig_type, declaration->symbol->string);
+               errorf(HERE, "incomplete type ('%T') not allowed for parameter '%Y'",
+                      orig_type, declaration->symbol);
        }
 }
 
@@ -2306,9 +2275,9 @@ static declaration_t *parse_declarator(
                const declaration_specifiers_t *specifiers, bool may_be_abstract)
 {
        type_t        *type         = specifiers->type;
-       declaration_t *declaration  = allocate_ast_zero(sizeof(declaration[0]));
+       declaration_t *const declaration = allocate_declaration_zero();
        declaration->storage_class  = specifiers->storage_class;
-       declaration->decl_modifiers = specifiers->decl_modifiers;
+       declaration->modifiers      = specifiers->decl_modifiers;
        declaration->is_inline      = specifiers->is_inline;
 
        construct_type_t *construct_type
@@ -2334,35 +2303,124 @@ static type_t *parse_abstract_declarator(type_t *base_type)
        return result;
 }
 
-static declaration_t *record_declaration(declaration_t *declaration)
+static declaration_t *append_declaration(declaration_t* const declaration)
 {
-       assert(declaration->parent_context == NULL);
-       assert(context != NULL);
-
-       symbol_t *symbol = declaration->symbol;
-       if(symbol != NULL) {
-               declaration_t *alias = environment_push(declaration);
-               if(alias != declaration)
-                       return alias;
-       } else {
-               declaration->parent_context = context;
-       }
-
-       if(last_declaration != NULL) {
+       if (last_declaration != NULL) {
                last_declaration->next = declaration;
        } else {
                context->declarations = declaration;
        }
        last_declaration = declaration;
-
        return declaration;
 }
 
+static declaration_t *internal_record_declaration(
+       declaration_t *const declaration,
+       const bool is_function_definition)
+{
+       const symbol_t *const symbol  = declaration->symbol;
+       const namespace_t     namespc = (namespace_t)declaration->namespc;
+
+       const type_t *const type = skip_typeref(declaration->type);
+       if (is_type_function(type) && type->function.unspecified_parameters) {
+               warningf(declaration->source_position,
+                        "function declaration '%#T' is not a prototype",
+                        type, declaration->symbol);
+       }
+
+       declaration_t *const previous_declaration = get_declaration(symbol, namespc);
+       assert(declaration != previous_declaration);
+       if (previous_declaration != NULL
+                       && previous_declaration->parent_context == context) {
+               /* can happen for K&R style declarations */
+               if(previous_declaration->type == NULL) {
+                       previous_declaration->type = declaration->type;
+               }
+
+               const type_t *const prev_type = skip_typeref(previous_declaration->type);
+               if (!types_compatible(type, prev_type)) {
+                       errorf(declaration->source_position,
+                               "declaration '%#T' is incompatible with previous declaration '%#T'",
+                               type, symbol, previous_declaration->type, symbol);
+                       errorf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol);
+               } else {
+                       unsigned old_storage_class = previous_declaration->storage_class;
+                       unsigned new_storage_class = declaration->storage_class;
+
+                       /* pretend no storage class means extern for function declarations
+                        * (except if the previous declaration is neither none nor extern) */
+                       if (is_type_function(type)) {
+                               switch (old_storage_class) {
+                                       case STORAGE_CLASS_NONE:
+                                               old_storage_class = STORAGE_CLASS_EXTERN;
+
+                                       case STORAGE_CLASS_EXTERN:
+                                               if (new_storage_class == STORAGE_CLASS_NONE && !is_function_definition) {
+                                                       new_storage_class = STORAGE_CLASS_EXTERN;
+                                               }
+                                               break;
+
+                                       default: break;
+                               }
+                       }
+
+                       if (old_storage_class == STORAGE_CLASS_EXTERN &&
+                           new_storage_class == STORAGE_CLASS_EXTERN) {
+warn_redundant_declaration:
+                                       warningf(declaration->source_position, "redundant declaration for '%Y'", symbol);
+                                       warningf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol);
+                       } else if (current_function == NULL) {
+                               if (old_storage_class != STORAGE_CLASS_STATIC &&
+                                   new_storage_class == STORAGE_CLASS_STATIC) {
+                                       errorf(declaration->source_position, "static declaration of '%Y' follows non-static declaration", symbol);
+                                       errorf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol);
+                               } else {
+                                       if (old_storage_class != STORAGE_CLASS_EXTERN) {
+                                               goto warn_redundant_declaration;
+                                       }
+                                       if (new_storage_class == STORAGE_CLASS_NONE) {
+                                               previous_declaration->storage_class = STORAGE_CLASS_NONE;
+                                       }
+                               }
+                       } else {
+                               if (old_storage_class == new_storage_class) {
+                                       errorf(declaration->source_position, "redeclaration of '%Y'", symbol);
+                               } else {
+                                       errorf(declaration->source_position, "redeclaration of '%Y' with different linkage", symbol);
+                               }
+                               errorf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol);
+                       }
+               }
+               return previous_declaration;
+       }
+
+       assert(declaration->parent_context == NULL);
+       assert(declaration->symbol != NULL);
+       assert(context != NULL);
+
+       declaration->parent_context = context;
+
+       environment_push(declaration);
+       return append_declaration(declaration);
+}
+
+static declaration_t *record_declaration(declaration_t *declaration)
+{
+       return internal_record_declaration(declaration, false);
+}
+
+static declaration_t *record_function_definition(declaration_t *const declaration)
+{
+       return internal_record_declaration(declaration, true);
+}
+
 static void parser_error_multiple_definition(declaration_t *declaration,
                const source_position_t source_position)
 {
-       errorf(source_position, "multiple definition of symbol '%s'", declaration->symbol->string);
-       errorf(declaration->source_position, "this is the location of the previous definition.");
+       errorf(source_position, "multiple definition of symbol '%Y'",
+              declaration->symbol);
+       errorf(declaration->source_position,
+              "this is the location of the previous definition.");
 }
 
 static bool is_declaration_specifier(const token_t *token,
@@ -2418,7 +2476,7 @@ static void parse_init_declarator_rest(declaration_t *declaration)
 
                                case INITIALIZER_STRING: {
                                        initializer_string_t *const string = &initializer->string;
-                                       cnst->conste.v.int_value = strlen(string->string) + 1;
+                                       cnst->conste.v.int_value = string->string.size;
                                        break;
                                }
 
@@ -2437,7 +2495,9 @@ static void parse_init_declarator_rest(declaration_t *declaration)
        }
 
        if(type != NULL && is_type_function(type)) {
-               errorf(declaration->source_position, "initializers not allowed for function types at declator '%s' (type '%T')", declaration->symbol->string, orig_type);
+               errorf(declaration->source_position,
+                      "initializers not allowed for function types at declator '%Y' (type '%T')",
+                      declaration->symbol, orig_type);
        } else {
                declaration->init.initializer = initializer;
        }
@@ -2450,8 +2510,7 @@ static void parse_anonymous_declaration_rest(
 {
        eat(';');
 
-       declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0]));
-
+       declaration_t *const declaration = allocate_declaration_zero();
        declaration->type            = specifiers->type;
        declaration->storage_class   = specifiers->storage_class;
        declaration->source_position = specifiers->source_position;
@@ -2493,7 +2552,8 @@ static void parse_declaration_rest(declaration_t *ndeclaration,
                type_t *type      = skip_typeref(orig_type);
 
                if(type->kind != TYPE_FUNCTION && declaration->is_inline) {
-                       warningf(declaration->source_position, "variable '%s' declared 'inline'\n", declaration->symbol->string);
+                       warningf(declaration->source_position,
+                                "variable '%Y' declared 'inline'\n", declaration->symbol);
                }
 
                if(token.type == '=') {
@@ -2511,11 +2571,32 @@ static void parse_declaration_rest(declaration_t *ndeclaration,
 
 static declaration_t *finished_kr_declaration(declaration_t *declaration)
 {
-       /* TODO: check that it was actually a parameter that gets a type */
+       symbol_t *symbol  = declaration->symbol;
+       if(symbol == NULL) {
+               errorf(HERE, "anonymous declaration not valid as function parameter");
+               return declaration;
+       }
+       namespace_t namespc = (namespace_t) declaration->namespc;
+       if(namespc != NAMESPACE_NORMAL) {
+               return record_declaration(declaration);
+       }
 
-       /* we should have a declaration for the parameter in the current
-        * scope */
-       return record_declaration(declaration);
+       declaration_t *previous_declaration = get_declaration(symbol, namespc);
+       if(previous_declaration == NULL ||
+                       previous_declaration->parent_context != context) {
+               errorf(HERE, "expected declaration of a function parameter, found '%Y'",
+                      symbol);
+               return declaration;
+       }
+
+       if(previous_declaration->type == NULL) {
+               previous_declaration->type           = declaration->type;
+               previous_declaration->storage_class  = declaration->storage_class;
+               previous_declaration->parent_context = context;
+               return previous_declaration;
+       } else {
+               return record_declaration(declaration);
+       }
 }
 
 static void parse_declaration(parsed_declaration_func finished_declaration)
@@ -2548,6 +2629,8 @@ static void parse_kr_declaration_list(declaration_t *declaration)
 
        declaration_t *parameter = declaration->context.declarations;
        for( ; parameter != NULL; parameter = parameter->next) {
+               assert(parameter->parent_context == NULL);
+               parameter->parent_context = context;
                environment_push(parameter);
        }
 
@@ -2573,13 +2656,15 @@ static void parse_kr_declaration_list(declaration_t *declaration)
                        parameter_declaration = parameter_declaration->next) {
                type_t *parameter_type = parameter_declaration->type;
                if(parameter_type == NULL) {
-#ifdef STRICT_C99
-                       errorf(HERE, "no type specified for function parameter '%s'", parameter_declaration->symbol->string);
-#else
-                       warningf(HERE, "no type specified for function parameter '%s', using int", parameter_declaration->symbol->string);
-                       parameter_type              = type_int;
-                       parameter_declaration->type = parameter_type;
-#endif
+                       if (strict_mode) {
+                               errorf(HERE, "no type specified for function parameter '%Y'",
+                                      parameter_declaration->symbol);
+                       } else {
+                               warningf(HERE, "no type specified for function parameter '%Y', using int",
+                                        parameter_declaration->symbol);
+                               parameter_type              = type_int;
+                               parameter_declaration->type = parameter_type;
+                       }
                }
 
                semantic_parameter(parameter_declaration);
@@ -2607,6 +2692,31 @@ static void parse_kr_declaration_list(declaration_t *declaration)
        declaration->type = type;
 }
 
+/**
+ * Check if all labels are defined in the current function.
+ */
+static void check_for_missing_labels(void)
+{
+       bool first_err = true;
+       for (const goto_statement_t *goto_statement = goto_first;
+            goto_statement != NULL;
+            goto_statement = goto_statement->next) {
+                const declaration_t *label = goto_statement->label;
+
+                if (label->source_position.input_name == NULL) {
+                        if (first_err) {
+                                first_err = false;
+                                diagnosticf("%s: In function '%Y':\n",
+                                        current_function->source_position.input_name,
+                                        current_function->symbol);
+                        }
+                        errorf(goto_statement->statement.source_position,
+                                "label '%Y' used but not defined", label->symbol);
+                }
+       }
+       goto_first = goto_last = NULL;
+}
+
 static void parse_external_declaration(void)
 {
        /* function-definitions and declarations both start with declaration
@@ -2617,7 +2727,7 @@ static void parse_external_declaration(void)
 
        /* must be a declaration */
        if(token.type == ';') {
-               parse_anonymous_declaration_rest(&specifiers, record_declaration);
+               parse_anonymous_declaration_rest(&specifiers, append_declaration);
                return;
        }
 
@@ -2648,7 +2758,8 @@ static void parse_external_declaration(void)
        /* note that we don't skip typerefs: the standard doesn't allow them here
         * (so we can't use is_type_function here) */
        if(type->kind != TYPE_FUNCTION) {
-               errorf(HERE, "declarator '%#T' has a body but is not a function type", type, ndeclaration->symbol);
+               errorf(HERE, "declarator '%#T' has a body but is not a function type",
+                      type, ndeclaration->symbol);
                eat_block();
                return;
        }
@@ -2666,10 +2777,9 @@ static void parse_external_declaration(void)
                ndeclaration->type = type;
        }
 
-       declaration_t *declaration = record_declaration(ndeclaration);
+       declaration_t *const declaration = record_function_definition(ndeclaration);
        if(ndeclaration != declaration) {
-               memcpy(&declaration->context, &ndeclaration->context,
-                               sizeof(declaration->context));
+               declaration->context = ndeclaration->context;
        }
        type = skip_typeref(declaration->type);
 
@@ -2680,6 +2790,12 @@ static void parse_external_declaration(void)
 
        declaration_t *parameter = declaration->context.declarations;
        for( ; parameter != NULL; parameter = parameter->next) {
+               if(parameter->parent_context == &ndeclaration->context) {
+                       parameter->parent_context = context;
+               }
+               assert(parameter->parent_context == NULL
+                               || parameter->parent_context == context);
+               parameter->parent_context = context;
                environment_push(parameter);
        }
 
@@ -2694,6 +2810,7 @@ static void parse_external_declaration(void)
                current_function                    = declaration;
 
                declaration->init.statement = parse_compound_statement();
+               check_for_missing_labels();
 
                assert(current_function == declaration);
                current_function = old_current_function;
@@ -2706,26 +2823,47 @@ end_of_parse_external_declaration:
        environment_pop_to(top);
 }
 
+static type_t *make_bitfield_type(type_t *base, expression_t *size)
+{
+       type_t *type        = allocate_type_zero(TYPE_BITFIELD);
+       type->bitfield.base = base;
+       type->bitfield.size = size;
+
+       return type;
+}
+
 static void parse_struct_declarators(const declaration_specifiers_t *specifiers)
 {
+       /* TODO: check constraints for struct declarations (in specifiers) */
        while(1) {
+               declaration_t *declaration;
+
                if(token.type == ':') {
                        next_token();
-                       parse_constant_expression();
-                       /* TODO (bitfields) */
-               } else {
-                       declaration_t *declaration = parse_declarator(specifiers, /*may_be_abstract=*/true);
 
-                       /* TODO: check constraints for struct declarations */
-                       /* TODO: check for doubled fields */
-                       record_declaration(declaration);
+                       type_t *base_type = specifiers->type;
+                       expression_t *size = parse_constant_expression();
+
+                       type_t *type = make_bitfield_type(base_type, size);
+
+                       declaration = allocate_declaration_zero();
+                       declaration->namespc         = NAMESPACE_NORMAL;
+                       declaration->storage_class   = STORAGE_CLASS_NONE;
+                       declaration->source_position = token.source_position;
+                       declaration->modifiers       = specifiers->decl_modifiers;
+                       declaration->type            = type;
+               } else {
+                       declaration = parse_declarator(specifiers,/*may_be_abstract=*/true);
 
                        if(token.type == ':') {
                                next_token();
-                               parse_constant_expression();
-                               /* TODO (bitfields) */
+                               expression_t *size = parse_constant_expression();
+
+                               type_t *type = make_bitfield_type(declaration->type, size);
+                               declaration->type = type;
                        }
                }
+               record_declaration(declaration);
 
                if(token.type != ',')
                        break;
@@ -2795,10 +2933,15 @@ static expression_t *create_invalid_expression(void)
        return expression;
 }
 
+/**
+ * Prints an error message if an expression was expected but not read
+ */
 static expression_t *expected_expression_error(void)
 {
-       errorf(HERE, "expected expression, got token '%K'", &token);
-
+       /* skip the error message if the error token was read */
+       if (token.type != T_ERROR) {
+               errorf(HERE, "expected expression, got token '%K'", &token);
+       }
        next_token();
 
        return create_invalid_expression();
@@ -2868,26 +3011,23 @@ static declaration_t *create_implicit_function(symbol_t *symbol,
                free_type(ntype);
        }
 
-       declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0]));
-
+       declaration_t *const declaration = allocate_declaration_zero();
        declaration->storage_class   = STORAGE_CLASS_EXTERN;
        declaration->type            = type;
        declaration->symbol          = symbol;
        declaration->source_position = source_position;
+       declaration->parent_context  = global_context;
 
-       /* prepend the implicit definition to the global context
-        * this is safe since the symbol wasn't declared as anything else yet
-        */
-       assert(symbol->declaration == NULL);
-
-       context_t *last_context = context;
-       context = global_context;
+       context_t *old_context = context;
+       set_context(global_context);
 
        environment_push(declaration);
+       /* prepend the declaration to the global declarations list */
        declaration->next     = context->declarations;
        context->declarations = declaration;
 
-       context = last_context;
+       assert(context == global_context);
+       set_context(old_context);
 
        return declaration;
 }
@@ -3027,22 +3167,21 @@ static expression_t *parse_reference(void)
        next_token();
 
        if(declaration == NULL) {
-#ifndef STRICT_C99
-               /* an implicitly defined function */
-               if(token.type == '(') {
-                       warningf(HERE, "implicit declaration of function '%s'\n", ref->symbol->string);
+               if (! strict_mode && token.type == '(') {
+                       /* an implicitly defined function */
+                       warningf(HERE, "implicit declaration of function '%Y'",
+                                ref->symbol);
 
                        declaration = create_implicit_function(ref->symbol,
                                                               source_position);
-               } else
-#endif
-               {
-                       errorf(HERE, "unknown symbol '%s' found.\n", ref->symbol->string);
+               } else {
+                       errorf(HERE, "unknown symbol '%Y' found.", ref->symbol);
                        return expression;
                }
        }
 
-       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! */
        type = automatic_type_conversion(type);
@@ -3152,7 +3291,6 @@ static expression_t *parse_function_keyword(void)
 
        expression->expression.kind     = EXPR_FUNCTION;
        expression->expression.datatype = type_string;
-       expression->value               = current_function->symbol->string;
 
        return (expression_t*) expression;
 }
@@ -3171,7 +3309,6 @@ static expression_t *parse_pretty_function_keyword(void)
 
        expression->expression.kind     = EXPR_PRETTY_FUNCTION;
        expression->expression.datatype = type_string;
-       expression->value               = current_function->symbol->string;
 
        return (expression_t*) expression;
 }
@@ -3439,7 +3576,7 @@ static expression_t *parse_primary_expression(void)
                return parse_int_const();
        case T_FLOATINGPOINT:
                return parse_float_const();
-       case T_STRING_LITERAL: /* TODO merge */
+       case T_STRING_LITERAL:
                return parse_string_const();
        case T_WIDE_STRING_LITERAL:
                return parse_wide_string_const();
@@ -3488,6 +3625,21 @@ static expression_t *parse_primary_expression(void)
        return create_invalid_expression();
 }
 
+/**
+ * Check if the expression has the character type and issue a warning then.
+ */
+static void check_for_char_index_type(const expression_t *expression) {
+       type_t *type      = expression->base.datatype;
+       type_t *base_type = skip_typeref(type);
+
+       if (base_type->base.kind == TYPE_ATOMIC) {
+               if (base_type->atomic.akind == ATOMIC_TYPE_CHAR) {
+                       warningf(expression->base.source_position,
+                               "array subscript has type '%T'", type);
+               }
+       }
+}
+
 static expression_t *parse_array_expression(unsigned precedence,
                                             expression_t *left)
 {
@@ -3515,12 +3667,14 @@ static expression_t *parse_array_expression(unsigned precedence,
                        return_type             = pointer->points_to;
                        array_access->array_ref = left;
                        array_access->index     = inside;
+                       check_for_char_index_type(inside);
                } else if(is_type_pointer(type_inside)) {
                        pointer_type_t *pointer = &type_inside->pointer;
                        return_type             = pointer->points_to;
                        array_access->array_ref = inside;
                        array_access->index     = left;
                        array_access->flipped   = true;
+                       check_for_char_index_type(left);
                } else {
                        errorf(HERE, "array access on object with non-pointer types '%T', '%T'", type_left, type_inside);
                }
@@ -3604,7 +3758,8 @@ static expression_t *parse_select_expression(unsigned precedence,
 
        if(type_left->kind != TYPE_COMPOUND_STRUCT
                        && type_left->kind != TYPE_COMPOUND_UNION) {
-               errorf(HERE, "request for member '%s' in something not a struct or union, but '%T'", symbol->string, type_left);
+               errorf(HERE, "request for member '%Y' in something not a struct or "
+                      "union, but '%T'", symbol, type_left);
                return create_invalid_expression();
        }
 
@@ -3612,7 +3767,8 @@ static expression_t *parse_select_expression(unsigned precedence,
        declaration_t   *declaration   = compound_type->declaration;
 
        if(!declaration->init.is_defined) {
-               errorf(HERE, "request for member '%s' of incomplete type '%T'", symbol->string, type_left);
+               errorf(HERE, "request for member '%Y' of incomplete type '%T'",
+                      symbol, type_left);
                return create_invalid_expression();
        }
 
@@ -3623,7 +3779,7 @@ static expression_t *parse_select_expression(unsigned precedence,
                }
        }
        if(iter == NULL) {
-               errorf(HERE, "'%T' has no member names '%s'", type_left, symbol->string);
+               errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol);
                return create_invalid_expression();
        }
 
@@ -3633,6 +3789,16 @@ static expression_t *parse_select_expression(unsigned precedence,
 
        select->select.compound_entry = iter;
        select->base.datatype         = expression_type;
+
+       if(expression_type->kind == TYPE_BITFIELD) {
+               expression_t *extract
+                       = allocate_expression_zero(EXPR_UNARY_BITFIELD_EXTRACT);
+               extract->unary.value   = select;
+               extract->base.datatype = expression_type->bitfield.base;
+
+               return extract;
+       }
+
        return select;
 }
 
@@ -3647,8 +3813,8 @@ static expression_t *parse_call_expression(unsigned precedence,
        (void) precedence;
        expression_t *result = allocate_expression_zero(EXPR_CALL);
 
-       call_expression_t *call  = &result->call;
-       call->function           = expression;
+       call_expression_t *call = &result->call;
+       call->function          = expression;
 
        function_type_t *function_type = NULL;
        type_t          *orig_type     = expression->base.datatype;
@@ -3939,6 +4105,9 @@ static void semantic_dereference(unary_expression_t *expression)
        expression->expression.datatype = result_type;
 }
 
+/**
+ * Check the semantic of the address taken expression.
+ */
 static void semantic_take_addr(unary_expression_t *expression)
 {
        expression_t *value  = expression->value;
@@ -3952,6 +4121,11 @@ static void semantic_take_addr(unary_expression_t *expression)
                reference_expression_t *reference   = (reference_expression_t*) value;
                declaration_t          *declaration = reference->declaration;
                if(declaration != NULL) {
+                       if (declaration->storage_class == STORAGE_CLASS_REGISTER) {
+                               errorf(expression->expression.source_position,
+                                       "address of register variable '%Y' requested",
+                                       declaration->symbol);
+                       }
                        declaration->address_taken = 1;
                }
        }
@@ -3963,13 +4137,14 @@ static void semantic_take_addr(unary_expression_t *expression)
 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;                             \
        unary_expression->unary.value = parse_sub_expression(precedence);          \
                                                                                   \
        sfunc(&unary_expression->unary);                                           \
-                                                                               \
+                                                                                  \
        return unary_expression;                                                   \
 }
 
@@ -4292,6 +4467,9 @@ static bool has_const_fields(const compound_type_t *type)
        const declaration_t *declaration = context->declarations;
 
        for (; declaration != NULL; declaration = declaration->next) {
+               if (declaration->namespc != NAMESPACE_NORMAL)
+                       continue;
+
                const type_t *decl_type = skip_typeref(declaration->type);
                if (decl_type->base.qualifiers & TYPE_QUALIFIER_CONST)
                        return true;
@@ -4320,15 +4498,19 @@ static void semantic_binexpr_assign(binary_expression_t *expression)
                return;
        }
        if(type_left->base.qualifiers & TYPE_QUALIFIER_CONST) {
-               errorf(HERE, "assignment to readonly location '%E' (type '%T')", left, orig_type_left);
+               errorf(HERE, "assignment to readonly location '%E' (type '%T')", left,
+                      orig_type_left);
                return;
        }
        if(is_type_incomplete(type_left)) {
-               errorf(HERE, "left-hand side of assignment '%E' has incomplete type '%T'", left, orig_type_left);
+               errorf(HERE,
+                      "left-hand side of assignment '%E' has incomplete type '%T'",
+                      left, orig_type_left);
                return;
        }
        if(is_type_compound(type_left) && has_const_fields(&type_left->compound)) {
-               errorf(HERE, "cannot assign to '%E' because compound type '%T' has readonly fields", left, orig_type_left);
+               errorf(HERE, "cannot assign to '%E' because compound type '%T' has readonly fields",
+                      left, orig_type_left);
                return;
        }
 
@@ -4698,11 +4880,45 @@ static statement_t *parse_case_statement(void)
        statement->case_label.expression = parse_expression();
 
        expect(':');
+
+       if (! is_constant_expression(statement->case_label.expression)) {
+               errorf(statement->base.source_position,
+                       "case label does not reduce to an integer constant");
+       } else {
+               /* TODO: check if the case label is already known */
+               if (current_switch != NULL) {
+                       /* link all cases into the switch statement */
+                       if (current_switch->last_case == NULL) {
+                               current_switch->first_case =
+                               current_switch->last_case  = &statement->case_label;
+                       } else {
+                               current_switch->last_case->next = &statement->case_label;
+                       }
+               } else {
+                       errorf(statement->base.source_position,
+                               "case label not within a switch statement");
+               }
+       }
        statement->case_label.label_statement = parse_statement();
 
        return statement;
 }
 
+/**
+ * Finds an existing default label of a switch statement.
+ */
+static case_label_statement_t *
+find_default_label(const switch_statement_t *statement)
+{
+       for (case_label_statement_t *label = statement->first_case;
+            label != NULL;
+                label = label->next) {
+               if (label->expression == NULL)
+                       return label;
+       }
+       return NULL;
+}
+
 /**
  * Parse a default statement.
  */
@@ -4715,6 +4931,25 @@ static statement_t *parse_default_statement(void)
        statement->base.source_position = token.source_position;
 
        expect(':');
+       if (current_switch != NULL) {
+               const case_label_statement_t *def_label = find_default_label(current_switch);
+               if (def_label != NULL) {
+                       errorf(HERE, "multiple default labels in one switch");
+                       errorf(def_label->statement.source_position,
+                               "this is the first default label");
+               } else {
+                       /* link all cases into the switch statement */
+                       if (current_switch->last_case == NULL) {
+                               current_switch->first_case =
+                                       current_switch->last_case  = &statement->case_label;
+                       } else {
+                               current_switch->last_case->next = &statement->case_label;
+                       }
+               }
+       } else {
+               errorf(statement->base.source_position,
+                       "'default' label not within a switch statement");
+       }
        statement->label.label_statement = parse_statement();
 
        return statement;
@@ -4735,7 +4970,7 @@ static declaration_t *get_label(symbol_t *symbol)
        }
 
        /* otherwise we need to create a new one */
-       declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0]));
+       declaration_t *const declaration = allocate_declaration_zero();
        declaration->namespc       = NAMESPACE_LABEL;
        declaration->symbol        = symbol;
 
@@ -4758,8 +4993,9 @@ static statement_t *parse_label_statement(void)
        /* if source position is already set then the label is defined twice,
         * otherwise it was just mentioned in a goto so far */
        if(label->source_position.input_name != NULL) {
-               errorf(HERE, "duplicate label '%s'\n", symbol->string);
-               errorf(label->source_position, "previous definition of '%s' was here\n", symbol->string);
+               errorf(HERE, "duplicate label '%Y'", symbol);
+               errorf(label->source_position, "previous definition of '%Y' was here",
+                      symbol);
        } else {
                label->source_position = token.source_position;
        }
@@ -4770,7 +5006,7 @@ static statement_t *parse_label_statement(void)
        label_statement->statement.source_position = token.source_position;
        label_statement->label                     = label;
 
-       expect(':');
+       eat(':');
 
        if(token.type == '}') {
                /* TODO only warn? */
@@ -4819,13 +5055,28 @@ static statement_t *parse_switch(void)
        statement->statement.source_position = token.source_position;
 
        expect('(');
-       statement->expression = parse_expression();
+       expression_t *const expr = parse_expression();
+       type_t       *const type = promote_integer(skip_typeref(expr->base.datatype));
+       statement->expression = create_implicit_cast(expr, type);
        expect(')');
+
+       switch_statement_t *rem = current_switch;
+       current_switch  = statement;
        statement->body = parse_statement();
+       current_switch  = rem;
 
        return (statement_t*) statement;
 }
 
+static statement_t *parse_loop_body(statement_t *const loop)
+{
+       statement_t *const rem = current_loop;
+       current_loop = loop;
+       statement_t *const body = parse_statement();
+       current_loop = rem;
+       return body;
+}
+
 /**
  * Parse a while statement.
  */
@@ -4840,7 +5091,8 @@ static statement_t *parse_while(void)
        expect('(');
        statement->condition = parse_expression();
        expect(')');
-       statement->body = parse_statement();
+
+       statement->body = parse_loop_body((statement_t*)statement);
 
        return (statement_t*) statement;
 }
@@ -4856,7 +5108,7 @@ static statement_t *parse_do(void)
        statement->statement.kind            = STATEMENT_DO_WHILE;
        statement->statement.source_position = token.source_position;
 
-       statement->body = parse_statement();
+       statement->body = parse_loop_body((statement_t*)statement);
        expect(T_while);
        expect('(');
        statement->condition = parse_expression();
@@ -4902,7 +5154,7 @@ static statement_t *parse_for(void)
                statement->step = parse_expression();
        }
        expect(')');
-       statement->body = parse_statement();
+       statement->body = parse_loop_body((statement_t*)statement);
 
        assert(context == &statement->context);
        set_context(last_context);
@@ -4935,6 +5187,13 @@ static statement_t *parse_goto(void)
 
        statement->label = label;
 
+       /* remember the goto's in a list for later checking */
+       if (goto_last == NULL) {
+               goto_first = goto_last = statement;
+       } else {
+               goto_last->next = statement;
+       }
+
        expect(';');
 
        return (statement_t*) statement;
@@ -4945,13 +5204,19 @@ static statement_t *parse_goto(void)
  */
 static statement_t *parse_continue(void)
 {
+       statement_t *statement;
+       if (current_loop == NULL) {
+               errorf(HERE, "continue statement not within loop");
+               statement = NULL;
+       } else {
+               statement = allocate_statement_zero(STATEMENT_CONTINUE);
+
+               statement->base.source_position = token.source_position;
+       }
+
        eat(T_continue);
        expect(';');
 
-       statement_t *statement          = allocate_ast_zero(sizeof(statement[0]));
-       statement->kind                 = STATEMENT_CONTINUE;
-       statement->base.source_position = token.source_position;
-
        return statement;
 }
 
@@ -4960,16 +5225,54 @@ static statement_t *parse_continue(void)
  */
 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 = NULL;
+       } else {
+               statement = allocate_statement_zero(STATEMENT_BREAK);
+
+               statement->base.source_position = token.source_position;
+       }
+
        eat(T_break);
        expect(';');
 
-       statement_t *statement          = allocate_ast_zero(sizeof(statement[0]));
-       statement->kind                 = STATEMENT_BREAK;
-       statement->base.source_position = token.source_position;
-
        return statement;
 }
 
+/**
+ * Check if a given declaration represents a local variable.
+ */
+static bool is_local_var_declaration(const declaration_t *declaration) {
+       switch ((storage_class_tag_t) declaration->storage_class) {
+       case STORAGE_CLASS_NONE:
+       case STORAGE_CLASS_AUTO:
+       case STORAGE_CLASS_REGISTER: {
+               const type_t *type = skip_typeref(declaration->type);
+               if(is_type_function(type)) {
+                       return false;
+               } else {
+                       return true;
+               }
+       }
+       default:
+               return false;
+       }
+}
+
+/**
+ * Check if a given expression represents a local variable.
+ */
+static bool is_local_variable(const expression_t *expression)
+{
+       if (expression->base.kind != EXPR_REFERENCE) {
+               return false;
+       }
+       const declaration_t *declaration = expression->reference.declaration;
+       return is_local_var_declaration(declaration);
+}
+
 /**
  * Parse a return statement.
  */
@@ -5004,16 +5307,26 @@ static statement_t *parse_return(void)
 
                if(is_type_atomic(return_type, ATOMIC_TYPE_VOID)
                                && !is_type_atomic(return_value_type, ATOMIC_TYPE_VOID)) {
-                       warningf(HERE, "'return' with a value, in function returning void");
+                       warningf(statement->statement.source_position,
+                               "'return' with a value, in function returning void");
                        return_value = NULL;
                } else {
                        if(return_type != NULL) {
                                semantic_assign(return_type, &return_value, "'return'");
                        }
                }
+               /* check for returning address of a local var */
+               if (return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) {
+                       const expression_t *expression = return_value->unary.value;
+                       if (is_local_variable(expression)) {
+                               warningf(statement->statement.source_position,
+                                       "function returns address of local variable");
+                       }
+               }
        } else {
                if(!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) {
-                       warningf(HERE, "'return' without value, in function returning non-void");
+                       warningf(statement->statement.source_position,
+                               "'return' without value, in function returning non-void");
                }
        }
        statement->return_value = return_value;
@@ -5246,7 +5559,13 @@ static translation_unit_t *parse_translation_unit(void)
        initialize_builtin_types();
 
        while(token.type != T_EOF) {
-               parse_external_declaration();
+               if (token.type == ';') {
+                       /* TODO error in strict mode */
+                       warningf(HERE, "stray ';' outside of function");
+                       next_token();
+               } else {
+                       parse_external_declaration();
+               }
        }
 
        assert(context == &unit->context);