Generate a more sensible warning for a stray ; in global context than "no type specif...
[cparser] / parser.c
index d64e2f0..71f125b 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;
@@ -49,7 +49,8 @@ static context_t      *context           = NULL;
 static declaration_t  *last_declaration  = NULL;
 static declaration_t  *current_function  = NULL;
 static struct obstack  temp_obst;
-static bool            found_error;
+
+#define HERE token.source_position
 
 static type_t *type_valist;
 
@@ -119,6 +120,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);
@@ -126,6 +131,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[] = {
@@ -150,6 +160,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);
@@ -159,8 +173,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),
@@ -179,22 +197,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);
@@ -204,10 +228,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),
@@ -224,6 +254,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);
@@ -234,6 +268,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[] = {
@@ -247,7 +286,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;
@@ -255,26 +298,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];
@@ -289,6 +340,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);
@@ -298,99 +352,41 @@ static inline const token_t *look_ahead(int num)
 
 #define eat(token_type)  do { assert(token.type == token_type); next_token(); } while(0)
 
-static void error(void)
-{
-       found_error = true;
-#ifdef ABORT_ON_ERROR
-       abort();
-#endif
-}
-
-static void parser_print_error_prefix_pos(
-               const source_position_t source_position)
-{
-       parser_print_prefix_pos(source_position);
-       fputs("error: ", stderr);
-       error();
-}
-
-static void parser_print_error_prefix(void)
-{
-       parser_print_error_prefix_pos(token.source_position);
-}
-
-static void parse_error(const char *message)
-{
-       parser_print_error_prefix();
-       fprintf(stderr, "parse error: %s\n", message);
-}
-
-static void parser_print_warning_prefix(void)
-{
-       parser_print_warning_prefix_pos(token.source_position);
-}
-
-static void parse_warning(const char *message)
-{
-       parse_warning_pos(token.source_position, message);
-}
-
+/**
+ * Report a parse error because an expected token was not found.
+ */
 static void parse_error_expected(const char *message, ...)
 {
-       va_list args;
-       int first = 1;
-
        if(message != NULL) {
-               parser_print_error_prefix();
-               fprintf(stderr, "%s\n", message);
+               errorf(HERE, "%s", message);
        }
-       parser_print_error_prefix();
-       fputs("Parse error: got ", stderr);
-       print_token(stderr, &token);
-       fputs(", expected ", stderr);
-
-       va_start(args, message);
-       token_type_t token_type = va_arg(args, token_type_t);
-       while(token_type != 0) {
-               if(first == 1) {
-                       first = 0;
-               } else {
-                       fprintf(stderr, ", ");
-               }
-               print_token_type(stderr, token_type);
-               token_type = va_arg(args, token_type_t);
-       }
-       va_end(args);
-       fprintf(stderr, "\n");
-}
-
-static void print_type_quoted(type_t *type)
-{
-       fputc('\'', stderr);
-       print_type(type);
-       fputc('\'', stderr);
+       va_list ap;
+       va_start(ap, message);
+       errorf(HERE, "got '%K', expected %#k", &token, &ap, ", ");
+       va_end(ap);
 }
 
+/**
+ * Report a type error.
+ */
 static void type_error(const char *msg, const source_position_t source_position,
                        type_t *type)
 {
-       parser_print_error_prefix_pos(source_position);
-       fprintf(stderr, "%s, but found type ", msg);
-       print_type_quoted(type);
-       fputc('\n', stderr);
+       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)
 {
-       parser_print_error_prefix_pos(source_position);
-       fprintf(stderr, "%s, incompatible types: ", msg);
-       print_type_quoted(type1);
-       fprintf(stderr, " - ");
-       print_type_quoted(type2);
-       fprintf(stderr, ")\n");
+       errorf(source_position, "%s, incompatible types: '%T' - '%T'", msg, type1, type2);
 }
 
+/**
+ * Eat an complete block, ie. '{ ... }'.
+ */
 static void eat_block(void)
 {
        if(token.type == '{')
@@ -408,6 +404,9 @@ static void eat_block(void)
        eat('}');
 }
 
