check the deprecated modifier
[cparser] / parser.c
index e791fba..4c4dfe7 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -108,6 +108,11 @@ static const symbol_t *sym_selectany  = NULL;
 static const symbol_t *sym_thread     = NULL;
 static const symbol_t *sym_uuid       = NULL;
 static const symbol_t *sym_deprecated = NULL;
+static const symbol_t *sym_restrict   = NULL;
+static const symbol_t *sym_noalias    = NULL;
+
+/** The token anchor set */
+static unsigned char token_anchor_set[T_LAST_TOKEN];
 
 /** The current source position. */
 #define HERE token.source_position
@@ -207,6 +212,8 @@ static declaration_t *allocate_declaration_zero(void)
 static size_t get_statement_struct_size(statement_kind_t kind)
 {
        static const size_t sizes[] = {
+               [STATEMENT_INVALID]     = sizeof(invalid_statement_t),
+               [STATEMENT_EMPTY]       = sizeof(empty_statement_t),
                [STATEMENT_COMPOUND]    = sizeof(compound_statement_t),
                [STATEMENT_RETURN]      = sizeof(return_statement_t),
                [STATEMENT_DECLARATION] = sizeof(declaration_statement_t),
@@ -241,6 +248,26 @@ static statement_t *allocate_statement_zero(statement_kind_t kind)
        return res;
 }
 
+/**
+ * Creates a new invalid statement.
+ */
+static statement_t *create_invalid_statement(void)
+{
+       statement_t *statement          = allocate_statement_zero(STATEMENT_INVALID);
+       statement->base.source_position = token.source_position;
+       return statement;
+}
+
+/**
+ * Allocate a new empty statement.
+ */
+static statement_t *create_empty_statement(void)
+{
+       statement_t *statement          = allocate_statement_zero(STATEMENT_EMPTY);
+       statement->base.source_position = token.source_position;
+       return statement;
+}
+
 /**
  * Returns the size of an expression node.
  *
@@ -255,7 +282,7 @@ static size_t get_expression_struct_size(expression_kind_t kind)
                [EXPR_CHARACTER_CONSTANT]      = sizeof(const_expression_t),
                [EXPR_WIDE_CHARACTER_CONSTANT] = sizeof(const_expression_t),
                [EXPR_STRING_LITERAL]          = sizeof(string_literal_expression_t),
-               [EXPR_WIDE_STRING_LITERAL]   = sizeof(wide_string_literal_expression_t),
+               [EXPR_WIDE_STRING_LITERAL]     = sizeof(wide_string_literal_expression_t),
                [EXPR_COMPOUND_LITERAL]        = sizeof(compound_literal_expression_t),
                [EXPR_CALL]                    = sizeof(call_expression_t),
                [EXPR_UNARY_FIRST]             = sizeof(unary_expression_t),
@@ -397,7 +424,6 @@ static size_t label_top(void)
        return ARR_LEN(label_stack);
 }
 
-
 /**
  * Return the next token.
  */
@@ -425,6 +451,102 @@ static inline const token_t *look_ahead(int num)
        return &lookahead_buffer[pos];
 }
 
