X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=32a2a9df7f965ffd74ca1c30b4aeb66e538223aa;hb=b5e161a375492f2af666767725c86d9dfab4f5f8;hp=d0c489b7c1b332514f68bfbf2bed1de5791fe142;hpb=0636f42c5ca92e692f15c1b31d2a0bc49f1a6d7a;p=cparser diff --git a/parser.c b/parser.c index d0c489b..32a2a9d 100644 --- a/parser.c +++ b/parser.c @@ -1,13 +1,33 @@ +/* + * This file is part of cparser. + * Copyright (C) 2007-2008 Matthias Braun + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ #include #include #include #include +#include "parser.h" #include "diagnostic.h" #include "format_check.h" -#include "parser.h" #include "lexer.h" +#include "symbol_t.h" #include "token_t.h" #include "types.h" #include "type_t.h" @@ -32,11 +52,27 @@ typedef struct declaration_specifiers_t declaration_specifiers_t; struct declaration_specifiers_t { source_position_t source_position; unsigned char declared_storage_class; - bool is_inline; - decl_modifiers_t decl_modifiers; + unsigned char alignment; /**< Alignment, 0 if not set. */ + 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. */ + symbol_t *put_property_sym; /**< the name of the put property if set. */ type_t *type; }; +/** + * An environment for parsing initializers (and compound literals). + */ +typedef struct parse_initializer_env_t { + type_t *type; /**< the type of the initializer. In case of an + array type with unspecified size this gets + adjusted to the actual size. */ + declaration_t *declaration; /**< the declaration that is initialized if any */ + bool must_be_constant; +} parse_initializer_env_t; + typedef declaration_t* (*parsed_declaration_func) (declaration_t *declaration); static token_t token; @@ -56,6 +92,29 @@ static label_statement_t *label_first = NULL; static label_statement_t *label_last = NULL; static struct obstack temp_obst; +/* symbols for Microsoft extended-decl-modifier */ +static const symbol_t *sym_align = NULL; +static const symbol_t *sym_allocate = NULL; +static const symbol_t *sym_dllimport = NULL; +static const symbol_t *sym_dllexport = NULL; +static const symbol_t *sym_naked = NULL; +static const symbol_t *sym_noinline = NULL; +static const symbol_t *sym_noreturn = NULL; +static const symbol_t *sym_nothrow = NULL; +static const symbol_t *sym_novtable = NULL; +static const symbol_t *sym_property = NULL; +static const symbol_t *sym_get = NULL; +static const symbol_t *sym_put = NULL; +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 @@ -87,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 \ @@ -115,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 @@ -141,7 +201,8 @@ static void *allocate_ast_zero(size_t size) static declaration_t *allocate_declaration_zero(void) { declaration_t *declaration = allocate_ast_zero(sizeof(declaration_t)); - declaration->type = type_error_type; + declaration->type = type_error_type; + declaration->alignment = 0; return declaration; } @@ -153,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), @@ -187,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. * @@ -195,31 +278,34 @@ static statement_t *allocate_statement_zero(statement_kind_t kind) static size_t get_expression_struct_size(expression_kind_t kind) { static const size_t sizes[] = { - [EXPR_INVALID] = sizeof(expression_base_t), - [EXPR_REFERENCE] = sizeof(reference_expression_t), - [EXPR_CONST] = sizeof(const_expression_t), - [EXPR_CHAR_CONST] = sizeof(const_expression_t), - [EXPR_STRING_LITERAL] = sizeof(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), - [EXPR_BINARY_FIRST] = sizeof(binary_expression_t), - [EXPR_CONDITIONAL] = sizeof(conditional_expression_t), - [EXPR_SELECT] = sizeof(select_expression_t), - [EXPR_ARRAY_ACCESS] = sizeof(array_access_expression_t), - [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_BUILTIN_SYMBOL] = sizeof(builtin_symbol_expression_t), - [EXPR_BUILTIN_CONSTANT_P] = sizeof(builtin_constant_expression_t), - [EXPR_BUILTIN_PREFETCH] = sizeof(builtin_prefetch_expression_t), - [EXPR_OFFSETOF] = sizeof(offsetof_expression_t), - [EXPR_VA_START] = sizeof(va_start_expression_t), - [EXPR_VA_ARG] = sizeof(va_arg_expression_t), - [EXPR_STATEMENT] = sizeof(statement_expression_t), + [EXPR_INVALID] = sizeof(expression_base_t), + [EXPR_REFERENCE] = sizeof(reference_expression_t), + [EXPR_CONST] = sizeof(const_expression_t), + [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_COMPOUND_LITERAL] = sizeof(compound_literal_expression_t), + [EXPR_CALL] = sizeof(call_expression_t), + [EXPR_UNARY_FIRST] = sizeof(unary_expression_t), + [EXPR_BINARY_FIRST] = sizeof(binary_expression_t), + [EXPR_CONDITIONAL] = sizeof(conditional_expression_t), + [EXPR_SELECT] = sizeof(select_expression_t), + [EXPR_ARRAY_ACCESS] = sizeof(array_access_expression_t), + [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_FUNCSIG] = sizeof(string_literal_expression_t), + [EXPR_FUNCDNAME] = sizeof(string_literal_expression_t), + [EXPR_BUILTIN_SYMBOL] = sizeof(builtin_symbol_expression_t), + [EXPR_BUILTIN_CONSTANT_P] = sizeof(builtin_constant_expression_t), + [EXPR_BUILTIN_PREFETCH] = sizeof(builtin_prefetch_expression_t), + [EXPR_OFFSETOF] = sizeof(offsetof_expression_t), + [EXPR_VA_START] = sizeof(va_start_expression_t), + [EXPR_VA_ARG] = sizeof(va_arg_expression_t), + [EXPR_STATEMENT] = sizeof(statement_expression_t), }; if(kind >= EXPR_UNARY_FIRST && kind <= EXPR_UNARY_LAST) { return sizes[EXPR_UNARY_FIRST]; @@ -342,7 +428,6 @@ static size_t label_top(void) return ARR_LEN(label_stack); } - /** * Return the next token. */ @@ -370,6 +455,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) /** @@ -382,7 +563,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); } @@ -405,101 +586,22 @@ static void type_error_incompatible(const char *msg, } /** - * Eat an complete block, ie. '{ ... }'. + * Expect the the current token is the expected token. + * If not, generate an error, eat the current statement, + * and goto the end_error label. */ -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 == '(') { - eat_paren(); - continue; - } - if(token.type == '{') { - eat_block(); - continue; - } - next_token(); - } - eat(')'); -} - #define expect(expected) \ do { \ if(UNLIKELY(token.type != (expected))) { \ parse_error_expected(NULL, (expected), 0); \ - eat_statement(); \ - return NULL; \ + 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) - -#define expect_void(expected) \ - do { \ - if(UNLIKELY(token.type != (expected))) { \ - parse_error_expected(NULL, (expected), 0); \ - eat_statement(); \ - return; \ - } \ - next_token(); \ - } while(0) - static void set_scope(scope_t *new_scope) { if(scope != NULL) { @@ -514,7 +616,8 @@ static void set_scope(scope_t *new_scope) * Search a symbol in a given namespace and returns its declaration or * NULL if this symbol was not found. */ -static declaration_t *get_declaration(const symbol_t *const symbol, const namespace_t namespc) +static declaration_t *get_declaration(const symbol_t *const symbol, + const namespace_t namespc) { declaration_t *declaration = symbol->declaration; for( ; declaration != NULL; declaration = declaration->symbol_next) { @@ -839,52 +942,63 @@ static string_t parse_string_literals(void) return result; } +/** + * Parse one GNU attribute. + */ +static void parse_gnu_attribute(void) +{ + eat(T___attribute__); + expect('('); + expect('('); + while(true) { + if(token.type != T_IDENTIFIER) + break; + symbol_t *sym = token.v.symbol; + if(sym == sym_deprecated) { + } + next_token(); + if(token.type == '(') + eat_until_matching_token('('); + 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_void('('); - 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: next_token(); - expect_void('('); + expect('('); 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(); } - expect_void(')'); + expect(')'); break; default: goto attributes_finished; } } +end_error: attributes_finished: ; } @@ -901,7 +1015,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 '.': @@ -929,6 +1045,8 @@ static designator_t *parse_designation(void) } last = designator; } +end_error: + return NULL; } static initializer_t *initializer_from_string(array_type_t *type, @@ -956,6 +1074,9 @@ static initializer_t *initializer_from_wide_string(array_type_t *const type, return initializer; } +/** + * Build an initializer from a given expression. + */ static initializer_t *initializer_from_expression(type_t *orig_type, expression_t *expression) { @@ -1004,12 +1125,20 @@ static initializer_t *initializer_from_expression(type_t *orig_type, return result; } +/** + * Checks if a given expression can be used as an constant initializer. + */ static bool is_initializer_constant(const expression_t *expression) { return is_constant_expression(expression) || is_address_constant(expression); } +/** + * Parses an scalar initializer. + * + * § 6.7.8.11; eat {} without warning + */ static initializer_t *parse_scalar_initializer(type_t *type, bool must_be_constant) { @@ -1058,57 +1187,74 @@ static initializer_t *parse_scalar_initializer(type_t *type, return initializer; } +/** + * An entry in the type path. + */ typedef struct type_path_entry_t type_path_entry_t; struct type_path_entry_t { - type_t *type; + type_t *type; /**< the upper top type. restored to path->top_tye if this entry is popped. */ union { - size_t index; - declaration_t *compound_entry; + size_t index; /**< For array types: the current index. */ + declaration_t *compound_entry; /**< For compound types: the current declaration. */ } v; }; +/** + * A type path expression a position inside compound or array types. + */ typedef struct type_path_t type_path_t; struct type_path_t { - type_path_entry_t *path; + type_path_entry_t *path; /**< An flexible array containing the current path. */ type_t *top_type; /**< type of the element the path points */ size_t max_index; /**< largest index in outermost array */ - bool invalid; }; +/** + * Prints a type path for debugging. + */ static __attribute__((unused)) void debug_print_type_path( const type_path_t *path) { size_t len = ARR_LEN(path->path); - if(path->invalid) { - fprintf(stderr, "invalid path"); - return; - } - for(size_t i = 0; i < len; ++i) { const type_path_entry_t *entry = & path->path[i]; type_t *type = skip_typeref(entry->type); if(is_type_compound(type)) { + /* in gcc mode structs can have no members */ + if(entry->v.compound_entry == NULL) { + assert(i == len-1); + continue; + } 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-"); } } - fprintf(stderr, " ("); - print_type(path->top_type); - fprintf(stderr, ")"); + if(path->top_type != NULL) { + fprintf(stderr, " ("); + print_type(path->top_type); + fprintf(stderr, ")"); + } } +/** + * Return the top type path entry, ie. in a path + * (type).a.b returns the b. + */ static type_path_entry_t *get_type_path_top(const type_path_t *path) { size_t len = ARR_LEN(path->path); assert(len > 0); - return & path->path[len-1]; + return &path->path[len-1]; } +/** + * Enlarge the type path by an (empty) element. + */ static type_path_entry_t *append_to_type_path(type_path_t *path) { size_t len = ARR_LEN(path->path); @@ -1119,6 +1265,10 @@ static type_path_entry_t *append_to_type_path(type_path_t *path) return result; } +/** + * Descending into a sub-type. Enter the scope of the current + * top_type. + */ static void descend_into_subtype(type_path_t *path) { type_t *orig_top_type = path->top_type; @@ -1132,9 +1282,13 @@ static void descend_into_subtype(type_path_t *path) if(is_type_compound(top_type)) { declaration_t *declaration = top_type->compound.declaration; declaration_t *entry = declaration->scope.declarations; + top->v.compound_entry = entry; - top->v.compound_entry = entry; - path->top_type = entry->type; + if(entry != NULL) { + path->top_type = entry->type; + } else { + path->top_type = NULL; + } } else { assert(is_type_array(top_type)); @@ -1143,6 +1297,10 @@ static void descend_into_subtype(type_path_t *path) } } +/** + * Pop an entry from the given type path, ie. returning from + * (type).a.b to (type).a + */ static void ascend_from_subtype(type_path_t *path) { type_path_entry_t *top = get_type_path_top(path); @@ -1153,10 +1311,13 @@ static void ascend_from_subtype(type_path_t *path) ARR_RESIZE(type_path_entry_t, path->path, len-1); } +/** + * Pop entries from the given type path until the given + * path level is reached. + */ static void ascend_to(type_path_t *path, size_t top_path_level) { size_t len = ARR_LEN(path->path); - assert(len >= top_path_level); while(len > top_path_level) { ascend_from_subtype(path); @@ -1253,8 +1414,6 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, descend_into_subtype(path); } } - - path->invalid = false; return true; failed: @@ -1263,9 +1422,6 @@ failed: static void advance_current_object(type_path_t *path, size_t top_path_level) { - if(path->invalid) - return; - type_path_entry_t *top = get_type_path_top(path); type_t *type = skip_typeref(top->type); @@ -1299,10 +1455,24 @@ static void advance_current_object(type_path_t *path, size_t top_path_level) ascend_from_subtype(path); advance_current_object(path, top_path_level); } else { - path->invalid = true; + path->top_type = NULL; } } +/** + * skip until token is found. + */ +static void skip_until(int type) { + while(token.type != type) { + if(token.type == T_EOF) + return; + next_token(); + } +} + +/** + * skip any {...} blocks until a closing braket is reached. + */ static void skip_initializers(void) { if(token.type == '{') @@ -1319,17 +1489,39 @@ 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, + */ static initializer_t *parse_sub_initializer(type_path_t *path, - type_t *outer_type, size_t top_path_level, bool must_be_constant) + type_t *outer_type, size_t top_path_level, + parse_initializer_env_t *env) { + if(token.type == '}') { + /* empty initializer */ + return create_empty_initializer(); + } + type_t *orig_type = path->top_type; - type_t *type = skip_typeref(orig_type); + type_t *type = NULL; - /* we can't do usefull stuff if we didn't even parse the type. Skip the - * initializers in this case. */ - if(!is_type_valid(type)) { - skip_initializers(); - return NULL; + if (orig_type == NULL) { + /* We are initializing an empty compound. */ + } else { + type = skip_typeref(orig_type); + + /* we can't do usefull stuff if we didn't even parse the type. Skip the + * initializers in this case. */ + if(!is_type_valid(type)) { + skip_initializers(); + return create_empty_initializer(); + } } initializer_t **initializers = NEW_ARR_F(initializer_t*, 0); @@ -1355,29 +1547,47 @@ static initializer_t *parse_sub_initializer(type_path_t *path, initializer_t *sub; if(token.type == '{') { - if(is_type_scalar(type)) { - sub = parse_scalar_initializer(type, must_be_constant); + if(type != NULL && is_type_scalar(type)) { + sub = parse_scalar_initializer(type, env->must_be_constant); } else { eat('{'); - descend_into_subtype(path); - + if(type == NULL) { + if (env->declaration != NULL) + errorf(HERE, "extra brace group at end of initializer for '%Y'", + env->declaration->symbol); + else + errorf(HERE, "extra brace group at end of initializer"); + } else + descend_into_subtype(path); + + add_anchor_token('}'); sub = parse_sub_initializer(path, orig_type, top_path_level+1, - must_be_constant); + env); + rem_anchor_token('}'); - ascend_from_subtype(path); - - expect_block('}'); + if(type != NULL) { + ascend_from_subtype(path); + expect('}'); + } else { + expect('}'); + goto error_parse_next; + } } } else { /* must be an expression */ expression_t *expression = parse_assignment_expression(); - if(must_be_constant && !is_initializer_constant(expression)) { + if(env->must_be_constant && !is_initializer_constant(expression)) { errorf(expression->base.source_position, "Initialisation expression '%E' is not constant\n", expression); } + if(type == NULL) { + /* we are already outside, ... */ + goto error_excess; + } + /* handle { "string" } special case */ if((expression->kind == EXPR_STRING_LITERAL || expression->kind == EXPR_WIDE_STRING_LITERAL) @@ -1429,9 +1639,19 @@ static initializer_t *parse_sub_initializer(type_path_t *path, path->max_index = index; } - /* append to initializers list */ - ARR_APP1(initializer_t*, initializers, sub); + if(type != NULL) { + /* append to initializers list */ + ARR_APP1(initializer_t*, initializers, sub); + } else { +error_excess: + if(env->declaration != NULL) + warningf(HERE, "excess elements in struct initializer for '%Y'", + env->declaration->symbol); + else + warningf(HERE, "excess elements in struct initializer"); + } +error_parse_next: if(token.type == '}') { break; } @@ -1440,9 +1660,15 @@ static initializer_t *parse_sub_initializer(type_path_t *path, break; } - advance_current_object(path, top_path_level); - orig_type = path->top_type; - type = skip_typeref(orig_type); + if(type != NULL) { + /* advance to the next declaration if we are not at the end */ + advance_current_object(path, top_path_level); + orig_type = path->top_type; + if(orig_type != NULL) + type = skip_typeref(orig_type); + else + type = NULL; + } } size_t len = ARR_LEN(initializers); @@ -1453,6 +1679,7 @@ static initializer_t *parse_sub_initializer(type_path_t *path, memcpy(&result->list.initializers, initializers, len * sizeof(initializers[0])); + DEL_ARR_F(initializers); ascend_to(path, top_path_level); return result; @@ -1464,22 +1691,17 @@ end_error: return NULL; } -typedef struct parse_initializer_env_t { - type_t *type; /* the type of the initializer. In case of an - array type with unspecified size this gets - adjusted to the actual size. */ - initializer_t *initializer; /* initializer will be filled in here */ - bool must_be_constant; -} parse_initializer_env_t; - -static void parse_initializer(parse_initializer_env_t *env) +/** + * Parses an initializer. Parsers either a compound literal + * (env->declaration == NULL) or an initializer of a declaration. + */ +static initializer_t *parse_initializer(parse_initializer_env_t *env) { type_t *type = skip_typeref(env->type); initializer_t *result = NULL; size_t max_index; if(is_type_scalar(type)) { - /* TODO: § 6.7.8.11; eat {} without warning */ result = parse_scalar_initializer(type, env->must_be_constant); } else if(token.type == '{') { eat('{'); @@ -1491,15 +1713,16 @@ static void parse_initializer(parse_initializer_env_t *env) descend_into_subtype(&path); - result = parse_sub_initializer(&path, env->type, 1, - env->must_be_constant); + 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); - expect_void('}'); + expect('}'); } else { - /* parse_scalar_initializer also works in this case: we simply + /* parse_scalar_initializer() also works in this case: we simply * have an expression without {} around it */ result = parse_scalar_initializer(type, env->must_be_constant); } @@ -1523,7 +1746,7 @@ static void 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); @@ -1538,7 +1761,9 @@ static void parse_initializer(parse_initializer_env_t *env) env->type = new_type; } - env->initializer = result; + return result; +end_error: + return NULL; } static declaration_t *append_declaration(declaration_t *declaration); @@ -1619,10 +1844,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; } @@ -1649,8 +1876,12 @@ static void parse_enum_entries(type_t *const enum_type) break; next_token(); } while(token.type != '}'); + rem_anchor_token('}'); - expect_void('}'); + expect('}'); + +end_error: + ; } static type_t *parse_enum_specifier(void) @@ -1721,6 +1952,7 @@ static type_t *parse_typeof(void) type_t *type; expect('('); + add_anchor_token(')'); expression_t *expression = NULL; @@ -1753,6 +1985,7 @@ restart: break; } + rem_anchor_token(')'); expect(')'); type_t *typeof_type = allocate_type_zero(TYPE_TYPEOF, expression->base.source_position); @@ -1760,6 +1993,8 @@ restart: typeof_type->typeoft.typeof_type = type; return typeof_type; +end_error: + return NULL; } typedef enum { @@ -1774,9 +2009,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; @@ -1791,21 +2031,179 @@ static type_t *create_builtin_type(symbol_t *const symbol, if (type != result) { free_type(type); } - - return result; -} - -static type_t *get_typedef_type(symbol_t *symbol) -{ - declaration_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL); - if(declaration == NULL - || declaration->storage_class != STORAGE_CLASS_TYPEDEF) - return NULL; - - type_t *type = allocate_type_zero(TYPE_TYPEDEF, declaration->source_position); - type->typedeft.declaration = declaration; - - return type; + + return result; +} + +static type_t *get_typedef_type(symbol_t *symbol) +{ + declaration_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL); + if(declaration == NULL + || declaration->storage_class != STORAGE_CLASS_TYPEDEF) + return NULL; + + type_t *type = allocate_type_zero(TYPE_TYPEDEF, declaration->source_position); + type->typedeft.declaration = declaration; + + return type; +} + +/** + * check for the allowed MS alignment values. + */ +static bool check_elignment_value(long long intvalue) { + if(intvalue < 1 || intvalue > 8192) { + errorf(HERE, "illegal alignment value"); + return false; + } + unsigned v = (unsigned)intvalue; + for(unsigned i = 1; i <= 8192; i += i) { + if (i == v) + return true; + } + errorf(HERE, "alignment must be power of two"); + return false; +} + +#define DET_MOD(name, tag) do { \ + if(*modifiers & tag) warningf(HERE, #name " used more than once"); \ + *modifiers |= tag; \ +} while(0) + +static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *specifiers) +{ + decl_modifiers_t *modifiers = &specifiers->decl_modifiers; + + 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('('); + if(token.type != T_INTEGER) + goto end_error; + if(check_elignment_value(token.v.intvalue)) { + if(specifiers->alignment != 0) + warningf(HERE, "align used more than once"); + specifiers->alignment = (unsigned char)token.v.intvalue; + } + next_token(); + expect(')'); + } else if(symbol == sym_allocate) { + next_token(); + expect('('); + if(token.type != T_IDENTIFIER) + goto end_error; + (void)token.v.symbol; + expect(')'); + } else if(symbol == sym_dllimport) { + next_token(); + DET_MOD(dllimport, DM_DLLIMPORT); + } else if(symbol == sym_dllexport) { + next_token(); + DET_MOD(dllexport, DM_DLLEXPORT); + } else if(symbol == sym_thread) { + next_token(); + DET_MOD(thread, DM_THREAD); + } else if(symbol == sym_naked) { + next_token(); + DET_MOD(naked, DM_NAKED); + } else if(symbol == sym_noinline) { + next_token(); + DET_MOD(noinline, DM_NOINLINE); + } else if(symbol == sym_noreturn) { + next_token(); + DET_MOD(noreturn, DM_NORETURN); + } else if(symbol == sym_nothrow) { + next_token(); + DET_MOD(nothrow, DM_NOTHROW); + } else if(symbol == sym_novtable) { + next_token(); + DET_MOD(novtable, DM_NOVTABLE); + } else if(symbol == sym_property) { + next_token(); + expect('('); + for(;;) { + bool is_get = false; + if(token.type != T_IDENTIFIER) + goto end_error; + if(token.v.symbol == sym_get) { + is_get = true; + } else if(token.v.symbol == sym_put) { + } else { + errorf(HERE, "Bad property name '%Y'", token.v.symbol); + goto end_error; + } + next_token(); + expect('='); + if(token.type != T_IDENTIFIER) + goto end_error; + if(is_get) { + if(specifiers->get_property_sym != NULL) { + errorf(HERE, "get property name already specified"); + } else { + specifiers->get_property_sym = token.v.symbol; + } + } else { + if(specifiers->put_property_sym != NULL) { + errorf(HERE, "put property name already specified"); + } else { + specifiers->put_property_sym = token.v.symbol; + } + } + next_token(); + if(token.type == ',') { + next_token(); + continue; + } + break; + } + expect(')'); + } else if(symbol == sym_selectany) { + next_token(); + DET_MOD(selectany, DM_SELECTANY); + } else if(symbol == sym_uuid) { + next_token(); + expect('('); + if(token.type != T_STRING_LITERAL) + goto end_error; + next_token(); + expect(')'); + } else if(symbol == sym_deprecated) { + next_token(); + 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; + next_token(); + } else { + errorf(HERE, "string literal expected"); + } + 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(); + } +end_error: + return; } static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) @@ -1836,6 +2234,15 @@ 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: + next_token(); + expect('('); + add_anchor_token(')'); + parse_microsoft_extended_decl_modifier(specifiers); + rem_anchor_token(')'); + expect(')'); + break; + case T___thread: switch (specifiers->declared_storage_class) { case STORAGE_CLASS_NONE: @@ -1867,6 +2274,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 */ @@ -1893,11 +2305,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; @@ -2025,6 +2442,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; @@ -2090,6 +2553,7 @@ finish_specifiers: } type->base.qualifiers = type_qualifiers; + /* FIXME: check type qualifiers here */ type_t *result = typehash_insert(type); if(newtype && result != type) { @@ -2097,6 +2561,8 @@ finish_specifiers: } specifiers->type = result; +end_error: + return; } static type_qualifiers_t parse_type_qualifiers(void) @@ -2109,6 +2575,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; @@ -2302,6 +2774,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])); @@ -2328,14 +2801,18 @@ static construct_type_t *parse_array_declarator(void) array->size = parse_assignment_expression(); } + rem_anchor_token(']'); expect(']'); return (construct_type_t*) array; +end_error: + return NULL; } static construct_type_t *parse_function_declarator(declaration_t *declaration) { eat('('); + add_anchor_token(')'); type_t *type; if(declaration != NULL) { @@ -2355,8 +2832,10 @@ 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: return (construct_type_t*) construct_function_type; } @@ -2398,7 +2877,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: @@ -2456,6 +2937,8 @@ declarator_finished: } return first; +end_error: + return NULL; } static type_t *construct_declarator_type(construct_type_t *construct_list, @@ -2465,7 +2948,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; @@ -2554,6 +3037,10 @@ 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; declaration->is_inline = specifiers->is_inline; declaration->storage_class = specifiers->declared_storage_class; @@ -2562,6 +3049,11 @@ static declaration_t *parse_declarator( declaration->storage_class = STORAGE_CLASS_AUTO; } + if(specifiers->alignment != 0) { + /* TODO: add checks here */ + declaration->alignment = specifiers->alignment; + } + construct_type_t *construct_type = parse_inner_declarator(declaration, may_be_abstract); type_t *const type = specifiers->type; @@ -2693,8 +3185,13 @@ static declaration_t *internal_record_declaration( errorf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol); } else { - unsigned old_storage_class - = previous_declaration->storage_class; + unsigned old_storage_class = previous_declaration->storage_class; + if (old_storage_class == STORAGE_CLASS_ENUM_ENTRY) { + errorf(declaration->source_position, "redeclaration of enum entry '%Y'", symbol); + errorf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol); + return previous_declaration; + } + unsigned new_storage_class = declaration->storage_class; if(is_type_incomplete(prev_type)) { @@ -2859,7 +3356,9 @@ static void parse_init_declarator_rest(declaration_t *declaration) parse_initializer_env_t env; env.type = orig_type; env.must_be_constant = must_be_constant; - parse_initializer(&env); + env.declaration = declaration; + + initializer_t *initializer = parse_initializer(&env); if(env.type != orig_type) { orig_type = env.type; @@ -2872,7 +3371,7 @@ static void parse_init_declarator_rest(declaration_t *declaration) "initializers not allowed for function types at declator '%Y' (type '%T')", declaration->symbol, orig_type); } else { - declaration->init.initializer = env.initializer; + declaration->init.initializer = initializer; } } @@ -2887,6 +3386,7 @@ static void parse_anonymous_declaration_rest( declaration->type = specifiers->type; declaration->declared_storage_class = specifiers->declared_storage_class; declaration->source_position = specifiers->source_position; + declaration->modifiers = specifiers->decl_modifiers; if (declaration->declared_storage_class != STORAGE_CLASS_NONE) { warningf(declaration->source_position, "useless storage class in empty declaration"); @@ -2918,6 +3418,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); @@ -2941,7 +3444,12 @@ static void parse_declaration_rest(declaration_t *ndeclaration, ndeclaration = parse_declarator(specifiers, /*may_be_abstract=*/false); } - expect_void(';'); + expect(';'); + +end_error: + rem_anchor_token(';'); + rem_anchor_token('='); + rem_anchor_token(','); } static declaration_t *finished_kr_declaration(declaration_t *declaration) @@ -3148,7 +3656,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 == ';') { @@ -3156,9 +3667,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); @@ -3170,7 +3689,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; } @@ -3378,12 +3897,16 @@ static void parse_compound_declarators(declaration_t *struct_declaration, break; next_token(); } - expect_void(';'); + expect(';'); + +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; @@ -3392,6 +3915,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"); } @@ -3524,15 +4049,39 @@ static expression_t *parse_int_const(void) /** * Parse a character constant. */ -static expression_t *parse_char_const(void) +static expression_t *parse_character_constant(void) { - expression_t *cnst = allocate_expression_zero(EXPR_CHAR_CONST); + expression_t *cnst = allocate_expression_zero(EXPR_CHARACTER_CONSTANT); + cnst->base.source_position = HERE; cnst->base.type = token.datatype; - cnst->conste.v.chars.begin = token.v.string.begin; - cnst->conste.v.chars.size = token.v.string.size; + cnst->conste.v.character = token.v.string; + + if (cnst->conste.v.character.size != 1) { + if (warning.multichar && (c_mode & _GNUC)) { + /* TODO */ + warningf(HERE, "multi-character character constant"); + } else { + errorf(HERE, "more than 1 characters in character constant"); + } + } + next_token(); + + return cnst; +} + +/** + * Parse a wide character constant. + */ +static expression_t *parse_wide_character_constant(void) +{ + expression_t *cnst = allocate_expression_zero(EXPR_WIDE_CHARACTER_CONSTANT); - if (cnst->conste.v.chars.size != 1) { + cnst->base.source_position = HERE; + cnst->base.type = token.datatype; + cnst->conste.v.wide_character = token.v.wide_string; + + if (cnst->conste.v.wide_character.size != 1) { if (warning.multichar && (c_mode & _GNUC)) { /* TODO */ warningf(HERE, "multi-character character constant"); @@ -3638,7 +4187,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"); } } @@ -3753,6 +4302,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; } @@ -3769,23 +4334,29 @@ static expression_t *parse_compound_literal(type_t *type) parse_initializer_env_t env; env.type = type; + env.declaration = NULL; env.must_be_constant = false; - parse_initializer(&env); + initializer_t *initializer = parse_initializer(&env); type = env.type; + expression->compound_literal.initializer = initializer; expression->compound_literal.type = type; - expression->compound_literal.initializer = env.initializer; expression->base.type = automatic_type_conversion(type); return expression; } +/** + * Parse a cast expression. + */ static expression_t *parse_cast(void) { 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(')'); if(token.type == '{') { @@ -3803,8 +4374,13 @@ static expression_t *parse_cast(void) cast->unary.value = value; return cast; +end_error: + return create_invalid_expression(); } +/** + * Parse a statement expression. + */ static expression_t *parse_statement_expression(void) { expression_t *expression = allocate_expression_zero(EXPR_STATEMENT); @@ -3831,11 +4407,17 @@ static expression_t *parse_statement_expression(void) expect(')'); return expression; +end_error: + return create_invalid_expression(); } +/** + * Parse a braced expression. + */ static expression_t *parse_brace_expression(void) { eat('('); + add_anchor_token(')'); switch(token.type) { case '{': @@ -3852,9 +4434,12 @@ static expression_t *parse_brace_expression(void) } expression_t *result = parse_expression(); + rem_anchor_token(')'); expect(')'); return result; +end_error: + return create_invalid_expression(); } static expression_t *parse_function_keyword(void) @@ -3875,7 +4460,6 @@ 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"); @@ -3887,6 +4471,34 @@ static expression_t *parse_pretty_function_keyword(void) return expression; } +static expression_t *parse_funcsig_keyword(void) +{ + next_token(); + + if (current_function == NULL) { + errorf(HERE, "'__FUNCSIG__' used outside of a function"); + } + + expression_t *expression = allocate_expression_zero(EXPR_FUNCSIG); + expression->base.type = type_char_ptr; + + return expression; +} + +static expression_t *parse_funcdname_keyword(void) +{ + next_token(); + + if (current_function == NULL) { + errorf(HERE, "'__FUNCDNAME__' used outside of a function"); + } + + expression_t *expression = allocate_expression_zero(EXPR_FUNCDNAME); + expression->base.type = type_char_ptr; + + return expression; +} + static designator_t *parse_designator(void) { designator_t *result = allocate_ast_zero(sizeof(result[0])); @@ -3895,7 +4507,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; @@ -3908,7 +4519,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])); @@ -3922,14 +4532,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; @@ -3939,8 +4550,13 @@ static designator_t *parse_designator(void) } return result; +end_error: + return NULL; } +/** + * Parse the __builtin_offsetof() expression. + */ static expression_t *parse_offsetof(void) { eat(T___builtin_offsetof); @@ -3949,9 +4565,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; @@ -3971,8 +4591,13 @@ static expression_t *parse_offsetof(void) DEL_ARR_F(path.path); return expression; +end_error: + return create_invalid_expression(); } +/** + * Parses a _builtin_va_start() expression. + */ static expression_t *parse_va_start(void) { eat(T___builtin_va_start); @@ -3980,7 +4605,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) { @@ -3995,10 +4622,13 @@ static expression_t *parse_va_start(void) } } errorf(expr->base.source_position, "second argument of 'va_start' must be last parameter of the current function"); - +end_error: return create_invalid_expression(); } +/** + * Parses a _builtin_va_arg() expression. + */ static expression_t *parse_va_arg(void) { eat(T___builtin_va_arg); @@ -4012,6 +4642,8 @@ static expression_t *parse_va_arg(void) expect(')'); return expression; +end_error: + return create_invalid_expression(); } static expression_t *parse_builtin_symbol(void) @@ -4030,6 +4662,9 @@ static expression_t *parse_builtin_symbol(void) return expression; } +/** + * Parses a __builtin_constant() expression. + */ static expression_t *parse_builtin_constant(void) { eat(T___builtin_constant_p); @@ -4037,13 +4672,20 @@ 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; return expression; +end_error: + return create_invalid_expression(); } +/** + * Parses a __builtin_prefetch() expression. + */ static expression_t *parse_builtin_prefetch(void) { eat(T___builtin_prefetch); @@ -4051,6 +4693,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(); @@ -4060,12 +4703,18 @@ 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; return expression; +end_error: + return create_invalid_expression(); } +/** + * Parses a __builtin_is_*() compare expression. + */ static expression_t *parse_compare_builtin(void) { expression_t *expression; @@ -4090,7 +4739,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; @@ -4117,8 +4766,13 @@ static expression_t *parse_compare_builtin(void) } return expression; +end_error: + return create_invalid_expression(); } +/** + * Parses a __builtin_expect() expression. + */ static expression_t *parse_builtin_expect(void) { eat(T___builtin_expect); @@ -4135,27 +4789,40 @@ static expression_t *parse_builtin_expect(void) expression->base.type = expression->binary.left->base.type; return expression; +end_error: + return create_invalid_expression(); } +/** + * 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; return expression; +end_error: + return create_invalid_expression(); } +/** + * Parses a primary expression. + */ static expression_t *parse_primary_expression(void) { switch (token.type) { case T_INTEGER: return parse_int_const(); - case T_CHARS: return parse_char_const(); + case T_CHARACTER_CONSTANT: return parse_character_constant(); + case T_WIDE_CHARACTER_CONSTANT: return parse_wide_character_constant(); case T_FLOATINGPOINT: return parse_float_const(); case T_STRING_LITERAL: case T_WIDE_STRING_LITERAL: return parse_string_const(); @@ -4163,6 +4830,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(); @@ -4180,14 +4849,12 @@ 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(); } errorf(HERE, "unexpected token %K, expected an expression", &token); - eat_statement(); - return create_invalid_expression(); } @@ -4211,6 +4878,7 @@ static expression_t *parse_array_expression(unsigned precedence, (void) precedence; eat('['); + add_anchor_token(']'); expression_t *inside = parse_expression(); @@ -4246,6 +4914,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; @@ -4265,7 +4934,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); @@ -4276,6 +4947,8 @@ static expression_t *parse_typeprop(expression_kind_t kind, unsigned precedence) } return tp_expression; +end_error: + return create_invalid_expression(); } static expression_t *parse_sizeof(unsigned precedence) @@ -4377,6 +5050,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; @@ -4400,6 +5074,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; @@ -4420,6 +5096,8 @@ static expression_t *parse_call_expression(unsigned precedence, next_token(); } } + rem_anchor_token(','); + rem_anchor_token(')'); expect(')'); if(function_type != NULL) { @@ -4472,6 +5150,8 @@ static expression_t *parse_call_expression(unsigned precedence, } return result; +end_error: + return create_invalid_expression(); } static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right); @@ -4493,6 +5173,7 @@ static expression_t *parse_conditional_expression(unsigned precedence, expression_t *expression) { eat('?'); + add_anchor_token(':'); expression_t *result = allocate_expression_zero(EXPR_CONDITIONAL); @@ -4508,6 +5189,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); @@ -4560,6 +5242,8 @@ static expression_t *parse_conditional_expression(unsigned precedence, = create_implicit_cast(false_expression, result_type); conditional->base.type = result_type; return result; +end_error: + return create_invalid_expression(); } /** @@ -4575,6 +5259,9 @@ static expression_t *parse_extension(unsigned precedence) return expression; } +/** + * Parse a __builtin_classify_type() expression. + */ static expression_t *parse_builtin_classify_type(const unsigned precedence) { eat(T___builtin_classify_type); @@ -4583,11 +5270,15 @@ 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; return result; +end_error: + return create_invalid_expression(); } static void semantic_incdec(unary_expression_t *expression) @@ -5083,16 +5774,30 @@ static void semantic_binexpr_assign(binary_expression_t *expression) expression->base.type = orig_type_left; } +/** + * Determine if the outermost operation (or parts thereof) of the given + * expression has no effect in order to generate a warning about this fact. + * Therefore in some cases this only examines some of the operands of the + * expression (see comments in the function and examples below). + * Examples: + * f() + 23; // warning, because + has no effect + * x || f(); // no warning, because x controls execution of f() + * x ? y : f(); // warning, because y has no effect + * (void)x; // no warning to be able to suppress the warning + * This function can NOT be used for an "expression has definitely no effect"- + * analysis. */ static bool expression_has_effect(const expression_t *const expr) { switch (expr->kind) { case EXPR_UNKNOWN: break; - case EXPR_INVALID: break; + case EXPR_INVALID: return true; /* do NOT warn */ case EXPR_REFERENCE: return false; case EXPR_CONST: return false; - case EXPR_CHAR_CONST: return false; + case EXPR_CHARACTER_CONSTANT: return false; + case EXPR_WIDE_CHARACTER_CONSTANT: return false; case EXPR_STRING_LITERAL: return false; case EXPR_WIDE_STRING_LITERAL: return false; + case EXPR_CALL: { const call_expression_t *const call = &expr->call; if (call->function->kind != EXPR_BUILTIN_SYMBOL) @@ -5103,12 +5808,16 @@ static bool expression_has_effect(const expression_t *const expr) default: return false; } } + + /* Generate the warning if either the left or right hand side of a + * conditional expression has no effect */ case EXPR_CONDITIONAL: { const conditional_expression_t *const cond = &expr->conditional; return expression_has_effect(cond->true_expression) && expression_has_effect(cond->false_expression); } + case EXPR_SELECT: return false; case EXPR_ARRAY_ACCESS: return false; case EXPR_SIZEOF: return false; @@ -5117,6 +5826,8 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_FUNCTION: return false; case EXPR_PRETTY_FUNCTION: return false; + case EXPR_FUNCSIG: return false; + case EXPR_FUNCDNAME: return false; case EXPR_BUILTIN_SYMBOL: break; /* handled in EXPR_CALL */ case EXPR_BUILTIN_CONSTANT_P: return false; case EXPR_BUILTIN_PREFETCH: return true; @@ -5136,10 +5847,14 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_UNARY_POSTFIX_DECREMENT: return true; case EXPR_UNARY_PREFIX_INCREMENT: return true; case EXPR_UNARY_PREFIX_DECREMENT: return true; + + /* Treat void casts as if they have an effect in order to being able to + * suppress the warning */ case EXPR_UNARY_CAST: { - type_t *type = skip_typeref(expr->base.type); + type_t *const type = skip_typeref(expr->base.type); return is_type_atomic(type, ATOMIC_TYPE_VOID); } + case EXPR_UNARY_CAST_IMPLICIT: return true; case EXPR_UNARY_ASSUME: return true; case EXPR_UNARY_BITFIELD_EXTRACT: return false; @@ -5171,8 +5886,14 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_BINARY_BITWISE_AND_ASSIGN: return true; case EXPR_BINARY_BITWISE_XOR_ASSIGN: return true; case EXPR_BINARY_BITWISE_OR_ASSIGN: return true; + + /* Only examine the right hand side of && and ||, because the left hand + * side already has the effect of controlling the execution of the right + * hand side */ case EXPR_BINARY_LOGICAL_AND: case EXPR_BINARY_LOGICAL_OR: + /* Only examine the right hand side of a comma expression, because the left + * hand side has a separate warning */ case EXPR_BINARY_COMMA: return expression_has_effect(expr->binary.right); @@ -5185,7 +5906,7 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_BINARY_ISUNORDERED: return false; } - panic("unexpected statement"); + internal_errorf(HERE, "unexpected expression"); } static void semantic_comma(binary_expression_t *expression) @@ -5474,6 +6195,8 @@ static asm_constraint_t *parse_asm_constraints(void) } return result; +end_error: + return NULL; } /** @@ -5521,28 +6244,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 create_invalid_statement(); } /** @@ -5587,6 +6322,8 @@ static statement_t *parse_case_statement(void) statement->case_label.statement = parse_statement(); return statement; +end_error: + return create_invalid_statement(); } /** @@ -5637,6 +6374,8 @@ static statement_t *parse_default_statement(void) statement->case_label.statement = parse_statement(); return statement; +end_error: + return create_invalid_statement(); } /** @@ -5693,13 +6432,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(); @@ -5728,16 +6474,23 @@ 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(); } return statement; +end_error: + return create_invalid_statement(); } /** @@ -5774,6 +6527,8 @@ static statement_t *parse_switch(void) } return statement; +end_error: + return create_invalid_statement(); } static statement_t *parse_loop_body(statement_t *const loop) @@ -5798,12 +6553,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 create_invalid_statement(); } /** @@ -5817,15 +6576,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 create_invalid_statement(); } /** @@ -5838,12 +6603,13 @@ static statement_t *parse_for(void) statement_t *statement = allocate_statement_zero(STATEMENT_FOR); statement->base.source_position = token.source_position; - expect('('); - int top = environment_top(); scope_t *last_scope = scope; set_scope(&statement->fors.scope); + expect('('); + add_anchor_token(')'); + if(token.type != ';') { if(is_declaration_specifier(&token, false)) { parse_declaration(record_declaration); @@ -5851,7 +6617,8 @@ static statement_t *parse_for(void) expression_t *const init = parse_expression(); statement->fors.initialisation = init; if (warning.unused_value && !expression_has_effect(init)) { - warningf(init->base.source_position, "initialisation of 'for'-statement has no effect"); + warningf(init->base.source_position, + "initialisation of 'for'-statement has no effect"); } expect(';'); } @@ -5867,9 +6634,11 @@ static statement_t *parse_for(void) expression_t *const step = parse_expression(); statement->fors.step = step; if (warning.unused_value && !expression_has_effect(step)) { - warningf(step->base.source_position, "step of 'for'-statement has no effect"); + warningf(step->base.source_position, + "step of 'for'-statement has no effect"); } } + rem_anchor_token(')'); expect(')'); statement->fors.body = parse_loop_body(statement); @@ -5878,6 +6647,14 @@ static statement_t *parse_for(void) environment_pop_to(top); return statement; + +end_error: + rem_anchor_token(')'); + assert(scope == &statement->fors.scope); + set_scope(last_scope); + environment_pop_to(top); + + return create_invalid_statement(); } /** @@ -5913,6 +6690,8 @@ static statement_t *parse_goto(void) expect(';'); return statement; +end_error: + return create_invalid_statement(); } /** @@ -5934,6 +6713,8 @@ static statement_t *parse_continue(void) expect(';'); return statement; +end_error: + return create_invalid_statement(); } /** @@ -5955,6 +6736,8 @@ static statement_t *parse_break(void) expect(';'); return statement; +end_error: + return create_invalid_statement(); } /** @@ -6070,6 +6853,8 @@ static statement_t *parse_return(void) statement->returns.value = return_value; return statement; +end_error: + return create_invalid_statement(); } /** @@ -6112,6 +6897,8 @@ static statement_t *parse_expression_statement(void) expect(';'); return statement; +end_error: + return create_invalid_statement(); } /** @@ -6122,6 +6909,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(); @@ -6176,11 +6964,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: @@ -6214,9 +7002,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; } @@ -6231,6 +7020,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; @@ -6240,8 +7030,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; @@ -6262,6 +7056,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); @@ -6381,9 +7177,6 @@ translation_unit_t *parse(void) DEL_ARR_F(environment_stack); DEL_ARR_F(label_stack); - if(error_count > 0) - return NULL; - return unit; } @@ -6392,6 +7185,29 @@ translation_unit_t *parse(void) */ void init_parser(void) { + if(c_mode & _MS) { + /* add predefined symbols for extended-decl-modifier */ + sym_align = symbol_table_insert("align"); + sym_allocate = symbol_table_insert("allocate"); + sym_dllimport = symbol_table_insert("dllimport"); + sym_dllexport = symbol_table_insert("dllexport"); + sym_naked = symbol_table_insert("naked"); + sym_noinline = symbol_table_insert("noinline"); + sym_noreturn = symbol_table_insert("noreturn"); + sym_nothrow = symbol_table_insert("nothrow"); + sym_novtable = symbol_table_insert("novtable"); + sym_property = symbol_table_insert("property"); + sym_get = symbol_table_insert("get"); + sym_put = symbol_table_insert("put"); + sym_selectany = symbol_table_insert("selectany"); + 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);