Correctly register declarations for compound types and enums.
[cparser] / parser.c
index 0dde06f..0dfaec2 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;
@@ -50,6 +50,7 @@ static declaration_t  *last_declaration  = NULL;
 static declaration_t  *current_function  = NULL;
 static struct obstack  temp_obst;
 
+/** The current source position. */
 #define HERE token.source_position
 
 static type_t *type_valist;
@@ -120,6 +121,10 @@ static void semantic_comparison(binary_expression_t *expression);
        TYPE_QUALIFIERS         \
        TYPE_SPECIFIERS
 
+/**
+ * Allocate an AST node with given size and
+ * initialize all fields with zero.
+ */
 static void *allocate_ast_zero(size_t size)
 {
        void *res = allocate_ast(size);
@@ -127,6 +132,11 @@ static void *allocate_ast_zero(size_t size)
        return res;
 }
 
+/**
+ * Returns the size of a statement node.
+ *
+ * @param kind  the statement kind
+ */
 static size_t get_statement_struct_size(statement_kind_t kind)
 {
        static const size_t sizes[] = {
@@ -151,6 +161,10 @@ static size_t get_statement_struct_size(statement_kind_t kind)
        return sizes[kind];
 }
 
+/**
+ * Allocate a statement node of given kind and initialize all
+ * fields with zero.
+ */
 static statement_t *allocate_statement_zero(statement_kind_t kind)
 {
        size_t       size = get_statement_struct_size(kind);
@@ -160,8 +174,12 @@ static statement_t *allocate_statement_zero(statement_kind_t kind)
        return res;
 }
 
-
-static size_t get_expression_struct_size(expression_kind_t type)
+/**
+ * Returns the size of an expression node.
+ *
+ * @param kind  the expression kind
+ */
+static size_t get_expression_struct_size(expression_kind_t kind)
 {
        static const size_t sizes[] = {
                [EXPR_INVALID]             = sizeof(expression_base_t),
@@ -180,22 +198,28 @@ static size_t get_expression_struct_size(expression_kind_t type)
                [EXPR_FUNCTION]            = sizeof(string_literal_expression_t),
                [EXPR_PRETTY_FUNCTION]     = sizeof(string_literal_expression_t),
                [EXPR_BUILTIN_SYMBOL]      = sizeof(builtin_symbol_expression_t),
+               [EXPR_BUILTIN_CONSTANT_P]  = sizeof(builtin_constant_expression_t),
+               [EXPR_BUILTIN_PREFETCH]    = sizeof(builtin_prefetch_expression_t),
                [EXPR_OFFSETOF]            = sizeof(offsetof_expression_t),
                [EXPR_VA_START]            = sizeof(va_start_expression_t),
                [EXPR_VA_ARG]              = sizeof(va_arg_expression_t),
                [EXPR_STATEMENT]           = sizeof(statement_expression_t),
        };
-       if(type >= EXPR_UNARY_FIRST && type <= EXPR_UNARY_LAST) {
+       if(kind >= EXPR_UNARY_FIRST && kind <= EXPR_UNARY_LAST) {
                return sizes[EXPR_UNARY_FIRST];
        }
-       if(type >= EXPR_BINARY_FIRST && type <= EXPR_BINARY_LAST) {
+       if(kind >= EXPR_BINARY_FIRST && kind <= EXPR_BINARY_LAST) {
                return sizes[EXPR_BINARY_FIRST];
        }
-       assert(type <= sizeof(sizes) / sizeof(sizes[0]));
-       assert(sizes[type] != 0);
-       return sizes[type];
+       assert(kind <= sizeof(sizes) / sizeof(sizes[0]));
+       assert(sizes[kind] != 0);
+       return sizes[kind];
 }
 
+/**
+ * Allocate an expression node of given kind and initialize all
+ * fields with zero.
+ */
 static expression_t *allocate_expression_zero(expression_kind_t kind)
 {
        size_t        size = get_expression_struct_size(kind);
@@ -205,10 +229,16 @@ static expression_t *allocate_expression_zero(expression_kind_t kind)
        return res;
 }
 
+/**
+ * Returns the size of a type node.
+ *
+ * @param kind  the type kind
+ */
 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),
@@ -225,6 +255,10 @@ static size_t get_type_struct_size(type_kind_t kind)
        return sizes[kind];
 }
 
+/**
+ * Allocate a type node of given kind and initialize all
+ * fields with zero.
+ */
 static type_t *allocate_type_zero(type_kind_t kind)
 {
        size_t  size = get_type_struct_size(kind);
@@ -235,6 +269,11 @@ static type_t *allocate_type_zero(type_kind_t kind)
        return res;
 }
 
+/**
+ * Returns the size of an initializer node.
+ *
+ * @param kind  the initializer kind
+ */
 static size_t get_initializer_size(initializer_kind_t kind)
 {
        static const size_t sizes[] = {
@@ -248,7 +287,11 @@ static size_t get_initializer_size(initializer_kind_t kind)
        return sizes[kind];
 }
 
-static initializer_t *allocate_initializer(initializer_kind_t kind)
+/**
+ * Allocate an initializer node of given kind and initialize all
+ * fields with zero.
+ */
+static initializer_t *allocate_initializer_zero(initializer_kind_t kind)
 {
        initializer_t *result = allocate_ast_zero(get_initializer_size(kind));
        result->kind          = kind;
@@ -256,26 +299,34 @@ static initializer_t *allocate_initializer(initializer_kind_t kind)
        return result;
 }
 
+/**
+ * Free a type from the type obstack.
+ */
 static void free_type(void *type)
 {
        obstack_free(type_obst, type);
 }
 
 /**
- * returns the top element of the environment stack
+ * Returns the index of the top element of the environment stack.
  */
 static size_t environment_top(void)
 {
        return ARR_LEN(environment_stack);
 }
 
+/**
+ * Returns the index of the top element of the label stack.
+ */
 static size_t label_top(void)
 {
        return ARR_LEN(label_stack);
 }
 
 
-
+/**
+ * Return the next token.
+ */
 static inline void next_token(void)
 {
        token                              = lookahead_buffer[lookahead_bufpos];
@@ -290,6 +341,9 @@ static inline void next_token(void)
 #endif
 }
 
+/**
+ * Return the next token with a given lookahead.
+ */
 static inline const token_t *look_ahead(int num)
 {
        assert(num > 0 && num <= MAX_LOOKAHEAD);
@@ -299,6 +353,9 @@ static inline const token_t *look_ahead(int num)
 
 #define eat(token_type)  do { assert(token.type == token_type); next_token(); } while(0)
 
+/**
+ * Report a parse error because an expected token was not found.
+ */
 static void parse_error_expected(const char *message, ...)
 {
        if(message != NULL) {
@@ -310,18 +367,27 @@ static void parse_error_expected(const char *message, ...)
        va_end(ap);
 }
 
+/**
+ * Report a type error.
+ */
 static void type_error(const char *msg, const source_position_t source_position,
                        type_t *type)
 {
        errorf(source_position, "%s, but found type '%T'", msg, type);
 }
 
+/**
+ * Report an incompatible type.
+ */
 static void type_error_incompatible(const char *msg,
                const source_position_t source_position, type_t *type1, type_t *type2)
 {
        errorf(source_position, "%s, incompatible types: '%T' - '%T'", msg, type1, type2);
 }
 
+/**
+ * Eat an complete block, ie. '{ ... }'.
+ */
 static void eat_block(void)
 {
        if(token.type == '{')
@@ -339,6 +405,9 @@ static void eat_block(void)
        eat('}');
 }
 
+/**
+ * Eat a statement until an ';' token.
+ */
 static void eat_statement(void)
 {
        while(token.type != ';') {
@@ -355,6 +424,9 @@ static void eat_statement(void)
        eat(';');
 }
 
+/**
+ * Eat a parenthesed term, ie. '( ... )'.
+ */
 static void eat_paren(void)
 {
        if(token.type == '(')
@@ -416,25 +488,10 @@ static void set_context(context_t *new_context)
 }
 
 /**
- * called when we find a 2nd declarator for an identifier we already have a
- * declarator for
+ * Search a symbol in a given namespace and returns its declaration or
+ * NULL if this symbol was not found.
  */
-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);
-}
-
-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) {
@@ -445,83 +502,15 @@ static declaration_t *get_declaration(symbol_t *symbol, namespace_t namespc)
        return NULL;
 }
 
-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;
@@ -552,19 +541,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);
 }
 
 /**
@@ -645,12 +634,21 @@ static int get_rank(const type_t *type)
 
 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;
 
        return type;
 }
 
+/**
+ * Create a cast expression.
+ *
+ * @param expression  the expression to cast
+ * @param dest_type   the destination type
+ */
 static expression_t *create_cast_expression(expression_t *expression,
                                             type_t *dest_type)
 {
@@ -662,6 +660,9 @@ static expression_t *create_cast_expression(expression_t *expression,
        return cast;
 }
 
+/**
+ * Check if a given expression represents the 0 pointer constant.
+ */
 static bool is_null_pointer_constant(const expression_t *expression)
 {
        /* skip void* cast */
@@ -682,6 +683,12 @@ static bool is_null_pointer_constant(const expression_t *expression)
        return expression->conste.v.int_value == 0;
 }
 
+/**
+ * Create an implicit cast expression.
+ *
+ * @param expression  the expression to cast
+ * @param dest_type   the destination type
+ */
 static expression_t *create_implicit_cast(expression_t *expression,
                                           type_t *dest_type)
 {
@@ -699,9 +706,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");
                        }
 
@@ -966,7 +975,7 @@ static initializer_t *initializer_from_string(array_type_t *type,
        /* TODO: check len vs. size of array type */
        (void) type;
 
-       initializer_t *initializer = allocate_initializer(INITIALIZER_STRING);
+       initializer_t *initializer = allocate_initializer_zero(INITIALIZER_STRING);
        initializer->string.string = string;
 
        return initializer;
@@ -979,7 +988,7 @@ static initializer_t *initializer_from_wide_string(array_type_t *const type,
        (void) type;
 
        initializer_t *const initializer =
-               allocate_initializer(INITIALIZER_WIDE_STRING);
+               allocate_initializer_zero(INITIALIZER_WIDE_STRING);
        initializer->wide_string.string = *string;
 
        return initializer;
@@ -993,8 +1002,8 @@ 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) {
@@ -1012,7 +1021,8 @@ static initializer_t *initializer_from_expression(type_t *type,
                                        }
                                }
 
-                               default: break;
+                               default:
+                                       break;
                        }
                }
        }