+/**
+ * Adds a token to the token anchor set (a multi-set).
+ */
+static void add_anchor_token(int token_type) {
+       assert(0 <= token_type && token_type < T_LAST_TOKEN);
+       ++token_anchor_set[token_type];
+}
+
+/**
+ * Remove a token from the token anchor set (a multi-set).
+ */
+static void rem_anchor_token(int token_type) {
+       assert(0 <= token_type && token_type < T_LAST_TOKEN);
+       --token_anchor_set[token_type];
+}
+
+static bool at_anchor(void) {
+       if(token.type < 0)
+               return false;
+       return token_anchor_set[token.type];
+}
+
+/**
+ * Eat tokens until a matching token is found.
+ */
+static void eat_until_matching_token(int type) {
+       unsigned parenthesis_count = 0;
+       unsigned brace_count = 0;
+       unsigned bracket_count = 0;
+       int end_token = type;
+
+       if(type == '(')
+               end_token = ')';
+       else if(type == '{')
+               end_token = '}';
+       else if(type == '[')
+               end_token = ']';
+
+       while(token.type != end_token ||
+             (parenthesis_count > 0 || brace_count > 0 || bracket_count > 0)) {
+
+               switch(token.type) {
+               case T_EOF: return;
+               case '(': ++parenthesis_count; break;
+               case '{': ++brace_count;       break;
+               case '[': ++bracket_count;     break;
+               case ')':
+                       if(parenthesis_count > 0)
+                               --parenthesis_count;
+                       break;
+               case '}':
+                       if(brace_count > 0)
+                               --brace_count;
+                       break;
+               case ']':
+                       if(bracket_count > 0)
+                               --bracket_count;
+                       break;
+               default:
+                       break;
+               }
+               next_token();
+       }
+}
+
+/**
+ * Eat input tokens until an anchor is found.
+ */
+static void eat_until_anchor(void) {
+       if(token.type == T_EOF)
+               return;
+       while(token_anchor_set[token.type] == 0) {
+               if(token.type == '(' || token.type == '{' || token.type == '[')
+                       eat_until_matching_token(token.type);
+               if(token.type == T_EOF)
+                       break;
+               next_token();
+       }
+}
+
+static void eat_block(void) {
+       eat_until_matching_token('{');
+       if(token.type == '}')
+               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)
 
 /**
@@ -437,7 +559,7 @@ static void parse_error_expected(const char *message, ...)
        }
        va_list ap;
        va_start(ap, message);
-       errorf(HERE, "got %K, expected %#k", &token, &ap, ", ");
+       errorf(HERE, "got %K, expected %#k", &token, &ap, "a ");
        va_end(ap);
 }
 
@@ -459,75 +581,6 @@ static void type_error_incompatible(const char *msg,
        errorf(source_position, "%s, incompatible types: '%T' - '%T'", msg, type1, type2);
 }
 
-/**
- * Eat an complete block, ie. '{ ... }'.
- */
-static void eat_block(void)
-{
-       if(token.type == '{')
-               next_token();
-
-       while(token.type != '}') {
-               if(token.type == T_EOF)
-                       return;
-               if(token.type == '{') {
-                       eat_block();
-                       continue;
-               }
-               next_token();
-       }
-       eat('}');
-}
-
-/**
- * Eat a statement until an ';' token.
- */
-static void eat_statement(void)
-{
-       while(token.type != ';') {
-               if(token.type == T_EOF)
-                       return;
-               if(token.type == '}')
-                       return;
-               if(token.type == '{') {
-                       eat_block();
-                       continue;
-               }
-               next_token();
-       }
-       eat(';');
-}
-
-/**
- * Eat a parenthesed term, ie. '( ... )'.
- */
-static void eat_paren(void)
-{
-       if(token.type == '(')
-               next_token();
-
-       while(token.type != ')') {
-               if(token.type == T_EOF)
-                       return;
-               if(token.type == ')' || token.type == ';' || token.type == '}') {
-                       return;
-               }
-               if(token.type == ')') {
-                       next_token();
-                       return;
-               }
-               if(token.type == '(') {
-                       eat_paren();
-                       continue;
-               }
-               if(token.type == '{') {
-                       eat_block();
-                       continue;
-               }
-               next_token();
-       }
-}
-
 /**
  * Expect the the current token is the expected token.
  * If not, generate an error, eat the current statement,
@@ -537,22 +590,14 @@ static void eat_paren(void)
        do {                                           \
     if(UNLIKELY(token.type != (expected))) {       \
         parse_error_expected(NULL, (expected), 0); \
-        eat_statement();                           \
+               add_anchor_token(expected);                \
+        eat_until_anchor();                        \
+               rem_anchor_token(expected);                \
         goto end_error;                            \
     }                                              \
     next_token();                                  \
        } while(0)
 
-#define expect_block(expected)                     \
-       do {                                           \
-    if(UNLIKELY(token.type != (expected))) {       \
-        parse_error_expected(NULL, (expected), 0); \
-        eat_block();                               \
-        return NULL;                               \
-    }                                              \
-    next_token();                                  \
-       } while(0)
-
 static void set_scope(scope_t *new_scope)
 {
        if(scope != NULL) {
@@ -927,7 +972,7 @@ static void parse_attributes(void)
                        if(token.type != T_STRING_LITERAL) {
                                parse_error_expected("while parsing assembler attribute",
                                                     T_STRING_LITERAL);
-                               eat_paren();
+                               eat_until_matching_token('(');
                                break;
                        } else {
                                parse_string_literals();
@@ -956,7 +1001,9 @@ static designator_t *parse_designation(void)
                        designator = allocate_ast_zero(sizeof(designator[0]));
                        designator->source_position = token.source_position;
                        next_token();
+                       add_anchor_token(']');
                        designator->array_index = parse_constant_expression();
+                       rem_anchor_token(']');
                        expect(']');
                        break;
                case '.':
@@ -1428,6 +1475,13 @@ static void skip_initializers(void)
        }
 }
 
+static initializer_t *create_empty_initializer(void)
+{
+       static initializer_t empty_initializer
+               = { .list = { { INITIALIZER_LIST }, 0 } };
+       return &empty_initializer;
+}
+
 /**
  * Parse a part of an initialiser for a struct or union,
  */