+/**
+ * Eat a statement until an ';' token.
+ */
 static void eat_statement(void)
 {
        while(token.type != ';') {
@@ -424,6 +423,9 @@ static void eat_statement(void)
        eat(';');
 }
 
+/**
+ * Eat a parenthesed term, ie. '( ... )'.
+ */
 static void eat_paren(void)
 {
        if(token.type == '(')
@@ -485,8 +487,8 @@ static void set_context(context_t *new_context)
 }
 
 /**
- * called when we find a 2nd declarator for an identifier we already have a
- * declarator for
+ * 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)
@@ -503,6 +505,10 @@ static bool is_compatible_declaration(declaration_t *declaration,
        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)
 {
        declaration_t *declaration = symbol->declaration;
@@ -514,6 +520,9 @@ 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) {
@@ -550,17 +559,8 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr,
        if(previous_declaration != NULL
                        && previous_declaration->parent_context == context) {
                if(!is_compatible_declaration(declaration, previous_declaration)) {
-                       parser_print_error_prefix_pos(declaration->source_position);
-                       fprintf(stderr, "definition of symbol '%s%s' with type ",
-                                       get_namespace_prefix(namespc), symbol->string);
-                       print_type_quoted(declaration->type);
-                       fputc('\n', stderr);
-                       parser_print_error_prefix_pos(
-                                       previous_declaration->source_position);
-                       fprintf(stderr, "is incompatible with previous declaration "
-                                       "of type ");
-                       print_type_quoted(previous_declaration->type);
-                       fputc('\n', stderr);
+                       errorf(declaration->source_position, "definition of symbol '%s%Y' with type '%T'", get_namespace_prefix(namespc), symbol, 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;
@@ -570,46 +570,30 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr,
                        if (current_function == NULL) {
                                if (old_storage_class != STORAGE_CLASS_STATIC &&
                                    new_storage_class == STORAGE_CLASS_STATIC) {
-                                       parser_print_error_prefix_pos(declaration->source_position);
-                                       fprintf(stderr,
-                                               "static declaration of '%s' follows non-static declaration\n",
-                                               symbol->string);
-                                       parser_print_error_prefix_pos(previous_declaration->source_position);
-                                       fprintf(stderr, "previous declaration of '%s' was here\n",
-                                               symbol->string);
+                                       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) {
                                                if (new_storage_class == STORAGE_CLASS_NONE) {
                                                        previous_declaration->storage_class = STORAGE_CLASS_NONE;
                                                }
                                        } else if(!is_type_function(type)) {
-                                               parser_print_warning_prefix_pos(declaration->source_position);
-                                               fprintf(stderr, "redundant declaration for '%s'\n",
-                                                                               symbol->string);
-                                               parser_print_warning_prefix_pos(previous_declaration->source_position);
-                                               fprintf(stderr, "previous declaration of '%s' was here\n",
-                                                                               symbol->string);
+                                               warningf(declaration->source_position, "redundant declaration for '%Y'", symbol);
+                                               warningf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol);
                                        }
                                }
                        } else {
                                if (old_storage_class == STORAGE_CLASS_EXTERN &&
                                                new_storage_class == STORAGE_CLASS_EXTERN) {
-                                       parser_print_warning_prefix_pos(declaration->source_position);
-                                       fprintf(stderr, "redundant extern declaration for '%s'\n",
-                                               symbol->string);
-                                       parser_print_warning_prefix_pos(previous_declaration->source_position);
-                                       fprintf(stderr, "previous declaration of '%s' was here\n",
-                                               symbol->string);
+                                       warningf(declaration->source_position, "redundant extern declaration for '%Y'\n", symbol);
+                                       warningf(previous_declaration->source_position, "previous declaration of '%Y' was here\n", symbol);
                                } else {
-                                       parser_print_error_prefix_pos(declaration->source_position);
                                        if (old_storage_class == new_storage_class) {
-                                               fprintf(stderr, "redeclaration of '%s'\n", symbol->string);
+                                               errorf(declaration->source_position, "redeclaration of '%Y'", symbol);
                                        } else {
-                                               fprintf(stderr, "redeclaration of '%s' with different linkage\n", symbol->string);
+                                               errorf(declaration->source_position, "redeclaration of '%Y' with different linkage", symbol);
                                        }
-                                       parser_print_error_prefix_pos(previous_declaration->source_position);
-                                       fprintf(stderr, "previous declaration of '%s' was here\n",
-                                               symbol->string);
+                                       errorf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol);
                                }
                        }
                }
@@ -739,12 +723,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)
 {
@@ -756,6 +749,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 */
@@ -776,6 +772,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)
 {
@@ -793,9 +795,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");
                        }
 
@@ -878,14 +882,7 @@ static void semantic_assign(type_t *orig_type_left, expression_t **right,
                unsigned missing_qualifiers
                        = points_to_right->base.qualifiers & ~points_to_left->base.qualifiers;
                if(missing_qualifiers != 0) {
-                       parser_print_error_prefix();
-                       fprintf(stderr, "destination type ");
-                       print_type_quoted(type_left);
-                       fprintf(stderr, " in %s from type ", context);
-                       print_type_quoted(type_right);
-                       fprintf(stderr, " lacks qualifiers '");
-                       print_type_qualifiers(missing_qualifiers);
-                       fprintf(stderr, "' in pointed-to type\n");
+                       errorf(HERE, "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointed-to type", type_left, context, type_right, missing_qualifiers);
                        return;
                }
 
@@ -910,13 +907,8 @@ static void semantic_assign(type_t *orig_type_left, expression_t **right,
 
 incompatible_assign_types:
        /* TODO: improve error message */
-       parser_print_error_prefix();
-       fprintf(stderr, "incompatible types in %s\n", context);
-       parser_print_error_prefix();
-       print_type_quoted(orig_type_left);
-       fputs(" <- ", stderr);
-       print_type_quoted(orig_type_right);
-       fputs("\n", stderr);
+       errorf(HERE, "incompatible types in %s", context);
+       errorf(HERE, "'%T' <- '%T'", orig_type_left, orig_type_right);
 }
 
 static expression_t *parse_constant_expression(void)
@@ -925,10 +917,7 @@ static expression_t *parse_constant_expression(void)
        expression_t *result = parse_sub_expression(7);
 
        if(!is_constant_expression(result)) {
-               parser_print_error_prefix_pos(result->base.source_position);
-               fprintf(stderr, "expression '");
-               print_expression(result);
-               fprintf(stderr, "' is not constant\n");
+               errorf(result->base.source_position, "expression '%E' is not constant\n", result);
        }
 
        return result;
@@ -942,7 +931,7 @@ static expression_t *parse_assignment_expression(void)
 
 static type_t *make_global_typedef(const char *name, type_t *type)
 {
-       symbol_t *symbol       = symbol_table_insert(name);
+       symbol_t *const symbol       = symbol_table_insert(name);
 
        declaration_t *declaration   = allocate_ast_zero(sizeof(declaration[0]));
        declaration->namespc         = NAMESPACE_NORMAL;
@@ -986,7 +975,7 @@ static void parse_attributes(void)
                        while(depth > 0) {
                                switch(token.type) {
                                case T_EOF:
-                                       parse_error("EOF while parsing attribute");
+                                       errorf(HERE, "EOF while parsing attribute");
                                        break;
                                case '(':
                                        next_token();
@@ -1075,7 +1064,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;
@@ -1088,7 +1077,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;
@@ -1102,8 +1091,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) {
@@ -1121,7 +1110,8 @@ static initializer_t *initializer_from_expression(type_t *type,
                                        }
                                }
 
-                               default: break;
+                               default:
+                                       break;
                        }
                }
        }
