fixed comments
[cparser] / parser.c
index d25c44f..fd17b0a 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -105,8 +105,11 @@ typedef struct parse_initializer_env_t {
 
 typedef declaration_t* (*parsed_declaration_func) (declaration_t *declaration, bool is_definition);
 
+/** The current token. */
 static token_t             token;
+/** The lookahead ring-buffer. */
 static token_t             lookahead_buffer[MAX_LOOKAHEAD];
+/** Position of the next token in the lookahead buffer. */
 static int                 lookahead_bufpos;
 static stack_entry_t      *environment_stack = NULL;
 static stack_entry_t      *label_stack       = NULL;
@@ -124,9 +127,15 @@ static goto_statement_t   *goto_first        = NULL;
 static goto_statement_t   *goto_last         = NULL;
 static label_statement_t  *label_first       = NULL;
 static label_statement_t  *label_last        = NULL;
+/** current translation unit. */
 static translation_unit_t *unit              = NULL;
+/** true if we are in a type property context (evaluation only for type. */
+static bool                in_type_prop      = false;
+/** true in we are in a __extension__ context. */
+static bool                in_gcc_extension  = false;
 static struct obstack      temp_obst;
 
+
 #define PUSH_PARENT(stmt)                          \
        statement_t *const prev_parent = current_parent; \
        current_parent = (stmt);
@@ -134,6 +143,9 @@ static struct obstack      temp_obst;
 
 static source_position_t null_position = { NULL, 0 };
 
+/** special symbol used for anonymous entities. */
+static const symbol_t *sym_anonymous = NULL;
+
 /* symbols for Microsoft extended-decl-modifier */
 static const symbol_t *sym_align      = NULL;
 static const symbol_t *sym_allocate   = NULL;
@@ -160,6 +172,9 @@ static unsigned char token_anchor_set[T_LAST_TOKEN];
 /** The current source position. */
 #define HERE (&token.source_position)
 
+/** true if we are in GCC mode. */
+#define GNU_MODE ((c_mode & _GNUC) || in_gcc_extension)
+
 static type_t *type_valist;
 
 static statement_t *parse_compound_statement(bool inside_expression_statement);
@@ -552,6 +567,7 @@ static void restore_anchor_state(int token_type, int count)
 static void rem_anchor_token(int token_type)
 {
        assert(0 <= token_type && token_type < T_LAST_TOKEN);
+       assert(token_anchor_set[token_type] != 0);
        --token_anchor_set[token_type];
 }
 
@@ -639,16 +655,6 @@ static void eat_block(void)
                next_token();
 }
 
-/**
- * eat all token until a ';' is reached or a stop token is found.
- */
-static void eat_statement(void)
-{
-       eat_until_matching_token(';');
-       if (token.type == ';')
-               next_token();
-}
-
 #define eat(token_type)  do { assert(token.type == token_type); next_token(); } while (0)
 
 /**
@@ -693,18 +699,18 @@ static void type_error_incompatible(const char *msg,
  * If not, generate an error, eat the current statement,
  * and goto the end_error label.
  */
-#define expect(expected)                              \
-       do {                                              \
-    if (UNLIKELY(token.type != (expected))) {          \
-        parse_error_expected(NULL, (expected), NULL); \
-               add_anchor_token(expected);                   \
-        eat_until_anchor();                           \
-        if (token.type == expected)                   \
-               next_token();                             \
-               rem_anchor_token(expected);                   \
-        goto end_error;                               \
-    }                                                 \
-    next_token();                                     \
+#define expect(expected)                                  \
+       do {                                                  \
+               if (UNLIKELY(token.type != (expected))) {         \
+                       parse_error_expected(NULL, (expected), NULL); \
+                       add_anchor_token(expected);                   \
+                       eat_until_anchor();                           \
+                       if (token.type == expected)                   \
+                               next_token();                             \
+                       rem_anchor_token(expected);                   \
+                       goto end_error;                               \
+               }                                                 \
+               next_token();                                     \
        } while (0)
 
 static void set_scope(scope_t *new_scope)
@@ -1030,7 +1036,7 @@ static void report_assign_error(assign_error_t error, type_t *orig_type_left,
 
        case ASSIGN_WARNING_POINTER_FROM_INT:
                warningf(source_position,
-                        "%s makes integer '%T' from pointer '%T' without a cast",
+                        "%s makes pointer '%T' from integer '%T' without a cast",
                                 context, orig_type_left, orig_type_right);
                return;
 
@@ -1497,12 +1503,12 @@ static void parse_gnu_attribute_format_args(gnu_attribute_t *attribute)
        add_anchor_token(',');
        parse_constant_expression();
        rem_anchor_token(',');
-       rem_anchor_token('(');
+       rem_anchor_token(')');
 
        expect(',');
        add_anchor_token(')');
        parse_constant_expression();
-       rem_anchor_token('(');
+       rem_anchor_token(')');
        expect(')');
        return;
 end_error:
@@ -2148,8 +2154,6 @@ static void descend_into_subtype(type_path_t *path)
        type_t *orig_top_type = path->top_type;
        type_t *top_type      = skip_typeref(orig_top_type);
 
-       assert(is_type_compound(top_type) || is_type_array(top_type));
-
        type_path_entry_t *top = append_to_type_path(path);
        top->type              = top_type;
 
@@ -2163,11 +2167,11 @@ static void descend_into_subtype(type_path_t *path)
                } else {
                        path->top_type         = NULL;
                }
-       } else {
-               assert(is_type_array(top_type));
-
+       } else if (is_type_array(top_type)) {
                top->v.index   = 0;
                path->top_type = top_type->array.element_type;
+       } else {
+               assert(!is_type_valid(top_type));
        }
 }
 
@@ -2473,6 +2477,10 @@ finish_designator:
 
                        if (type == NULL) {
                                /* we are already outside, ... */
+                               if (is_type_compound(outer_type) &&
+                                   !outer_type->compound.declaration->init.complete) {
+                                       goto error_parse_next;
+                               }
                                goto error_excess;
                        }
 