@@ -1021,7 +1031,7 @@ static initializer_t *initializer_from_expression(type_t *type,
        if(is_type_scalar(type) || types_compatible(type, expression_type)) {
                semantic_assign(type, &expression, "initializer");
 
-               initializer_t *result = allocate_initializer(INITIALIZER_VALUE);
+               initializer_t *result = allocate_initializer_zero(INITIALIZER_VALUE);
                result->value.value   = expression;
 
                return result;
@@ -1048,6 +1058,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)
@@ -1096,6 +1124,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) {
@@ -1135,6 +1170,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;
@@ -1239,7 +1281,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)
 {
@@ -1288,13 +1330,18 @@ static declaration_t *parse_compound_type_specifier(bool is_struct)
                }
                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;
@@ -1382,6 +1429,7 @@ static type_t *parse_enum_specifier(void)
                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);
@@ -1389,9 +1437,10 @@ 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);
+               environment_push(declaration);
+               append_declaration(declaration);
                declaration->init.is_defined = 1;
 
                parse_enum_entries(&type->enumt);
@@ -1758,13 +1807,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");
@@ -1866,7 +1915,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);
        }
 }
 
@@ -2216,7 +2266,7 @@ static declaration_t *parse_declarator(
        type_t        *type         = specifiers->type;
        declaration_t *declaration  = allocate_ast_zero(sizeof(declaration[0]));
        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
@@ -2242,35 +2292,119 @@ 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) {
+               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,
@@ -2345,7 +2479,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;
        }
