X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=df444bd0c3c9588696a222302d45fd2713935070;hb=5c1f4f4c1fb16d5c4d6de6f8e12b520e2a7f265e;hp=4a91619afcc645c1a0fcbfd373c682a9d8a3da98;hpb=2c6cbbabbfa0f1005541880279cf506fd84ccbb9;p=cparser diff --git a/parser.c b/parser.c index 4a91619..df444bd 100644 --- a/parser.c +++ b/parser.c @@ -53,7 +53,8 @@ struct declaration_specifiers_t { source_position_t source_position; unsigned char declared_storage_class; unsigned char alignment; /**< Alignment, 0 if not set. */ - bool is_inline; + unsigned int is_inline : 1; + unsigned int deprecated : 1; decl_modifiers_t decl_modifiers; /**< MS __declspec extended modifier mask */ const char *deprecated_string; /**< can be set if declaration was marked deprecated. */ symbol_t *get_property_sym; /**< the name of the get property if set. */ @@ -108,6 +109,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 @@ -140,7 +146,7 @@ static void semantic_comparison(binary_expression_t *expression); case T_restrict: \ case T_volatile: \ case T_inline: \ - case T_forceinline: + case T__forceinline: #ifdef PROVIDE_COMPLEX #define COMPLEX_SPECIFIERS \ @@ -168,6 +174,7 @@ static void semantic_comparison(binary_expression_t *expression); case T_enum: \ case T___typeof__: \ case T___builtin_va_list: \ + case T__declspec: \ COMPLEX_SPECIFIERS \ IMAGINARY_SPECIFIERS @@ -207,6 +214,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 +250,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 +284,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), @@ -266,8 +295,7 @@ static size_t get_expression_struct_size(expression_kind_t kind) [EXPR_SIZEOF] = sizeof(typeprop_expression_t), [EXPR_ALIGNOF] = sizeof(typeprop_expression_t), [EXPR_CLASSIFY_TYPE] = sizeof(classify_type_expression_t), - [EXPR_FUNCTION] = sizeof(string_literal_expression_t), - [EXPR_PRETTY_FUNCTION] = sizeof(string_literal_expression_t), + [EXPR_FUNCNAME] = sizeof(funcname_expression_t), [EXPR_BUILTIN_SYMBOL] = sizeof(builtin_symbol_expression_t), [EXPR_BUILTIN_CONSTANT_P] = sizeof(builtin_constant_expression_t), [EXPR_BUILTIN_PREFETCH] = sizeof(builtin_prefetch_expression_t), @@ -397,7 +425,6 @@ static size_t label_top(void) return ARR_LEN(label_stack); } - /** * Return the next token. */ @@ -425,6 +452,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 +560,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 +582,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 +591,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) { @@ -893,32 +939,157 @@ static string_t parse_string_literals(void) return result; } +typedef enum gnu_attribute_kind_t { + GNU_AK_CONST, + GNU_AK_VOLATILE, + GNU_AK_CDECL, + GNU_AK_STDCALL, + GNU_AK_FASTCALL, + GNU_AK_DEPRECATED, + GNU_AK_NOINLINE, + GNU_AK_NORETURN, + GNU_AK_NAKED, + GNU_AK_PURE, + GNU_AK_ALWAYS_INLINE, + GNU_AK_MALLOC, + GNU_AK_WEAK, + GNU_AK_LAST +} gnu_attribute_kind_t; + +static const char *gnu_attribute_names[GNU_AK_LAST] = { + [GNU_AK_CONST] = "const", + [GNU_AK_VOLATILE] = "volatile", + [GNU_AK_CDECL] = "cdecl", + [GNU_AK_STDCALL] = "stdcall", + [GNU_AK_FASTCALL] = "fastcall", + [GNU_AK_DEPRECATED] = "deprecated", + [GNU_AK_NOINLINE] = "noinline", + [GNU_AK_NORETURN] = "noreturn", + [GNU_AK_NAKED] = "naked", + [GNU_AK_PURE] = "pure", + [GNU_AK_ALWAYS_INLINE] = "always_inline", + [GNU_AK_MALLOC] = "malloc", + [GNU_AK_WEAK] = "weak", +}; + +/** + * compare two string, ignoring double underscores on the second. + */ +static int strcmp_underscore(const char *s1, const char *s2) { + if(s2[0] == '_' && s2[1] == '_') { + s2 += 2; + size_t l1 = strlen(s1); + if(l1 + 2 != strlen(s2)) { + /* not equal */ + return 1; + } + return strncmp(s1, s2, l1); + } + return strcmp(s1, s2); +} + +/** + * Parse one GNU attribute. + * + * Note that attribute names can be specified WITH or WITHOUT + * double underscores, ie const or __const__. + * + * The following attributes are parsed without arguments + * const + * volatile + * cdecl + * stdcall + * fastcall + * deprecated + * noinline + * noreturn + * naked + * pure + * always_inline + * malloc + * weak + */ +static void parse_gnu_attribute(void) +{ + eat(T___attribute__); + expect('('); + expect('('); + while(true) { + const char *name; + if(token.type == T_const) { + name = "const"; + } else if(token.type == T_volatile) { + name = "volatile"; + } else if(token.type == T_cdecl) { + /* __attribute__((cdecl)), WITH ms mode */ + name = "cdecl"; + } else if(token.type != T_IDENTIFIER) { + parse_error_expected("while parsing GNU attribute", T_IDENTIFIER); + break; + } + const symbol_t *sym = token.v.symbol; + name = sym->string; + next_token(); + + gnu_attribute_kind_t kind; + for(kind = 0; kind < GNU_AK_LAST; ++kind) { + if(strcmp_underscore(gnu_attribute_names[kind], name) == 0) + break; + } + switch(kind) { + case GNU_AK_CONST: + break; + case GNU_AK_VOLATILE: + break; + case GNU_AK_CDECL: + break; + case GNU_AK_STDCALL: + break; + case GNU_AK_FASTCALL: + break; + case GNU_AK_DEPRECATED: + break; + case GNU_AK_NOINLINE: + break; + case GNU_AK_NORETURN: + break; + case GNU_AK_NAKED: + break; + case GNU_AK_PURE: + break; + case GNU_AK_ALWAYS_INLINE: + break; + case GNU_AK_MALLOC: + break; + case GNU_AK_WEAK: + break; + case GNU_AK_LAST: + warningf(HERE, "unrecognized attribute '%s'", name); + + /* skip possible arguments */ + if(token.type == '(') + eat_until_matching_token('('); + break; + } + if(token.type != ',') + break; + next_token(); + } + expect(')'); + expect(')'); +end_error: + return; +} + +/** + * Parse GNU attributes. + */ static void parse_attributes(void) { while(true) { switch(token.type) { case T___attribute__: { - next_token(); - - expect('('); - int depth = 1; - while(depth > 0) { - switch(token.type) { - case T_EOF: - errorf(HERE, "EOF while parsing attribute"); - break; - case '(': - next_token(); - depth++; - break; - case ')': - next_token(); - depth--; - break; - default: - next_token(); - } - } + parse_gnu_attribute(); break; } case T_asm: @@ -927,7 +1098,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 +1127,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 '.': @@ -1102,8 +1275,8 @@ static initializer_t *parse_scalar_initializer(type_t *type, if(initializer == NULL) { errorf(expression->base.source_position, - "expression '%E' doesn't match expected type '%T'", - expression, type); + "expression '%E' (type '%T') doesn't match expected type '%T'", + expression, expression->base.type, type); /* TODO */ return NULL; } @@ -1168,7 +1341,7 @@ static __attribute__((unused)) void debug_print_type_path( } fprintf(stderr, ".%s", entry->v.compound_entry->symbol->string); } else if(is_type_array(type)) { - fprintf(stderr, "[%u]", entry->v.index); + fprintf(stderr, "[%zd]", entry->v.index); } else { fprintf(stderr, "-INVALID-"); } @@ -1428,6 +1601,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 +1617,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 +1632,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 +1672,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 +1825,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 +1858,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 +1956,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 +1988,7 @@ static void parse_enum_entries(type_t *const enum_type) break; next_token(); } while(token.type != '}'); + rem_anchor_token('}'); expect('}'); @@ -1877,6 +2064,7 @@ static type_t *parse_typeof(void) type_t *type; expect('('); + add_anchor_token(')'); expression_t *expression = NULL; @@ -1909,6 +2097,7 @@ restart: break; } + rem_anchor_token(')'); expect(')'); type_t *typeof_type = allocate_type_zero(TYPE_TYPEOF, expression->base.source_position); @@ -1932,9 +2121,14 @@ typedef enum { SPECIFIER_FLOAT = 1 << 8, SPECIFIER_BOOL = 1 << 9, SPECIFIER_VOID = 1 << 10, + SPECIFIER_INT8 = 1 << 11, + SPECIFIER_INT16 = 1 << 12, + SPECIFIER_INT32 = 1 << 13, + SPECIFIER_INT64 = 1 << 14, + SPECIFIER_INT128 = 1 << 15, #ifdef PROVIDE_COMPLEX - SPECIFIER_COMPLEX = 1 << 11, - SPECIFIER_IMAGINARY = 1 << 12, + SPECIFIER_COMPLEX = 1 << 16, + SPECIFIER_IMAGINARY = 1 << 17, #endif } specifiers_t; @@ -1990,11 +2184,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('('); @@ -2089,8 +2288,10 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe expect(')'); } else if(symbol == sym_deprecated) { next_token(); - DET_MOD(deprecated, DM_DEPRECATED); - if(token.type == '(') { + if(specifiers->deprecated != 0) + warningf(HERE, "deprecated used more than once"); + specifiers->deprecated = 1; + if(token.type == '(') { next_token(); if(token.type == T_STRING_LITERAL) { specifiers->deprecated_string = token.v.string.begin; @@ -2100,12 +2301,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(); } @@ -2141,10 +2346,12 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) MATCH_STORAGE_CLASS(T_auto, STORAGE_CLASS_AUTO) MATCH_STORAGE_CLASS(T_register, STORAGE_CLASS_REGISTER) - case T_declspec: + case T__declspec: next_token(); expect('('); + add_anchor_token(')'); parse_microsoft_extended_decl_modifier(specifiers); + rem_anchor_token(')'); expect(')'); break; @@ -2179,6 +2386,11 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) MATCH_TYPE_QUALIFIER(T_const, TYPE_QUALIFIER_CONST); MATCH_TYPE_QUALIFIER(T_restrict, TYPE_QUALIFIER_RESTRICT); MATCH_TYPE_QUALIFIER(T_volatile, TYPE_QUALIFIER_VOLATILE); + MATCH_TYPE_QUALIFIER(T__w64, TYPE_QUALIFIER_W64); + MATCH_TYPE_QUALIFIER(T___ptr32, TYPE_QUALIFIER_PTR32); + MATCH_TYPE_QUALIFIER(T___ptr64, TYPE_QUALIFIER_PTR64); + MATCH_TYPE_QUALIFIER(T___uptr, TYPE_QUALIFIER_UPTR); + MATCH_TYPE_QUALIFIER(T___sptr, TYPE_QUALIFIER_SPTR); case T___extension__: /* TODO */ @@ -2205,11 +2417,16 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) MATCH_SPECIFIER(T_signed, SPECIFIER_SIGNED, "signed") MATCH_SPECIFIER(T_unsigned, SPECIFIER_UNSIGNED, "unsigned") MATCH_SPECIFIER(T__Bool, SPECIFIER_BOOL, "_Bool") + MATCH_SPECIFIER(T__int8, SPECIFIER_INT8, "_int8") + MATCH_SPECIFIER(T__int16, SPECIFIER_INT16, "_int16") + MATCH_SPECIFIER(T__int32, SPECIFIER_INT32, "_int32") + MATCH_SPECIFIER(T__int64, SPECIFIER_INT64, "_int64") + MATCH_SPECIFIER(T__int128, SPECIFIER_INT128, "_int128") #ifdef PROVIDE_COMPLEX MATCH_SPECIFIER(T__Complex, SPECIFIER_COMPLEX, "_Complex") MATCH_SPECIFIER(T__Imaginary, SPECIFIER_IMAGINARY, "_Imaginary") #endif - case T_forceinline: + case T__forceinline: /* only in microsoft mode */ specifiers->decl_modifiers |= DM_FORCEINLINE; @@ -2337,6 +2554,52 @@ finish_specifiers: | SPECIFIER_INT: atomic_type = ATOMIC_TYPE_ULONGLONG; break; + + case SPECIFIER_UNSIGNED | SPECIFIER_INT8: + atomic_type = unsigned_int8_type_kind; + break; + + case SPECIFIER_UNSIGNED | SPECIFIER_INT16: + atomic_type = unsigned_int16_type_kind; + break; + + case SPECIFIER_UNSIGNED | SPECIFIER_INT32: + atomic_type = unsigned_int32_type_kind; + break; + + case SPECIFIER_UNSIGNED | SPECIFIER_INT64: + atomic_type = unsigned_int64_type_kind; + break; + + case SPECIFIER_UNSIGNED | SPECIFIER_INT128: + atomic_type = unsigned_int128_type_kind; + break; + + case SPECIFIER_INT8: + case SPECIFIER_SIGNED | SPECIFIER_INT8: + atomic_type = int8_type_kind; + break; + + case SPECIFIER_INT16: + case SPECIFIER_SIGNED | SPECIFIER_INT16: + atomic_type = int16_type_kind; + break; + + case SPECIFIER_INT32: + case SPECIFIER_SIGNED | SPECIFIER_INT32: + atomic_type = int32_type_kind; + break; + + case SPECIFIER_INT64: + case SPECIFIER_SIGNED | SPECIFIER_INT64: + atomic_type = int64_type_kind; + break; + + case SPECIFIER_INT128: + case SPECIFIER_SIGNED | SPECIFIER_INT128: + atomic_type = int128_type_kind; + break; + case SPECIFIER_FLOAT: atomic_type = ATOMIC_TYPE_FLOAT; break; @@ -2402,6 +2665,7 @@ finish_specifiers: } type->base.qualifiers = type_qualifiers; + /* FIXME: check type qualifiers here */ type_t *result = typehash_insert(type); if(newtype && result != type) { @@ -2423,6 +2687,12 @@ static type_qualifiers_t parse_type_qualifiers(void) MATCH_TYPE_QUALIFIER(T_const, TYPE_QUALIFIER_CONST); MATCH_TYPE_QUALIFIER(T_restrict, TYPE_QUALIFIER_RESTRICT); MATCH_TYPE_QUALIFIER(T_volatile, TYPE_QUALIFIER_VOLATILE); + /* microsoft extended type modifiers */ + MATCH_TYPE_QUALIFIER(T__w64, TYPE_QUALIFIER_W64); + MATCH_TYPE_QUALIFIER(T___ptr32, TYPE_QUALIFIER_PTR32); + MATCH_TYPE_QUALIFIER(T___ptr64, TYPE_QUALIFIER_PTR64); + MATCH_TYPE_QUALIFIER(T___uptr, TYPE_QUALIFIER_UPTR); + MATCH_TYPE_QUALIFIER(T___sptr, TYPE_QUALIFIER_SPTR); default: return type_qualifiers; @@ -2616,6 +2886,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 +2913,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 +2924,7 @@ end_error: static construct_type_t *parse_function_declarator(declaration_t *declaration) { eat('('); + add_anchor_token(')'); type_t *type; if(declaration != NULL) { @@ -2671,11 +2944,11 @@ 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(')'); - return (construct_type_t*) construct_function_type; end_error: - return NULL; + return (construct_type_t*) construct_function_type; } static construct_type_t *parse_inner_declarator(declaration_t *declaration, @@ -2716,7 +2989,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: @@ -2785,7 +3060,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; @@ -2874,6 +3149,7 @@ static declaration_t *parse_declarator( declaration_t *const declaration = allocate_declaration_zero(); declaration->declared_storage_class = specifiers->declared_storage_class; declaration->modifiers = specifiers->decl_modifiers; + declaration->deprecated = specifiers->deprecated; declaration->deprecated_string = specifiers->deprecated_string; declaration->get_property_sym = specifiers->get_property_sym; declaration->put_property_sym = specifiers->put_property_sym; @@ -3254,6 +3530,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); @@ -3280,7 +3559,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) @@ -3487,7 +3768,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 == ';') { @@ -3495,9 +3779,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); @@ -3509,7 +3801,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; } @@ -3726,6 +4018,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; @@ -3734,6 +4027,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"); } @@ -4004,7 +4299,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"); } } @@ -4119,6 +4414,22 @@ static expression_t *parse_reference(void) /* this declaration is used */ declaration->used = true; + /* check for deprecated functions */ + if(declaration->deprecated != 0) { + const char *prefix = ""; + if (is_type_function(declaration->type)) + prefix = "function "; + + if (declaration->deprecated_string != NULL) { + warningf(source_position, + "%s'%Y' was declared 'deprecated(\"%s\")'", prefix, declaration->symbol, + declaration->deprecated_string); + } else { + warningf(source_position, + "%s'%Y' was declared 'deprecated'", prefix, declaration->symbol); + } + } + return expression; } @@ -4156,6 +4467,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 == '{') { @@ -4216,6 +4529,7 @@ end_error: static expression_t *parse_brace_expression(void) { eat('('); + add_anchor_token(')'); switch(token.type) { case '{': @@ -4232,6 +4546,7 @@ static expression_t *parse_brace_expression(void) } expression_t *result = parse_expression(); + rem_anchor_token(')'); expect(')'); return result; @@ -4248,8 +4563,9 @@ static expression_t *parse_function_keyword(void) errorf(HERE, "'__func__' used outside of a function"); } - expression_t *expression = allocate_expression_zero(EXPR_FUNCTION); - expression->base.type = type_char_ptr; + expression_t *expression = allocate_expression_zero(EXPR_FUNCNAME); + expression->base.type = type_char_ptr; + expression->funcname.kind = FUNCNAME_FUNCTION; return expression; } @@ -4257,14 +4573,44 @@ static expression_t *parse_function_keyword(void) static expression_t *parse_pretty_function_keyword(void) { eat(T___PRETTY_FUNCTION__); - /* TODO */ if (current_function == NULL) { errorf(HERE, "'__PRETTY_FUNCTION__' used outside of a function"); } - expression_t *expression = allocate_expression_zero(EXPR_PRETTY_FUNCTION); - expression->base.type = type_char_ptr; + expression_t *expression = allocate_expression_zero(EXPR_FUNCNAME); + expression->base.type = type_char_ptr; + expression->funcname.kind = FUNCNAME_PRETTY_FUNCTION; + + return expression; +} + +static expression_t *parse_funcsig_keyword(void) +{ + eat(T___FUNCSIG__); + + if (current_function == NULL) { + errorf(HERE, "'__FUNCSIG__' used outside of a function"); + } + + expression_t *expression = allocate_expression_zero(EXPR_FUNCNAME); + expression->base.type = type_char_ptr; + expression->funcname.kind = FUNCNAME_FUNCSIG; + + return expression; +} + +static expression_t *parse_funcdname_keyword(void) +{ + eat(T___FUNCDNAME__); + + if (current_function == NULL) { + errorf(HERE, "'__FUNCDNAME__' used outside of a function"); + } + + expression_t *expression = allocate_expression_zero(EXPR_FUNCNAME); + expression->base.type = type_char_ptr; + expression->funcname.kind = FUNCNAME_FUNCDNAME; return expression; } @@ -4277,7 +4623,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; @@ -4290,7 +4635,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])); @@ -4304,14 +4648,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; @@ -4336,9 +4681,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; @@ -4372,7 +4721,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) { @@ -4437,7 +4788,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; @@ -4456,6 +4809,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(); @@ -4465,6 +4819,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; @@ -4500,7 +4855,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; @@ -4558,13 +4913,15 @@ end_error: * Parses a MS assume() expression. */ static expression_t *parse_assume(void) { - eat(T_assume); + eat(T__assume); expression_t *expression = 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; @@ -4573,6 +4930,45 @@ end_error: return create_invalid_expression(); } +/** + * Parse a microsoft __noop expression. + */ +static expression_t *parse_noop_expression(void) { + source_position_t source_position = HERE; + eat(T___noop); + + if (token.type == '(') { + /* parse arguments */ + eat('('); + add_anchor_token(')'); + add_anchor_token(','); + + if(token.type != ')') { + while(true) { + (void)parse_assignment_expression(); + if(token.type != ',') + break; + next_token(); + } + } + } + rem_anchor_token(','); + rem_anchor_token(')'); + expect(')'); + + /* the result is a (int)0 */ + expression_t *cnst = allocate_expression_zero(EXPR_CONST); + cnst->base.source_position = source_position; + cnst->base.type = type_int; + cnst->conste.v.int_value = 0; + cnst->conste.is_ms_noop = true; + + return cnst; + +end_error: + return create_invalid_expression(); +} + /** * Parses a primary expression. */ @@ -4589,6 +4985,8 @@ static expression_t *parse_primary_expression(void) case T___FUNCTION__: case T___func__: return parse_function_keyword(); case T___PRETTY_FUNCTION__: return parse_pretty_function_keyword(); + case T___FUNCSIG__: return parse_funcsig_keyword(); + case T___FUNCDNAME__: return parse_funcdname_keyword(); case T___builtin_offsetof: return parse_offsetof(); case T___builtin_va_start: return parse_va_start(); case T___builtin_va_arg: return parse_va_arg(); @@ -4606,14 +5004,13 @@ static expression_t *parse_primary_expression(void) case T___builtin_isunordered: return parse_compare_builtin(); case T___builtin_constant_p: return parse_builtin_constant(); case T___builtin_prefetch: return parse_builtin_prefetch(); - case T_assume: return parse_assume(); + case T__assume: return parse_assume(); case '(': return parse_brace_expression(); + case T___noop: return parse_noop_expression(); } errorf(HERE, "unexpected token %K, expected an expression", &token); - eat_statement(); - return create_invalid_expression(); } @@ -4637,6 +5034,7 @@ static expression_t *parse_array_expression(unsigned precedence, (void) precedence; eat('['); + add_anchor_token(']'); expression_t *inside = parse_expression(); @@ -4672,6 +5070,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; @@ -4691,7 +5090,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); @@ -4805,6 +5206,7 @@ static expression_t *parse_call_expression(unsigned precedence, { (void) precedence; expression_t *result = allocate_expression_zero(EXPR_CALL); + result->base.source_position = expression->base.source_position; call_expression_t *call = &result->call; call->function = expression; @@ -4828,6 +5230,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; @@ -4848,6 +5252,8 @@ static expression_t *parse_call_expression(unsigned precedence, next_token(); } } + rem_anchor_token(','); + rem_anchor_token(')'); expect(')'); if(function_type != NULL) { @@ -4923,6 +5329,7 @@ static expression_t *parse_conditional_expression(unsigned precedence, expression_t *expression) { eat('?'); + add_anchor_token(':'); expression_t *result = allocate_expression_zero(EXPR_CONDITIONAL); @@ -4938,6 +5345,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); @@ -4948,7 +5356,16 @@ static expression_t *parse_conditional_expression(unsigned precedence, /* 6.5.15.3 */ type_t *result_type; - if (is_type_arithmetic(true_type) && is_type_arithmetic(false_type)) { + if(is_type_atomic(true_type, ATOMIC_TYPE_VOID) || + is_type_atomic(false_type, ATOMIC_TYPE_VOID)) { + if (!is_type_atomic(true_type, ATOMIC_TYPE_VOID) + || !is_type_atomic(false_type, ATOMIC_TYPE_VOID)) { + warningf(expression->base.source_position, + "ISO C forbids conditional expression with only one void side"); + } + result_type = type_void; + } else if (is_type_arithmetic(true_type) + && is_type_arithmetic(false_type)) { result_type = semantic_arithmetic(true_type, false_type); true_expression = create_implicit_cast(true_expression, result_type); @@ -4957,22 +5374,40 @@ static expression_t *parse_conditional_expression(unsigned precedence, conditional->true_expression = true_expression; conditional->false_expression = false_expression; conditional->base.type = result_type; - } else if (same_compound_type(true_type, false_type) || ( - is_type_atomic(true_type, ATOMIC_TYPE_VOID) && - is_type_atomic(false_type, ATOMIC_TYPE_VOID) - )) { + } else if (same_compound_type(true_type, false_type)) { /* just take 1 of the 2 types */ result_type = true_type; - } else if (is_type_pointer(true_type) && is_type_pointer(false_type) - && pointers_compatible(true_type, false_type)) { - /* ok */ - result_type = true_type; - } else if (is_type_pointer(true_type) - && is_null_pointer_constant(false_expression)) { - result_type = true_type; - } else if (is_type_pointer(false_type) - && is_null_pointer_constant(true_expression)) { - result_type = false_type; + } else if (is_type_pointer(true_type) || is_type_pointer(false_type)) { + type_t *pointer_type; + type_t *other_type; + expression_t *other_expression; + if (is_type_pointer(true_type)) { + pointer_type = true_type; + other_type = false_type; + other_expression = false_expression; + } else { + pointer_type = false_type; + other_type = true_type; + other_expression = true_expression; + } + + if(is_type_pointer(other_type)) { + if(!pointers_compatible(true_type, false_type)) { + warningf(expression->base.source_position, + "pointer types '%T' and '%T' in conditional expression are incompatible", true_type, false_type); + } + result_type = true_type; + } else if(is_null_pointer_constant(other_expression)) { + result_type = pointer_type; + } else if(is_type_integer(other_type)) { + warningf(expression->base.source_position, + "pointer/integer type mismatch in conditional expression ('%T' and '%T')", true_type, false_type); + result_type = pointer_type; + } else { + type_error_incompatible("while parsing conditional", + expression->base.source_position, true_type, false_type); + result_type = type_error_type; + } } else { /* TODO: one pointer to void*, other some pointer */ @@ -5018,7 +5453,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; @@ -5538,7 +5975,8 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_UNKNOWN: break; case EXPR_INVALID: return true; /* do NOT warn */ case EXPR_REFERENCE: return false; - case EXPR_CONST: return false; + /* suppress the warning for microsoft __noop operations */ + case EXPR_CONST: return expr->conste.is_ms_noop; case EXPR_CHARACTER_CONSTANT: return false; case EXPR_WIDE_CHARACTER_CONSTANT: return false; case EXPR_STRING_LITERAL: return false; @@ -5570,8 +6008,7 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_CLASSIFY_TYPE: return false; case EXPR_ALIGNOF: return false; - case EXPR_FUNCTION: return false; - case EXPR_PRETTY_FUNCTION: return false; + case EXPR_FUNCNAME: return false; case EXPR_BUILTIN_SYMBOL: break; /* handled in EXPR_CALL */ case EXPR_BUILTIN_CONSTANT_P: return false; case EXPR_BUILTIN_PREFETCH: return true; @@ -5650,7 +6087,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) @@ -5988,30 +6425,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(); } /** @@ -6057,7 +6504,7 @@ static statement_t *parse_case_statement(void) return statement; end_error: - return NULL; + return create_invalid_statement(); } /** @@ -6109,7 +6556,7 @@ static statement_t *parse_default_statement(void) return statement; end_error: - return NULL; + return create_invalid_statement(); } /** @@ -6166,13 +6613,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(); @@ -6201,10 +6655,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(); @@ -6212,7 +6671,7 @@ static statement_t *parse_if(void) return statement; end_error: - return NULL; + return create_invalid_statement(); } /** @@ -6250,7 +6709,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) @@ -6275,14 +6734,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(); } /** @@ -6296,17 +6757,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(); } /** @@ -6324,6 +6789,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)) { @@ -6353,6 +6819,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); @@ -6363,11 +6830,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(); } /** @@ -6404,7 +6872,7 @@ static statement_t *parse_goto(void) return statement; end_error: - return NULL; + return create_invalid_statement(); } /** @@ -6427,7 +6895,7 @@ static statement_t *parse_continue(void) return statement; end_error: - return NULL; + return create_invalid_statement(); } /** @@ -6450,7 +6918,7 @@ static statement_t *parse_break(void) return statement; end_error: - return NULL; + return create_invalid_statement(); } /** @@ -6567,7 +7035,7 @@ static statement_t *parse_return(void) return statement; end_error: - return NULL; + return create_invalid_statement(); } /** @@ -6611,7 +7079,7 @@ static statement_t *parse_expression_statement(void) return statement; end_error: - return NULL; + return create_invalid_statement(); } /** @@ -6622,6 +7090,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(); @@ -6676,11 +7145,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: @@ -6714,9 +7183,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; } @@ -6731,6 +7201,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; @@ -6740,8 +7211,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; @@ -6762,6 +7237,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); @@ -6881,9 +7358,6 @@ translation_unit_t *parse(void) DEL_ARR_F(environment_stack); DEL_ARR_F(label_stack); - if(error_count > 0) - return NULL; - return unit; } @@ -6910,7 +7384,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);