@@ -1437,7 +1491,7 @@ static initializer_t *parse_sub_initializer(type_path_t *path,
 {
        if(token.type == '}') {
                /* empty initializer */
-               return NULL;
+               return create_empty_initializer();
        }
 
        type_t *orig_type = path->top_type;
@@ -1452,7 +1506,7 @@ static initializer_t *parse_sub_initializer(type_path_t *path,
                 * initializers in this case. */
                if(!is_type_valid(type)) {
                        skip_initializers();
-                       return NULL;
+                       return create_empty_initializer();
                }
        }
 
@@ -1492,14 +1546,16 @@ static initializer_t *parse_sub_initializer(type_path_t *path,
                                } else
                                        descend_into_subtype(path);
 
+                               add_anchor_token('}');
                                sub = parse_sub_initializer(path, orig_type, top_path_level+1,
                                                            env);
+                               rem_anchor_token('}');
 
                                if(type != NULL) {
                                        ascend_from_subtype(path);
-                                       expect_block('}');
+                                       expect('}');
                                } else {
-                                       expect_block('}');
+                                       expect('}');
                                        goto error_parse_next;
                                }
                        }
@@ -1643,7 +1699,9 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env)
 
                descend_into_subtype(&path);
 
+               add_anchor_token('}');
                result = parse_sub_initializer(&path, env->type, 1, env);
+               rem_anchor_token('}');
 
                max_index = path.max_index;
                DEL_ARR_F(path.path);
@@ -1674,7 +1732,7 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env)
                        break;
 
                default:
-                       panic("invalid initializer type");
+                       internal_errorf(HERE, "invalid initializer type");
                }
 
                expression_t *cnst       = allocate_expression_zero(EXPR_CONST);
@@ -1772,10 +1830,12 @@ static void parse_enum_entries(type_t *const enum_type)
                return;
        }
 
+       add_anchor_token('}');
        do {
                if(token.type != T_IDENTIFIER) {
                        parse_error_expected("while parsing enum entry", T_IDENTIFIER, 0);
                        eat_block();
+                       rem_anchor_token('}');
                        return;
                }
 
@@ -1802,6 +1862,7 @@ static void parse_enum_entries(type_t *const enum_type)
                        break;
                next_token();
        } while(token.type != '}');
+       rem_anchor_token('}');
 
        expect('}');
 
@@ -1877,6 +1938,7 @@ static type_t *parse_typeof(void)
        type_t *type;
 
        expect('(');
+       add_anchor_token(')');
 
        expression_t *expression  = NULL;
 
@@ -1909,6 +1971,7 @@ restart:
                break;
        }
 
+       rem_anchor_token(')');
        expect(')');
 
        type_t *typeof_type              = allocate_type_zero(TYPE_TYPEOF, expression->base.source_position);
@@ -1990,11 +2053,16 @@ static bool check_elignment_value(long long intvalue) {
 
 static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *specifiers)
 {
-       symbol_t         *symbol;
        decl_modifiers_t *modifiers = &specifiers->decl_modifiers;
 
-       while(token.type == T_IDENTIFIER) {
-               symbol = token.v.symbol;
+       while(true) {
+               if(token.type == T_restrict) {
+                       next_token();
+                       DET_MOD(restrict, DM_RESTRICT);
+                       goto end_loop;
+               } else if(token.type != T_IDENTIFIER)
+                       break;
+               symbol_t *symbol = token.v.symbol;
                if(symbol == sym_align) {
                        next_token();
                        expect('(');
@@ -2100,12 +2168,16 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe
                                }
                                expect(')');
                        }
+               } else if(symbol == sym_noalias) {
+                       next_token();
+                       DET_MOD(noalias, DM_NOALIAS);
                } else {
                        warningf(HERE, "Unknown modifier %Y ignored", token.v.symbol);
                        next_token();
                        if(token.type == '(')
                                skip_until(')');
                }
+end_loop:
                if (token.type == ',')
                        next_token();
        }
@@ -2144,7 +2216,9 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
                case T_declspec:
                        next_token();
                        expect('(');