@@ -2401,7 +2537,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 == '=') {
@@ -2456,6 +2593,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);
        }
 
@@ -2481,13 +2620,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);
@@ -2525,7 +2666,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;
        }
 
@@ -2574,10 +2715,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);
 
@@ -2588,6 +2728,8 @@ static void parse_external_declaration(void)
 
        declaration_t *parameter = declaration->context.declarations;
        for( ; parameter != NULL; parameter = parameter->next) {
+               assert(parameter->parent_context == NULL || parameter->parent_context == context);
+               parameter->parent_context = context;
                environment_push(parameter);
        }
 
@@ -2614,26 +2756,50 @@ 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 */
+                       type_t *base_type = specifiers->type;
+                       expression_t *size = parse_constant_expression();
+
+                       type_t *type = make_bitfield_type(base_type, size);
+
+                       declaration = allocate_ast_zero(sizeof(declaration[0]));
+
+                       declaration->namespc         = NAMESPACE_NORMAL;
+                       declaration->storage_class   = STORAGE_CLASS_NONE;
+                       declaration->source_position = token.source_position;
+                       declaration->modifiers       = specifiers->decl_modifiers;
+                       declaration->type            = type;
+
                        record_declaration(declaration);
+               } 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;
@@ -2693,6 +2859,9 @@ struct expression_parser_function_t {
 
 expression_parser_function_t expression_parsers[T_LAST_TOKEN];
 
+/**
+ * Creates a new invalid expression.
+ */
 static expression_t *create_invalid_expression(void)
 {
        expression_t *expression         = allocate_expression_zero(EXPR_INVALID);
@@ -2709,6 +2878,9 @@ static expression_t *expected_expression_error(void)
        return create_invalid_expression();
 }
 
+/**
+ * Parse a string constant.
+ */
 static expression_t *parse_string_const(void)
 {
        expression_t *cnst  = allocate_expression_zero(EXPR_STRING_LITERAL);
@@ -2718,6 +2890,9 @@ static expression_t *parse_string_const(void)
        return cnst;
 }
 
+/**
+ * Parse a wide string constant.
+ */
 static expression_t *parse_wide_string_const(void)
 {
        expression_t *const cnst = allocate_expression_zero(EXPR_WIDE_STRING_LITERAL);
@@ -2727,6 +2902,9 @@ static expression_t *parse_wide_string_const(void)
        return cnst;
 }
 
+/**
+ * Parse an integer constant.
+ */
 static expression_t *parse_int_const(void)
 {
        expression_t *cnst       = allocate_expression_zero(EXPR_CONST);
@@ -2738,6 +2916,9 @@ static expression_t *parse_int_const(void)
        return cnst;
 }
 
+/**
+ * Parse a float constant.
+ */
 static expression_t *parse_float_const(void)
 {
        expression_t *cnst         = allocate_expression_zero(EXPR_CONST);
@@ -2767,24 +2948,22 @@ static declaration_t *create_implicit_function(symbol_t *symbol,
        declaration->type            = type;
        declaration->symbol          = symbol;
        declaration->source_position = source_position;
-
-       /* 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;
+       declaration->parent_context  = global_context;
 
        environment_push(declaration);
        declaration->next     = context->declarations;
        context->declarations = declaration;
 
-       context = last_context;
-
        return declaration;
 }
 
+/**
+ * Creates a return_type (func)(argument_type) function type if not
+ * already exists.
+ *
+ * @param return_type    the return type
+ * @param argument_type  the argument type
+ */
 static type_t *make_function_1_type(type_t *return_type, type_t *argument_type)
 {
        function_parameter_t *parameter
@@ -2804,6 +2983,11 @@ static type_t *make_function_1_type(type_t *return_type, type_t *argument_type)
        return result;
 }
 
+/**
+ * Creates a function type for some function like builtins.
+ *
+ * @param symbol   the symbol describing the builtin
+ */
 static type_t *get_builtin_symbol_type(symbol_t *symbol)
 {
        switch(symbol->ID) {
@@ -2823,7 +3007,9 @@ static type_t *get_builtin_symbol_type(symbol_t *symbol)
 }
 
 /**
- * performs automatic type cast as described in Â§ 6.3.2.1
+ * Performs automatic type cast as described in Â§ 6.3.2.1.
+ *
+ * @param orig_type  the original type
  */
 static type_t *automatic_type_conversion(type_t *orig_type)
 {
@@ -2906,22 +3092,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);
@@ -3177,6 +3362,42 @@ static expression_t *parse_builtin_symbol(void)
        return expression;
 }
 
+static expression_t *parse_builtin_constant(void)
+{
+       eat(T___builtin_constant_p);
+
+       expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_CONSTANT_P);
+
+       expect('(');
+       expression->builtin_constant.value = parse_assignment_expression();
+       expect(')');
+       expression->base.datatype = type_int;
+
+       return expression;
+}
+
+static expression_t *parse_builtin_prefetch(void)
+{
+       eat(T___builtin_prefetch);
+
+       expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_PREFETCH);
+
+       expect('(');
+       expression->builtin_prefetch.adr = parse_assignment_expression();
+       if (token.type == ',') {
+               next_token();
+               expression->builtin_prefetch.rw = parse_assignment_expression();
+       }
+       if (token.type == ',') {
+               next_token();
+               expression->builtin_prefetch.locality = parse_assignment_expression();
+       }
+       expect(')');
+       expression->base.datatype = type_void;
+
+       return expression;
+}
+
 static expression_t *parse_compare_builtin(void)
 {
        expression_t *expression;
@@ -3254,7 +3475,7 @@ static expression_t *parse_assume(void) {
                = allocate_expression_zero(EXPR_UNARY_ASSUME);
 
        expect('(');
-       expression->unary.value = parse_expression();
+       expression->unary.value = parse_assignment_expression();
        expect(')');
 
        expression->base.datatype = type_void;
@@ -3282,7 +3503,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();
@@ -3312,6 +3533,10 @@ static expression_t *parse_primary_expression(void)
        case T___builtin_islessgreater:
        case T___builtin_isunordered:
                return parse_compare_builtin();
+       case T___builtin_constant_p:
+               return parse_builtin_constant();
+       case T___builtin_prefetch:
+               return parse_builtin_prefetch();
        case T___alignof__:
                return parse_alignof();
        case T_assume:
@@ -3443,7 +3668,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();
        }
 
@@ -3451,7 +3677,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();
        }
 
@@ -3462,7 +3689,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();
        }
 