@@ -1130,7 +1120,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;
@@ -1157,6 +1147,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)
@@ -1166,7 +1174,7 @@ static initializer_t *parse_sub_initializer(type_t *type,
                if(token.type == '{') {
                        next_token();
                        if(!had_initializer_brace_warning) {
-                               parse_warning("braces around scalar initializer");
+                               warningf(HERE, "braces around scalar initializer");
                                had_initializer_brace_warning = true;
                        }
                        initializer_t *result = parse_sub_initializer(type, NULL, NULL);
@@ -1184,7 +1192,7 @@ static initializer_t *parse_sub_initializer(type_t *type,
                return initializer_from_expression(type, expression);
        }
 
-       /* does the expression match the currently looked at object to initalize */
+       /* does the expression match the currently looked at object to initialize */
        if(expression != NULL) {
                initializer_t *result = initializer_from_expression(type, expression);
                if(result != NULL)
@@ -1205,6 +1213,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) {
@@ -1233,7 +1248,7 @@ static initializer_t *parse_sub_initializer(type_t *type,
                        sub = parse_sub_initializer_elem(element_type);
                        if(sub == NULL) {
                                /* TODO error, do nicer cleanup */
-                               parse_error("member initializer didn't match");
+                               errorf(HERE, "member initializer didn't match");
                                DEL_ARR_F(elems);
                                return NULL;
                        }
@@ -1244,6 +1259,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;
@@ -1285,8 +1307,8 @@ static initializer_t *parse_sub_initializer(type_t *type,
 
                        sub = parse_sub_initializer_elem(iter_type);
                        if(sub == NULL) {
-                               /* TODO error, do nicer cleanup*/
-                               parse_error("member initializer didn't match");
+                               /* TODO error, do nicer cleanup */
+                               errorf(HERE, "member initializer didn't match");
                                DEL_ARR_F(elems);
                                return NULL;
                        }
@@ -1324,14 +1346,7 @@ static initializer_t *parse_initializer(type_t *type)
                expression_t  *expression  = parse_assignment_expression();
                initializer_t *initializer = initializer_from_expression(type, expression);
                if(initializer == NULL) {
-                       parser_print_error_prefix();
-                       fprintf(stderr, "initializer expression '");
-                       print_expression(expression);
-                       fprintf(stderr, "', type ");
-                       print_type_quoted(expression->base.datatype);
-                       fprintf(stderr, " is incompatible with type ");
-                       print_type_quoted(type);
-                       fprintf(stderr, "\n");
+                       errorf(HERE, "initializer expression '%E', type '%T' is incompatible with type '%T'", expression, expression->base.datatype, type);
                }
                return initializer;
        }
@@ -1410,9 +1425,8 @@ static declaration_t *parse_compound_type_specifier(bool is_struct)
        if(token.type == '{') {
                if(declaration->init.is_defined) {
                        assert(symbol != NULL);
-                       parser_print_error_prefix();
-                       fprintf(stderr, "multiple definition of %s %s\n",
-                                       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;
@@ -1438,7 +1452,7 @@ static void parse_enum_entries(enum_type_t *const enum_type)
 
        if(token.type == '}') {
                next_token();
-               parse_error("empty enum not allowed");
+               errorf(HERE, "empty enum not allowed");
                return;
        }
 
@@ -1507,9 +1521,7 @@ static type_t *parse_enum_specifier(void)
 
        if(token.type == '{') {
                if(declaration->init.is_defined) {
-                       parser_print_error_prefix();
-                       fprintf(stderr, "multiple definitions of enum %s\n",
-                               symbol->string);
+                       errorf(HERE, "multiple definitions of enum %Y", symbol);
                }
                record_declaration(declaration);
                declaration->init.is_defined = 1;
@@ -1643,8 +1655,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
 #define MATCH_STORAGE_CLASS(token, class)                                \
                case token:                                                      \
                        if(specifiers->storage_class != STORAGE_CLASS_NONE) {        \
-                               parse_error("multiple storage classes in declaration "   \
-                                           "specifiers");                               \
+                               errorf(HERE, "multiple storage classes in declaration specifiers"); \
                        }                                                            \
                        specifiers->storage_class = class;                           \
                        next_token();                                                \
@@ -1671,7 +1682,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
                                        break;
 
                                default:
-                                       parse_error("multiple storage classes in declaration specifiers");
+                                       errorf(HERE, "multiple storage classes in declaration specifiers");
                                        break;
                        }
                        next_token();
@@ -1698,7 +1709,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
                case token:                                                     \
                        next_token();                                               \
                        if(type_specifiers & specifier) {                           \
-                               parse_error("multiple " name " type specifiers given"); \
+                               errorf(HERE, "multiple " name " type specifiers given"); \
                        } else {                                                    \
                                type_specifiers |= specifier;                           \
                        }                                                           \
@@ -1729,7 +1740,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
                case T_long:
                        next_token();
                        if(type_specifiers & SPECIFIER_LONG_LONG) {
-                               parse_error("multiple type specifiers given");
+                               errorf(HERE, "multiple type specifiers given");
                        } else if(type_specifiers & SPECIFIER_LONG) {
                                type_specifiers |= SPECIFIER_LONG_LONG;
                        } else {
@@ -1879,20 +1890,20 @@ finish_specifiers:
                default:
                        /* invalid specifier combination, give an error message */
                        if(type_specifiers == 0) {
-#ifndef STRICT_C99
-                               parse_warning("no type specifiers in declaration, using int");
-                               atomic_type = ATOMIC_TYPE_INT;
-                               break;
-#else
-                               parse_error("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)) {
-                               parse_error("signed and unsigned specifiers gives");
+                               errorf(HERE, "signed and unsigned specifiers gives");
                        } else if(type_specifiers & (SPECIFIER_SIGNED | SPECIFIER_UNSIGNED)) {
-                               parse_error("only integer types can be signed or unsigned");
+                               errorf(HERE, "only integer types can be signed or unsigned");
                        } else {
-                               parse_error("multiple datatypes in declaration");
+                               errorf(HERE, "multiple datatypes in declaration");
                        }
                        atomic_type = ATOMIC_TYPE_INVALID;
                }
@@ -1902,7 +1913,7 @@ finish_specifiers:
                newtype            = 1;
        } else {
                if(type_specifiers != 0) {
-                       parse_error("multiple datatypes in declaration");
+                       errorf(HERE, "multiple datatypes in declaration");
                }
        }
 
@@ -1964,10 +1975,10 @@ static void semantic_parameter(declaration_t *declaration)
        /* TODO: improve error messages */
 
        if(declaration->storage_class == STORAGE_CLASS_TYPEDEF) {
-               parse_error("typedef not allowed in parameter list");
+               errorf(HERE, "typedef not allowed in parameter list");
        } else if(declaration->storage_class != STORAGE_CLASS_NONE
                        && declaration->storage_class != STORAGE_CLASS_REGISTER) {
-               parse_error("parameter may only have none or register storage class");
+               errorf(HERE, "parameter may only have none or register storage class");
        }
 
        type_t *orig_type = declaration->type;
@@ -1975,7 +1986,7 @@ static void semantic_parameter(declaration_t *declaration)
                return;
        type_t *type = skip_typeref(orig_type);
 
-       /* Array as last part of a paramter type is just syntactic sugar.  Turn it
+       /* Array as last part of a parameter type is just syntactic sugar.  Turn it
         * into a pointer. Â§ 6.7.5.3 (7) */
        if (is_type_array(type)) {
                const array_type_t *arr_type     = &type->array;
@@ -1987,11 +1998,8 @@ static void semantic_parameter(declaration_t *declaration)
        }
 
        if(is_type_incomplete(type)) {
-               parser_print_error_prefix();
-               fprintf(stderr, "incomplete type (");
-               print_type_quoted(orig_type);
-               fprintf(stderr, ") not allowed for parameter '%s'\n",
-                       declaration->symbol->string);
+               errorf(HERE, "incomplete type ('%T') not allowed for parameter '%Y'",
+                      orig_type, declaration->symbol);
        }
 }
 
@@ -2207,7 +2215,7 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration,
        switch(token.type) {
        case T_IDENTIFIER:
                if(declaration == NULL) {
-                       parse_error("no identifier expected in typename");
+                       errorf(HERE, "no identifier expected in typename");
                } else {
                        declaration->symbol          = token.v.symbol;
                        declaration->source_position = token.source_position;
@@ -2341,7 +2349,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
@@ -2394,11 +2402,10 @@ static declaration_t *record_declaration(declaration_t *declaration)
 static void parser_error_multiple_definition(declaration_t *declaration,
                const source_position_t source_position)
 {
-       parser_print_error_prefix_pos(source_position);
-       fprintf(stderr, "multiple definition of symbol '%s'\n",
-               declaration->symbol->string);
-       parser_print_error_prefix_pos(declaration->source_position);
-       fprintf(stderr, "this is the location of the previous definition.\n");
+       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,
@@ -2473,11 +2480,9 @@ static void parse_init_declarator_rest(declaration_t *declaration)
        }
 
        if(type != NULL && is_type_function(type)) {
-               parser_print_error_prefix_pos(declaration->source_position);
-               fprintf(stderr, "initializers not allowed for function types at "
-                               "declator '%s' (type ", declaration->symbol->string);
-               print_type_quoted(orig_type);
-               fprintf(stderr, ")\n");
+               errorf(declaration->source_position,
+                      "initializers not allowed for function types at declator '%Y' (type '%T')",
+                      declaration->symbol, orig_type);
        } else {
                declaration->init.initializer = initializer;
        }
@@ -2497,8 +2502,7 @@ static void parse_anonymous_declaration_rest(
        declaration->source_position = specifiers->source_position;
 
        if (declaration->storage_class != STORAGE_CLASS_NONE) {
-               parse_warning_pos(declaration->source_position,
-                               "useless storage class in empty declaration");
+               warningf(declaration->source_position, "useless storage class in empty declaration");
        }
 
        type_t *type = declaration->type;
@@ -2507,8 +2511,7 @@ static void parse_anonymous_declaration_rest(
                case TYPE_COMPOUND_UNION: {
                        const compound_type_t *compound_type = &type->compound;
                        if (compound_type->declaration->symbol == NULL) {
-                               parse_warning_pos(declaration->source_position,
-                                               "unnamed struct/union that defines no instances");
+                               warningf(declaration->source_position, "unnamed struct/union that defines no instances");
                        }
                        break;
                }
@@ -2517,8 +2520,7 @@ static void parse_anonymous_declaration_rest(
                        break;
 
                default:
-                       parse_warning_pos(declaration->source_position,
-                                         "empty declaration");
+                       warningf(declaration->source_position, "empty declaration");
                        break;
        }
 
@@ -2536,9 +2538,8 @@ static void parse_declaration_rest(declaration_t *ndeclaration,
                type_t *type      = skip_typeref(orig_type);
 
                if(type->kind != TYPE_FUNCTION && declaration->is_inline) {
-                       parser_print_warning_prefix_pos(declaration->source_position);
-                       fprintf(stderr, "variable '%s' declared 'inline'\n",
-                                       declaration->symbol->string);
+                       warningf(declaration->source_position,
+                                "variable '%Y' declared 'inline'\n", declaration->symbol);
                }
 
                if(token.type == '=') {
@@ -2618,17 +2619,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
-                       parser_print_error_prefix();
-                       fprintf(stderr, "no type specified for function parameter '%s'\n",
-                               parameter_declaration->symbol->string);
-#else
-                       parser_print_warning_prefix();
-                       fprintf(stderr, "no type specified for function parameter '%s', "
-                               "using int\n", 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);
@@ -2697,10 +2696,7 @@ 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) {
-               parser_print_error_prefix();
-               fprintf(stderr, "declarator '");
-               print_type_ext(type, ndeclaration->symbol, NULL);
-               fprintf(stderr, "' has a body but is not a function type.\n");
+               errorf(HERE, "declarator '%#T' has a body but is not a function type", type, ndeclaration->symbol);
                eat_block();
                return;
        }
@@ -2758,26 +2754,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;
@@ -2798,7 +2818,7 @@ static void parse_compound_type_entries(void)
                parse_struct_declarators(&specifiers);
        }
        if(token.type == T_EOF) {
-               parse_error("EOF while parsing struct");
+               errorf(HERE, "EOF while parsing struct");
        }
        next_token();
 }
@@ -2812,7 +2832,7 @@ static type_t *parse_typename(void)
                /* TODO: improve error message, user does probably not know what a
                 * storage class is...
                 */
-               parse_error("typename may not have a storage class");
+               errorf(HERE, "typename may not have a storage class");
        }
 
        type_t *result = parse_abstract_declarator(specifiers.type);
@@ -2837,6 +2857,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);
@@ -2846,16 +2869,16 @@ static expression_t *create_invalid_expression(void)
 
 static expression_t *expected_expression_error(void)
 {
-       parser_print_error_prefix();
-       fprintf(stderr, "expected expression, got token ");
-       print_token(stderr, &token);
-       fprintf(stderr, "\n");
+       errorf(HERE, "expected expression, got token '%K'", &token);
 
        next_token();
 
        return create_invalid_expression();
 }
 
+/**
+ * Parse a string constant.
+ */
 static expression_t *parse_string_const(void)
 {
        expression_t *cnst  = allocate_expression_zero(EXPR_STRING_LITERAL);
@@ -2865,6 +2888,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);
@@ -2874,6 +2900,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);
@@ -2885,6 +2914,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);
@@ -2932,6 +2964,13 @@ static declaration_t *create_implicit_function(symbol_t *symbol,
        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
@@ -2951,6 +2990,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) {
@@ -2970,7 +3014,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)
 {
@@ -3009,7 +3055,13 @@ type_t *revert_automatic_type_conversion(const expression_t *expression)
        }
        case EXPR_SELECT: {
                const select_expression_t *select = &expression->select;
-               return select->compound_entry->type;
+               type_t *orig_type = select->compound_entry->type;
+               type_t *type      = skip_typeref(orig_type);
+               if(type->kind == TYPE_BITFIELD) {
+                       return type->bitfield.base;
+               } else {
+                       return orig_type;
+               }
        }
        case EXPR_UNARY_DEREFERENCE: {
                expression_t   *value        = expression->unary.value;
@@ -3053,25 +3105,25 @@ static expression_t *parse_reference(void)
        next_token();
 
        if(declaration == NULL) {
-#ifndef STRICT_C99
-               /* an implicitly defined function */
-               if(token.type == '(') {
-                       parser_print_prefix_pos(token.source_position);
-                       fprintf(stderr, "warning: 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
-               {
-                       parser_print_error_prefix();
-                       fprintf(stderr, "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;
+       type_t *skipped_type = skip_typeref(type);
+       if(skipped_type->kind == TYPE_BITFIELD) {
+               type = skipped_type->bitfield.base;
+       }
+
        /* we always do the auto-type conversions; the & and sizeof parser contains
         * code to revert this! */
        type = automatic_type_conversion(type);
@@ -3149,7 +3201,7 @@ static expression_t *parse_brace_expression(void)
 
        switch(token.type) {
        case '{':
-               /* gcc extension: a stement expression */
+               /* gcc extension: a statement expression */
                return parse_statement_expression();
 
        TYPE_QUALIFIERS
@@ -3173,7 +3225,7 @@ static expression_t *parse_function_keyword(void)
        /* TODO */
 
        if (current_function == NULL) {
-               parse_error("'__func__' used outside of a function");
+               errorf(HERE, "'__func__' used outside of a function");
        }
 
        string_literal_expression_t *expression
@@ -3192,7 +3244,7 @@ static expression_t *parse_pretty_function_keyword(void)
        /* TODO */
 
        if (current_function == NULL) {
-               parse_error("'__PRETTY_FUNCTION__' used outside of a function");
+               errorf(HERE, "'__PRETTY_FUNCTION__' used outside of a function");
        }
 
        string_literal_expression_t *expression
@@ -3291,9 +3343,7 @@ static expression_t *parse_va_start(void)
                        return expression;
                }
        }
-       parser_print_error_prefix_pos(expr->base.source_position);
-       fprintf(stderr, "second argument of 'va_start' must be last parameter "
-                       "of the current function\n");
+       errorf(expr->base.source_position, "second argument of 'va_start' must be last parameter of the current function");
 
        return create_invalid_expression();
 }
@@ -3329,6 +3379,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;
@@ -3406,13 +3492,27 @@ 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;
        return expression;
 }
 
+static expression_t *parse_alignof(void) {
+       eat(T___alignof__);
+
+       expression_t *expression
+               = allocate_expression_zero(EXPR_ALIGNOF);
+
+       expect('(');
+       expression->alignofe.type = parse_typename();
+       expect(')');
+
+       expression->base.datatype = type_size_t;
+       return expression;
+}
+
 static expression_t *parse_primary_expression(void)
 {
        switch(token.type) {
@@ -3420,7 +3520,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();
@@ -3450,6 +3550,12 @@ 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:
                return parse_assume();
 
@@ -3457,10 +3563,7 @@ static expression_t *parse_primary_expression(void)
                return parse_brace_expression();
        }
 
-       parser_print_error_prefix();
-       fprintf(stderr, "unexpected token ");
-       print_token(stderr, &token);
-       fprintf(stderr, "\n");
+       errorf(HERE, "unexpected token '%K'", &token);
        eat_statement();
 
        return create_invalid_expression();
@@ -3500,12 +3603,7 @@ static expression_t *parse_array_expression(unsigned precedence,
                        array_access->index     = left;
                        array_access->flipped   = true;
                } else {
-                       parser_print_error_prefix();
-                       fprintf(stderr, "array access on object with non-pointer types ");
-                       print_type_quoted(type_left);
-                       fprintf(stderr, ", ");
-                       print_type_quoted(type_inside);
-                       fprintf(stderr, "\n");
+                       errorf(HERE, "array access on object with non-pointer types '%T', '%T'", type_left, type_inside);
                }
        } else {
                array_access->array_ref = left;
@@ -3577,10 +3675,7 @@ static expression_t *parse_select_expression(unsigned precedence,
        type_t *type_left = type;
        if(is_pointer) {
                if(type->kind != TYPE_POINTER) {
-                       parser_print_error_prefix();
-                       fprintf(stderr, "left hand side of '->' is not a pointer, but ");
-                       print_type_quoted(orig_type);
-                       fputc('\n', stderr);
+                       errorf(HERE, "left hand side of '->' is not a pointer, but '%T'", orig_type);
                        return create_invalid_expression();
                }
                pointer_type_t *pointer_type = &type->pointer;
@@ -3590,11 +3685,8 @@ static expression_t *parse_select_expression(unsigned precedence,
 
        if(type_left->kind != TYPE_COMPOUND_STRUCT
                        && type_left->kind != TYPE_COMPOUND_UNION) {
-               parser_print_error_prefix();
-               fprintf(stderr, "request for member '%s' in something not a struct or "
-                       "union, but ", symbol->string);
-               print_type_quoted(type_left);
-               fputc('\n', stderr);
+               errorf(HERE, "request for member '%Y' in something not a struct or "
+                      "union, but '%T'", symbol, type_left);
                return create_invalid_expression();
        }
 
@@ -3602,11 +3694,8 @@ static expression_t *parse_select_expression(unsigned precedence,
        declaration_t   *declaration   = compound_type->declaration;
 
        if(!declaration->init.is_defined) {
-               parser_print_error_prefix();
-               fprintf(stderr, "request for member '%s' of incomplete type ",
-                       symbol->string);
-               print_type_quoted(type_left);
-               fputc('\n', stderr);
+               errorf(HERE, "request for member '%Y' of incomplete type '%T'",
+                      symbol, type_left);
                return create_invalid_expression();
        }
 
@@ -3617,29 +3706,36 @@ static expression_t *parse_select_expression(unsigned precedence,
                }
        }
        if(iter == NULL) {
-               parser_print_error_prefix();
-               print_type_quoted(type_left);
-               fprintf(stderr, " has no member named '%s'\n", symbol->string);
+               errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol);
                return create_invalid_expression();
        }
 
        /* we always do the auto-type conversions; the & and sizeof parser contains
         * code to revert this! */
        type_t *expression_type = automatic_type_conversion(iter->type);
+       if(expression_type->kind == TYPE_BITFIELD) {
+               expression_type = expression_type->bitfield.base;
+       }
 
        select->select.compound_entry = iter;
        select->base.datatype         = expression_type;
+
        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;
@@ -3657,12 +3753,7 @@ static expression_t *parse_call_expression(unsigned precedence,
                        }
                }
                if(function_type == NULL) {
-                       parser_print_error_prefix();
-                       fputs("called object '", stderr);
-                       print_expression(expression);
-                       fputs("' (type ", stderr);
-                       print_type_quoted(orig_type);
-                       fputs(") is not a pointer to a function\n", stderr);
+                       errorf(HERE, "called object '%E' (type '%T') is not a pointer to a function", expression, orig_type);
 
                        function_type             = NULL;
                        call->expression.datatype = NULL;
@@ -3705,18 +3796,12 @@ static expression_t *parse_call_expression(unsigned precedence,
                }
                /* too few parameters */
                if(parameter != NULL) {
-                       parser_print_error_prefix();
-                       fprintf(stderr, "too few arguments to function '");
-                       print_expression(expression);
-                       fprintf(stderr, "'\n");
+                       errorf(HERE, "too few arguments to function '%E'", expression);
                } else if(argument != NULL) {
                        /* too many parameters */
                        if(!function_type->variadic
                                        && !function_type->unspecified_parameters) {
-                               parser_print_error_prefix();
-                               fprintf(stderr, "too many arguments to function '");
-                               print_expression(expression);
-                               fprintf(stderr, "'\n");
+                               errorf(HERE, "too many arguments to function '%E'", expression);
                        } else {
                                /* do default promotion */
                                for( ; argument != NULL; argument = argument->next) {
@@ -3761,6 +3846,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)
 {
@@ -3827,13 +3917,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)
@@ -3860,8 +3954,7 @@ static void semantic_incdec(unary_expression_t *expression)
        type_t *type = skip_typeref(orig_type);
        if(!is_type_arithmetic(type) && type->kind != TYPE_POINTER) {
                /* TODO: improve error message */
-               parser_print_error_prefix();
-               fprintf(stderr, "operation needs an arithmetic or pointer type\n");
+               errorf(HERE, "operation needs an arithmetic or pointer type");
                return;
        }
 
@@ -3877,8 +3970,7 @@ static void semantic_unexpr_arithmetic(unary_expression_t *expression)
        type_t *type = skip_typeref(orig_type);
        if(!is_type_arithmetic(type)) {
                /* TODO: improve error message */
-               parser_print_error_prefix();
-               fprintf(stderr, "operation needs an arithmetic type\n");
+               errorf(HERE, "operation needs an arithmetic type");
                return;
        }
 
@@ -3893,7 +3985,7 @@ static void semantic_unexpr_scalar(unary_expression_t *expression)
 
        type_t *type = skip_typeref(orig_type);
        if (!is_type_scalar(type)) {
-               parse_error("operand of ! must be of scalar type\n");
+               errorf(HERE, "operand of ! must be of scalar type");
                return;
        }
 
@@ -3908,7 +4000,7 @@ static void semantic_unexpr_integer(unary_expression_t *expression)
 
        type_t *type = skip_typeref(orig_type);
        if (!is_type_integer(type)) {
-               parse_error("operand of ~ must be of integer type\n");
+               errorf(HERE, "operand of ~ must be of integer type");
                return;
        }
 
@@ -3923,10 +4015,7 @@ static void semantic_dereference(unary_expression_t *expression)
 
        type_t *type = skip_typeref(orig_type);
        if(!is_type_pointer(type)) {
-               parser_print_error_prefix();
-               fputs("Unary '*' needs pointer or arrray type, but type ", stderr);
-               print_type_quoted(orig_type);
-               fputs(" given.\n", stderr);
+               errorf(HERE, "Unary '*' needs pointer or arrray type, but type '%T' given", orig_type);
                return;
        }
 
@@ -4050,6 +4139,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;
@@ -4065,8 +4157,7 @@ static void semantic_binexpr_arithmetic(binary_expression_t *expression)
 
        if(!is_type_arithmetic(type_left) || !is_type_arithmetic(type_right)) {
                /* TODO: improve error message */
-               parser_print_error_prefix();
-               fprintf(stderr, "operation needs arithmetic types\n");
+               errorf(HERE, "operation needs arithmetic types");
                return;
        }
 
@@ -4091,8 +4182,7 @@ static void semantic_shift_op(binary_expression_t *expression)
 
        if(!is_type_integer(type_left) || !is_type_integer(type_right)) {
                /* TODO: improve error message */
-               parser_print_error_prefix();
-               fprintf(stderr, "operation needs integer types\n");
+               errorf(HERE, "operation needs integer types");
                return;
        }
 
@@ -4129,12 +4219,7 @@ static void semantic_add(binary_expression_t *expression)
        } else if(is_type_pointer(type_right) && is_type_integer(type_left)) {
                expression->expression.datatype = type_right;
        } else {
-               parser_print_error_prefix();
-               fprintf(stderr, "invalid operands to binary + (");
-               print_type_quoted(orig_type_left);
-               fprintf(stderr, ", ");
-               print_type_quoted(orig_type_right);
-               fprintf(stderr, ")\n");
+               errorf(HERE, "invalid operands to binary + ('%T', '%T')", orig_type_left, orig_type_right);
        }
 }
 
@@ -4162,22 +4247,12 @@ static void semantic_sub(binary_expression_t *expression)
                expression->expression.datatype = type_left;
        } else if(is_type_pointer(type_left) && is_type_pointer(type_right)) {
                if(!pointers_compatible(type_left, type_right)) {
-                       parser_print_error_prefix();
-                       fprintf(stderr, "pointers to incompatible objects to binary - (");
-                       print_type_quoted(orig_type_left);
-                       fprintf(stderr, ", ");
-                       print_type_quoted(orig_type_right);
-                       fprintf(stderr, ")\n");
+                       errorf(HERE, "pointers to incompatible objects to binary - ('%T', '%T')", orig_type_left, orig_type_right);
                } else {
                        expression->expression.datatype = type_ptrdiff_t;
                }
        } else {
-               parser_print_error_prefix();
-               fprintf(stderr, "invalid operands to binary - (");
-               print_type_quoted(orig_type_left);
-               fprintf(stderr, ", ");
-               print_type_quoted(orig_type_right);
-               fprintf(stderr, ")\n");
+               errorf(HERE, "invalid operands to binary - ('%T', '%T')", orig_type_left, orig_type_right);
        }
 }
 
@@ -4228,15 +4303,14 @@ static void semantic_arithmetic_assign(binary_expression_t *expression)
 
        if(!is_type_arithmetic(type_left) || !is_type_arithmetic(type_right)) {
                /* TODO: improve error message */
-               parser_print_error_prefix();
-               fprintf(stderr, "operation needs arithmetic types\n");
+               errorf(HERE, "operation needs arithmetic types");
                return;
        }
 
        /* 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;
@@ -4259,23 +4333,21 @@ 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;
        } else if (is_type_pointer(type_left) && is_type_integer(type_right)) {
                expression->expression.datatype = type_left;
        } else {
-               parser_print_error_prefix();
-               fputs("Incompatible types ", stderr);
-               print_type_quoted(orig_type_left);
-               fputs(" and ", stderr);
-               print_type_quoted(orig_type_right);
-               fputs(" in assignment\n", stderr);
+               errorf(HERE, "incompatible types '%T' and '%T' in assignment", orig_type_left, orig_type_right);
                return;
        }
 }
 
+/**
+ * Check the semantic restrictions of a logical expression.
+ */
 static void semantic_logical_op(binary_expression_t *expression)
 {
        expression_t *left            = expression->left;
@@ -4291,21 +4363,36 @@ static void semantic_logical_op(binary_expression_t *expression)
 
        if (!is_type_scalar(type_left) || !is_type_scalar(type_right)) {
                /* TODO: improve error message */
-               parser_print_error_prefix();
-               fprintf(stderr, "operation needs scalar types\n");
+               errorf(HERE, "operation needs scalar types");
                return;
        }
 
        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;
@@ -4319,37 +4406,19 @@ static void semantic_binexpr_assign(binary_expression_t *expression)
 
        /* must be a modifiable lvalue */
        if (is_type_array(type_left)) {
-               parser_print_error_prefix();
-               fprintf(stderr, "Cannot assign to arrays ('");
-               print_expression(left);
-               fprintf(stderr, "')\n");
+               errorf(HERE, "cannot assign to arrays ('%E')", left);
                return;
        }
        if(type_left->base.qualifiers & TYPE_QUALIFIER_CONST) {
-               parser_print_error_prefix();
-               fprintf(stderr, "assignment to readonly location '");
-               print_expression(left);
-               fprintf(stderr, "' (type ");
-               print_type_quoted(orig_type_left);
-               fprintf(stderr, ")\n");
+               errorf(HERE, "assignment to readonly location '%E' (type '%T')", left, orig_type_left);
                return;
        }
        if(is_type_incomplete(type_left)) {
-               parser_print_error_prefix();
-               fprintf(stderr, "left-hand side of assignment '");
-               print_expression(left);
-               fprintf(stderr, "' has incomplete type ");
-               print_type_quoted(orig_type_left);
-               fprintf(stderr, "\n");
+               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)) {
-               parser_print_error_prefix();
-               fprintf(stderr, "can't assign to '");
-               print_expression(left);
-               fprintf(stderr, "' because compound type ");
-               print_type_quoted(orig_type_left);
-               fprintf(stderr, " has readonly fields\n");
+       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;
        }
 
@@ -4473,37 +4542,48 @@ 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)
 {
        expression_parser_function_t *entry = &expression_parsers[token_type];
 
        if(entry->parser != NULL) {
-               fprintf(stderr, "for token ");
-               print_token_type(stderr, (token_type_t) token_type);
-               fprintf(stderr, "\n");
+               diagnosticf("for token '%k'\n", (token_type_t)token_type);
                panic("trying to register multiple expression parsers for a token");
        }
        entry->parser     = 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)
 {
        expression_parser_function_t *entry = &expression_parsers[token_type];
 
        if(entry->infix_parser != NULL) {
-               fprintf(stderr, "for token ");
-               print_token_type(stderr, (token_type_t) token_type);
-               fprintf(stderr, "\n");
+               diagnosticf("for token '%k'\n", (token_type_t)token_type);
                panic("trying to register multiple infix expression parsers for a "
                      "token");
        }
@@ -4511,6 +4591,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));
@@ -4579,6 +4662,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;
@@ -4620,6 +4706,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;
@@ -4644,6 +4733,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);
@@ -4683,6 +4775,9 @@ end_of_asm:
        return statement;
 }
 
+/**
+ * Parse a case statement.
+ */
 static statement_t *parse_case_statement(void)
 {
        eat(T_case);
@@ -4698,6 +4793,9 @@ static statement_t *parse_case_statement(void)
        return statement;
 }
 
+/**
+ * Parse a default statement.
+ */
 static statement_t *parse_default_statement(void)
 {
        eat(T_default);
@@ -4712,6 +4810,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);
@@ -4733,6 +4834,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);
@@ -4744,11 +4848,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) {
-               parser_print_error_prefix();
-               fprintf(stderr, "duplicate label '%s'\n", symbol->string);
-               parser_print_error_prefix_pos(label->source_position);
-               fprintf(stderr, "previous definition of '%s' was here\n",
-                       symbol->string);
+               errorf(HERE, "duplicate label '%Y'\n", symbol);
+               errorf(label->source_position, "previous definition of '%Y' was here\n",
+                      symbol);
        } else {
                label->source_position = token.source_position;
        }
@@ -4762,7 +4864,8 @@ static statement_t *parse_label_statement(void)
        expect(':');
 
        if(token.type == '}') {
-               parse_error("label at end of compound statement");
+               /* TODO only warn? */
+               errorf(HERE, "label at end of compound statement");
                return (statement_t*) label_statement;
        } else {
                label_statement->label_statement = parse_statement();
@@ -4771,6 +4874,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);
@@ -4792,6 +4898,9 @@ static statement_t *parse_if(void)
        return (statement_t*) statement;
 }
 
+/**
+ * Parse a switch statement.
+ */
 static statement_t *parse_switch(void)
 {
        eat(T_switch);
@@ -4808,6 +4917,9 @@ static statement_t *parse_switch(void)
        return (statement_t*) statement;
 }
 
+/**
+ * Parse a while statement.
+ */
 static statement_t *parse_while(void)
 {
        eat(T_while);
@@ -4824,6 +4936,9 @@ static statement_t *parse_while(void)
        return (statement_t*) statement;
 }
 
+/**
+ * Parse a do statement.
+ */
 static statement_t *parse_do(void)
 {
        eat(T_do);
@@ -4842,6 +4957,9 @@ static statement_t *parse_do(void)
        return (statement_t*) statement;
 }
 
+/**
+ * Parse a for statement.
+ */
 static statement_t *parse_for(void)
 {
        eat(T_for);
@@ -4884,6 +5002,9 @@ static statement_t *parse_for(void)
        return (statement_t*) statement;
 }
 
+/**
+ * Parse a goto statement.
+ */
 static statement_t *parse_goto(void)
 {
        eat(T_goto);
@@ -4910,6 +5031,9 @@ static statement_t *parse_goto(void)
        return (statement_t*) statement;
 }
 
+/**
+ * Parse a continue statement.
+ */
 static statement_t *parse_continue(void)
 {
        eat(T_continue);
@@ -4922,6 +5046,9 @@ static statement_t *parse_continue(void)
        return statement;
 }
 
+/**
+ * Parse a break statement.
+ */
 static statement_t *parse_break(void)
 {
        eat(T_break);
@@ -4934,6 +5061,9 @@ static statement_t *parse_break(void)
        return statement;
 }
 
+/**
+ * Parse a return statement.
+ */
 static statement_t *parse_return(void)
 {
        eat(T_return);
@@ -4965,7 +5095,7 @@ static statement_t *parse_return(void)
 
                if(is_type_atomic(return_type, ATOMIC_TYPE_VOID)
                                && !is_type_atomic(return_value_type, ATOMIC_TYPE_VOID)) {
-                       parse_warning("'return' with a value, in function returning void");
+                       warningf(HERE, "'return' with a value, in function returning void");
                        return_value = NULL;
                } else {
                        if(return_type != NULL) {
@@ -4974,8 +5104,7 @@ static statement_t *parse_return(void)
                }
        } else {
                if(!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) {
-                       parse_warning("'return' without value, in function returning "
-                                     "non-void");
+                       warningf(HERE, "'return' without value, in function returning non-void");
                }
        }
        statement->return_value = return_value;
@@ -4983,6 +5112,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);
@@ -5002,6 +5134,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);
@@ -5014,6 +5149,9 @@ static statement_t *parse_expression_statement(void)
        return statement;
 }
 
+/**
+ * Parse a statement.
+ */
 static statement_t *parse_statement(void)
 {
        statement_t   *statement = NULL;
@@ -5115,6 +5253,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
@@ -5147,12 +5288,11 @@ static statement_t *parse_compound_statement(void)
                last_statement = statement;
        }
 
-       if(token.type != '}') {
-               parser_print_error_prefix_pos(
-                               compound_statement->statement.source_position);
-               fprintf(stderr, "end of file while looking for closing '}'\n");
+       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);
@@ -5161,7 +5301,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);
@@ -5178,6 +5321,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]));
@@ -5188,10 +5334,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);
@@ -5204,11 +5356,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);
@@ -5222,12 +5381,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();
@@ -5237,6 +5399,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);