+                       add_anchor_token(')');
                        parse_microsoft_extended_decl_modifier(specifiers);
+                       rem_anchor_token(')');
                        expect(')');
                        break;
 
@@ -2616,6 +2690,7 @@ static construct_type_t *parse_pointer_declarator(void)
 static construct_type_t *parse_array_declarator(void)
 {
        eat('[');
+       add_anchor_token(']');
 
        parsed_array_t *array = obstack_alloc(&temp_obst, sizeof(array[0]));
        memset(array, 0, sizeof(array[0]));
@@ -2642,6 +2717,7 @@ static construct_type_t *parse_array_declarator(void)
                array->size = parse_assignment_expression();
        }
 
+       rem_anchor_token(']');
        expect(']');
 
        return (construct_type_t*) array;
@@ -2652,6 +2728,7 @@ end_error:
 static construct_type_t *parse_function_declarator(declaration_t *declaration)
 {
        eat('(');
+       add_anchor_token(')');
 
        type_t *type;
        if(declaration != NULL) {
@@ -2671,6 +2748,7 @@ static construct_type_t *parse_function_declarator(declaration_t *declaration)
        construct_function_type->construct_type.kind = CONSTRUCT_FUNCTION;
        construct_function_type->function_type       = type;
 
+       rem_anchor_token(')');
        expect(')');
 
 end_error:
@@ -2715,7 +2793,9 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration,
                break;
        case '(':
                next_token();
+               add_anchor_token(')');
                inner_types = parse_inner_declarator(declaration, may_be_abstract);
+               rem_anchor_token(')');
                expect(')');
                break;
        default:
@@ -2784,7 +2864,7 @@ static type_t *construct_declarator_type(construct_type_t *construct_list,
        for( ; iter != NULL; iter = iter->next) {
                switch(iter->kind) {
                case CONSTRUCT_INVALID:
-                       panic("invalid type construction found");
+                       internal_errorf(HERE, "invalid type construction found");
                case CONSTRUCT_FUNCTION: {
                        construct_function_type_t *construct_function_type
                                = (construct_function_type_t*) iter;
@@ -3253,6 +3333,9 @@ static void parse_declaration_rest(declaration_t *ndeclaration,
                const declaration_specifiers_t *specifiers,
                parsed_declaration_func finished_declaration)
 {
+       add_anchor_token(';');
+       add_anchor_token('=');
+       add_anchor_token(',');
        while(true) {
                declaration_t *declaration = finished_declaration(ndeclaration);
 
@@ -3279,7 +3362,9 @@ static void parse_declaration_rest(declaration_t *ndeclaration,
        expect(';');
 
 end_error:
-       ;
+       rem_anchor_token(';');
+       rem_anchor_token('=');
+       rem_anchor_token(',');
 }
 
 static declaration_t *finished_kr_declaration(declaration_t *declaration)
@@ -3486,7 +3571,10 @@ static void parse_external_declaration(void)
         * specifiers */
        declaration_specifiers_t specifiers;
        memset(&specifiers, 0, sizeof(specifiers));
+
+       add_anchor_token(';');
        parse_declaration_specifiers(&specifiers);
+       rem_anchor_token(';');
 
        /* must be a declaration */
        if(token.type == ';') {
@@ -3494,9 +3582,17 @@ static void parse_external_declaration(void)
                return;
        }
 
+       add_anchor_token(',');
+       add_anchor_token('=');
+       rem_anchor_token(';');
+
        /* declarator is common to both function-definitions and declarations */
        declaration_t *ndeclaration = parse_declarator(&specifiers, /*may_be_abstract=*/false);
 
+       rem_anchor_token(',');
+       rem_anchor_token('=');
+       rem_anchor_token(';');
+
        /* must be a declaration */
        if(token.type == ',' || token.type == '=' || token.type == ';') {
                parse_declaration_rest(ndeclaration, &specifiers, record_declaration);
@@ -3508,7 +3604,7 @@ static void parse_external_declaration(void)
 
        if(token.type != '{') {
                parse_error_expected("while parsing function definition", '{', 0);
-               eat_statement();
+               eat_until_matching_token(';');
                return;
        }
 
@@ -3725,6 +3821,7 @@ end_error:
 static void parse_compound_type_entries(declaration_t *compound_declaration)
 {
        eat('{');
+       add_anchor_token('}');
 
        while(token.type != '}' && token.type != T_EOF) {
                declaration_specifiers_t specifiers;
@@ -3733,6 +3830,8 @@ static void parse_compound_type_entries(declaration_t *compound_declaration)
 
                parse_compound_declarators(compound_declaration, &specifiers);
        }
+       rem_anchor_token('}');
+
        if(token.type == T_EOF) {
                errorf(HERE, "EOF while parsing struct");
        }
@@ -4003,7 +4102,7 @@ static type_t *get_builtin_symbol_type(symbol_t *symbol)
        case T___builtin_va_end:
                return make_function_1_type(type_void, type_valist);
        default:
-               panic("not implemented builtin symbol found");
+               internal_errorf(HERE, "not implemented builtin symbol found");
        }
 }
 
@@ -4155,6 +4254,8 @@ static expression_t *parse_cast(void)
 
        type_t *type  = parse_typename();
 
+       /* matching add_anchor_token() is at call site */
+       rem_anchor_token(')');
        expect(')');
 
        if(token.type == '{') {
@@ -4215,6 +4316,7 @@ end_error:
 static expression_t *parse_brace_expression(void)
 {
        eat('(');
+       add_anchor_token(')');
 
        switch(token.type) {
        case '{':
@@ -4231,6 +4333,7 @@ static expression_t *parse_brace_expression(void)
        }
 
        expression_t *result = parse_expression();
+       rem_anchor_token(')');
        expect(')');
 
        return result;
@@ -4276,7 +4379,6 @@ static designator_t *parse_designator(void)
        if(token.type != T_IDENTIFIER) {
                parse_error_expected("while parsing member designator",
                                     T_IDENTIFIER, 0);
-               eat_paren();
                return NULL;
        }
        result->symbol = token.v.symbol;
@@ -4289,7 +4391,6 @@ static designator_t *parse_designator(void)
                        if(token.type != T_IDENTIFIER) {
                                parse_error_expected("while parsing member designator",
                                                     T_IDENTIFIER, 0);
-                               eat_paren();
                                return NULL;
                        }
                        designator_t *designator    = allocate_ast_zero(sizeof(result[0]));
@@ -4303,14 +4404,15 @@ static designator_t *parse_designator(void)
                }
                if(token.type == '[') {
                        next_token();
+                       add_anchor_token(']');
                        designator_t *designator    = allocate_ast_zero(sizeof(result[0]));
                        designator->source_position = HERE;
                        designator->array_index     = parse_expression();
+                       rem_anchor_token(']');
+                       expect(']');
                        if(designator->array_index == NULL) {
-                               eat_paren();
                                return NULL;
                        }
-                       expect(']');
 
                        last_designator->next = designator;
                        last_designator       = designator;
@@ -4335,9 +4437,13 @@ static expression_t *parse_offsetof(void)
        expression->base.type    = type_size_t;
 
        expect('(');
+       add_anchor_token(',');
        type_t *type = parse_typename();
+       rem_anchor_token(',');
        expect(',');
+       add_anchor_token(')');
        designator_t *designator = parse_designator();
+       rem_anchor_token(')');
        expect(')');
 
        expression->offsetofe.type       = type;
@@ -4371,7 +4477,9 @@ static expression_t *parse_va_start(void)
        expression_t *expression = allocate_expression_zero(EXPR_VA_START);
 
        expect('(');
+       add_anchor_token(',');
        expression->va_starte.ap = parse_assignment_expression();
+       rem_anchor_token(',');
        expect(',');
        expression_t *const expr = parse_assignment_expression();
        if (expr->kind == EXPR_REFERENCE) {
@@ -4436,7 +4544,9 @@ static expression_t *parse_builtin_constant(void)
        expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_CONSTANT_P);
 
        expect('(');
+       add_anchor_token(')');
        expression->builtin_constant.value = parse_assignment_expression();
+       rem_anchor_token(')');
        expect(')');
        expression->base.type = type_int;
 
@@ -4455,6 +4565,7 @@ static expression_t *parse_builtin_prefetch(void)
        expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_PREFETCH);
 
        expect('(');
+       add_anchor_token(')');
        expression->builtin_prefetch.adr = parse_assignment_expression();
        if (token.type == ',') {
                next_token();
@@ -4464,6 +4575,7 @@ static expression_t *parse_builtin_prefetch(void)
                next_token();
                expression->builtin_prefetch.locality = parse_assignment_expression();
        }
+       rem_anchor_token(')');
        expect(')');
        expression->base.type = type_void;
 
@@ -4499,7 +4611,7 @@ static expression_t *parse_compare_builtin(void)
                expression = allocate_expression_zero(EXPR_BINARY_ISUNORDERED);
                break;
        default:
-               panic("invalid compare builtin found");
+               internal_errorf(HERE, "invalid compare builtin found");
                break;
        }
        expression->base.source_position = HERE;
@@ -4563,7 +4675,9 @@ static expression_t *parse_assume(void) {
                = allocate_expression_zero(EXPR_UNARY_ASSUME);
 
        expect('(');
+       add_anchor_token(')');
        expression->unary.value = parse_assignment_expression();
+       rem_anchor_token(')');
        expect(')');
 
        expression->base.type = type_void;
@@ -4611,8 +4725,6 @@ static expression_t *parse_primary_expression(void)
        }
 
        errorf(HERE, "unexpected token %K, expected an expression", &token);
-       eat_statement();
-
        return create_invalid_expression();
 }
 
@@ -4636,6 +4748,7 @@ static expression_t *parse_array_expression(unsigned precedence,
        (void) precedence;
 
        eat('[');
+       add_anchor_token(']');
 
        expression_t *inside = parse_expression();
 
@@ -4671,6 +4784,7 @@ static expression_t *parse_array_expression(unsigned precedence,
                array_access->array_ref = create_invalid_expression();
        }
 
+       rem_anchor_token(']');
        if(token.type != ']') {
                parse_error_expected("Problem while parsing array access", ']', 0);
                return expression;
@@ -4690,7 +4804,9 @@ static expression_t *parse_typeprop(expression_kind_t kind, unsigned precedence)
 
        if(token.type == '(' && is_declaration_specifier(look_ahead(1), true)) {
                next_token();
+               add_anchor_token(')');
                tp_expression->typeprop.type = parse_typename();
+               rem_anchor_token(')');
                expect(')');
        } else {
                expression_t *expression = parse_sub_expression(precedence);
@@ -4827,6 +4943,8 @@ static expression_t *parse_call_expression(unsigned precedence,
 
        /* parse arguments */
        eat('(');
+       add_anchor_token(')');
+       add_anchor_token(',');
 
        if(token.type != ')') {
                call_argument_t *last_argument = NULL;
@@ -4847,6 +4965,8 @@ static expression_t *parse_call_expression(unsigned precedence,
                        next_token();
                }
        }
+       rem_anchor_token(',');
+       rem_anchor_token(')');
        expect(')');
 
        if(function_type != NULL) {
@@ -4896,6 +5016,22 @@ static expression_t *parse_call_expression(unsigned precedence,
                } else {
                        check_format(&result->call);
                }
+
+               /* check deprecated */
+               if(expression->base.kind == EXPR_REFERENCE) {
+                       const reference_expression_t *ref = (reference_expression_t *)expression;
+                       const declaration_t *declaration = ref->declaration;
+                       if(declaration->modifiers & DM_DEPRECATED) {
+                               if (declaration->deprecated_string != NULL) {
+                                       warningf(result->base.source_position,
+                                               "function '%Y' was declared 'deprecated(%s)'", declaration->symbol,
+                                               declaration->deprecated_string);
+                               } else {
+                                       warningf(result->base.source_position,
+                                               "function '%Y' was declared 'deprecated'", declaration->symbol);
+                               }
+                       }
+               }
        }
 
        return result;
@@ -4922,6 +5058,7 @@ static expression_t *parse_conditional_expression(unsigned precedence,
                                                   expression_t *expression)
 {
        eat('?');
+       add_anchor_token(':');
 
        expression_t *result = allocate_expression_zero(EXPR_CONDITIONAL);
 
@@ -4937,6 +5074,7 @@ static expression_t *parse_conditional_expression(unsigned precedence,
        }
 
        expression_t *true_expression = parse_expression();
+       rem_anchor_token(':');
        expect(':');
        expression_t *false_expression = parse_sub_expression(precedence);
 
@@ -5017,7 +5155,9 @@ static expression_t *parse_builtin_classify_type(const unsigned precedence)
        result->base.type    = type_int;
 
        expect('(');
+       add_anchor_token(')');
        expression_t *expression = parse_sub_expression(precedence);
+       rem_anchor_token(')');
        expect(')');
        result->classify_type.type_expression = expression;
 
@@ -5649,7 +5789,7 @@ static bool expression_has_effect(const expression_t *const expr)
                case EXPR_BINARY_ISUNORDERED:        return false;
        }
 
-       panic("unexpected expression");
+       internal_errorf(HERE, "unexpected expression");
 }
 
 static void semantic_comma(binary_expression_t *expression)
@@ -5987,30 +6127,40 @@ static statement_t *parse_asm_statement(void)
        }
 
        expect('(');
+       add_anchor_token(')');
+       add_anchor_token(':');
        asm_statement->asm_text = parse_string_literals();
 
-       if(token.type != ':')
+       if(token.type != ':') {
+               rem_anchor_token(':');
                goto end_of_asm;
+       }
        eat(':');
 
        asm_statement->inputs = parse_asm_constraints();
-       if(token.type != ':')
+       if(token.type != ':') {
+               rem_anchor_token(':');
                goto end_of_asm;
+       }
        eat(':');
 
        asm_statement->outputs = parse_asm_constraints();
-       if(token.type != ':')
+       if(token.type != ':') {
+               rem_anchor_token(':');
                goto end_of_asm;
+       }
+       rem_anchor_token(':');
        eat(':');
 
        asm_statement->clobbers = parse_asm_clobbers();
 
 end_of_asm:
+       rem_anchor_token(')');
        expect(')');
        expect(';');
        return statement;
 end_error:
-       return NULL;
+       return create_invalid_statement();
 }
 
 /**
@@ -6056,7 +6206,7 @@ static statement_t *parse_case_statement(void)
 
        return statement;
 end_error:
-       return NULL;
+       return create_invalid_statement();
 }
 
 /**
@@ -6108,7 +6258,7 @@ static statement_t *parse_default_statement(void)
 
        return statement;
 end_error:
-       return NULL;
+       return create_invalid_statement();
 }
 
 /**
@@ -6165,13 +6315,20 @@ static statement_t *parse_label_statement(void)
 
        if(token.type == '}') {
                /* TODO only warn? */
-               errorf(HERE, "label at end of compound statement");
+               if(false) {
+                       warningf(HERE, "label at end of compound statement");
+                       statement->label.statement = create_empty_statement();
+               } else {
+                       errorf(HERE, "label at end of compound statement");
+                       statement->label.statement = create_invalid_statement();
+               }
                return statement;
        } else {
                if (token.type == ';') {
                        /* eat an empty statement here, to avoid the warning about an empty
                         * after a label.  label:; is commonly used to have a label before
                         * a }. */
+                       statement->label.statement = create_empty_statement();
                        next_token();
                } else {
                        statement->label.statement = parse_statement();
@@ -6200,10 +6357,15 @@ static statement_t *parse_if(void)
        statement->base.source_position = token.source_position;
 
        expect('(');
+       add_anchor_token(')');
        statement->ifs.condition = parse_expression();
+       rem_anchor_token(')');
        expect(')');
 
+       add_anchor_token(T_else);
        statement->ifs.true_statement = parse_statement();
+       rem_anchor_token(T_else);
+
        if(token.type == T_else) {
                next_token();
                statement->ifs.false_statement = parse_statement();
@@ -6211,7 +6373,7 @@ static statement_t *parse_if(void)
 
        return statement;
 end_error:
-       return NULL;
+       return create_invalid_statement();
 }
 
 /**
@@ -6249,7 +6411,7 @@ static statement_t *parse_switch(void)
 
        return statement;
 end_error:
-       return NULL;
+       return create_invalid_statement();
 }
 
 static statement_t *parse_loop_body(statement_t *const loop)
@@ -6274,14 +6436,16 @@ static statement_t *parse_while(void)
        statement->base.source_position = token.source_position;
 
        expect('(');
+       add_anchor_token(')');
        statement->whiles.condition = parse_expression();
+       rem_anchor_token(')');
        expect(')');
 
        statement->whiles.body = parse_loop_body(statement);
 
        return statement;
 end_error:
-       return NULL;
+       return create_invalid_statement();
 }
 
 /**
@@ -6295,17 +6459,21 @@ static statement_t *parse_do(void)
 
        statement->base.source_position = token.source_position;
 
+       add_anchor_token(T_while);
        statement->do_while.body = parse_loop_body(statement);
+       rem_anchor_token(T_while);
 
        expect(T_while);
        expect('(');
+       add_anchor_token(')');
        statement->do_while.condition = parse_expression();
+       rem_anchor_token(')');
        expect(')');
        expect(';');
 
        return statement;
 end_error:
-       return NULL;
+       return create_invalid_statement();
 }
 
 /**
@@ -6323,6 +6491,7 @@ static statement_t *parse_for(void)
        set_scope(&statement->fors.scope);
 
        expect('(');
+       add_anchor_token(')');
 
        if(token.type != ';') {
                if(is_declaration_specifier(&token, false)) {
@@ -6352,6 +6521,7 @@ static statement_t *parse_for(void)
                                 "step of 'for'-statement has no effect");
                }
        }
+       rem_anchor_token(')');
        expect(')');
        statement->fors.body = parse_loop_body(statement);
 
@@ -6362,11 +6532,12 @@ static statement_t *parse_for(void)
        return statement;
 
 end_error:
+       rem_anchor_token(')');
        assert(scope == &statement->fors.scope);
        set_scope(last_scope);
        environment_pop_to(top);
 
-       return NULL;
+       return create_invalid_statement();
 }
 
 /**
@@ -6403,7 +6574,7 @@ static statement_t *parse_goto(void)
 
        return statement;
 end_error:
-       return NULL;
+       return create_invalid_statement();
 }
 
 /**
@@ -6426,7 +6597,7 @@ static statement_t *parse_continue(void)
 
        return statement;
 end_error:
-       return NULL;
+       return create_invalid_statement();
 }
 
 /**
@@ -6449,7 +6620,7 @@ static statement_t *parse_break(void)
 
        return statement;
 end_error:
-       return NULL;
+       return create_invalid_statement();
 }
 
 /**
@@ -6566,7 +6737,7 @@ static statement_t *parse_return(void)
 
        return statement;
 end_error:
-       return NULL;
+       return create_invalid_statement();
 }
 
 /**
@@ -6610,7 +6781,7 @@ static statement_t *parse_expression_statement(void)
 
        return statement;
 end_error:
-       return NULL;
+       return create_invalid_statement();
 }
 
 /**
@@ -6621,6 +6792,7 @@ static statement_t *parse_statement(void)
        statement_t   *statement = NULL;
 
        /* declaration or statement */
+       add_anchor_token(';');
        switch(token.type) {
        case T_asm:
                statement = parse_asm_statement();
@@ -6675,11 +6847,11 @@ static statement_t *parse_statement(void)
                break;
 
        case ';':
-               if (warning.empty_statement) {
+               if(warning.empty_statement) {
                        warningf(HERE, "statement is empty");
                }
+               statement = create_empty_statement();
                next_token();
-               statement = NULL;
                break;
 
        case T_IDENTIFIER:
@@ -6713,9 +6885,10 @@ static statement_t *parse_statement(void)
                statement = parse_expression_statement();
                break;
        }
+       rem_anchor_token(';');
 
-       assert(statement == NULL
-                       || statement->base.source_position.input_name != NULL);
+       assert(statement != NULL
+                       && statement->base.source_position.input_name != NULL);
 
        return statement;
 }
@@ -6730,6 +6903,7 @@ static statement_t *parse_compound_statement(void)
        statement->base.source_position = token.source_position;
 
        eat('{');
+       add_anchor_token('}');
 
        int      top        = environment_top();
        scope_t *last_scope = scope;
@@ -6739,8 +6913,12 @@ static statement_t *parse_compound_statement(void)
 
        while(token.type != '}' && token.type != T_EOF) {
                statement_t *sub_statement = parse_statement();
-               if(sub_statement == NULL)
+               if(is_invalid_statement(sub_statement)) {
+                       /* an error occurred. if we are at an anchor, return */
+                       if(at_anchor())
+                               goto end_error;
                        continue;
+               }
 
                if(last_statement != NULL) {
                        last_statement->base.next = sub_statement;
@@ -6761,6 +6939,8 @@ static statement_t *parse_compound_statement(void)
                       "end of file while looking for closing '}'");
        }
 
+end_error:
+       rem_anchor_token('}');
        assert(scope == &statement->compound.scope);
        set_scope(last_scope);
        environment_pop_to(top);
@@ -6880,9 +7060,6 @@ translation_unit_t *parse(void)
        DEL_ARR_F(environment_stack);
        DEL_ARR_F(label_stack);
 
-       if(error_count > 0)
-               return NULL;
-
        return unit;
 }
 
@@ -6909,7 +7086,11 @@ void init_parser(void)
                sym_thread     = symbol_table_insert("thread");
                sym_uuid       = symbol_table_insert("uuid");
                sym_deprecated = symbol_table_insert("deprecated");
+               sym_restrict   = symbol_table_insert("restrict");
+               sym_noalias    = symbol_table_insert("noalias");
        }
+       memset(token_anchor_set, 0, sizeof(token_anchor_set));
+
        init_expression_parsers();
        obstack_init(&temp_obst);