@@ -3472,17 +3699,32 @@ 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;
 }
 
+/**
+ * Parse a call expression, ie. expression '( ... )'.
+ *
+ * @param expression  the function address
+ */
 static expression_t *parse_call_expression(unsigned precedence,
                                            expression_t *expression)
 {
        (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;
@@ -3593,6 +3835,11 @@ static bool same_compound_type(const type_t *type1, const type_t *type2)
        return compound1->declaration == compound2->declaration;
 }
 
+/**
+ * Parse a conditional expression, ie. 'expression ? ... : ...'.
+ *
+ * @param expression  the conditional expression
+ */
 static expression_t *parse_conditional_expression(unsigned precedence,
                                                   expression_t *expression)
 {
@@ -3659,13 +3906,17 @@ static expression_t *parse_conditional_expression(unsigned precedence,
        return result;
 }
 
+/**
+ * Parse an extension expression.
+ */
 static expression_t *parse_extension(unsigned precedence)
 {
        eat(T___extension__);
 
        /* TODO enable extensions */
-
-       return parse_sub_expression(precedence);
+       expression_t *expression = parse_sub_expression(precedence);
+       /* TODO disable extensions */
+       return expression;
 }
 
 static expression_t *parse_builtin_classify_type(const unsigned precedence)
@@ -3764,6 +4015,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;
@@ -3777,6 +4031,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;
                }
        }
