missing return added
[cparser] / parser.c
index b027d96..2577cb1 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -48,6 +48,18 @@ typedef struct {
        unsigned short namespc;
 } stack_entry_t;
 
+typedef struct gnu_attribute_t gnu_attribute_t;
+struct gnu_attribute_t {
+       gnu_attribute_kind_t kind;
+       gnu_attribute_t     *next;
+       bool                 invalid;
+       bool                 have_arguments;
+       union {
+               size_t   value;
+               string_t string;
+       } u;
+};
+
 typedef struct declaration_specifiers_t  declaration_specifiers_t;
 struct declaration_specifiers_t {
        source_position_t  source_position;
@@ -56,6 +68,7 @@ struct declaration_specifiers_t {
        unsigned int       is_inline : 1;
        unsigned int       deprecated : 1;
        decl_modifiers_t   decl_modifiers;    /**< MS __declspec extended modifier mask */
+       gnu_attribute_t   *gnu_attributes;    /**< list of GNU attributes */
        const char        *deprecated_string; /**< can be set if declaration was marked deprecated. */
        symbol_t          *get_property_sym;  /**< the name of the get property if set. */
        symbol_t          *put_property_sym;  /**< the name of the put property if set. */
@@ -92,6 +105,8 @@ static label_statement_t  *label_first       = NULL;
 static label_statement_t  *label_last        = NULL;
 static struct obstack      temp_obst;
 
+static source_position_t null_position = { NULL, 0 };
+
 /* symbols for Microsoft extended-decl-modifier */
 static const symbol_t *sym_align      = NULL;
 static const symbol_t *sym_allocate   = NULL;
@@ -116,7 +131,7 @@ static const symbol_t *sym_noalias    = NULL;
 static unsigned char token_anchor_set[T_LAST_TOKEN];
 
 /** The current source position. */
-#define HERE token.source_position
+#define HERE &token.source_position
 
 static type_t *type_valist;
 
@@ -369,14 +384,14 @@ static size_t get_type_struct_size(type_kind_t kind)
  * Allocate a type node of given kind and initialize all
  * fields with zero.
  */
-static type_t *allocate_type_zero(type_kind_t kind, source_position_t source_position)
+static type_t *allocate_type_zero(type_kind_t kind, const source_position_t *source_position)
 {
        size_t  size = get_type_struct_size(kind);
        type_t *res  = obstack_alloc(type_obst, size);
        memset(res, 0, size);
 
        res->base.kind            = kind;
-       res->base.source_position = source_position;
+       res->base.source_position = *source_position;
        return res;
 }
 
@@ -577,7 +592,7 @@ static void parse_error_expected(const char *message, ...)
 /**
  * Report a type error.
  */
-static void type_error(const char *msg, const source_position_t source_position,
+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);
@@ -587,7 +602,7 @@ static void type_error(const char *msg, const source_position_t source_position,
  * Report an incompatible type.
  */
 static void type_error_incompatible(const char *msg,
-               const source_position_t source_position, type_t *type1, type_t *type2)
+               const source_position_t *source_position, type_t *type1, type_t *type2)
 {
        errorf(source_position, "%s, incompatible types: '%T' - '%T'", msg, type1, type2);
 }
@@ -836,55 +851,68 @@ static expression_t *create_implicit_cast(expression_t *expression,
 /** Implements the rules from ยง 6.5.16.1 */
 static type_t *semantic_assign(type_t *orig_type_left,
                             const expression_t *const right,
-                            const char *context)
+                            const char *context,
+                            const source_position_t *source_position)
 {
        type_t *const orig_type_right = right->base.type;
        type_t *const type_left       = skip_typeref(orig_type_left);
        type_t *const type_right      = skip_typeref(orig_type_right);
 
-       if ((is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) ||
-           (is_type_pointer(type_left) && is_null_pointer_constant(right)) ||
-           (is_type_atomic(type_left, ATOMIC_TYPE_BOOL)
-               && is_type_pointer(type_right))) {
-               return orig_type_left;
-       }
+       if(is_type_pointer(type_left)) {
+               if(is_null_pointer_constant(right)) {
+                       return orig_type_left;
+               } else if(is_type_pointer(type_right)) {
+                       type_t *points_to_left
+                               = skip_typeref(type_left->pointer.points_to);
+                       type_t *points_to_right
+                               = skip_typeref(type_right->pointer.points_to);
+
+                       /* the left type has all qualifiers from the right type */
+                       unsigned missing_qualifiers
+                               = points_to_right->base.qualifiers & ~points_to_left->base.qualifiers;
+                       if(missing_qualifiers != 0) {
+                               errorf(source_position,
+                                               "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointed-to type", type_left, context, type_right, missing_qualifiers);
+                               return orig_type_left;
+                       }
 
-       if (is_type_pointer(type_left) && is_type_pointer(type_right)) {
-               type_t *points_to_left  = skip_typeref(type_left->pointer.points_to);
-               type_t *points_to_right = skip_typeref(type_right->pointer.points_to);
+                       points_to_left  = get_unqualified_type(points_to_left);
+                       points_to_right = get_unqualified_type(points_to_right);
 
-               /* the left type has all qualifiers from the right type */
-               unsigned missing_qualifiers
-                       = points_to_right->base.qualifiers & ~points_to_left->base.qualifiers;
-               if(missing_qualifiers != 0) {
-                       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 orig_type_left;
-               }
+                       if (is_type_atomic(points_to_left, ATOMIC_TYPE_VOID) ||
+                                       is_type_atomic(points_to_right, ATOMIC_TYPE_VOID)) {
+                               return orig_type_left;
+                       }
 
-               points_to_left  = get_unqualified_type(points_to_left);
-               points_to_right = get_unqualified_type(points_to_right);
+                       if (!types_compatible(points_to_left, points_to_right)) {
+                               warningf(source_position,
+                                       "destination type '%T' in %s is incompatible with '%E' of type '%T'",
+                                       orig_type_left, context, right, orig_type_right);
+                       }
 
-               if (is_type_atomic(points_to_left, ATOMIC_TYPE_VOID) ||
-                               is_type_atomic(points_to_right, ATOMIC_TYPE_VOID)) {
+                       return orig_type_left;
+               } else if(is_type_integer(type_right)) {
+                       warningf(source_position,
+                                       "%s makes pointer '%T' from integer '%T' without a cast",
+                                       context, orig_type_left, orig_type_right);
                        return orig_type_left;
                }
-
-               if (!types_compatible(points_to_left, points_to_right)) {
-                       warningf(right->base.source_position,
-                               "destination type '%T' in %s is incompatible with '%E' of type '%T'",
-                               orig_type_left, context, right, orig_type_right);
-               }
-
+       } else if ((is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) ||
+           (is_type_atomic(type_left, ATOMIC_TYPE_BOOL)
+               && is_type_pointer(type_right))) {
                return orig_type_left;
-       }
-
-       if ((is_type_compound(type_left)  && is_type_compound(type_right))
+       } else if ((is_type_compound(type_left)  && is_type_compound(type_right))
                        || (is_type_builtin(type_left) && is_type_builtin(type_right))) {
                type_t *const unqual_type_left  = get_unqualified_type(type_left);
                type_t *const unqual_type_right = get_unqualified_type(type_right);
                if (types_compatible(unqual_type_left, unqual_type_right)) {
                        return orig_type_left;
                }
+       } else if (is_type_integer(type_left) && is_type_pointer(type_right)) {
+               warningf(source_position,
+                               "%s makes integer '%T' from pointer '%T' without a cast",
+                               context, orig_type_left, orig_type_right);
+               return orig_type_left;
        }
 
        if (!is_type_valid(type_left))
@@ -902,7 +930,7 @@ static expression_t *parse_constant_expression(void)
        expression_t *result = parse_sub_expression(7);
 
        if(!is_constant_expression(result)) {
-               errorf(result->base.source_position, "expression '%E' is not constant\n", result);
+               errorf(&result->base.source_position, "expression '%E' is not constant\n", result);
        }
 
        return result;
@@ -928,7 +956,7 @@ static type_t *make_global_typedef(const char *name, type_t *type)
 
        record_declaration(declaration);
 
-       type_t *typedef_type               = allocate_type_zero(TYPE_TYPEDEF, builtin_source_position);
+       type_t *typedef_type               = allocate_type_zero(TYPE_TYPEDEF, &builtin_source_position);
        typedef_type->typedeft.declaration = declaration;
 
        return typedef_type;
@@ -949,47 +977,71 @@ static string_t parse_string_literals(void)
        return result;
 }
 
-typedef enum gnu_attribute_kind_t {
-       GNU_AK_CONST,
-       GNU_AK_VOLATILE,
-       GNU_AK_CDECL,
-       GNU_AK_STDCALL,
-       GNU_AK_FASTCALL,
-       GNU_AK_DEPRECATED,
-       GNU_AK_NOINLINE,
-       GNU_AK_NORETURN,
-       GNU_AK_NAKED,
-       GNU_AK_PURE,
-       GNU_AK_ALWAYS_INLINE,
-       GNU_AK_MALLOC,
-       GNU_AK_WEAK,
-       GNU_AK_ALIGNED,
-       GNU_AK_ALIAS,
-       GNU_AK_SECTION,
-       GNU_AK_FORMAT,
-       GNU_AK_FORMAT_ARG,
-       GNU_AK_LAST
-} gnu_attribute_kind_t;
-
 static const char *gnu_attribute_names[GNU_AK_LAST] = {
-       [GNU_AK_CONST]         = "const",
-       [GNU_AK_VOLATILE]      = "volatile",
-       [GNU_AK_CDECL]         = "cdecl",
-       [GNU_AK_STDCALL]       = "stdcall",
-       [GNU_AK_FASTCALL]      = "fastcall",
-       [GNU_AK_DEPRECATED]    = "deprecated",
-       [GNU_AK_NOINLINE]      = "noinline",
-       [GNU_AK_NORETURN]      = "noreturn",
-       [GNU_AK_NAKED]         = "naked",
-       [GNU_AK_PURE]          = "pure",
-       [GNU_AK_ALWAYS_INLINE] = "always_inline",
-       [GNU_AK_MALLOC]        = "malloc",
-       [GNU_AK_WEAK]          = "weak",
-       [GNU_AK_ALIGNED]       = "aligned",
-       [GNU_AK_ALIAS]         = "alias",
-       [GNU_AK_SECTION]       = "section",
-       [GNU_AK_FORMAT]        = "format",
-       [GNU_AK_FORMAT_ARG]    = "format_arg"
+       [GNU_AK_CONST]                  = "const",
+       [GNU_AK_VOLATILE]               = "volatile",
+       [GNU_AK_CDECL]                  = "cdecl",
+       [GNU_AK_STDCALL]                = "stdcall",
+       [GNU_AK_FASTCALL]               = "fastcall",
+       [GNU_AK_DEPRECATED]             = "deprecated",
+       [GNU_AK_NOINLINE]               = "noinline",
+       [GNU_AK_NORETURN]               = "noreturn",
+       [GNU_AK_NAKED]                  = "naked",
+       [GNU_AK_PURE]                   = "pure",
+       [GNU_AK_ALWAYS_INLINE]          = "always_inline",
+       [GNU_AK_MALLOC]                 = "malloc",
+       [GNU_AK_WEAK]                   = "weak",
+       [GNU_AK_CONSTRUCTOR]            = "constructor",
+       [GNU_AK_DESTRUCTOR]             = "destructor",
+       [GNU_AK_NOTHROW]                = "nothrow",
+       [GNU_AK_TRANSPARENT_UNION]      = "transparent_union",
+       [GNU_AK_COMMON]                 = "coommon",
+       [GNU_AK_NOCOMMON]               = "nocommon",
+       [GNU_AK_PACKED]                 = "packed",
+       [GNU_AK_SHARED]                 = "shared",
+       [GNU_AK_NOTSHARED]              = "notshared",
+       [GNU_AK_USED]                   = "used",
+       [GNU_AK_UNUSED]                 = "unused",
+       [GNU_AK_NO_INSTRUMENT_FUNCTION] = "no_instrument_function",
+       [GNU_AK_WARN_UNUSED_RESULT]     = "warn_unused_result",
+       [GNU_AK_LONGCALL]               = "longcall",
+       [GNU_AK_SHORTCALL]              = "shortcall",
+       [GNU_AK_LONG_CALL]              = "long_call",
+       [GNU_AK_SHORT_CALL]             = "short_call",
+       [GNU_AK_FUNCTION_VECTOR]        = "function_vector",
+       [GNU_AK_INTERRUPT]                              = "interrupt",
+       [GNU_AK_INTERRUPT_HANDLER]      = "interrupt_handler",
+       [GNU_AK_NMI_HANDLER]            = "nmi_handler",
+       [GNU_AK_NESTING]                = "nesting",
+       [GNU_AK_NEAR]                   = "near",
+       [GNU_AK_FAR]                    = "far",
+       [GNU_AK_SIGNAL]                 = "signal",
+       [GNU_AK_EIGTHBIT_DATA]          = "eightbit_data",
+       [GNU_AK_TINY_DATA]              = "tiny_data",
+       [GNU_AK_SAVEALL]                = "saveall",
+       [GNU_AK_FLATTEN]                = "flatten",
+       [GNU_AK_SSEREGPARM]             = "sseregparm",
+       [GNU_AK_EXTERNALLY_VISIBLE]     = "externally_visible",
+       [GNU_AK_RETURN_TWICE]           = "return_twice",
+       [GNU_AK_MAY_ALIAS]              = "may_alias",
+       [GNU_AK_MS_STRUCT]              = "ms_struct",
+       [GNU_AK_GCC_STRUCT]             = "gcc_struct",
+       [GNU_AK_DLLIMPORT]              = "dllimport",
+       [GNU_AK_DLLEXPORT]              = "dllexport",
+       [GNU_AK_ALIGNED]                = "aligned",
+       [GNU_AK_ALIAS]                  = "alias",
+       [GNU_AK_SECTION]                = "section",
+       [GNU_AK_FORMAT]                 = "format",
+       [GNU_AK_FORMAT_ARG]             = "format_arg",
+       [GNU_AK_WEAKREF]                = "weakref",
+       [GNU_AK_NONNULL]                = "nonnull",
+       [GNU_AK_TLS_MODEL]              = "tls_model",
+       [GNU_AK_VISIBILITY]             = "visibility",
+       [GNU_AK_REGPARM]                = "regparm",
+       [GNU_AK_MODEL]                  = "model",
+       [GNU_AK_TRAP_EXIT]              = "trap_exit",
+       [GNU_AK_SP_SWITCH]              = "sp_switch",
+       [GNU_AK_SENTINEL]               = "sentinel"
 };
 
 /**
@@ -1008,46 +1060,180 @@ static int strcmp_underscore(const char *s1, const char *s2) {
        return strcmp(s1, s2);
 }
 
-static expression_t *parse_gnu_attribute_const_arg(void) {
+/**
+ * Allocate a new gnu temporal attribute.
+ */
+static gnu_attribute_t *allocate_gnu_attribute(gnu_attribute_kind_t kind) {
+       gnu_attribute_t *attribute = obstack_alloc(&temp_obst, sizeof(*attribute));
+       attribute->kind           = kind;
+       attribute->next           = NULL;
+       attribute->invalid        = false;
+       attribute->have_arguments = false;
+       return attribute;
+}
+
+/**
+ * parse one constant expression argument.
+ */
+static void parse_gnu_attribute_const_arg(gnu_attribute_t *attribute) {
        expression_t *expression;
-       expect('(');
-       add_anchor_token('(');
+       add_anchor_token(')');
        expression = parse_constant_expression();
-       rem_anchor_token('(');
+       rem_anchor_token(')');
        expect(')');
-       return expression;
+       (void)expression;
+       return;
 end_error:
-       return create_invalid_expression();
+       attribute->invalid = true;
 }
 
-static string_t parse_gnu_attribute_string_arg(void) {
-       string_t string = { NULL, 0 };
-       expect('(');
+/**
+ * parse a list of constant expressions arguments.
+ */
+static void parse_gnu_attribute_const_arg_list(gnu_attribute_t *attribute) {
+       expression_t *expression;
+       add_anchor_token(')');
+       add_anchor_token(',');
+       while(true){
+               expression = parse_constant_expression();
+               if(token.type != ',')
+                       break;
+               next_token();
+       }
+       rem_anchor_token(',');
+       rem_anchor_token(')');
+       expect(')');
+       (void)expression;
+       return;
+end_error:
+       attribute->invalid = true;
+}
+
+/**
+ * parse one string literal argument.
+ */
+static void parse_gnu_attribute_string_arg(gnu_attribute_t *attribute, string_t *string) {
        add_anchor_token('(');
        if(token.type != T_STRING_LITERAL) {
                parse_error_expected("while parsing attribute directive", T_STRING_LITERAL);
                goto end_error;
        }
-       string = parse_string_literals();
+       *string = parse_string_literals();
        rem_anchor_token('(');
        expect(')');
+       return;
 end_error:
-       return string;
+       attribute->invalid = true;
 }
 
-static const char *format_names[] = {
-       "printf",
-       "scanf",
-       "strftime",
-       "strfmon"
-};
+/**
+ * parse one tls model.
+ */
+static void parse_gnu_attribute_tls_model_arg(gnu_attribute_t *attribute) {
+       static const char *tls_models[] = {
+               "global-dynamic",
+               "local-dynamic",
+               "initial-exec",
+               "local-exec"
+       };
+       string_t string = { NULL, 0 };
+       parse_gnu_attribute_string_arg(attribute, &string);
+       if(string.begin != NULL) {
+               for(size_t i = 0; i < 4; ++i) {
+                       if(strcmp(tls_models[i], string.begin) == 0) {
+                               attribute->u.value = i;
+                               return;
+                       }
+               }
+       }
+       errorf(HERE, "'%s' is an unrecognized tls model", string.begin);
+       attribute->invalid = true;
+}
+
+/**
+ * parse one tls model.
+ */
+static void parse_gnu_attribute_visibility_arg(gnu_attribute_t *attribute) {
+       static const char *visibilities[] = {
+               "default",
+               "protected",
+               "hidden",
+               "internal"
+       };
+       string_t string = { NULL, 0 };
+       parse_gnu_attribute_string_arg(attribute, &string);
+       if(string.begin != NULL) {
+               for(size_t i = 0; i < 4; ++i) {
+                       if(strcmp(visibilities[i], string.begin) == 0) {
+                               attribute->u.value = i;
+                               return;
+                       }
+               }
+       }
+       errorf(HERE, "'%s' is an unrecognized visibility", string.begin);
+       attribute->invalid = true;
+}
+
+/**
+ * parse one (code) model.
+ */
+static void parse_gnu_attribute_model_arg(gnu_attribute_t *attribute) {
+       static const char *visibilities[] = {
+               "small",
+               "medium",
+               "large"
+       };
+       string_t string = { NULL, 0 };
+       parse_gnu_attribute_string_arg(attribute, &string);
+       if(string.begin != NULL) {
+               for(int i = 0; i < 3; ++i) {
+                       if(strcmp(visibilities[i], string.begin) == 0) {
+                               attribute->u.value = i;
+                               return;
+                       }
+               }
+       }
+       errorf(HERE, "'%s' is an unrecognized model", string.begin);
+       attribute->invalid = true;
+}
+
+/**
+ * parse one interrupt argument.
+ */
+static void parse_gnu_attribute_interrupt_arg(gnu_attribute_t *attribute) {
+       static const char *interrupts[] = {
+               "IRQ",
+               "FIQ",
+               "SWI",
+               "ABORT",
+               "UNDEF"
+       };
+       string_t string = { NULL, 0 };
+       parse_gnu_attribute_string_arg(attribute, &string);
+       if(string.begin != NULL) {
+               for(size_t i = 0; i < 5; ++i) {
+                       if(strcmp(interrupts[i], string.begin) == 0) {
+                               attribute->u.value = i;
+                               return;
+                       }
+               }
+       }
+       errorf(HERE, "'%s' is an interrupt", string.begin);
+       attribute->invalid = true;
+}
 
 /**
  * parse ( identifier, const expression, const expression )
  */
-static void parse_gnu_attribute_format_args(void) {
+static void parse_gnu_attribute_format_args(gnu_attribute_t *attribute) {
+       static const char *format_names[] = {
+               "printf",
+               "scanf",
+               "strftime",
+               "strfmon"
+       };
        int i;
-       expect('(');
+
        if(token.type != T_IDENTIFIER) {
                parse_error_expected("while parsing format attribute directive", T_IDENTIFIER);
                goto end_error;
@@ -1077,7 +1263,7 @@ static void parse_gnu_attribute_format_args(void) {
        expect(')');
        return;
 end_error:
-       return;
+       attribute->u.value = true;
 }
 
 /**
@@ -1100,6 +1286,42 @@ end_error:
  *  always_inline
  *  malloc
  *  weak
+ *  constructor
+ *  destructor
+ *  nothrow
+ *  transparent_union
+ *  common
+ *  nocommon
+ *  packed
+ *  shared
+ *  notshared
+ *  used
+ *  unused
+ *  no_instrument_function
+ *  warn_unused_result
+ *  longcall
+ *  shortcall
+ *  long_call
+ *  short_call
+ *  function_vector
+ *  interrupt_handler
+ *  nmi_handler
+ *  nesting
+ *  near
+ *  far
+ *  signal
+ *  eightbit_data
+ *  tiny_data
+ *  saveall
+ *  flatten
+ *  sseregparm
+ *  externally_visible
+ *  return_twice
+ *  may_alias
+ *  ms_struct
+ *  gcc_struct
+ *  dllimport
+ *  dllexport
  *
  * The following attributes are parsed with arguments
  *  aligned( const expression )
@@ -1107,13 +1329,36 @@ end_error:
  *  section( string literal )
  *  format( identifier, const expression, const expression )
  *  format_arg( const expression )
+ *  tls_model( string literal )
+ *  visibility( string literal )
+ *  regparm( const expression )
+ *  model( string leteral )
+ *  trap_exit( const expression )
+ *  sp_switch( string literal )
+ *
+ * The following attributes might have arguments
+ *  weak_ref( string literal )
+ *  non_null( const expression // ',' )
+ *  interrupt( string literal )
+ *  sentinel( constant expression )
  */
-static void parse_gnu_attribute(void)
+static void parse_gnu_attribute(gnu_attribute_t **attributes)
 {
+       gnu_attribute_t *head = *attributes;
+       gnu_attribute_t *last = *attributes;
+       gnu_attribute_t *attribute;
+
        eat(T___attribute__);
        expect('(');
        expect('(');
+
        if(token.type != ')') {
+               /* find the end of the list */
+               if(last != NULL) {
+                       while(last->next != NULL)
+                               last = last->next;
+               }
+
                /* non-empty attribute list */
                while(true) {
                        const char *name;
@@ -1132,62 +1377,176 @@ static void parse_gnu_attribute(void)
                        name = sym->string;
                        next_token();
 
-                       gnu_attribute_kind_t kind;
-                       for(kind = 0; kind < GNU_AK_LAST; ++kind) {
-                               if(strcmp_underscore(gnu_attribute_names[kind], name) == 0)
+                       int i;
+                       for(i = 0; i < GNU_AK_LAST; ++i) {
+                               if(strcmp_underscore(gnu_attribute_names[i], name) == 0)
                                        break;
                        }
-                       switch(kind) {
-                       case GNU_AK_CONST:
-                               break;
-                       case GNU_AK_VOLATILE:
-                               break;
-                       case GNU_AK_CDECL:
-                               break;
-                       case GNU_AK_STDCALL:
-                               break;
-                       case GNU_AK_FASTCALL:
-                               break;
-                       case GNU_AK_DEPRECATED:
-                               break;
-                       case GNU_AK_NOINLINE:
-                               break;
-                       case GNU_AK_NORETURN:
-                               break;
-                       case GNU_AK_NAKED:
-                               break;
-                       case GNU_AK_PURE:
-                               break;
-                       case GNU_AK_ALWAYS_INLINE:
-                               break;
-                       case GNU_AK_MALLOC:
-                               break;
-                       case GNU_AK_WEAK:
-                               break;
-                       case GNU_AK_ALIGNED:
-                               parse_gnu_attribute_const_arg();
-                               break;
-                       case GNU_AK_ALIAS:
-                               parse_gnu_attribute_string_arg();
-                               break;
-                       case GNU_AK_SECTION:
-                               parse_gnu_attribute_string_arg();
-                               break;
-                       case GNU_AK_FORMAT:
-                               parse_gnu_attribute_format_args();
-                               break;
-                       case GNU_AK_FORMAT_ARG:
-                               parse_gnu_attribute_const_arg();
-                               break;
-                       case GNU_AK_LAST:
+                       gnu_attribute_kind_t kind = (gnu_attribute_kind_t)i;
+
+                       attribute = NULL;
+                       if(kind == GNU_AK_LAST) {
                                if(warning.attribute)
                                        warningf(HERE, "'%s' attribute directive ignored", name);
 
                                /* skip possible arguments */
-                               if(token.type == '(')
-                                       eat_until_matching_token('(');
-                               break;
+                               if(token.type == '(') {
+                                       eat_until_matching_token(')');
+                               }
+                       } else {
+                               /* check for arguments */
+                               attribute = allocate_gnu_attribute(kind);
+                               if(token.type == '(') {
+                                       next_token();
+                                       if(token.type == ')') {
+                                               /* empty args are allowed */
+                                               next_token();
+                                       } else
+                                               attribute->have_arguments = true;
+                               }
+
+                               switch(kind) {
+                               case GNU_AK_CONST:
+                               case GNU_AK_VOLATILE:
+                               case GNU_AK_CDECL:
+                               case GNU_AK_STDCALL:
+                               case GNU_AK_FASTCALL:
+                               case GNU_AK_DEPRECATED:
+                               case GNU_AK_NOINLINE:
+                               case GNU_AK_NORETURN:
+                               case GNU_AK_NAKED:
+                               case GNU_AK_PURE:
+                               case GNU_AK_ALWAYS_INLINE:
+                               case GNU_AK_MALLOC:
+                               case GNU_AK_WEAK:
+                               case GNU_AK_CONSTRUCTOR:
+                               case GNU_AK_DESTRUCTOR:
+                               case GNU_AK_NOTHROW:
+                               case GNU_AK_TRANSPARENT_UNION:
+                               case GNU_AK_COMMON:
+                               case GNU_AK_NOCOMMON:
+                               case GNU_AK_PACKED:
+                               case GNU_AK_SHARED:
+                               case GNU_AK_NOTSHARED:
+                               case GNU_AK_USED:
+                               case GNU_AK_UNUSED:
+                               case GNU_AK_NO_INSTRUMENT_FUNCTION:
+                               case GNU_AK_WARN_UNUSED_RESULT:
+                               case GNU_AK_LONGCALL:
+                               case GNU_AK_SHORTCALL:
+                               case GNU_AK_LONG_CALL:
+                               case GNU_AK_SHORT_CALL:
+                               case GNU_AK_FUNCTION_VECTOR:
+                               case GNU_AK_INTERRUPT_HANDLER:
+                               case GNU_AK_NMI_HANDLER:
+                               case GNU_AK_NESTING:
+                               case GNU_AK_NEAR:
+                               case GNU_AK_FAR:
+                               case GNU_AK_SIGNAL:
+                               case GNU_AK_EIGTHBIT_DATA:
+                               case GNU_AK_TINY_DATA:
+                               case GNU_AK_SAVEALL:
+                               case GNU_AK_FLATTEN:
+                               case GNU_AK_SSEREGPARM:
+                               case GNU_AK_EXTERNALLY_VISIBLE:
+                               case GNU_AK_RETURN_TWICE:
+                               case GNU_AK_MAY_ALIAS:
+                               case GNU_AK_MS_STRUCT:
+                               case GNU_AK_GCC_STRUCT:
+                               case GNU_AK_DLLIMPORT:
+                               case GNU_AK_DLLEXPORT:
+                                       if(attribute->have_arguments) {
+                                               /* should have no arguments */
+                                               errorf(HERE, "wrong number of arguments specified for '%s' attribute", name);
+                                               eat_until_matching_token('(');
+                                               /* we have already consumed '(', so we stop before ')', eat it */
+                                               eat(')');
+                                               attribute->invalid = true;
+                                       }
+                                       break;
+
+                               case GNU_AK_ALIGNED:
+                               case GNU_AK_FORMAT_ARG:
+                               case GNU_AK_REGPARM:
+                               case GNU_AK_TRAP_EXIT:
+                                       if(!attribute->have_arguments) {
+                                               /* should have arguments */
+                                               errorf(HERE, "wrong number of arguments specified for '%s' attribute", name);
+                                               attribute->invalid = true;
+                                       } else
+                                               parse_gnu_attribute_const_arg(attribute);
+                                       break;
+                               case GNU_AK_ALIAS:
+                               case GNU_AK_SECTION:
+                               case GNU_AK_SP_SWITCH:
+                                       if(!attribute->have_arguments) {
+                                               /* should have arguments */
+                                               errorf(HERE, "wrong number of arguments specified for '%s' attribute", name);
+                                               attribute->invalid = true;
+                                       } else
+                                               parse_gnu_attribute_string_arg(attribute, &attribute->u.string);
+                                       break;
+                               case GNU_AK_FORMAT:
+                                       if(!attribute->have_arguments) {
+                                               /* should have arguments */
+                                               errorf(HERE, "wrong number of arguments specified for '%s' attribute", name);
+                                               attribute->invalid = true;
+                                       } else
+                                               parse_gnu_attribute_format_args(attribute);
+                                       break;
+                               case GNU_AK_WEAKREF:
+                                       /* may have one string argument */
+                                       if(attribute->have_arguments)
+                                               parse_gnu_attribute_string_arg(attribute, &attribute->u.string);
+                                       break;
+                               case GNU_AK_NONNULL:
+                                       if(attribute->have_arguments)
+                                               parse_gnu_attribute_const_arg_list(attribute);
+                                       break;
+                               case GNU_AK_TLS_MODEL:
+                                       if(!attribute->have_arguments) {
+                                               /* should have arguments */
+                                               errorf(HERE, "wrong number of arguments specified for '%s' attribute", name);
+                                       } else
+                                               parse_gnu_attribute_tls_model_arg(attribute);
+                                       break;
+                               case GNU_AK_VISIBILITY:
+                                       if(!attribute->have_arguments) {
+                                               /* should have arguments */
+                                               errorf(HERE, "wrong number of arguments specified for '%s' attribute", name);
+                                       } else
+                                               parse_gnu_attribute_visibility_arg(attribute);
+                                       break;
+                               case GNU_AK_MODEL:
+                                       if(!attribute->have_arguments) {
+                                               /* should have arguments */
+                                               errorf(HERE, "wrong number of arguments specified for '%s' attribute", name);
+                                       } else
+                                               parse_gnu_attribute_model_arg(attribute);
+                               case GNU_AK_INTERRUPT:
+                                       /* may have one string argument */
+                                       if(attribute->have_arguments)
+                                               parse_gnu_attribute_interrupt_arg(attribute);
+                                       break;
+                               case GNU_AK_SENTINEL:
+                                       /* may have one string argument */
+                                       if(attribute->have_arguments)
+                                               parse_gnu_attribute_const_arg(attribute);
+                                       break;
+                               case GNU_AK_LAST:
+                                       /* already handled */
+                                       break;
+                               }
                        }
+                       if(attribute != NULL) {
+                               if(last != NULL) {
+                                       last->next = attribute;
+                                       last       = attribute;
+                               } else {
+                                       head = last = attribute;
+                               }
+                       }
+
                        if(token.type != ',')
                                break;
                        next_token();
@@ -1196,18 +1555,18 @@ static void parse_gnu_attribute(void)
        expect(')');
        expect(')');
 end_error:
-       return;
+       *attributes = head;
 }
 
 /**
  * Parse GNU attributes.
  */
-static void parse_attributes(void)
+static void parse_attributes(gnu_attribute_t **attributes)
 {
        while(true) {
                switch(token.type) {
                case T___attribute__: {
-                       parse_gnu_attribute();
+                       parse_gnu_attribute(attributes);
                        break;
                }
                case T_asm:
@@ -1228,9 +1587,9 @@ static void parse_attributes(void)
                }
        }
 
-end_error:
 attributes_finished:
-       ;
+end_error:
+       return;
 }
 
 static designator_t *parse_designation(void)
@@ -1345,7 +1704,8 @@ static initializer_t *initializer_from_expression(type_t *orig_type,
                }
        }
 
-       type_t *const res_type = semantic_assign(type, expression, "initializer");
+       type_t *const res_type = semantic_assign(type, expression, "initializer",
+                                                &expression->base.source_position);
        if (res_type == NULL)
                return NULL;
 
@@ -1384,7 +1744,7 @@ static initializer_t *parse_scalar_initializer(type_t *type,
 
        expression_t *expression = parse_assignment_expression();
        if(must_be_constant && !is_initializer_constant(expression)) {
-               errorf(expression->base.source_position,
+               errorf(&expression->base.source_position,
                       "Initialisation expression '%E' is not constant\n",
                       expression);
        }
@@ -1392,7 +1752,7 @@ static initializer_t *parse_scalar_initializer(type_t *type,
        initializer_t *initializer = initializer_from_expression(type, expression);
 
        if(initializer == NULL) {
-               errorf(expression->base.source_position,
+               errorf(&expression->base.source_position,
                       "expression '%E' (type '%T') doesn't match expected type '%T'",
                       expression, expression->base.type, type);
                /* TODO */
@@ -1568,7 +1928,7 @@ static bool walk_designator(type_path_t *path, const designator_t *designator,
                        symbol_t *symbol = designator->symbol;
                        if(!is_type_compound(type)) {
                                if(is_type_valid(type)) {
-                                       errorf(designator->source_position,
+                                       errorf(&designator->source_position,
                                               "'.%Y' designator used for non-compound type '%T'",
                                               symbol, orig_type);
                                }
@@ -1583,14 +1943,14 @@ static bool walk_designator(type_path_t *path, const designator_t *designator,
                                }
                        }
                        if(iter == NULL) {
-                               errorf(designator->source_position,
+                               errorf(&designator->source_position,
                                       "'%T' has no member named '%Y'", orig_type, symbol);
                                goto failed;
                        }
                        if(used_in_offsetof) {
                                type_t *real_type = skip_typeref(iter->type);
                                if(real_type->kind == TYPE_BITFIELD) {
-                                       errorf(designator->source_position,
+                                       errorf(&designator->source_position,
                                               "offsetof designator '%Y' may not specify bitfield",
                                               symbol);
                                        goto failed;
@@ -1606,7 +1966,7 @@ static bool walk_designator(type_path_t *path, const designator_t *designator,
 
                        if(!is_type_array(type)) {
                                if(is_type_valid(type)) {
-                                       errorf(designator->source_position,
+                                       errorf(&designator->source_position,
                                               "[%E] designator used for non-array type '%T'",
                                               array_index, orig_type);
                                }
@@ -1619,16 +1979,16 @@ static bool walk_designator(type_path_t *path, const designator_t *designator,
                        long index = fold_constant(array_index);
                        if(!used_in_offsetof) {
                                if(index < 0) {
-                                       errorf(designator->source_position,
+                                       errorf(&designator->source_position,
                                               "array index [%E] must be positive", array_index);
                                        goto failed;
                                }
                                if(type->array.size_constant == true) {
                                        long array_size = type->array.size;
                                        if(index >= array_size) {
-                                               errorf(designator->source_position,
-                                                               "designator [%E] (%d) exceeds array size %d",
-                                                               array_index, index, array_size);
+                                               errorf(&designator->source_position,
+                                                      "designator [%E] (%d) exceeds array size %d",
+                                                      array_index, index, array_size);
                                                goto failed;
                                        }
                                }
@@ -1808,7 +2168,7 @@ static initializer_t *parse_sub_initializer(type_path_t *path,
                        expression_t *expression = parse_assignment_expression();
 
                        if(env->must_be_constant && !is_initializer_constant(expression)) {
-                               errorf(expression->base.source_position,
+                               errorf(&expression->base.source_position,
                                       "Initialisation expression '%E' is not constant\n",
                                       expression);
                        }
@@ -1849,7 +2209,7 @@ static initializer_t *parse_sub_initializer(type_path_t *path,
                                        goto end_error;
                                }
                                if(is_type_scalar(type)) {
-                                       errorf(expression->base.source_position,
+                                       errorf(&expression->base.source_position,
                                                        "expression '%E' doesn't match expected type '%T'",
                                                        expression, orig_type);
                                        goto end_error;
@@ -2000,6 +2360,7 @@ static declaration_t *append_declaration(declaration_t *declaration);
 
 static declaration_t *parse_compound_type_specifier(bool is_struct)
 {
+       gnu_attribute_t *attributes = NULL;
        if(is_struct) {
                eat(T_struct);
        } else {
@@ -2010,8 +2371,7 @@ static declaration_t *parse_compound_type_specifier(bool is_struct)
        declaration_t *declaration = NULL;
 
        if (token.type == T___attribute__) {
-               /* TODO */
-               parse_attributes();
+               parse_attributes(&attributes);
        }
 
        if(token.type == T_IDENTIFIER) {
@@ -2058,7 +2418,7 @@ static declaration_t *parse_compound_type_specifier(bool is_struct)
                declaration->init.is_defined = true;
 
                parse_compound_type_entries(declaration);
-               parse_attributes();
+               parse_attributes(&attributes);
        }
 
        return declaration;
@@ -2116,11 +2476,11 @@ end_error:
 
 static type_t *parse_enum_specifier(void)
 {
-       eat(T_enum);
-
-       declaration_t *declaration;
-       symbol_t      *symbol;
+       gnu_attribute_t *attributes = NULL;
+       declaration_t   *declaration;
+       symbol_t        *symbol;
 
+       eat(T_enum);
        if(token.type == T_IDENTIFIER) {
                symbol = token.v.symbol;
                next_token();
@@ -2143,7 +2503,7 @@ static type_t *parse_enum_specifier(void)
                declaration->parent_scope  = scope;
        }
 
-       type_t *const type      = allocate_type_zero(TYPE_ENUM, declaration->source_position);
+       type_t *const type      = allocate_type_zero(TYPE_ENUM, &declaration->source_position);
        type->enumt.declaration = declaration;
 
        if(token.type == '{') {
@@ -2157,7 +2517,7 @@ static type_t *parse_enum_specifier(void)
                declaration->init.is_defined = 1;
 
                parse_enum_entries(type);
-               parse_attributes();
+               parse_attributes(&attributes);
        }
 
        return type;
@@ -2218,7 +2578,7 @@ restart:
        rem_anchor_token(')');
        expect(')');
 
-       type_t *typeof_type              = allocate_type_zero(TYPE_TYPEOF, expression->base.source_position);
+       type_t *typeof_type              = allocate_type_zero(TYPE_TYPEOF, &expression->base.source_position);
        typeof_type->typeoft.expression  = expression;
        typeof_type->typeoft.typeof_type = type;
 
@@ -2253,7 +2613,7 @@ typedef enum {
 static type_t *create_builtin_type(symbol_t *const symbol,
                                    type_t *const real_type)
 {
-       type_t *type            = allocate_type_zero(TYPE_BUILTIN, builtin_source_position);
+       type_t *type            = allocate_type_zero(TYPE_BUILTIN, &builtin_source_position);
        type->builtin.symbol    = symbol;
        type->builtin.real_type = real_type;
 
@@ -2272,7 +2632,7 @@ static type_t *get_typedef_type(symbol_t *symbol)
                        || declaration->storage_class != STORAGE_CLASS_TYPEDEF)
                return NULL;
 
-       type_t *type               = allocate_type_zero(TYPE_TYPEDEF, declaration->source_position);
+       type_t *type               = allocate_type_zero(TYPE_TYPEDEF, &declaration->source_position);
        type->typedeft.declaration = declaration;
 
        return type;
@@ -2588,7 +2948,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
                        break;
 
                case T___attribute__:
-                       parse_attributes();
+                       parse_attributes(&specifiers->gnu_attributes);
                        break;
 
                case T_IDENTIFIER: {
@@ -2773,7 +3133,7 @@ finish_specifiers:
                        atomic_type = ATOMIC_TYPE_INVALID;
                }
 
-               type               = allocate_type_zero(TYPE_ATOMIC, builtin_source_position);
+               type               = allocate_type_zero(TYPE_ATOMIC, &builtin_source_position);
                type->atomic.akind = atomic_type;
                newtype            = 1;
        } else {
@@ -3046,9 +3406,9 @@ static construct_type_t *parse_function_declarator(declaration_t *declaration)
 
        type_t *type;
        if(declaration != NULL) {
-               type = allocate_type_zero(TYPE_FUNCTION, declaration->source_position);
+               type = allocate_type_zero(TYPE_FUNCTION, &declaration->source_position);
        } else {
-               type = allocate_type_zero(TYPE_FUNCTION, token.source_position);
+               type = allocate_type_zero(TYPE_FUNCTION, HERE);
        }
 
        declaration_t *parameters = parse_parameters(&type->function);
@@ -3076,6 +3436,7 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration,
         * how to construct the final declarator type */
        construct_type_t *first = NULL;
        construct_type_t *last  = NULL;
+       gnu_attribute_t  *attributes = NULL;
 
        /* pointers */
        while(token.type == '*') {
@@ -3091,7 +3452,7 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration,
        }
 
        /* TODO: find out if this is correct */
-       parse_attributes();
+       parse_attributes(&attributes);
 
        construct_type_t *inner_types = NULL;
 
@@ -3155,7 +3516,7 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration,
        }
 
 declarator_finished:
-       parse_attributes();
+       parse_attributes(&attributes);
 
        /* append inner_types at the end of the list, we don't to set last anymore
         * as it's not needed anymore */
@@ -3202,7 +3563,7 @@ static type_t *construct_declarator_type(construct_type_t *construct_list,
 
                case CONSTRUCT_POINTER: {
                        parsed_pointer_t *parsed_pointer = (parsed_pointer_t*) iter;
-                       type_t           *pointer_type   = allocate_type_zero(TYPE_POINTER, (source_position_t){NULL, 0});
+                       type_t           *pointer_type   = allocate_type_zero(TYPE_POINTER, &null_position);
                        pointer_type->pointer.points_to  = type;
                        pointer_type->base.qualifiers    = parsed_pointer->type_qualifiers;
 
@@ -3212,7 +3573,7 @@ static type_t *construct_declarator_type(construct_type_t *construct_list,
 
                case CONSTRUCT_ARRAY: {
                        parsed_array_t *parsed_array  = (parsed_array_t*) iter;
-                       type_t         *array_type    = allocate_type_zero(TYPE_ARRAY, (source_position_t){NULL, 0});
+                       type_t         *array_type    = allocate_type_zero(TYPE_ARRAY, &null_position);
 
                        expression_t *size_expression = parsed_array->size;
                        if(size_expression != NULL) {
@@ -3332,36 +3693,42 @@ static declaration_t *append_declaration(declaration_t* const declaration)
 static void check_type_of_main(const declaration_t *const decl, const function_type_t *const func_type)
 {
        if (decl->storage_class == STORAGE_CLASS_STATIC) {
-               warningf(decl->source_position, "'main' is normally a non-static function");
+               warningf(&decl->source_position,
+                        "'main' is normally a non-static function");
        }
        if (skip_typeref(func_type->return_type) != type_int) {
-               warningf(decl->source_position, "return type of 'main' should be 'int', but is '%T'", func_type->return_type);
+               warningf(&decl->source_position,
+                        "return type of 'main' should be 'int', but is '%T'",
+                        func_type->return_type);
        }
        const function_parameter_t *parm = func_type->parameters;
        if (parm != NULL) {
                type_t *const first_type = parm->type;
                if (!types_compatible(skip_typeref(first_type), type_int)) {
-                       warningf(decl->source_position, "first argument of 'main' should be 'int', but is '%T'", first_type);
+                       warningf(&decl->source_position,
+                                "first argument of 'main' should be 'int', but is '%T'", first_type);
                }
                parm = parm->next;
                if (parm != NULL) {
                        type_t *const second_type = parm->type;
                        if (!types_compatible(skip_typeref(second_type), type_char_ptr_ptr)) {
-                               warningf(decl->source_position, "second argument of 'main' should be 'char**', but is '%T'", second_type);
+                               warningf(&decl->source_position,
+                                        "second argument of 'main' should be 'char**', but is '%T'", second_type);
                        }
                        parm = parm->next;
                        if (parm != NULL) {
                                type_t *const third_type = parm->type;
                                if (!types_compatible(skip_typeref(third_type), type_char_ptr_ptr)) {
-                                       warningf(decl->source_position, "third argument of 'main' should be 'char**', but is '%T'", third_type);
+                                       warningf(&decl->source_position,
+                                                "third argument of 'main' should be 'char**', but is '%T'", third_type);
                                }
                                parm = parm->next;
                                if (parm != NULL) {
-                                       warningf(decl->source_position, "'main' takes only zero, two or three arguments");
+                                       warningf(&decl->source_position, "'main' takes only zero, two or three arguments");
                                }
                        }
                } else {
-                       warningf(decl->source_position, "'main' takes only zero, two or three arguments");
+                       warningf(&decl->source_position, "'main' takes only zero, two or three arguments");
                }
        }
 }
@@ -3386,7 +3753,7 @@ static declaration_t *internal_record_declaration(
        if (is_type_function(type) &&
                        type->function.unspecified_parameters &&
                        warning.strict_prototypes) {
-               warningf(declaration->source_position,
+               warningf(&declaration->source_position,
                         "function declaration '%#T' is not a prototype",
                         orig_type, declaration->symbol);
        }
@@ -3408,17 +3775,16 @@ static declaration_t *internal_record_declaration(
 
                        const type_t *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'",
-                                      orig_type, symbol, previous_declaration->type, symbol);
-                               errorf(previous_declaration->source_position,
-                                      "previous declaration of '%Y' was here", symbol);
+                               errorf(&declaration->source_position,
+                                      "declaration '%#T' is incompatible with '%#T' (declared %P)",
+                                      orig_type, symbol, previous_declaration->type, symbol,
+                                  &previous_declaration->source_position);
                        } else {
                                unsigned old_storage_class = previous_declaration->storage_class;
-                               if (old_storage_class == STORAGE_CLASS_ENUM_ENTRY) {
-                                       errorf(declaration->source_position, "redeclaration of enum entry '%Y'", symbol);
-                                       errorf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol);
+                               if(old_storage_class == STORAGE_CLASS_ENUM_ENTRY) {
+                                       errorf(&declaration->source_position,
+                                              "redeclaration of enum entry '%Y' (declared %P)",
+                                              symbol, &previous_declaration->source_position);
                                        return previous_declaration;
                                }
 
@@ -3442,7 +3808,7 @@ static declaration_t *internal_record_declaration(
                                                                if (warning.missing_prototypes &&
                                                                    prev_type->function.unspecified_parameters &&
                                                                    !is_sym_main(symbol)) {
-                                                                       warningf(declaration->source_position,
+                                                                       warningf(&declaration->source_position,
                                                                                 "no previous prototype for '%#T'",
                                                                                 orig_type, symbol);
                                                                }
@@ -3459,20 +3825,16 @@ static declaration_t *internal_record_declaration(
                                                new_storage_class == STORAGE_CLASS_EXTERN) {
 warn_redundant_declaration:
                                        if (warning.redundant_decls) {
-                                               warningf(declaration->source_position,
-                                                        "redundant declaration for '%Y'", symbol);
-                                               warningf(previous_declaration->source_position,
-                                                        "previous declaration of '%Y' was here",
-                                                        symbol);
+                                               warningf(&declaration->source_position,
+                                                        "redundant declaration for '%Y' (declared %P)",
+                                                        symbol, &previous_declaration->source_position);
                                        }
                                } 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);
+                                               errorf(&declaration->source_position,
+                                                      "static declaration of '%Y' follows non-static declaration (declared %P)",
+                                                      symbol, &previous_declaration->source_position);
                                        } else {
                                                if (old_storage_class != STORAGE_CLASS_EXTERN && !is_function_definition) {
                                                        goto warn_redundant_declaration;
@@ -3484,15 +3846,14 @@ warn_redundant_declaration:
                                        }
                                } else {
                                        if (old_storage_class == new_storage_class) {
-                                               errorf(declaration->source_position,
-                                                      "redeclaration of '%Y'", symbol);
+                                               errorf(&declaration->source_position,
+                                                      "redeclaration of '%Y' (declared %P)",
+                                                      symbol, &previous_declaration->source_position);
                                        } else {
-                                               errorf(declaration->source_position,
-                                                      "redeclaration of '%Y' with different linkage",
-                                                      symbol);
+                                               errorf(&declaration->source_position,
+                                                      "redeclaration of '%Y' with different linkage (declared %P)",
+                                                      symbol, &previous_declaration->source_position);
                                        }
-                                       errorf(previous_declaration->source_position,
-                                              "previous declaration of '%Y' was here", symbol);
                                }
                        }
                        return previous_declaration;
@@ -3500,10 +3861,10 @@ warn_redundant_declaration:
        } else if (is_function_definition) {
                if (declaration->storage_class != STORAGE_CLASS_STATIC) {
                        if (warning.missing_prototypes && !is_sym_main(symbol)) {
-                               warningf(declaration->source_position,
+                               warningf(&declaration->source_position,
                                         "no previous prototype for '%#T'", orig_type, symbol);
                        } else if (warning.missing_declarations && !is_sym_main(symbol)) {
-                               warningf(declaration->source_position,
+                               warningf(&declaration->source_position,
                                         "no previous declaration for '%#T'", orig_type,
                                         symbol);
                        }
@@ -3514,7 +3875,7 @@ warn_redundant_declaration:
              declaration->storage_class == STORAGE_CLASS_NONE ||
              declaration->storage_class == STORAGE_CLASS_THREAD
            )) {
-               warningf(declaration->source_position,
+               warningf(&declaration->source_position,
                         "no previous declaration for '%#T'", orig_type, symbol);
        }
 
@@ -3538,12 +3899,10 @@ static declaration_t *record_function_definition(declaration_t *declaration)
 }
 
 static void parser_error_multiple_definition(declaration_t *declaration,
-               const source_position_t source_position)
+               const source_position_t *source_position)
 {
-       errorf(source_position, "multiple definition of symbol '%Y'",
-              declaration->symbol);
-       errorf(declaration->source_position,
-              "this is the location of the previous definition.");
+       errorf(source_position, "multiple definition of symbol '%Y' (declared %P)",
+              declaration->symbol, &declaration->source_position);
 }
 
 static bool is_declaration_specifier(const token_t *token,
@@ -3573,7 +3932,7 @@ static void parse_init_declarator_rest(declaration_t *declaration)
        type_t *type      = skip_typeref(orig_type);
 
        if(declaration->init.initializer != NULL) {
-               parser_error_multiple_definition(declaration, token.source_position);
+               parser_error_multiple_definition(declaration, HERE);
        }
 
        bool must_be_constant = false;
@@ -3597,7 +3956,7 @@ static void parse_init_declarator_rest(declaration_t *declaration)
        }
 
        if(is_type_function(type)) {
-               errorf(declaration->source_position,
+               errorf(&declaration->source_position,
                       "initializers not allowed for function types at declator '%Y' (type '%T')",
                       declaration->symbol, orig_type);
        } else {
@@ -3619,7 +3978,8 @@ static void parse_anonymous_declaration_rest(
        declaration->modifiers              = specifiers->decl_modifiers;
 
        if (declaration->declared_storage_class != STORAGE_CLASS_NONE) {
-               warningf(declaration->source_position, "useless storage class in empty declaration");
+               warningf(&declaration->source_position,
+                        "useless storage class in empty declaration");
        }
        declaration->storage_class = STORAGE_CLASS_NONE;
 
@@ -3628,7 +3988,8 @@ static void parse_anonymous_declaration_rest(
                case TYPE_COMPOUND_STRUCT:
                case TYPE_COMPOUND_UNION: {
                        if (type->compound.declaration->symbol == NULL) {
-                               warningf(declaration->source_position, "unnamed struct/union that defines no instances");
+                               warningf(&declaration->source_position,
+                                        "unnamed struct/union that defines no instances");
                        }
                        break;
                }
@@ -3637,7 +3998,7 @@ static void parse_anonymous_declaration_rest(
                        break;
 
                default:
-                       warningf(declaration->source_position, "empty declaration");
+                       warningf(&declaration->source_position, "empty declaration");
                        break;
        }
 
@@ -3660,7 +4021,7 @@ static void parse_declaration_rest(declaration_t *ndeclaration,
                if (type->kind != TYPE_FUNCTION &&
                    declaration->is_inline &&
                    is_type_valid(type)) {
-                       warningf(declaration->source_position,
+                       warningf(&declaration->source_position,
                                 "variable '%Y' declared 'inline'\n", declaration->symbol);
                }
 
@@ -3837,7 +4198,7 @@ static void check_labels(void)
                label->used = true;
                if (label->source_position.input_name == NULL) {
                        print_in_function();
-                       errorf(goto_statement->base.source_position,
+                       errorf(&goto_statement->base.source_position,
                               "label '%Y' used but not defined", label->symbol);
                 }
        }
@@ -3851,7 +4212,7 @@ static void check_labels(void)
 
                        if (! label->used) {
                                print_in_function();
-                               warningf(label_statement->base.source_position,
+                               warningf(&label_statement->base.source_position,
                                        "label '%Y' defined but not used", label->symbol);
                        }
                }
@@ -3871,8 +4232,8 @@ static void check_declarations(void)
                for (; parameter != NULL; parameter = parameter->next) {
                        if (! parameter->used) {
                                print_in_function();
-                               warningf(parameter->source_position,
-                                       "unused parameter '%Y'", parameter->symbol);
+                               warningf(&parameter->source_position,
+                                        "unused parameter '%Y'", parameter->symbol);
                        }
                }
        }
@@ -3972,7 +4333,7 @@ static void parse_external_declaration(void)
        }
 
        if(declaration->init.statement != NULL) {
-               parser_error_multiple_definition(declaration, token.source_position);
+               parser_error_multiple_definition(declaration, HERE);
                eat_block();
                goto end_of_parse_external_declaration;
        } else {
@@ -3998,7 +4359,7 @@ end_of_parse_external_declaration:
 }
 
 static type_t *make_bitfield_type(type_t *base, expression_t *size,
-                                  source_position_t source_position)
+                                  source_position_t *source_position)
 {
        type_t *type        = allocate_type_zero(TYPE_BITFIELD, source_position);
        type->bitfield.base = base;
@@ -4048,7 +4409,7 @@ static void parse_compound_declarators(declaration_t *struct_declaration,
                declaration_t *declaration;
 
                if(token.type == ':') {
-                       source_position_t source_position = HERE;
+                       source_position_t source_position = *HERE;
                        next_token();
 
                        type_t *base_type = specifiers->type;
@@ -4059,7 +4420,7 @@ static void parse_compound_declarators(declaration_t *struct_declaration,
                                       base_type);
                        }
 
-                       type_t *type = make_bitfield_type(base_type, size, source_position);
+                       type_t *type = make_bitfield_type(base_type, size, &source_position);
 
                        declaration                         = allocate_declaration_zero();
                        declaration->namespc                = NAMESPACE_NORMAL;
@@ -4075,7 +4436,7 @@ static void parse_compound_declarators(declaration_t *struct_declaration,
                        type_t *type      = skip_typeref(orig_type);
 
                        if(token.type == ':') {
-                               source_position_t source_position = HERE;
+                               source_position_t source_position = *HERE;
                                next_token();
                                expression_t *size = parse_constant_expression();
 
@@ -4084,7 +4445,7 @@ static void parse_compound_declarators(declaration_t *struct_declaration,
                                               "integer type", orig_type);
                                }
 
-                               type_t *bitfield_type = make_bitfield_type(orig_type, size, source_position);
+                               type_t *bitfield_type = make_bitfield_type(orig_type, size, &source_position);
                                declaration->type = bitfield_type;
                        } else {
                                /* TODO we ignore arrays for now... what is missing is a check
@@ -4108,10 +4469,9 @@ static void parse_compound_declarators(declaration_t *struct_declaration,
 
                        if(prev_decl != NULL) {
                                assert(prev_decl->symbol == symbol);
-                               errorf(declaration->source_position,
-                                      "multiple declarations of symbol '%Y'", symbol);
-                               errorf(prev_decl->source_position,
-                                      "previous declaration of '%Y' was here", symbol);
+                               errorf(&declaration->source_position,
+                                      "multiple declarations of symbol '%Y' (declared %P)",
+                                      symbol, &prev_decl->source_position);
                        }
                }
 
@@ -4257,7 +4617,7 @@ static expression_t *parse_string_const(void)
 static expression_t *parse_int_const(void)
 {
        expression_t *cnst         = allocate_expression_zero(EXPR_CONST);
-       cnst->base.source_position = HERE;
+       cnst->base.source_position = *HERE;
        cnst->base.type            = token.datatype;
        cnst->conste.v.int_value   = token.v.intvalue;
 
@@ -4273,7 +4633,7 @@ static expression_t *parse_character_constant(void)
 {
        expression_t *cnst = allocate_expression_zero(EXPR_CHARACTER_CONSTANT);
 
-       cnst->base.source_position = HERE;
+       cnst->base.source_position = *HERE;
        cnst->base.type            = token.datatype;
        cnst->conste.v.character   = token.v.string;
 
@@ -4297,7 +4657,7 @@ static expression_t *parse_wide_character_constant(void)
 {
        expression_t *cnst = allocate_expression_zero(EXPR_WIDE_CHARACTER_CONSTANT);
 
-       cnst->base.source_position    = HERE;
+       cnst->base.source_position    = *HERE;
        cnst->base.type               = token.datatype;
        cnst->conste.v.wide_character = token.v.wide_string;
 
@@ -4329,7 +4689,7 @@ static expression_t *parse_float_const(void)
 }
 
 static declaration_t *create_implicit_function(symbol_t *symbol,
-               const source_position_t source_position)
+               const source_position_t *source_position)
 {
        type_t *ntype                          = allocate_type_zero(TYPE_FUNCTION, source_position);
        ntype->function.return_type            = type_int;
@@ -4345,7 +4705,7 @@ static declaration_t *create_implicit_function(symbol_t *symbol,
        declaration->declared_storage_class = STORAGE_CLASS_EXTERN;
        declaration->type                   = type;
        declaration->symbol                 = symbol;
-       declaration->source_position        = source_position;
+       declaration->source_position        = *source_position;
        declaration->parent_scope           = global_scope;
 
        scope_t *old_scope = scope;
@@ -4376,7 +4736,7 @@ static type_t *make_function_1_type(type_t *return_type, type_t *argument_type)
        memset(parameter, 0, sizeof(parameter[0]));
        parameter->type = argument_type;
 
-       type_t *type               = allocate_type_zero(TYPE_FUNCTION, builtin_source_position);
+       type_t *type               = allocate_type_zero(TYPE_FUNCTION, &builtin_source_position);
        type->function.return_type = return_type;
        type->function.parameters  = parameter;
 
@@ -4503,7 +4863,7 @@ static expression_t *parse_reference(void)
                        }
 
                        declaration = create_implicit_function(ref->symbol,
-                                                              source_position);
+                                                              &source_position);
                } else {
                        errorf(HERE, "unknown symbol '%Y' found.", ref->symbol);
                        return create_invalid_expression();
@@ -4529,11 +4889,11 @@ static expression_t *parse_reference(void)
                        prefix = "function ";
 
                if (declaration->deprecated_string != NULL) {
-                       warningf(source_position,
+                       warningf(&source_position,
                                "%s'%Y' was declared 'deprecated(\"%s\")'", prefix, declaration->symbol,
                                declaration->deprecated_string);
                } else {
-                       warningf(source_position,
+                       warningf(&source_position,
                                "%s'%Y' was declared 'deprecated'", prefix, declaration->symbol);
                }
        }
@@ -4620,7 +4980,7 @@ static expression_t *parse_statement_expression(void)
                        type = stmt->expression.expression->base.type;
                }
        } else {
-               warningf(expression->base.source_position, "empty statement expression ({})");
+               warningf(&expression->base.source_position, "empty statement expression ({})");
        }
        expression->base.type = type;
 
@@ -4726,7 +5086,7 @@ static expression_t *parse_funcdname_keyword(void)
 static designator_t *parse_designator(void)
 {
        designator_t *result    = allocate_ast_zero(sizeof(result[0]));
-       result->source_position = HERE;
+       result->source_position = *HERE;
 
        if(token.type != T_IDENTIFIER) {
                parse_error_expected("while parsing member designator",
@@ -4746,7 +5106,7 @@ static designator_t *parse_designator(void)
                                return NULL;
                        }
                        designator_t *designator    = allocate_ast_zero(sizeof(result[0]));
-                       designator->source_position = HERE;
+                       designator->source_position = *HERE;
                        designator->symbol          = token.v.symbol;
                        next_token();
 
@@ -4758,7 +5118,7 @@ static designator_t *parse_designator(void)
                        next_token();
                        add_anchor_token(']');
                        designator_t *designator    = allocate_ast_zero(sizeof(result[0]));
-                       designator->source_position = HERE;
+                       designator->source_position = *HERE;
                        designator->array_index     = parse_expression();
                        rem_anchor_token(']');
                        expect(']');
@@ -4845,7 +5205,8 @@ static expression_t *parse_va_start(void)
                        return expression;
                }
        }
-       errorf(expr->base.source_position, "second argument of 'va_start' must be last parameter of the current function");
+       errorf(&expr->base.source_position,
+              "second argument of 'va_start' must be last parameter of the current function");
 end_error:
        return create_invalid_expression();
 }
@@ -4966,7 +5327,7 @@ static expression_t *parse_compare_builtin(void)
                internal_errorf(HERE, "invalid compare builtin found");
                break;
        }
-       expression->base.source_position = HERE;
+       expression->base.source_position = *HERE;
        next_token();
 
        expect('(');
@@ -4983,7 +5344,7 @@ static expression_t *parse_compare_builtin(void)
        if(!is_type_float(type_left) && !is_type_float(type_right)) {
                if (is_type_valid(type_left) && is_type_valid(type_right)) {
                        type_error_incompatible("invalid operands in comparison",
-                               expression->base.source_position, orig_type_left, orig_type_right);
+                               &expression->base.source_position, orig_type_left, orig_type_right);
                }
        } else {
                semantic_comparison(&expression->binary);
@@ -5042,7 +5403,7 @@ end_error:
  * Parse a microsoft __noop expression.
  */
 static expression_t *parse_noop_expression(void) {
-       source_position_t source_position = HERE;
+       source_position_t source_position = *HERE;
        eat(T___noop);
 
        if (token.type == '(') {
@@ -5131,8 +5492,8 @@ static void check_for_char_index_type(const expression_t *expression) {
 
        if (is_type_atomic(base_type, ATOMIC_TYPE_CHAR) &&
                        warning.char_subscripts) {
-               warningf(expression->base.source_position,
-                       "array subscript has type '%T'", type);
+               warningf(&expression->base.source_position,
+                        "array subscript has type '%T'", type);
        }
 }
 
@@ -5372,10 +5733,12 @@ static expression_t *parse_call_expression(unsigned precedence,
                        type_t *expected_type = parameter->type;
                        /* TODO report scope in error messages */
                        expression_t *const arg_expr = argument->expression;
-                       type_t       *const res_type = semantic_assign(expected_type, arg_expr, "function call");
+                       type_t       *const res_type = semantic_assign(expected_type, arg_expr,
+                                                                      "function call",
+                                                                      &arg_expr->base.source_position);
                        if (res_type == NULL) {
                                /* TODO improve error message */
-                               errorf(arg_expr->base.source_position,
+                               errorf(&arg_expr->base.source_position,
                                        "Cannot call function with argument '%E' of type '%T' where type '%T' is expected",
                                        arg_expr, arg_expr->base.type, expected_type);
                        } else {
@@ -5449,7 +5812,7 @@ static expression_t *parse_conditional_expression(unsigned precedence,
        type_t *const condition_type      = skip_typeref(condition_type_orig);
        if (!is_type_scalar(condition_type) && is_type_valid(condition_type)) {
                type_error("expected a scalar type in conditional condition",
-                          expression->base.source_position, condition_type_orig);
+                          &expression->base.source_position, condition_type_orig);
        }
 
        expression_t *true_expression = parse_expression();
@@ -5467,13 +5830,13 @@ static expression_t *parse_conditional_expression(unsigned precedence,
        if(is_type_atomic(true_type, ATOMIC_TYPE_VOID) ||
                is_type_atomic(false_type, ATOMIC_TYPE_VOID)) {
                if (!is_type_atomic(true_type, ATOMIC_TYPE_VOID)
-                               || !is_type_atomic(false_type, ATOMIC_TYPE_VOID)) {
-                       warningf(expression->base.source_position,
+                   || !is_type_atomic(false_type, ATOMIC_TYPE_VOID)) {
+                       warningf(&expression->base.source_position,
                                        "ISO C forbids conditional expression with only one void side");
                }
                result_type = type_void;
        } else if (is_type_arithmetic(true_type)
-                       && is_type_arithmetic(false_type)) {
+                  && is_type_arithmetic(false_type)) {
                result_type = semantic_arithmetic(true_type, false_type);
 
                true_expression  = create_implicit_cast(true_expression, result_type);
@@ -5501,19 +5864,19 @@ static expression_t *parse_conditional_expression(unsigned precedence,
 
                if(is_type_pointer(other_type)) {
                        if(!pointers_compatible(true_type, false_type)) {
-                               warningf(expression->base.source_position,
+                               warningf(&expression->base.source_position,
                                                "pointer types '%T' and '%T' in conditional expression are incompatible", true_type, false_type);
                        }
                        result_type = true_type;
                } else if(is_null_pointer_constant(other_expression)) {
                        result_type = pointer_type;
                } else if(is_type_integer(other_type)) {
-                       warningf(expression->base.source_position,
+                       warningf(&expression->base.source_position,
                                        "pointer/integer type mismatch in conditional expression ('%T' and '%T')", true_type, false_type);
                        result_type = pointer_type;
                } else {
                        type_error_incompatible("while parsing conditional",
-                                       expression->base.source_position, true_type, false_type);
+                                       &expression->base.source_position, true_type, false_type);
                        result_type = type_error_type;
                }
        } else {
@@ -5521,7 +5884,7 @@ static expression_t *parse_conditional_expression(unsigned precedence,
 
                if (is_type_valid(true_type) && is_type_valid(false_type)) {
                        type_error_incompatible("while parsing conditional",
-                                               expression->base.source_position, true_type,
+                                               &expression->base.source_position, true_type,
                                                false_type);
                }
                result_type = type_error_type;
@@ -5663,9 +6026,9 @@ static void semantic_take_addr(unary_expression_t *expression)
                declaration_t *const declaration = value->reference.declaration;
                if(declaration != NULL) {
                        if (declaration->storage_class == STORAGE_CLASS_REGISTER) {
-                               errorf(expression->base.source_position,
-                                       "address of register variable '%Y' requested",
-                                       declaration->symbol);
+                               errorf(&expression->base.source_position,
+                                      "address of register variable '%Y' requested",
+                                      declaration->symbol);
                        }
                        declaration->address_taken = 1;
                }
@@ -5681,7 +6044,7 @@ static expression_t *parse_##unexpression_type(unsigned precedence)            \
                                                                                   \
        expression_t *unary_expression                                             \
                = allocate_expression_zero(unexpression_type);                         \
-       unary_expression->base.source_position = HERE;                             \
+       unary_expression->base.source_position = *HERE;                            \
        unary_expression->unary.value = parse_sub_expression(precedence);          \
                                                                                   \
        sfunc(&unary_expression->unary);                                           \
@@ -5897,7 +6260,7 @@ static void semantic_comparison(binary_expression_t *expression)
                    (expression->base.kind != EXPR_BINARY_EQUAL &&
                     expression->base.kind != EXPR_BINARY_NOTEQUAL) &&
                    (is_type_signed(type_left) != is_type_signed(type_right))) {
-                       warningf(expression->base.source_position,
+                       warningf(&expression->base.source_position,
                                 "comparison between signed and unsigned");
                }
                type_t *arithmetic_type = semantic_arithmetic(type_left, type_right);
@@ -5908,7 +6271,7 @@ static void semantic_comparison(binary_expression_t *expression)
                    (expression->base.kind == EXPR_BINARY_EQUAL ||
                     expression->base.kind == EXPR_BINARY_NOTEQUAL) &&
                    is_type_float(arithmetic_type)) {
-                       warningf(expression->base.source_position,
+                       warningf(&expression->base.source_position,
                                 "comparing floating point with == or != is unsafe");
                }
        } else if (is_type_pointer(type_left) && is_type_pointer(type_right)) {
@@ -5919,7 +6282,7 @@ static void semantic_comparison(binary_expression_t *expression)
                expression->left = create_implicit_cast(left, type_right);
        } else if (is_type_valid(type_left) && is_type_valid(type_right)) {
                type_error_incompatible("invalid operands in comparison",
-                                       expression->base.source_position,
+                                       &expression->base.source_position,
                                        type_left, type_right);
        }
        expression->base.type = type_int;
@@ -6053,9 +6416,9 @@ static void semantic_binexpr_assign(binary_expression_t *expression)
        }
 
        type_t *const res_type = semantic_assign(orig_type_left, expression->right,
-                                                "assignment");
+                       "assignment", &left->base.source_position);
        if (res_type == NULL) {
-               errorf(expression->base.source_position,
+               errorf(&expression->base.source_position,
                        "cannot assign to '%T' from '%T'",
                        orig_type_left, expression->right->base.type);
        } else {
@@ -6203,7 +6566,8 @@ static void semantic_comma(binary_expression_t *expression)
        if (warning.unused_value) {
                const expression_t *const left = expression->left;
                if (!expression_has_effect(left)) {
-                       warningf(left->base.source_position, "left-hand operand of comma expression has no effect");
+                       warningf(&left->base.source_position,
+                                "left-hand operand of comma expression has no effect");
                }
        }
        expression->base.type = expression->right->base.type;
@@ -6214,7 +6578,7 @@ static expression_t *parse_##binexpression_type(unsigned precedence,      \
                                                 expression_t *left)       \
 {                                                                         \
        eat(token_type);                                                      \
-       source_position_t pos = HERE;                                         \
+       source_position_t pos = *HERE;                                        \
                                                                           \
        expression_t *right = parse_sub_expression(precedence + lr);          \
                                                                           \
@@ -6591,8 +6955,8 @@ static statement_t *parse_case_statement(void)
        expect(':');
 
        if (! is_constant_expression(statement->case_label.expression)) {
-               errorf(statement->base.source_position,
-                       "case label does not reduce to an integer constant");
+               errorf(&statement->base.source_position,
+                      "case label does not reduce to an integer constant");
        } else {
                /* TODO: check if the case label is already known */
                if (current_switch != NULL) {
@@ -6604,8 +6968,8 @@ static statement_t *parse_case_statement(void)
                                current_switch->last_case->next = &statement->case_label;
                        }
                } else {
-                       errorf(statement->base.source_position,
-                               "case label not within a switch statement");
+                       errorf(&statement->base.source_position,
+                              "case label not within a switch statement");
                }
        }
        statement->case_label.statement = parse_statement();
@@ -6644,9 +7008,8 @@ static statement_t *parse_default_statement(void)
        if (current_switch != NULL) {
                const case_label_statement_t *def_label = find_default_label(current_switch);
                if (def_label != NULL) {
-                       errorf(HERE, "multiple default labels in one switch");
-                       errorf(def_label->base.source_position,
-                               "this is the first default label");
+                       errorf(HERE, "multiple default labels in one switch (previous declared %P)",
+                              &def_label->base.source_position);
                } else {
                        /* link all cases into the switch statement */
                        if (current_switch->last_case == NULL) {
@@ -6657,7 +7020,7 @@ static statement_t *parse_default_statement(void)
                        }
                }
        } else {
-               errorf(statement->base.source_position,
+               errorf(&statement->base.source_position,
                        "'default' label not within a switch statement");
        }
        statement->case_label.statement = parse_statement();
@@ -6705,9 +7068,8 @@ 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 '%Y'", symbol);
-               errorf(label->source_position, "previous definition of '%Y' was here",
-                      symbol);
+               errorf(HERE, "duplicate label '%Y' (declared %P)",
+                      symbol, &label->source_position);
        } else {
                label->source_position = token.source_position;
        }
@@ -6798,7 +7160,7 @@ static statement_t *parse_switch(void)
        if (is_type_integer(type)) {
                type = promote_integer(type);
        } else if (is_type_valid(type)) {
-               errorf(expr->base.source_position,
+               errorf(&expr->base.source_position,
                       "switch quantity is not an integer, but '%T'", type);
                type = type_error_type;
        }
@@ -6810,9 +7172,9 @@ static statement_t *parse_switch(void)
        statement->switchs.body = parse_statement();
        current_switch          = rem;
 
-       if (warning.switch_default
-                       && find_default_label(&statement->switchs) == NULL) {
-               warningf(statement->base.source_position, "switch has no default case");
+       if(warning.switch_default &&
+          find_default_label(&statement->switchs) == NULL) {
+               warningf(&statement->base.source_position, "switch has no default case");
        }
 
        return statement;
@@ -6903,12 +7265,14 @@ static statement_t *parse_for(void)
                if(is_declaration_specifier(&token, false)) {
                        parse_declaration(record_declaration);
                } else {
+                       add_anchor_token(';');
                        expression_t *const init = parse_expression();
                        statement->fors.initialisation = init;
-                       if (warning.unused_value  && !expression_has_effect(init)) {
-                               warningf(init->base.source_position,
+                       if (warning.unused_value && !expression_has_effect(init)) {
+                               warningf(&init->base.source_position,
                                         "initialisation of 'for'-statement has no effect");
                        }
+                       rem_anchor_token(';');
                        expect(';');
                }
        } else {
@@ -6916,14 +7280,16 @@ static statement_t *parse_for(void)
        }
 
        if(token.type != ';') {
+               add_anchor_token(';');
                statement->fors.condition = parse_expression();
+               rem_anchor_token(';');
        }
        expect(';');
        if(token.type != ')') {
                expression_t *const step = parse_expression();
                statement->fors.step = step;
-               if (warning.unused_value  && !expression_has_effect(step)) {
-                       warningf(step->base.source_position,
+               if (warning.unused_value && !expression_has_effect(step)) {
+                       warningf(&step->base.source_position,
                                 "step of 'for'-statement has no effect");
                }
        }
@@ -7091,11 +7457,11 @@ declaration_t *expr_is_variable(const expression_t *expression)
  */
 static statement_t *parse_return(void)
 {
-       eat(T_return);
-
        statement_t *statement          = allocate_statement_zero(STATEMENT_RETURN);
        statement->base.source_position = token.source_position;
 
+       eat(T_return);
+
        expression_t *return_value = NULL;
        if(token.type != ';') {
                return_value = parse_expression();
@@ -7111,14 +7477,14 @@ static statement_t *parse_return(void)
 
                if(is_type_atomic(return_type, ATOMIC_TYPE_VOID)
                                && !is_type_atomic(return_value_type, ATOMIC_TYPE_VOID)) {
-                       warningf(statement->base.source_position,
+                       warningf(&statement->base.source_position,
                                 "'return' with a value, in function returning void");
                        return_value = NULL;
                } else {
                        type_t *const res_type = semantic_assign(return_type,
-                               return_value, "'return'");
+                               return_value, "'return'", &statement->base.source_position);
                        if (res_type == NULL) {
-                               errorf(statement->base.source_position,
+                               errorf(&statement->base.source_position,
                                       "cannot return something of type '%T' in function returning '%T'",
                                       return_value->base.type, return_type);
                        } else {
@@ -7129,13 +7495,13 @@ static statement_t *parse_return(void)
                if (return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) {
                        const expression_t *expression = return_value->unary.value;
                        if (is_local_variable(expression)) {
-                               warningf(statement->base.source_position,
+                               warningf(&statement->base.source_position,
                                         "function returns address of local variable");
                        }
                }
        } else {
                if(!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) {
-                       warningf(statement->base.source_position,
+                       warningf(&statement->base.source_position,
                                 "'return' without value, in function returning non-void");
                }
        }
@@ -7179,8 +7545,8 @@ static statement_t *parse_expression_statement(void)
        expression_t *const expr         = parse_expression();
        statement->expression.expression = expr;
 
-       if (warning.unused_value  && !expression_has_effect(expr)) {
-               warningf(expr->base.source_position, "statement has no effect");
+       if (warning.unused_value && !expression_has_effect(expr)) {
+               warningf(&expr->base.source_position, "statement has no effect");
        }
 
        expect(';');
@@ -7341,7 +7707,7 @@ static statement_t *parse_compound_statement(void)
        if(token.type == '}') {
                next_token();
        } else {
-               errorf(statement->base.source_position,
+               errorf(&statement->base.source_position,
                       "end of file while looking for closing '}'");
        }
 
@@ -7400,7 +7766,7 @@ static void check_unused_globals(void)
                        s = "defined";
                }
 
-               warningf(decl->source_position, "'%#T' %s but not used",
+               warningf(&decl->source_position, "'%#T' %s but not used",
                        type, decl->symbol, s);
        }
 }