@@ -2857,16 +2865,16 @@ static type_t *parse_typeof(void)
 
        expression_t *expression  = NULL;
 
-restart:
-       switch(token.type) {
-       case T___extension__:
-               /* This can be a prefix to a typename or an expression.  We simply eat
-                * it now. */
-               do {
-                       next_token();
-               } while (token.type == T___extension__);
-               goto restart;
+       bool old_type_prop     = in_type_prop;
+       bool old_gcc_extension = in_gcc_extension;
+       in_type_prop           = true;
 
+       while (token.type == T___extension__) {
+               /* This can be a prefix to a typename or an expression. */
+               next_token();
+               in_gcc_extension = true;
+       }
+       switch (token.type) {
        case T_IDENTIFIER:
                if (is_typedef_symbol(token.v.symbol)) {
                        type = parse_typename();
@@ -2885,6 +2893,8 @@ restart:
                type       = expression->base.type;
                break;
        }
+       in_type_prop     = old_type_prop;
+       in_gcc_extension = old_gcc_extension;
 
        rem_anchor_token(')');
        expect(')');
@@ -2957,7 +2967,7 @@ static bool check_alignment_value(long long intvalue)
                return false;
        }
        unsigned v = (unsigned)intvalue;
-       for(unsigned i = 1; i <= 8192; i += i) {
+       for (unsigned i = 1; i <= 8192; i += i) {
                if (i == v)
                        return true;
        }
@@ -3028,7 +3038,7 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe
                } else if (symbol == sym_property) {
                        next_token();
                        expect('(');
-                       for(;;) {
+                       for (;;) {
                                bool is_get = false;
                                if (token.type != T_IDENTIFIER)
                                        goto end_error;
@@ -3131,33 +3141,38 @@ static void finish_struct_type(compound_type_t *type) {
        if (! struct_decl->init.complete)
                return;
 
-       il_size_t      size      = 0;
-       il_size_t      new_size;
-       il_alignment_t alignment = 1;
-       bool           need_pad  = false;
+       il_size_t      size           = 0;
+       il_size_t      offset;
+       il_alignment_t alignment      = 1;
+       bool           need_pad       = false;
 
        declaration_t *entry = struct_decl->scope.declarations;
        for (; entry != NULL; entry = entry->next) {
                if (entry->namespc != NAMESPACE_NORMAL)
                        continue;
 
-               type_t         *m_type      = skip_typeref(entry->type);
-               il_alignment_t  m_alignment = m_type->base.alignment;
-
-               new_size = (size + m_alignment - 1) & -m_alignment;
+               type_t *m_type = skip_typeref(entry->type);
+               if (! is_type_valid(m_type)) {
+                       /* simply ignore errors here */
+                       continue;
+               }
+               il_alignment_t m_alignment = m_type->base.alignment;
                if (m_alignment > alignment)
                        alignment = m_alignment;
-               if (new_size > size)
+
+               offset = (size + m_alignment - 1) & -m_alignment;
+
+               if (offset > size)
                        need_pad = true;
-               entry->offset = new_size;
-               size = new_size + m_type->base.size;
+               entry->offset = offset;
+               size = offset + m_type->base.size;
        }
        if (type->base.alignment != 0) {
                alignment = type->base.alignment;
        }
 
-       new_size = (size + alignment - 1) & -alignment;
-       if (new_size > size)
+       offset = (size + alignment - 1) & -alignment;
+       if (offset > size)
                need_pad = true;
 
        if (warning.padded && need_pad) {
@@ -3170,7 +3185,7 @@ static void finish_struct_type(compound_type_t *type) {
                        type, struct_decl->symbol);
        }
 
-       type->base.size      = new_size;
+       type->base.size      = offset;
        type->base.alignment = alignment;
 }
 
@@ -3194,6 +3209,8 @@ static void finish_union_type(compound_type_t *type) {
                        continue;
 
                type_t *m_type = skip_typeref(entry->type);
+               if (! is_type_valid(m_type))
+                       continue;
 
                entry->offset = 0;
                if (m_type->base.size > size)
@@ -3211,12 +3228,13 @@ static void finish_union_type(compound_type_t *type) {
 
 static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
 {
-       type_t            *type            = NULL;
-       type_qualifiers_t  qualifiers      = TYPE_QUALIFIER_NONE;
-       type_modifiers_t   modifiers       = TYPE_MODIFIER_NONE;
-       unsigned           type_specifiers = 0;
-       bool               newtype         = false;
-       bool               saw_error       = false;
+       type_t            *type              = NULL;
+       type_qualifiers_t  qualifiers        = TYPE_QUALIFIER_NONE;
+       type_modifiers_t   modifiers         = TYPE_MODIFIER_NONE;
+       unsigned           type_specifiers   = 0;
+       bool               newtype           = false;
+       bool               saw_error         = false;
+       bool               old_gcc_extension = in_gcc_extension;
 
        specifiers->source_position = token.source_position;
 
@@ -3226,7 +3244,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
                if (specifiers->modifiers & DM_TRANSPARENT_UNION)
                        modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION;
 
-               switch(token.type) {
+               switch (token.type) {
 
                /* storage class */
 #define MATCH_STORAGE_CLASS(token, class)                                  \
@@ -3291,8 +3309,8 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
                MATCH_TYPE_QUALIFIER(T___sptr,   TYPE_QUALIFIER_SPTR);
 
                case T___extension__:
-                       /* TODO */
                        next_token();
+                       in_gcc_extension = true;
                        break;
 
                /* type specifiers */
@@ -3437,6 +3455,8 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
        }
 
 finish_specifiers:
+       in_gcc_extension = old_gcc_extension;
+
        if (type == NULL || (saw_error && type_specifiers != 0)) {
                atomic_type_kind_t atomic_type;
 
@@ -3575,10 +3595,8 @@ warn_about_long_long:
                default:
                        /* invalid specifier combination, give an error message */
                        if (type_specifiers == 0) {
-                               if (saw_error) {
-                                       specifiers->type = type_error_type;
-                                       return;
-                               }
+                               if (saw_error)
+                                       goto end_error;
 
                                if (!strict_mode) {
                                        if (warning.implicit_int) {
@@ -3597,15 +3615,13 @@ warn_about_long_long:
                        } else {
                                errorf(HERE, "multiple datatypes in declaration");
                        }
-                       atomic_type = ATOMIC_TYPE_INVALID;
+                       goto end_error;
                }
 
-               if (type_specifiers & SPECIFIER_COMPLEX &&
-                  atomic_type != ATOMIC_TYPE_INVALID) {
+               if (type_specifiers & SPECIFIER_COMPLEX) {
                        type                = allocate_type_zero(TYPE_COMPLEX, &builtin_source_position);
                        type->complex.akind = atomic_type;
-               } else if (type_specifiers & SPECIFIER_IMAGINARY &&
-                         atomic_type != ATOMIC_TYPE_INVALID) {
+               } else if (type_specifiers & SPECIFIER_IMAGINARY) {
                        type                  = allocate_type_zero(TYPE_IMAGINARY, &builtin_source_position);
                        type->imaginary.akind = atomic_type;
                } else {
@@ -3628,7 +3644,10 @@ warn_about_long_long:
        }
 
        specifiers->type = result;
+       return;
+
 end_error:
+       specifiers->type = type_error_type;
        return;
 }
 
@@ -3902,9 +3921,8 @@ static construct_type_t *parse_array_declarator(void)
        rem_anchor_token(']');
        expect(']');
 
-       return (construct_type_t*) array;
 end_error:
-       return NULL;
+       return (construct_type_t*) array;
 }
 
 static construct_type_t *parse_function_declarator(declaration_t *declaration)
@@ -4032,8 +4050,10 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration,
                next_token();
                add_anchor_token(')');
                inner_types = parse_inner_declarator(declaration, may_be_abstract);
-               /* All later declarators only modify the return type, not declaration */
-               declaration = NULL;
+               if (inner_types != NULL) {
+                       /* All later declarators only modify the return type, not declaration */
+                       declaration = NULL;
+               }
                rem_anchor_token(')');
                expect(')');
                break;
@@ -4041,13 +4061,7 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration,
                if (may_be_abstract)
                        break;
                parse_error_expected("while parsing declarator", T_IDENTIFIER, '(', NULL);
-               /* avoid a loop in the outermost scope, because eat_statement doesn't
-                * eat '}' */
-               if (token.type == '}' && current_function == NULL) {
-                       next_token();
-               } else {
-                       eat_statement();
-               }
+               eat_until_anchor();
                return NULL;
        }
 
@@ -4146,15 +4160,19 @@ static type_t *construct_declarator_type(construct_type_t *construct_list,
                        function_type->function.return_type = type;
 
                        type_t *skipped_return_type = skip_typeref(type);
+                       /* ยง6.7.5.3(1) */
                        if (is_type_function(skipped_return_type)) {
                                errorf(HERE, "function returning function is not allowed");
-                               type = type_error_type;
                        } else if (is_type_array(skipped_return_type)) {
                                errorf(HERE, "function returning array is not allowed");
-                               type = type_error_type;
                        } else {
-                               type = function_type;
+                               if (skipped_return_type->base.qualifiers != 0) {
+                                       warningf(HERE,
+                                               "type qualifiers in return type of function type are meaningless");
+                               }
                        }
+
+                       type = function_type;
                        break;
                }
 
@@ -4195,12 +4213,13 @@ static type_t *construct_declarator_type(construct_type_t *construct_list,
                        }
 
                        type_t *skipped_type = skip_typeref(type);
-                       if (is_type_atomic(skipped_type, ATOMIC_TYPE_VOID)) {
-                               errorf(HERE, "array of void is not allowed");
-                               type = type_error_type;
-                       } else {
-                               type = array_type;
+                       /* ยง6.7.5.2(1) */
+                       if (is_type_incomplete(skipped_type)) {
+                               errorf(HERE, "array of incomplete type '%T' is not allowed", type);
+                       } else if (is_type_function(skipped_type)) {
+                               errorf(HERE, "array of functions is not allowed");
                        }
+                       type = array_type;
                        break;
                }
                }
@@ -4297,7 +4316,7 @@ static void check_type_of_main(const declaration_t *const decl, const function_t
                warningf(&decl->source_position,
                         "'main' is normally a non-static function");
        }
-       if (skip_typeref(func_type->return_type) != type_int) {
+       if (!types_compatible(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);
@@ -4360,7 +4379,7 @@ static declaration_t *record_declaration(
                        previous_declaration == NULL) {
                warningf(&declaration->source_position,
                         "function declaration '%#T' is not a prototype",
-                        orig_type, declaration->symbol);
+                        orig_type, symbol);
        }
 
        if (warning.main && is_type_function(type) && is_sym_main(symbol)) {
@@ -4450,8 +4469,9 @@ static declaration_t *record_declaration(
                        if (old_storage_class == STORAGE_CLASS_EXTERN &&
                                        new_storage_class == STORAGE_CLASS_EXTERN) {
 warn_redundant_declaration:
-                               if (!is_definition          &&
-                                   warning.redundant_decls &&
+                               if (!is_definition           &&
+                                   warning.redundant_decls  &&
+                                   is_type_valid(prev_type) &&
                                    strcmp(previous_declaration->source_position.input_name, "<builtin>") != 0) {
                                        warningf(&declaration->source_position,
                                                 "redundant declaration for '%Y' (declared %P)",
@@ -4469,14 +4489,16 @@ warn_redundant_declaration:
                                } else {
                                        goto warn_redundant_declaration;
                                }
-                       } else if (old_storage_class == new_storage_class) {
-                               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 (declared %P)",
-                                      symbol, &previous_declaration->source_position);
+                       } else if (is_type_valid(prev_type)) {
+                               if (old_storage_class == new_storage_class) {
+                                       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 (declared %P)",
+                                              symbol, &previous_declaration->source_position);
+                               }
                        }
                }
 
@@ -4525,7 +4547,7 @@ static void parser_error_multiple_definition(declaration_t *declaration,
 static bool is_declaration_specifier(const token_t *token,
                                      bool only_specifiers_qualifiers)
 {
-       switch(token->type) {
+       switch (token->type) {
                TYPE_SPECIFIERS
                TYPE_QUALIFIERS
                        return true;
@@ -4588,24 +4610,17 @@ static void parse_anonymous_declaration_rest(
 {
        eat(';');
 
-       declaration_t *const declaration    = allocate_declaration_zero();
-       declaration->type                   = specifiers->type;
-       declaration->declared_storage_class = specifiers->declared_storage_class;
-       declaration->source_position        = specifiers->source_position;
-       declaration->modifiers              = specifiers->modifiers;
-
-       if (declaration->declared_storage_class != STORAGE_CLASS_NONE) {
-               warningf(&declaration->source_position,
+       if (specifiers->declared_storage_class != STORAGE_CLASS_NONE) {
+               warningf(&specifiers->source_position,
                         "useless storage class in empty declaration");
        }
-       declaration->storage_class = STORAGE_CLASS_NONE;
 
-       type_t *type = declaration->type;
+       type_t *type = specifiers->type;
        switch (type->kind) {
                case TYPE_COMPOUND_STRUCT:
                case TYPE_COMPOUND_UNION: {
                        if (type->compound.declaration->symbol == NULL) {
-                               warningf(&declaration->source_position,
+                               warningf(&specifiers->source_position,
                                         "unnamed struct/union that defines no instances");
                        }
                        break;
@@ -4615,11 +4630,20 @@ static void parse_anonymous_declaration_rest(
                        break;
 
                default:
-                       warningf(&declaration->source_position, "empty declaration");
+                       warningf(&specifiers->source_position, "empty declaration");
                        break;
        }
 
+#ifdef RECORD_EMPTY_DECLARATIONS
+       declaration_t *const declaration    = allocate_declaration_zero();
+       declaration->type                   = specifiers->type;
+       declaration->declared_storage_class = specifiers->declared_storage_class;
+       declaration->source_position        = specifiers->source_position;
+       declaration->modifiers              = specifiers->modifiers;
+       declaration->storage_class          = STORAGE_CLASS_NONE;
+
        append_declaration(declaration);
+#endif
 }
 
 static void parse_declaration_rest(declaration_t *ndeclaration,
@@ -4627,7 +4651,6 @@ static void parse_declaration_rest(declaration_t *ndeclaration,
                parsed_declaration_func finished_declaration)
 {
        add_anchor_token(';');
-       add_anchor_token('=');
        add_anchor_token(',');
        while(true) {
                declaration_t *declaration =
@@ -4651,13 +4674,14 @@ static void parse_declaration_rest(declaration_t *ndeclaration,
                        break;
                eat(',');
 
+               add_anchor_token('=');
                ndeclaration = parse_declarator(specifiers, /*may_be_abstract=*/false);
+               rem_anchor_token('=');
        }
        expect(';');
 
 end_error:
        rem_anchor_token(';');
-       rem_anchor_token('=');
        rem_anchor_token(',');
 }
 
@@ -4700,7 +4724,10 @@ static void parse_declaration(parsed_declaration_func finished_declaration)
 {
        declaration_specifiers_t specifiers;
        memset(&specifiers, 0, sizeof(specifiers));
+
+       add_anchor_token(';');
        parse_declaration_specifiers(&specifiers);
+       rem_anchor_token(';');
 
        if (token.type == ';') {
                parse_anonymous_declaration_rest(&specifiers);
@@ -5370,7 +5397,7 @@ static void parse_external_declaration(void)
 
        add_anchor_token(',');
        add_anchor_token('=');
-       rem_anchor_token(';');
+       add_anchor_token(';');
 
        /* declarator is common to both function-definitions and declarations */
        declaration_t *ndeclaration = parse_declarator(&specifiers, /*may_be_abstract=*/false);
@@ -5508,12 +5535,40 @@ static void parse_external_declaration(void)
 }
 
 static type_t *make_bitfield_type(type_t *base_type, expression_t *size,
-                                  source_position_t *source_position)
+                                  source_position_t *source_position,
+                                  const symbol_t *symbol)
 {
        type_t *type = allocate_type_zero(TYPE_BITFIELD, source_position);
 
-       type->bitfield.base_type = base_type;
-       type->bitfield.size      = size;
+       type->bitfield.base_type       = base_type;
+       type->bitfield.size_expression = size;
+
+       il_size_t bit_size;
+       type_t *skipped_type = skip_typeref(base_type);
+       if (!is_type_integer(skipped_type)) {
+               errorf(HERE, "bitfield base type '%T' is not an integer type",
+                       base_type);
+               bit_size = 0;
+       } else {
+               bit_size = skipped_type->base.size * 8;
+       }
+
+       if (is_constant_expression(size)) {
+               long v = fold_constant(size);
+
+               if (v < 0) {
+                       errorf(source_position, "negative width in bit-field '%Y'",
+                               symbol);
+               } else if (v == 0) {
+                       errorf(source_position, "zero width for bit-field '%Y'",
+                               symbol);
+               } else if (bit_size > 0 && (il_size_t)v > bit_size) {
+                       errorf(source_position, "width of '%Y' exceeds its type",
+                               symbol);
+               } else {
+                       type->bitfield.bit_size = v;
+               }
+       }
 
        return type;
 }
@@ -5565,12 +5620,8 @@ static void parse_compound_declarators(declaration_t *struct_declaration,
                        type_t *base_type = specifiers->type;
                        expression_t *size = parse_constant_expression();
 
-                       if (!is_type_integer(skip_typeref(base_type))) {
-                               errorf(HERE, "bitfield base type '%T' is not an integer type",
-                                      base_type);
-                       }
-
-                       type_t *type = make_bitfield_type(base_type, size, &source_position);
+                       type_t *type = make_bitfield_type(base_type, size,
+                                       &source_position, sym_anonymous);
 
                        declaration                         = allocate_declaration_zero();
                        declaration->namespc                = NAMESPACE_NORMAL;
@@ -5590,12 +5641,8 @@ static void parse_compound_declarators(declaration_t *struct_declaration,
                                next_token();
                                expression_t *size = parse_constant_expression();
 
-                               if (!is_type_integer(type)) {
-                                       errorf(HERE, "bitfield base type '%T' is not an integer type",
-                                              orig_type);
-                               }
-
-                               type_t *bitfield_type = make_bitfield_type(orig_type, size, &source_position);
+                               type_t *bitfield_type = make_bitfield_type(orig_type, size,
+                                               &source_position, declaration->symbol);
                                declaration->type = bitfield_type;
                        } else {
                                /* TODO we ignore arrays for now... what is missing is a check
@@ -5788,8 +5835,7 @@ static expression_t *parse_character_constant(void)
        cnst->conste.v.character   = token.v.string;
 
        if (cnst->conste.v.character.size != 1) {
-               if (warning.multichar && (c_mode & _GNUC)) {
-                       /* TODO */
+               if (warning.multichar && GNU_MODE) {
                        warningf(HERE, "multi-character character constant");
                } else {
                        errorf(HERE, "more than 1 characters in character constant");
@@ -5812,8 +5858,7 @@ static expression_t *parse_wide_character_constant(void)
        cnst->conste.v.wide_character = token.v.wide_string;
 
        if (cnst->conste.v.wide_character.size != 1) {
-               if (warning.multichar && (c_mode & _GNUC)) {
-                       /* TODO */
+               if (warning.multichar && GNU_MODE) {
                        warningf(HERE, "multi-character character constant");
                } else {
                        errorf(HERE, "more than 1 characters in character constant");
@@ -6046,21 +6091,15 @@ static expression_t *parse_reference(void)
 
        declaration_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL);
 
-       source_position_t source_position = token.source_position;
-       next_token();
-
        if (declaration == NULL) {
-               if (token.type == '(') {
+               if (!strict_mode && look_ahead(1)->type == '(') {
                        /* an implicitly declared function */
-                       if (strict_mode) {
-                               errorf(HERE, "unknown symbol '%Y' found.", symbol);
-                       } else if (warning.implicit_function_declaration) {
+                       if (warning.implicit_function_declaration) {
                                warningf(HERE, "implicit declaration of function '%Y'",
                                        symbol);
                        }
 
-                       declaration = create_implicit_function(symbol,
-                                                              &source_position);
+                       declaration = create_implicit_function(symbol, HERE);
                } else {
                        errorf(HERE, "unknown symbol '%Y' found.", symbol);
                        declaration = create_error_declaration(symbol, STORAGE_CLASS_NONE);
@@ -6086,23 +6125,21 @@ static expression_t *parse_reference(void)
                        "function" : "variable";
 
                if (declaration->deprecated_string != NULL) {
-                       warningf(&source_position,
-                               "%s '%Y' is deprecated (declared %P): \"%s\"", prefix,
-                               declaration->symbol, &declaration->source_position,
+                       warningf(HERE, "%s '%Y' is deprecated (declared %P): \"%s\"",
+                               prefix, declaration->symbol, &declaration->source_position,
                                declaration->deprecated_string);
                } else {
-                       warningf(&source_position,
-                               "%s '%Y' is deprecated (declared %P)", prefix,
+                       warningf(HERE, "%s '%Y' is deprecated (declared %P)", prefix,
                                declaration->symbol, &declaration->source_position);
                }
        }
-       if (warning.init_self && declaration == current_init_decl) {
+       if (warning.init_self && declaration == current_init_decl && !in_type_prop) {
                current_init_decl = NULL;
-               warningf(&source_position,
-                       "variable '%#T' is initialized by itself",
+               warningf(HERE, "variable '%#T' is initialized by itself",
                        declaration->type, declaration->symbol);
        }
 
+       next_token();
        return expression;
 }
 
@@ -6177,11 +6214,12 @@ static expression_t *parse_compound_literal(type_t *type)
  */
 static expression_t *parse_cast(void)
 {
+       add_anchor_token(')');
+
        source_position_t source_position = token.source_position;
 
        type_t *type  = parse_typename();
 
-       /* matching add_anchor_token() is at call site */
        rem_anchor_token(')');
        expect(')');
 
@@ -6210,6 +6248,8 @@ end_error:
  */
 static expression_t *parse_statement_expression(void)
 {
+       add_anchor_token(')');
+
        expression_t *expression = allocate_expression_zero(EXPR_STATEMENT);
 
        statement_t *statement           = parse_compound_statement(true);
@@ -6231,11 +6271,11 @@ static expression_t *parse_statement_expression(void)
        }
        expression->base.type = type;
 
+       rem_anchor_token(')');
        expect(')');
 
-       return expression;
 end_error:
-       return create_invalid_expression();
+       return expression;
 }
 
 /**
@@ -6244,7 +6284,6 @@ end_error:
 static expression_t *parse_parenthesized_expression(void)
 {
        eat('(');
-       add_anchor_token(')');
 
        switch(token.type) {
        case '{':
@@ -6260,13 +6299,13 @@ static expression_t *parse_parenthesized_expression(void)
                }
        }
 
+       add_anchor_token(')');
        expression_t *result = parse_expression();
        rem_anchor_token(')');
        expect(')');
 
-       return result;
 end_error:
-       return create_invalid_expression();
+       return result;
 }
 
 static expression_t *parse_function_keyword(void)
@@ -6443,17 +6482,15 @@ static expression_t *parse_va_start(void)
        expression_t *const expr = parse_assignment_expression();
        if (expr->kind == EXPR_REFERENCE) {
                declaration_t *const decl = expr->reference.declaration;
-               if (decl == NULL)
-                       return create_invalid_expression();
-               if (decl->parent_scope == &current_function->scope &&
-                   decl->next == NULL) {
-                       expression->va_starte.parameter = decl;
-                       expect(')');
-                       return expression;
+               if (decl->parent_scope != &current_function->scope || decl->next != NULL) {
+                       errorf(&expr->base.source_position,
+                              "second argument of 'va_start' must be last parameter of the current function");
                }
+               expression->va_starte.parameter = decl;
+               expect(')');
+               return expression;
        }
-       errorf(&expr->base.source_position,
-              "second argument of 'va_start' must be last parameter of the current function");
+       expect(')');
 end_error:
        return create_invalid_expression();
 }
@@ -6792,7 +6829,7 @@ static expression_t *parse_primary_expression(void)
                case T___builtin_prefetch:       return parse_builtin_prefetch();
                case T__assume:                  return parse_assume();
                case T_ANDAND:
-                       if (c_mode & _GNUC)
+                       if (GNU_MODE)
                                return parse_label_address();
                        break;
 
@@ -6858,19 +6895,18 @@ static expression_t *parse_array_expression(unsigned precedence,
                                orig_type_left, orig_type_inside);
                }
                return_type             = type_error_type;
-               array_access->array_ref = create_invalid_expression();
+               array_access->array_ref = left;
+               array_access->index     = inside;
        }
 
+       expression->base.type = automatic_type_conversion(return_type);
+
        rem_anchor_token(']');
-       if (token.type != ']') {
+       if (token.type == ']') {
+               next_token();
+       } else {
                parse_error_expected("Problem while parsing array access", ']', NULL);
-               return expression;
        }
-       next_token();
-
-       return_type           = automatic_type_conversion(return_type);
-       expression->base.type = return_type;
-
        return expression;
 }
 
@@ -6878,12 +6914,15 @@ static expression_t *parse_typeprop(expression_kind_t const kind,
                                     source_position_t const pos,
                                     unsigned const precedence)
 {
-       expression_t *tp_expression = allocate_expression_zero(kind);
+       expression_t  *tp_expression = allocate_expression_zero(kind);
        tp_expression->base.type            = type_size_t;
        tp_expression->base.source_position = pos;
 
        char const* const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof";
 
+       /* we only refer to a type property, mark this case */
+       bool old     = in_type_prop;
+       in_type_prop = true;
        if (token.type == '(' && is_declaration_specifier(look_ahead(1), true)) {
                next_token();
                add_anchor_token(')');
@@ -6923,9 +6962,9 @@ static expression_t *parse_typeprop(expression_kind_t const kind,
                tp_expression->typeprop.tp_expression = expression;
        }
 
-       return tp_expression;
 end_error:
-       return create_invalid_expression();
+       in_type_prop = old;
+       return tp_expression;
 }
 
 static expression_t *parse_sizeof(unsigned precedence)
@@ -6990,7 +7029,7 @@ static expression_t *parse_select_expression(unsigned precedence,
                if (!declaration->init.complete) {
                        errorf(HERE, "request for member '%Y' of incomplete type '%T'",
                               symbol, type_left);
-                       return create_invalid_expression();
+                       goto create_error_entry;
                }
 
                entry = find_compound_entry(declaration, symbol);
@@ -7072,26 +7111,15 @@ static void check_call_argument(const function_parameter_t *parameter,
                snprintf(buf, sizeof(buf), "call argument %u", pos);
                report_assign_error(error, expected_type, arg_expr,     buf,
                                                        &arg_expr->base.source_position);
-       } else if (warning.traditional | warning.conversion) {
-               if (
-                   /* passing as integer instead of float or complex */
-                   (is_type_integer(expected_type) &&
-                    (is_type_float(arg_type) || is_type_complex(arg_type))) ||
-                   /* passing as complex instead of integer or float */
-                   (is_type_complex(expected_type) &&
-                    (is_type_integer(arg_type) || is_type_float(arg_type))) ||
-                   /* passing as float instead of integer or complex */
-                   (is_type_float(expected_type) &&
-                    (is_type_integer(arg_type) || is_type_complex(arg_type))) ||
-                   /* passing as float instead of double */
-                   (is_type_float(expected_type) && expected_type != type_double &&
-                    is_type_float(arg_type))) {
+       } else if (warning.traditional || warning.conversion) {
+               type_t *const promoted_type = get_default_promoted_type(arg_type);
+               if (!types_compatible(expected_type_skip, promoted_type) &&
+                   !types_compatible(expected_type_skip, type_void_ptr) &&
+                   !types_compatible(type_void_ptr,      promoted_type)) {
+                       /* Deliberately show the skipped types in this warning */
                        warningf(&arg_expr->base.source_position,
                                "passing call argument %u as '%T' rather than '%T' due to prototype",
-                               pos, expected_type, arg_type);
-               }
-               if (is_type_integer(expected_type) && is_type_integer(arg_type)) {
-                       /* TODO check for size HERE */
+                               pos, expected_type_skip, promoted_type);
                }
        }
 }
@@ -7192,9 +7220,8 @@ static expression_t *parse_call_expression(unsigned precedence,
                         "function call has aggregate value");
        }
 
-       return result;
 end_error:
-       return create_invalid_expression();
+       return result;
 }
 
 static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right);
@@ -7234,7 +7261,7 @@ static expression_t *parse_conditional_expression(unsigned precedence,
 
        expression_t *true_expression = expression;
        bool          gnu_cond = false;
-       if ((c_mode & _GNUC) && token.type == ':') {
+       if (GNU_MODE && token.type == ':') {
                gnu_cond = true;
        } else
                true_expression = parse_expression();
@@ -7345,9 +7372,10 @@ static expression_t *parse_extension(unsigned precedence)
 {
        eat(T___extension__);
 
-       /* TODO enable extensions */
+       bool old_gcc_extension   = in_gcc_extension;
+       in_gcc_extension         = true;
        expression_t *expression = parse_sub_expression(precedence);
-       /* TODO disable extensions */
+       in_gcc_extension         = old_gcc_extension;
        return expression;
 }
 
@@ -7381,7 +7409,7 @@ static bool check_pointer_arithmetic(const source_position_t *source_position,
        points_to = skip_typeref(points_to);
 
        if (is_type_incomplete(points_to)) {
-               if (!(c_mode & _GNUC) || !is_type_atomic(points_to, ATOMIC_TYPE_VOID)) {
+               if (!GNU_MODE || !is_type_atomic(points_to, ATOMIC_TYPE_VOID)) {
                        errorf(source_position,
                               "arithmetic with pointer to incomplete type '%T' not allowed",
                               orig_pointer_type);
@@ -7392,7 +7420,7 @@ static bool check_pointer_arithmetic(const source_position_t *source_position,
                                 orig_pointer_type);
                }
        } else if (is_type_function(points_to)) {
-               if (!(c_mode && _GNUC)) {
+               if (!GNU_MODE) {
                        errorf(source_position,
                               "arithmetic with pointer to function type '%T' not allowed",
                               orig_pointer_type);
@@ -7612,6 +7640,9 @@ static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right)
 {
        /* TODO: handle complex + imaginary types */
 
+       type_left  = get_unqualified_type(type_left);
+       type_right = get_unqualified_type(type_right);
+
        /* ยง 6.3.1.8 Usual arithmetic conversions */
        if (type_left == type_long_double || type_right == type_long_double) {
                return type_long_double;
@@ -7698,10 +7729,15 @@ static void semantic_binexpr_arithmetic(binary_expression_t *expression)
 
 static void warn_div_by_zero(binary_expression_t const *const expression)
 {
-       if (warning.div_by_zero                       &&
-           is_type_integer(expression->base.type)    &&
-           is_constant_expression(expression->right) &&
-           fold_constant(expression->right) == 0) {
+       if (!warning.div_by_zero ||
+           !is_type_integer(expression->base.type))
+               return;
+
+       expression_t const *const right = expression->right;
+       /* The type of the right operand can be different for /= */
+       if (is_type_integer(right->base.type) &&
+           is_constant_expression(right)     &&
+           fold_constant(right) == 0) {
                warningf(&expression->base.source_position, "division by zero");
        }
 }
@@ -8627,29 +8663,41 @@ static statement_t *parse_case_statement(void)
        source_position_t *const pos       = &statement->base.source_position;
 
        *pos                             = token.source_position;
-       statement->case_label.expression = parse_expression();
-       if (! is_constant_expression(statement->case_label.expression)) {
-               errorf(pos, "case label does not reduce to an integer constant");
+       expression_t *const expression   = parse_expression();
+       statement->case_label.expression = expression;
+       if (!is_constant_expression(expression)) {
+               /* This check does not prevent the error message in all cases of an
+                * prior error while parsing the expression.  At least it catches the
+                * common case of a mistyped enum entry. */
+               if (is_type_valid(expression->base.type)) {
+                       errorf(pos, "case label does not reduce to an integer constant");
+               }
                statement->case_label.is_bad = true;
        } else {
-               long const val = fold_constant(statement->case_label.expression);
+               long const val = fold_constant(expression);
                statement->case_label.first_case = val;
                statement->case_label.last_case  = val;
        }
 
-       if (c_mode & _GNUC) {
+       if (GNU_MODE) {
                if (token.type == T_DOTDOTDOT) {
                        next_token();
-                       statement->case_label.end_range = parse_expression();
-                       if (! is_constant_expression(statement->case_label.end_range)) {
-                               errorf(pos, "case range does not reduce to an integer constant");
+                       expression_t *const end_range   = parse_expression();
+                       statement->case_label.end_range = end_range;
+                       if (!is_constant_expression(end_range)) {
+                               /* This check does not prevent the error message in all cases of an
+                                * prior error while parsing the expression.  At least it catches the
+                                * common case of a mistyped enum entry. */
+                               if (is_type_valid(end_range->base.type)) {
+                                       errorf(pos, "case range does not reduce to an integer constant");
+                               }
                                statement->case_label.is_bad = true;
                        } else {
-                               long const val = fold_constant(statement->case_label.end_range);
+                               long const val = fold_constant(end_range);
                                statement->case_label.last_case = val;
 
                                if (val < statement->case_label.first_case) {
-                                       statement->case_label.is_empty = true;
+                                       statement->case_label.is_empty_range = true;
                                        warningf(pos, "empty range specified");
                                }
                        }
@@ -8665,7 +8713,7 @@ static statement_t *parse_case_statement(void)
                        /* Check for duplicate case values */
                        case_label_statement_t *c = &statement->case_label;
                        for (case_label_statement_t *l = current_switch->first_case; l != NULL; l = l->next) {
-                               if (l->is_bad || l->is_empty || l->expression == NULL)
+                               if (l->is_bad || l->is_empty_range || l->expression == NULL)
                                        continue;
 
                                if (c->last_case < l->first_case || c->first_case > l->last_case)
@@ -9088,7 +9136,7 @@ static statement_t *parse_goto(void)
        eat(T_goto);
 
        statement_t *statement;
-       if (c_mode & _GNUC && token.type == '*') {
+       if (GNU_MODE && token.type == '*') {
                next_token();
                expression_t *expression = parse_expression();
 
@@ -9111,11 +9159,11 @@ static statement_t *parse_goto(void)
                statement->gotos.expression     = expression;
        } else {
                if (token.type != T_IDENTIFIER) {
-                       if (c_mode & _GNUC)
+                       if (GNU_MODE)
                                parse_error_expected("while parsing goto", T_IDENTIFIER, '*', NULL);
                        else
                                parse_error_expected("while parsing goto", T_IDENTIFIER, NULL);
-                       eat_statement();
+                       eat_until_anchor();
                        goto end_error;
                }
                symbol_t *symbol = token.v.symbol;
@@ -9323,7 +9371,10 @@ static statement_t *parse_declaration_statement(void)
        statement->base.source_position = token.source_position;
 
        declaration_t *before = last_declaration;
-       parse_declaration(record_declaration);
+       if (GNU_MODE)
+               parse_external_declaration();
+       else
+               parse_declaration(record_declaration);
 
        if (before == NULL) {
                statement->declaration.declarations_begin = scope->declarations;
@@ -9477,13 +9528,18 @@ static statement_t *intern_parse_statement(void)
                } else if (is_typedef_symbol(token.v.symbol)) {
                        statement = parse_declaration_statement();
                } else switch (la1_type) {
+                       case '*':
+                               if (get_declaration(token.v.symbol, NAMESPACE_NORMAL) != NULL)
+                                       goto expression_statment;
+                               /* FALLTHROUGH */
+
                        DECLARATION_START
                        case T_IDENTIFIER:
-                       case '*':
                                statement = parse_declaration_statement();
                                break;
 
                        default:
+expression_statment:
                                statement = parse_expression_statement();
                                break;
                }
@@ -9496,7 +9552,10 @@ static statement_t *intern_parse_statement(void)
                do {
                        next_token();
                } while (token.type == T___extension__);
+               bool old_gcc_extension = in_gcc_extension;
+               in_gcc_extension       = true;
                statement = parse_statement();
+               in_gcc_extension = false;
                break;
 
        DECLARATION_START
@@ -9509,7 +9568,7 @@ static statement_t *intern_parse_statement(void)
 
        case ';':        statement = parse_empty_statement();         break;
        case '{':        statement = parse_compound_statement(false); break;
-       case T___leave:  statement = parse_leave_statement();                   break;
+       case T___leave:  statement = parse_leave_statement();         break;
        case T___try:    statement = parse_ms_try_statment();         break;
        case T_asm:      statement = parse_asm_statement();           break;
        case T_break:    statement = parse_break();                   break;
@@ -9523,7 +9582,58 @@ static statement_t *intern_parse_statement(void)
        case T_return:   statement = parse_return();                  break;
        case T_switch:   statement = parse_switch();                  break;
        case T_while:    statement = parse_while();                   break;
-       default:         statement = parse_expression_statement();    break;
+
+       case '!':
+       case '&':
+       case '(':
+       case '*':
+       case '+':
+       case '-':
+       case '~':
+       case T_ANDAND:
+       case T_CHARACTER_CONSTANT:
+       case T_FLOATINGPOINT:
+       case T_INTEGER:
+       case T_MINUSMINUS:
+       case T_PLUSPLUS:
+       case T_STRING_LITERAL:
+       case T_WIDE_CHARACTER_CONSTANT:
+       case T_WIDE_STRING_LITERAL:
+       case T___FUNCDNAME__:
+       case T___FUNCSIG__:
+       case T___FUNCTION__:
+       case T___PRETTY_FUNCTION__:
+       case T___builtin_alloca:
+       case T___builtin_classify_type:
+       case T___builtin_constant_p:
+       case T___builtin_expect:
+       case T___builtin_huge_val:
+       case T___builtin_isgreater:
+       case T___builtin_isgreaterequal:
+       case T___builtin_isless:
+       case T___builtin_islessequal:
+       case T___builtin_islessgreater:
+       case T___builtin_isunordered:
+       case T___builtin_nan:
+       case T___builtin_nand:
+       case T___builtin_nanf:
+       case T___builtin_offsetof:
+       case T___builtin_prefetch:
+       case T___builtin_va_arg:
+       case T___builtin_va_end:
+       case T___builtin_va_start:
+       case T___func__:
+       case T___noop:
+       case T__assume:
+               statement = parse_expression_statement();
+               break;
+
+       default:
+               errorf(HERE, "unexpected token %K while parsing statement", &token);
+               statement = create_invalid_statement();
+               if (!at_anchor())
+                       next_token();
+               break;
        }
        rem_anchor_token(';');
 
@@ -9720,32 +9830,52 @@ end_error:;
  */
 static void parse_translation_unit(void)
 {
-       for (;;) switch (token.type) {
-               DECLARATION_START
-               case T_IDENTIFIER:
-               case T___extension__:
-                       parse_external_declaration();
-                       break;
+       for (;;) {
+#ifndef NDEBUG
+               bool anchor_leak = false;
+               for (int i = 0; i != T_LAST_TOKEN; ++i) {
+                       unsigned char count = token_anchor_set[i];
+                       if (count != 0) {
+                               errorf(HERE, "Leaked anchor token %k %d times", i, count);
+                               anchor_leak = true;
+                       }
+               }
+               if (in_gcc_extension) {
+                       errorf(HERE, "Leaked __extension__");
+                       anchor_leak = true;
+               }
 
-               case T_asm:
-                       parse_global_asm();
-                       break;
+               if (anchor_leak)
+                       abort();
+#endif
 
-               case T_EOF:
-                       return;
+               switch (token.type) {
+                       DECLARATION_START
+                       case T_IDENTIFIER:
+                       case T___extension__:
+                               parse_external_declaration();
+                               break;
 
-               case ';':
-                       /* TODO error in strict mode */
-                       warningf(HERE, "stray ';' outside of function");
-                       next_token();
-                       break;
+                       case T_asm:
+                               parse_global_asm();
+                               break;
 
-               default:
-                       errorf(HERE, "stray %K outside of function", &token);
-                       if (token.type == '(' || token.type == '{' || token.type == '[')
-                               eat_until_matching_token(token.type);
-                       next_token();
-                       break;
+                       case T_EOF:
+                               return;
+
+                       case ';':
+                               /* TODO error in strict mode */
+                               warningf(HERE, "stray ';' outside of function");
+                               next_token();
+                               break;
+
+                       default:
+                               errorf(HERE, "stray %K outside of function", &token);
+                               if (token.type == '(' || token.type == '{' || token.type == '[')
+                                       eat_until_matching_token(token.type);
+                               next_token();
+                               break;
+               }
        }
 }
 
@@ -9811,6 +9941,8 @@ void parse(void)
  */
 void init_parser(void)
 {
+       sym_anonymous = symbol_table_insert("<anonymous>");
+
        if (c_mode & _MS) {
                /* add predefined symbols for extended-decl-modifier */
                sym_align      = symbol_table_insert("align");