@@ -3788,13 +4047,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;                                                   \
 }
 
@@ -3877,6 +4137,9 @@ static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right)
        }
 }
 
+/**
+ * Check the semantic restrictions for a binary expression.
+ */
 static void semantic_binexpr_arithmetic(binary_expression_t *expression)
 {
        expression_t *left       = expression->left;
@@ -4045,7 +4308,7 @@ static void semantic_arithmetic_assign(binary_expression_t *expression)
        /* combined instructions are tricky. We can't create an implicit cast on
         * the left side, because we need the uncasted form for the store.
         * The ast2firm pass has to know that left_type must be right_type
-        * for the arithmeitc operation and create a cast by itself */
+        * for the arithmetic operation and create a cast by itself */
        type_t *arithmetic_type = semantic_arithmetic(type_left, type_right);
        expression->right       = create_implicit_cast(right, arithmetic_type);
        expression->expression.datatype = type_left;
@@ -4068,7 +4331,7 @@ static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression)
                /* combined instructions are tricky. We can't create an implicit cast on
                 * the left side, because we need the uncasted form for the store.
                 * The ast2firm pass has to know that left_type must be right_type
-                * for the arithmeitc operation and create a cast by itself */
+                * for the arithmetic operation and create a cast by itself */
                type_t *const arithmetic_type = semantic_arithmetic(type_left, type_right);
                expression->right = create_implicit_cast(right, arithmetic_type);
                expression->expression.datatype = type_left;
@@ -4080,6 +4343,9 @@ static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression)
        }
 }
 
+/**
+ * Check the semantic restrictions of a logical expression.
+ */
 static void semantic_logical_op(binary_expression_t *expression)
 {
        expression_t *left            = expression->left;
@@ -4102,13 +4368,29 @@ static void semantic_logical_op(binary_expression_t *expression)
        expression->expression.datatype = type_int;
 }
 
-static bool has_const_fields(type_t *type)
+/**
+ * Checks if a compound type has constant fields.
+ */
+static bool has_const_fields(const compound_type_t *type)
 {
-       (void) type;
+       const context_t     *context = &type->declaration->context;
+       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;
+       }
        /* TODO */
        return false;
 }
 
+/**
+ * Check the semantic restrictions of a binary assign expression.
+ */
 static void semantic_binexpr_assign(binary_expression_t *expression)
 {
        expression_t *left           = expression->left;
@@ -4126,15 +4408,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)) {
-               errorf(HERE, "cannot assign to '%E' because compound type '%T' has readonly fields", left, orig_type_left);
+       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);
                return;
        }
 
@@ -4258,13 +4544,21 @@ static expression_t *parse_sub_expression(unsigned precedence)
        return left;
 }
 
+/**
+ * Parse an expression.
+ */
 static expression_t *parse_expression(void)
 {
        return parse_sub_expression(1);
 }
 
-
-
+/**
+ * Register a parser for a prefix-like operator with given precedence.
+ *
+ * @param parser      the parser function
+ * @param token_type  the token type of the prefix token
+ * @param precedence  the precedence of the operator
+ */
 static void register_expression_parser(parse_expression_function parser,
                                        int token_type, unsigned precedence)
 {
@@ -4278,6 +4572,13 @@ static void register_expression_parser(parse_expression_function parser,
        entry->precedence = precedence;
 }
 
+/**
+ * Register a parser for an infix operator with given precedence.
+ *
+ * @param parser      the parser function
+ * @param token_type  the token type of the infix operator
+ * @param precedence  the precedence of the operator
+ */
 static void register_infix_parser(parse_expression_infix_function parser,
                int token_type, unsigned precedence)
 {
@@ -4292,6 +4593,9 @@ static void register_infix_parser(parse_expression_infix_function parser,
        entry->infix_precedence = precedence;
 }
 
+/**
+ * Initialize the expression parsers.
+ */
 static void init_expression_parsers(void)
 {
        memset(&expression_parsers, 0, sizeof(expression_parsers));
@@ -4360,6 +4664,9 @@ static void init_expression_parsers(void)
                                                     T___builtin_classify_type, 25);
 }
 
+/**
+ * Parse a asm statement constraints specification.
+ */
 static asm_constraint_t *parse_asm_constraints(void)
 {
        asm_constraint_t *result = NULL;
@@ -4401,6 +4708,9 @@ static asm_constraint_t *parse_asm_constraints(void)
        return result;
 }
 
+/**
+ * Parse a asm statement clobber specification.
+ */
 static asm_clobber_t *parse_asm_clobbers(void)
 {
        asm_clobber_t *result = NULL;
@@ -4425,6 +4735,9 @@ static asm_clobber_t *parse_asm_clobbers(void)
        return result;
 }
 
+/**
+ * Parse an asm statement.
+ */
 static statement_t *parse_asm_statement(void)
 {
        eat(T_asm);
@@ -4464,6 +4777,9 @@ end_of_asm:
        return statement;
 }
 
+/**
+ * Parse a case statement.
+ */
 static statement_t *parse_case_statement(void)
 {
        eat(T_case);
@@ -4479,6 +4795,9 @@ static statement_t *parse_case_statement(void)
        return statement;
 }
 
+/**
+ * Parse a default statement.
+ */
 static statement_t *parse_default_statement(void)
 {
        eat(T_default);
@@ -4493,6 +4812,9 @@ static statement_t *parse_default_statement(void)
        return statement;
 }
 
+/**
+ * Return the declaration for a given label symbol or create a new one.
+ */
 static declaration_t *get_label(symbol_t *symbol)
 {
        declaration_t *candidate = get_declaration(symbol, NAMESPACE_LABEL);
@@ -4514,6 +4836,9 @@ static declaration_t *get_label(symbol_t *symbol)
        return declaration;
 }
 
+/**
+ * Parse a label statement.
+ */
 static statement_t *parse_label_statement(void)
 {
        assert(token.type == T_IDENTIFIER);
@@ -4525,8 +4850,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;
        }
@@ -4537,7 +4863,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? */
@@ -4550,6 +4876,9 @@ static statement_t *parse_label_statement(void)
        return (statement_t*) label_statement;
 }
 
+/**
+ * Parse an if statement.
+ */
 static statement_t *parse_if(void)
 {
        eat(T_if);
@@ -4571,6 +4900,9 @@ static statement_t *parse_if(void)
        return (statement_t*) statement;
 }
 
+/**
+ * Parse a switch statement.
+ */
 static statement_t *parse_switch(void)
 {
        eat(T_switch);
@@ -4587,6 +4919,9 @@ static statement_t *parse_switch(void)
        return (statement_t*) statement;
 }
 
+/**
+ * Parse a while statement.
+ */
 static statement_t *parse_while(void)
 {
        eat(T_while);
@@ -4603,6 +4938,9 @@ static statement_t *parse_while(void)
        return (statement_t*) statement;
 }
 
+/**
+ * Parse a do statement.
+ */
 static statement_t *parse_do(void)
 {
        eat(T_do);
@@ -4621,6 +4959,9 @@ static statement_t *parse_do(void)
        return (statement_t*) statement;
 }
 
+/**
+ * Parse a for statement.
+ */
 static statement_t *parse_for(void)
 {
        eat(T_for);
@@ -4663,6 +5004,9 @@ static statement_t *parse_for(void)
        return (statement_t*) statement;
 }
 
+/**
+ * Parse a goto statement.
+ */
 static statement_t *parse_goto(void)
 {
        eat(T_goto);
@@ -4689,6 +5033,9 @@ static statement_t *parse_goto(void)
        return (statement_t*) statement;
 }
 
+/**
+ * Parse a continue statement.
+ */
 static statement_t *parse_continue(void)
 {
        eat(T_continue);
@@ -4701,6 +5048,9 @@ static statement_t *parse_continue(void)
        return statement;
 }
 
+/**
+ * Parse a break statement.
+ */
 static statement_t *parse_break(void)
 {
        eat(T_break);
@@ -4713,6 +5063,9 @@ static statement_t *parse_break(void)
        return statement;
 }
 
+/**
+ * Parse a return statement.
+ */
 static statement_t *parse_return(void)
 {
        eat(T_return);
@@ -4761,6 +5114,9 @@ static statement_t *parse_return(void)
        return (statement_t*) statement;
 }
 
+/**
+ * Parse a declaration statement.
+ */
 static statement_t *parse_declaration_statement(void)
 {
        statement_t *statement = allocate_statement_zero(STATEMENT_DECLARATION);
@@ -4780,6 +5136,9 @@ static statement_t *parse_declaration_statement(void)
        return statement;
 }
 
+/**
+ * Parse an expression statement, ie. expr ';'.
+ */
 static statement_t *parse_expression_statement(void)
 {
        statement_t *statement = allocate_statement_zero(STATEMENT_EXPRESSION);
@@ -4792,6 +5151,9 @@ static statement_t *parse_expression_statement(void)
        return statement;
 }
 
+/**
+ * Parse a statement.
+ */
 static statement_t *parse_statement(void)
 {
        statement_t   *statement = NULL;
@@ -4893,6 +5255,9 @@ static statement_t *parse_statement(void)
        return statement;
 }
 
+/**
+ * Parse a compound statement.
+ */
 static statement_t *parse_compound_statement(void)
 {
        compound_statement_t *compound_statement
@@ -4925,10 +5290,11 @@ static statement_t *parse_compound_statement(void)
                last_statement = statement;
        }
 
-       if(token.type != '}') {
+       if(token.type == '}') {
+               next_token();
+       } else {
                errorf(compound_statement->statement.source_position, "end of file while looking for closing '}'");
        }
-       next_token();
 
        assert(context == &compound_statement->context);
        set_context(last_context);
@@ -4937,7 +5303,10 @@ static statement_t *parse_compound_statement(void)
        return (statement_t*) compound_statement;
 }
 
-static void initialize_builtins(void)
+/**
+ * Initialize builtin types.
+ */
+static void initialize_builtin_types(void)
 {
        type_intmax_t    = make_global_typedef("__intmax_t__",      type_long_long);
        type_size_t      = make_global_typedef("__SIZE_TYPE__",     type_unsigned_long);
@@ -4954,6 +5323,9 @@ static void initialize_builtins(void)
        type_wchar_t_ptr   = make_pointer_type(type_wchar_t,   TYPE_QUALIFIER_NONE);
 }
 
+/**
+ * Parse a translation unit.
+ */
 static translation_unit_t *parse_translation_unit(void)
 {
        translation_unit_t *unit = allocate_ast_zero(sizeof(unit[0]));
@@ -4964,10 +5336,16 @@ static translation_unit_t *parse_translation_unit(void)
        assert(context == NULL);
        set_context(&unit->context);
 
-       initialize_builtins();
+       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);
@@ -4980,11 +5358,18 @@ static translation_unit_t *parse_translation_unit(void)
        return unit;
 }
 
+/**
+ * Parse the input.
+ *
+ * @return  the translation unit or NULL if errors occurred.
+ */
 translation_unit_t *parse(void)
 {
        environment_stack = NEW_ARR_F(stack_entry_t, 0);
        label_stack       = NEW_ARR_F(stack_entry_t, 0);
-       found_error       = false;
+       diagnostic_count  = 0;
+       error_count       = 0;
+       warning_count     = 0;
 
        type_set_output(stderr);
        ast_set_output(stderr);
@@ -4998,12 +5383,15 @@ translation_unit_t *parse(void)
        DEL_ARR_F(environment_stack);
        DEL_ARR_F(label_stack);
 
-       if(found_error)
+       if(error_count > 0)
                return NULL;
 
        return unit;
 }
 
+/**
+ * Initialize the parser.
+ */
 void init_parser(void)
 {
        init_expression_parsers();
@@ -5013,6 +5401,9 @@ void init_parser(void)
        type_valist = create_builtin_type(va_list_sym, type_void_ptr);
 }
 
+/**
+ * Terminate the parser.
+ */
 void exit_parser(void)
 {
        obstack_free(&temp_obst, NULL);