X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=df444bd0c3c9588696a222302d45fd2713935070;hb=5c1f4f4c1fb16d5c4d6de6f8e12b520e2a7f265e;hp=7467196c016b64005467b819ae2ed3f594bf1c3c;hpb=f928976aed1725d96a398dededac5eddcbe7870d;p=cparser diff --git a/parser.c b/parser.c index 7467196..df444bd 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" @@ -31,12 +51,28 @@ typedef struct { typedef struct declaration_specifiers_t declaration_specifiers_t; struct declaration_specifiers_t { source_position_t source_position; - unsigned char storage_class; - bool is_inline; - decl_modifiers_t decl_modifiers; + unsigned char declared_storage_class; + 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; @@ -54,7 +90,30 @@ static goto_statement_t *goto_first = NULL; static goto_statement_t *goto_last = NULL; static label_statement_t *label_first = NULL; static label_statement_t *label_last = NULL; -static struct obstack temp_obst; +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,30 +278,31 @@ 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_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_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), + [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]; @@ -297,7 +381,8 @@ static size_t get_initializer_size(initializer_kind_t kind) [INITIALIZER_VALUE] = sizeof(initializer_value_t), [INITIALIZER_STRING] = sizeof(initializer_string_t), [INITIALIZER_WIDE_STRING] = sizeof(initializer_wide_string_t), - [INITIALIZER_LIST] = sizeof(initializer_list_t) + [INITIALIZER_LIST] = sizeof(initializer_list_t), + [INITIALIZER_DESIGNATOR] = sizeof(initializer_designator_t) }; assert(kind < sizeof(sizes) / sizeof(*sizes)); assert(sizes[kind] != 0); @@ -340,7 +425,6 @@ static size_t label_top(void) return ARR_LEN(label_stack); } - /** * Return the next token. */ @@ -368,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) /** @@ -380,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); } @@ -403,94 +583,21 @@ static void type_error_incompatible(const char *msg, } /** - * 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. '( ... )'. + * 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_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; \ - } \ - next_token(); - -#define expect_block(expected) \ - if(UNLIKELY(token.type != (expected))) { \ - parse_error_expected(NULL, (expected), 0); \ - eat_block(); \ - return NULL; \ - } \ - next_token(); - -#define expect_void(expected) \ - if(UNLIKELY(token.type != (expected))) { \ - parse_error_expected(NULL, (expected), 0); \ - eat_statement(); \ - return; \ + add_anchor_token(expected); \ + eat_until_anchor(); \ + rem_anchor_token(expected); \ + goto end_error; \ } \ - next_token(); + next_token(); \ + } while(0) static void set_scope(scope_t *new_scope) { @@ -506,7 +613,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) { @@ -760,7 +868,8 @@ static type_t *semantic_assign(type_t *orig_type_left, return orig_type_left; } - if (is_type_compound(type_left) && is_type_compound(type_right)) { + if ((is_type_compound(type_left) && is_type_compound(type_right)) + || (is_type_builtin(type_left) && is_type_builtin(type_right))) { type_t *const unqual_type_left = get_unqualified_type(type_left); type_t *const unqual_type_right = get_unqualified_type(type_right); if (types_compatible(unqual_type_left, unqual_type_right)) { @@ -800,11 +909,12 @@ static type_t *make_global_typedef(const char *name, type_t *type) symbol_t *const symbol = symbol_table_insert(name); declaration_t *const declaration = allocate_declaration_zero(); - declaration->namespc = NAMESPACE_NORMAL; - declaration->storage_class = STORAGE_CLASS_TYPEDEF; - declaration->type = type; - declaration->symbol = symbol; - declaration->source_position = builtin_source_position; + declaration->namespc = NAMESPACE_NORMAL; + declaration->storage_class = STORAGE_CLASS_TYPEDEF; + declaration->declared_storage_class = STORAGE_CLASS_TYPEDEF; + declaration->type = type; + declaration->symbol = symbol; + declaration->source_position = builtin_source_position; record_declaration(declaration); @@ -829,76 +939,202 @@ 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_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: ; } -#if 0 static designator_t *parse_designation(void) { - if(token.type != '[' && token.type != '.') - return NULL; - designator_t *result = NULL; designator_t *last = NULL; - while(1) { + while(true) { designator_t *designator; switch(token.type) { case '[': designator = allocate_ast_zero(sizeof(designator[0])); + designator->source_position = token.source_position; next_token(); - designator->array_access = parse_constant_expression(); + add_anchor_token(']'); + designator->array_index = parse_constant_expression(); + rem_anchor_token(']'); expect(']'); break; case '.': designator = allocate_ast_zero(sizeof(designator[0])); + designator->source_position = token.source_position; next_token(); if(token.type != T_IDENTIFIER) { parse_error_expected("while parsing designator", @@ -921,8 +1157,9 @@ static designator_t *parse_designation(void) } last = designator; } +end_error: + return NULL; } -#endif static initializer_t *initializer_from_string(array_type_t *type, const string_t *const string) @@ -949,13 +1186,18 @@ static initializer_t *initializer_from_wide_string(array_type_t *const type, return initializer; } -static initializer_t *initializer_from_expression(type_t *type, +/** + * Build an initializer from a given expression. + */ +static initializer_t *initializer_from_expression(type_t *orig_type, expression_t *expression) { /* TODO check that expression is a constant expression */ /* § 6.7.8.14/15 char array may be initialized by string literals */ - type_t *const expr_type = expression->base.type; + type_t *type = skip_typeref(orig_type); + type_t *expr_type_orig = expression->base.type; + type_t *expr_type = skip_typeref(expr_type_orig); if (is_type_array(type) && expr_type->kind == TYPE_POINTER) { array_type_t *const array_type = &type->array; type_t *const element_type = skip_typeref(array_type->element_type); @@ -995,256 +1237,645 @@ static initializer_t *initializer_from_expression(type_t *type, return result; } -static initializer_t *parse_sub_initializer(type_t *type, - expression_t *expression); +/** + * 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); +} -static initializer_t *parse_sub_initializer_elem(type_t *type) +/** + * Parses an scalar initializer. + * + * § 6.7.8.11; eat {} without warning + */ +static initializer_t *parse_scalar_initializer(type_t *type, + bool must_be_constant) { - if(token.type == '{') { - return parse_sub_initializer(type, NULL); + /* there might be extra {} hierarchies */ + int braces = 0; + while(token.type == '{') { + next_token(); + if(braces == 0) { + warningf(HERE, "extra curly braces around scalar initializer"); + } + braces++; } expression_t *expression = parse_assignment_expression(); - return parse_sub_initializer(type, expression); -} + if(must_be_constant && !is_initializer_constant(expression)) { + errorf(expression->base.source_position, + "Initialisation expression '%E' is not constant\n", + expression); + } -static bool had_initializer_brace_warning; + initializer_t *initializer = initializer_from_expression(type, expression); -static void skip_designator(void) -{ - while(1) { - if(token.type == '.') { - next_token(); - if(token.type == T_IDENTIFIER) - next_token(); - } else if(token.type == '[') { + if(initializer == NULL) { + errorf(expression->base.source_position, + "expression '%E' (type '%T') doesn't match expected type '%T'", + expression, expression->base.type, type); + /* TODO */ + return NULL; + } + + bool additional_warning_displayed = false; + while(braces > 0) { + if(token.type == ',') { next_token(); - parse_constant_expression(); - if(token.type == ']') - next_token(); - } else { - break; } + if(token.type != '}') { + if(!additional_warning_displayed) { + warningf(HERE, "additional elements in scalar initializer"); + additional_warning_displayed = true; + } + } + eat_block(); + braces--; } + + return initializer; } -static initializer_t *parse_sub_initializer(type_t *type, - expression_t *expression) +/** + * An entry in the type path. + */ +typedef struct type_path_entry_t type_path_entry_t; +struct type_path_entry_t { + type_t *type; /**< the upper top type. restored to path->top_tye if this entry is popped. */ + union { + 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; /**< 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 */ +}; + +/** + * Prints a type path for debugging. + */ +static __attribute__((unused)) void debug_print_type_path( + const type_path_t *path) { - if(is_type_scalar(type)) { - /* there might be extra {} hierarchies */ - if(token.type == '{') { - next_token(); - if(!had_initializer_brace_warning) { - warningf(HERE, "braces around scalar initializer"); - had_initializer_brace_warning = true; - } - initializer_t *result = parse_sub_initializer(type, NULL); - if(token.type == ',') { - next_token(); - /* TODO: warn about excessive elements */ + size_t len = ARR_LEN(path->path); + + 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; } - expect_block('}'); - return result; + fprintf(stderr, ".%s", entry->v.compound_entry->symbol->string); + } else if(is_type_array(type)) { + fprintf(stderr, "[%zd]", entry->v.index); + } else { + fprintf(stderr, "-INVALID-"); } + } + 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]; +} + +/** + * 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); + ARR_RESIZE(type_path_entry_t, path->path, len+1); + + type_path_entry_t *result = & path->path[len]; + memset(result, 0, sizeof(result[0])); + 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; + type_t *top_type = skip_typeref(orig_top_type); + + assert(is_type_compound(top_type) || is_type_array(top_type)); + + type_path_entry_t *top = append_to_type_path(path); + top->type = top_type; - if(expression == NULL) { - expression = parse_assignment_expression(); + if(is_type_compound(top_type)) { + declaration_t *declaration = top_type->compound.declaration; + declaration_t *entry = declaration->scope.declarations; + top->v.compound_entry = entry; + + if(entry != NULL) { + path->top_type = entry->type; + } else { + path->top_type = NULL; } - return initializer_from_expression(type, expression); - } + } else { + assert(is_type_array(top_type)); - /* does the expression match the currently looked at object to initialize */ - if(expression != NULL) { - initializer_t *result = initializer_from_expression(type, expression); - if(result != NULL) - return result; + top->v.index = 0; + path->top_type = top_type->array.element_type; } +} - bool read_paren = false; - if(token.type == '{') { - next_token(); - read_paren = true; +/** + * 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); + + path->top_type = top->type; + + size_t len = ARR_LEN(path->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); + + while(len > top_path_level) { + ascend_from_subtype(path); + len = ARR_LEN(path->path); } +} - /* descend into subtype */ - initializer_t *result = NULL; - initializer_t **elems; - if(is_type_array(type)) { - if(token.type == '.') { - errorf(HERE, - "compound designator in initializer for array type '%T'", - type); - skip_designator(); - } +static bool walk_designator(type_path_t *path, const designator_t *designator, + bool used_in_offsetof) +{ + for( ; designator != NULL; designator = designator->next) { + type_path_entry_t *top = get_type_path_top(path); + type_t *orig_type = top->type; - type_t *const element_type = skip_typeref(type->array.element_type); + type_t *type = skip_typeref(orig_type); - initializer_t *sub; - had_initializer_brace_warning = false; + if(designator->symbol != NULL) { + symbol_t *symbol = designator->symbol; + if(!is_type_compound(type)) { + if(is_type_valid(type)) { + errorf(designator->source_position, + "'.%Y' designator used for non-compound type '%T'", + symbol, orig_type); + } + goto failed; + } - if(token.type == '{') { - sub = parse_sub_initializer(element_type, NULL); + declaration_t *declaration = type->compound.declaration; + declaration_t *iter = declaration->scope.declarations; + for( ; iter != NULL; iter = iter->next) { + if(iter->symbol == symbol) { + break; + } + } + if(iter == NULL) { + errorf(designator->source_position, + "'%T' has no member named '%Y'", orig_type, symbol); + goto failed; + } + if(used_in_offsetof) { + type_t *real_type = skip_typeref(iter->type); + if(real_type->kind == TYPE_BITFIELD) { + errorf(designator->source_position, + "offsetof designator '%Y' may not specify bitfield", + symbol); + goto failed; + } + } + + top->type = orig_type; + top->v.compound_entry = iter; + orig_type = iter->type; } else { - if(expression == NULL) { - expression = parse_assignment_expression(); - - /* 6.7.8.14 + 15: we can have an optional {} around the string - * literal */ - if(read_paren && (expression->kind == EXPR_STRING_LITERAL - || expression->kind == EXPR_WIDE_STRING_LITERAL)) { - initializer_t *result - = initializer_from_expression(type, expression); - if(result != NULL) { - expect_block('}'); - return result; + expression_t *array_index = designator->array_index; + assert(designator->array_index != NULL); + + if(!is_type_array(type)) { + if(is_type_valid(type)) { + errorf(designator->source_position, + "[%E] designator used for non-array type '%T'", + array_index, orig_type); + } + goto failed; + } + if(!is_type_valid(array_index->base.type)) { + goto failed; + } + + long index = fold_constant(array_index); + if(!used_in_offsetof) { + if(index < 0) { + errorf(designator->source_position, + "array index [%E] must be positive", array_index); + goto failed; + } + if(type->array.size_constant == true) { + long array_size = type->array.size; + if(index >= array_size) { + errorf(designator->source_position, + "designator [%E] (%d) exceeds array size %d", + array_index, index, array_size); + goto failed; } } } - sub = parse_sub_initializer(element_type, expression); + top->type = orig_type; + top->v.index = (size_t) index; + orig_type = type->array.element_type; } + path->top_type = orig_type; - /* didn't match the subtypes -> try the parent type */ - if(sub == NULL) { - assert(!read_paren); - return NULL; + if(designator->next != NULL) { + descend_into_subtype(path); } + } + return true; - elems = NEW_ARR_F(initializer_t*, 0); - ARR_APP1(initializer_t*, elems, sub); +failed: + return false; +} - while(true) { - if(token.type == '}') - break; - expect_block(','); - if(token.type == '}') - break; +static void advance_current_object(type_path_t *path, size_t top_path_level) +{ + type_path_entry_t *top = get_type_path_top(path); - sub = parse_sub_initializer_elem(element_type); - if(sub == NULL) { - /* TODO error, do nicer cleanup */ - errorf(HERE, "member initializer didn't match"); - DEL_ARR_F(elems); - return NULL; - } - ARR_APP1(initializer_t*, elems, sub); + type_t *type = skip_typeref(top->type); + if(is_type_union(type)) { + /* in unions only the first element is initialized */ + top->v.compound_entry = NULL; + } else if(is_type_struct(type)) { + declaration_t *entry = top->v.compound_entry; + + entry = entry->next; + top->v.compound_entry = entry; + if(entry != NULL) { + path->top_type = entry->type; + return; } } else { - assert(is_type_compound(type)); - scope_t *const scope = &type->compound.declaration->scope; + assert(is_type_array(type)); - if(token.type == '[') { - errorf(HERE, - "array designator in initializer for compound type '%T'", - type); - skip_designator(); + top->v.index++; + + if(!type->array.size_constant || top->v.index < type->array.size) { + return; } + } - declaration_t *first = scope->declarations; - if(first == NULL) - return NULL; - type_t *first_type = first->type; - first_type = skip_typeref(first_type); + /* we're past the last member of the current sub-aggregate, try if we + * can ascend in the type hierarchy and continue with another subobject */ + size_t len = ARR_LEN(path->path); - initializer_t *sub; - had_initializer_brace_warning = false; - if(expression == NULL) { - sub = parse_sub_initializer_elem(first_type); - } else { - sub = parse_sub_initializer(first_type, expression); - } + if(len > top_path_level) { + ascend_from_subtype(path); + advance_current_object(path, top_path_level); + } else { + 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 == '{') + next_token(); - /* didn't match the subtypes -> try our parent type */ - if(sub == NULL) { - assert(!read_paren); - return NULL; + while(token.type != '}') { + if(token.type == T_EOF) + return; + if(token.type == '{') { + eat_block(); + continue; } + next_token(); + } +} - elems = NEW_ARR_F(initializer_t*, 0); - ARR_APP1(initializer_t*, elems, sub); +static initializer_t *create_empty_initializer(void) +{ + static initializer_t empty_initializer + = { .list = { { INITIALIZER_LIST }, 0 } }; + return &empty_initializer; +} - declaration_t *iter = first->next; - for( ; iter != NULL; iter = iter->next) { - if(iter->symbol == NULL) - continue; - if(iter->namespc != NAMESPACE_NORMAL) - continue; +/** + * 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, + parse_initializer_env_t *env) +{ + if(token.type == '}') { + /* empty initializer */ + return create_empty_initializer(); + } - if(token.type == '}') - break; - expect_block(','); - if(token.type == '}') - break; + type_t *orig_type = path->top_type; + type_t *type = NULL; - type_t *iter_type = iter->type; - iter_type = skip_typeref(iter_type); + if (orig_type == NULL) { + /* We are initializing an empty compound. */ + } else { + type = skip_typeref(orig_type); - sub = parse_sub_initializer_elem(iter_type); - if(sub == NULL) { - /* TODO error, do nicer cleanup */ - errorf(HERE, "member initializer didn't match"); - DEL_ARR_F(elems); - return NULL; - } - ARR_APP1(initializer_t*, elems, sub); + /* 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(); } } - int len = ARR_LEN(elems); - size_t elems_size = sizeof(initializer_t*) * len; + initializer_t **initializers = NEW_ARR_F(initializer_t*, 0); - initializer_list_t *init = allocate_ast_zero(sizeof(init[0]) + elems_size); + while(true) { + designator_t *designator = NULL; + if(token.type == '.' || token.type == '[') { + designator = parse_designation(); + + /* reset path to toplevel, evaluate designator from there */ + ascend_to(path, top_path_level); + if(!walk_designator(path, designator, false)) { + /* can't continue after designation error */ + goto end_error; + } - init->initializer.kind = INITIALIZER_LIST; - init->len = len; - memcpy(init->initializers, elems, elems_size); - DEL_ARR_F(elems); + initializer_t *designator_initializer + = allocate_initializer_zero(INITIALIZER_DESIGNATOR); + designator_initializer->designator.designator = designator; + ARR_APP1(initializer_t*, initializers, designator_initializer); + } - result = (initializer_t*) init; + initializer_t *sub; - if(read_paren) { - if(token.type == ',') - next_token(); - expect('}'); - } - return result; -} + if(token.type == '{') { + if(type != NULL && is_type_scalar(type)) { + sub = parse_scalar_initializer(type, env->must_be_constant); + } else { + eat('{'); + 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, + env); + rem_anchor_token('}'); + + 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(); -static initializer_t *parse_initializer(type_t *const orig_type) -{ - initializer_t *result; + if(env->must_be_constant && !is_initializer_constant(expression)) { + errorf(expression->base.source_position, + "Initialisation expression '%E' is not constant\n", + expression); + } - type_t *const type = skip_typeref(orig_type); + if(type == NULL) { + /* we are already outside, ... */ + goto error_excess; + } - if(token.type != '{') { - expression_t *expression = parse_assignment_expression(); - initializer_t *initializer = initializer_from_expression(type, expression); - if(initializer == NULL) { - errorf(HERE, - "initializer expression '%E' of type '%T' is incompatible with type '%T'", - expression, expression->base.type, orig_type); + /* handle { "string" } special case */ + if((expression->kind == EXPR_STRING_LITERAL + || expression->kind == EXPR_WIDE_STRING_LITERAL) + && outer_type != NULL) { + sub = initializer_from_expression(outer_type, expression); + if(sub != NULL) { + if(token.type == ',') { + next_token(); + } + if(token.type != '}') { + warningf(HERE, "excessive elements in initializer for type '%T'", + orig_type); + } + /* TODO: eat , ... */ + return sub; + } + } + + /* descend into subtypes until expression matches type */ + while(true) { + orig_type = path->top_type; + type = skip_typeref(orig_type); + + sub = initializer_from_expression(orig_type, expression); + if(sub != NULL) { + break; + } + if(!is_type_valid(type)) { + goto end_error; + } + if(is_type_scalar(type)) { + errorf(expression->base.source_position, + "expression '%E' doesn't match expected type '%T'", + expression, orig_type); + goto end_error; + } + + descend_into_subtype(path); + } + } + + /* update largest index of top array */ + const type_path_entry_t *first = &path->path[0]; + type_t *first_type = first->type; + first_type = skip_typeref(first_type); + if(is_type_array(first_type)) { + size_t index = first->v.index; + if(index > path->max_index) + path->max_index = index; + } + + 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; + } + expect(','); + if(token.type == '}') { + break; + } + + 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; } - return initializer; } + size_t len = ARR_LEN(initializers); + size_t size = sizeof(initializer_list_t) + len * sizeof(initializers[0]); + initializer_t *result = allocate_ast_zero(size); + result->kind = INITIALIZER_LIST; + result->list.len = len; + memcpy(&result->list.initializers, initializers, + len * sizeof(initializers[0])); + + DEL_ARR_F(initializers); + ascend_to(path, top_path_level); + + return result; + +end_error: + skip_initializers(); + DEL_ARR_F(initializers); + ascend_to(path, top_path_level); + return NULL; +} + +/** + * 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)) { - /* § 6.7.8.11 */ + result = parse_scalar_initializer(type, env->must_be_constant); + } else if(token.type == '{') { eat('{'); - expression_t *expression = parse_assignment_expression(); - result = initializer_from_expression(type, expression); + type_path_t path; + memset(&path, 0, sizeof(path)); + path.top_type = env->type; + path.path = NEW_ARR_F(type_path_entry_t, 0); - if(token.type == ',') - next_token(); + 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); expect('}'); - return result; } else { - result = parse_sub_initializer(type, NULL); + /* 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); + } + + /* § 6.7.5 (22) array initializers for arrays with unknown size determine + * the array type size */ + if(is_type_array(type) && type->array.size_expression == NULL + && result != NULL) { + size_t size; + switch (result->kind) { + case INITIALIZER_LIST: + size = max_index + 1; + break; + + case INITIALIZER_STRING: + size = result->string.string.size; + break; + + case INITIALIZER_WIDE_STRING: + size = result->wide_string.string.size; + break; + + default: + internal_errorf(HERE, "invalid initializer type"); + } + + expression_t *cnst = allocate_expression_zero(EXPR_CONST); + cnst->base.type = type_size_t; + cnst->conste.v.int_value = size; + + type_t *new_type = duplicate_type(type); + + new_type->array.size_expression = cnst; + new_type->array.size_constant = true; + new_type->array.size = size; + env->type = new_type; } return result; +end_error: + return NULL; } static declaration_t *append_declaration(declaration_t *declaration); @@ -1325,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; } @@ -1341,7 +1974,10 @@ static void parse_enum_entries(type_t *const enum_type) if(token.type == '=') { next_token(); - entry->init.enum_value = parse_constant_expression(); + expression_t *value = parse_constant_expression(); + + value = create_implicit_cast(value, enum_type); + entry->init.enum_value = value; /* TODO semantic */ } @@ -1352,8 +1988,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) @@ -1424,6 +2064,7 @@ static type_t *parse_typeof(void) type_t *type; expect('('); + add_anchor_token(')'); expression_t *expression = NULL; @@ -1456,6 +2097,7 @@ restart: break; } + rem_anchor_token(')'); expect(')'); type_t *typeof_type = allocate_type_zero(TYPE_TYPEOF, expression->base.source_position); @@ -1463,6 +2105,8 @@ restart: typeof_type->typeoft.typeof_type = type; return typeof_type; +end_error: + return NULL; } typedef enum { @@ -1477,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; @@ -1511,6 +2160,164 @@ static type_t *get_typedef_type(symbol_t *symbol) 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) { type_t *type = NULL; @@ -1524,13 +2331,13 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) switch(token.type) { /* storage class */ -#define MATCH_STORAGE_CLASS(token, class) \ - case token: \ - if(specifiers->storage_class != STORAGE_CLASS_NONE) { \ +#define MATCH_STORAGE_CLASS(token, class) \ + case token: \ + if(specifiers->declared_storage_class != STORAGE_CLASS_NONE) { \ errorf(HERE, "multiple storage classes in declaration specifiers"); \ - } \ - specifiers->storage_class = class; \ - next_token(); \ + } \ + specifiers->declared_storage_class = class; \ + next_token(); \ break; MATCH_STORAGE_CLASS(T_typedef, STORAGE_CLASS_TYPEDEF) @@ -1539,23 +2346,32 @@ 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->storage_class) { - case STORAGE_CLASS_NONE: - specifiers->storage_class = STORAGE_CLASS_THREAD; - break; + switch (specifiers->declared_storage_class) { + case STORAGE_CLASS_NONE: + specifiers->declared_storage_class = STORAGE_CLASS_THREAD; + break; - case STORAGE_CLASS_EXTERN: - specifiers->storage_class = STORAGE_CLASS_THREAD_EXTERN; - break; + case STORAGE_CLASS_EXTERN: + specifiers->declared_storage_class = STORAGE_CLASS_THREAD_EXTERN; + break; - case STORAGE_CLASS_STATIC: - specifiers->storage_class = STORAGE_CLASS_THREAD_STATIC; - break; + case STORAGE_CLASS_STATIC: + specifiers->declared_storage_class = STORAGE_CLASS_THREAD_STATIC; + break; - default: - errorf(HERE, "multiple storage classes in declaration specifiers"); - break; + default: + errorf(HERE, "multiple storage classes in declaration specifiers"); + break; } next_token(); break; @@ -1570,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 */ @@ -1596,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; @@ -1728,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; @@ -1793,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) { @@ -1800,6 +2673,8 @@ finish_specifiers: } specifiers->type = result; +end_error: + return; } static type_qualifiers_t parse_type_qualifiers(void) @@ -1812,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; @@ -1849,10 +2730,10 @@ static void semantic_parameter(declaration_t *declaration) { /* TODO: improve error messages */ - if(declaration->storage_class == STORAGE_CLASS_TYPEDEF) { + if(declaration->declared_storage_class == STORAGE_CLASS_TYPEDEF) { errorf(HERE, "typedef not allowed in parameter list"); - } else if(declaration->storage_class != STORAGE_CLASS_NONE - && declaration->storage_class != STORAGE_CLASS_REGISTER) { + } else if(declaration->declared_storage_class != STORAGE_CLASS_NONE + && declaration->declared_storage_class != STORAGE_CLASS_REGISTER) { errorf(HERE, "parameter may only have none or register storage class"); } @@ -2005,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])); @@ -2031,14 +2913,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) { @@ -2058,8 +2944,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; } @@ -2101,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: @@ -2159,6 +3049,8 @@ declarator_finished: } return first; +end_error: + return NULL; } static type_t *construct_declarator_type(construct_type_t *construct_list, @@ -2168,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; @@ -2204,11 +3096,27 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, parsed_array_t *parsed_array = (parsed_array_t*) iter; type_t *array_type = allocate_type_zero(TYPE_ARRAY, (source_position_t){NULL, 0}); - array_type->base.qualifiers = parsed_array->type_qualifiers; - array_type->array.element_type = type; - array_type->array.is_static = parsed_array->is_static; - array_type->array.is_variable = parsed_array->is_variable; - array_type->array.size = parsed_array->size; + expression_t *size_expression = parsed_array->size; + if(size_expression != NULL) { + size_expression + = create_implicit_cast(size_expression, type_size_t); + } + + array_type->base.qualifiers = parsed_array->type_qualifiers; + array_type->array.element_type = type; + array_type->array.is_static = parsed_array->is_static; + array_type->array.is_variable = parsed_array->is_variable; + array_type->array.size_expression = size_expression; + + if(size_expression != NULL) { + if(is_constant_expression(size_expression)) { + array_type->array.size_constant = true; + array_type->array.size + = fold_constant(size_expression); + } else { + array_type->array.is_vla = true; + } + } type_t *skipped_type = skip_typeref(type); if (is_type_atomic(skipped_type, ATOMIC_TYPE_VOID)) { @@ -2238,10 +3146,25 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, static declaration_t *parse_declarator( const declaration_specifiers_t *specifiers, bool may_be_abstract) { - declaration_t *const declaration = allocate_declaration_zero(); - declaration->storage_class = specifiers->storage_class; - declaration->modifiers = specifiers->decl_modifiers; - declaration->is_inline = specifiers->is_inline; + 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; + if(declaration->storage_class == STORAGE_CLASS_NONE + && scope != global_scope) { + 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); @@ -2374,8 +3297,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)) { @@ -2433,6 +3361,7 @@ warn_redundant_declaration: } if (new_storage_class == STORAGE_CLASS_NONE) { previous_declaration->storage_class = STORAGE_CLASS_NONE; + previous_declaration->declared_storage_class = STORAGE_CLASS_NONE; } } } else { @@ -2523,47 +3452,30 @@ static void parse_init_declarator_rest(declaration_t *declaration) eat('='); type_t *orig_type = declaration->type; - type_t *type = type = skip_typeref(orig_type); + type_t *type = skip_typeref(orig_type); if(declaration->init.initializer != NULL) { parser_error_multiple_definition(declaration, token.source_position); } - initializer_t *initializer = parse_initializer(type); - - /* § 6.7.5 (22) array initializers for arrays with unknown size determine - * the array type size */ - if(is_type_array(type) && initializer != NULL) { - array_type_t *array_type = &type->array; - - if(array_type->size == NULL) { - expression_t *cnst = allocate_expression_zero(EXPR_CONST); - - cnst->base.type = type_size_t; - - switch (initializer->kind) { - case INITIALIZER_LIST: { - cnst->conste.v.int_value = initializer->list.len; - break; - } - - case INITIALIZER_STRING: { - cnst->conste.v.int_value = initializer->string.string.size; - break; - } + bool must_be_constant = false; + if(declaration->storage_class == STORAGE_CLASS_STATIC + || declaration->storage_class == STORAGE_CLASS_THREAD_STATIC + || declaration->parent_scope == global_scope) { + must_be_constant = true; + } - case INITIALIZER_WIDE_STRING: { - cnst->conste.v.int_value = initializer->wide_string.string.size; - break; - } + parse_initializer_env_t env; + env.type = orig_type; + env.must_be_constant = must_be_constant; + env.declaration = declaration; - default: - panic("invalid initializer type"); - } + initializer_t *initializer = parse_initializer(&env); - array_type->size = cnst; - array_type->has_implicit_size = true; - } + if(env.type != orig_type) { + orig_type = env.type; + type = skip_typeref(orig_type); + declaration->type = env.type; } if(is_type_function(type)) { @@ -2582,14 +3494,16 @@ static void parse_anonymous_declaration_rest( { eat(';'); - declaration_t *const declaration = allocate_declaration_zero(); - declaration->type = specifiers->type; - declaration->storage_class = specifiers->storage_class; - declaration->source_position = specifiers->source_position; + declaration_t *const declaration = allocate_declaration_zero(); + declaration->type = specifiers->type; + declaration->declared_storage_class = specifiers->declared_storage_class; + declaration->source_position = specifiers->source_position; + declaration->modifiers = specifiers->decl_modifiers; - if (declaration->storage_class != STORAGE_CLASS_NONE) { + if (declaration->declared_storage_class != STORAGE_CLASS_NONE) { warningf(declaration->source_position, "useless storage class in empty declaration"); } + declaration->storage_class = STORAGE_CLASS_NONE; type_t *type = declaration->type; switch (type->kind) { @@ -2616,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); @@ -2639,7 +3556,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) @@ -2664,6 +3586,7 @@ static declaration_t *finished_kr_declaration(declaration_t *declaration) if(previous_declaration->type == NULL) { previous_declaration->type = declaration->type; + previous_declaration->declared_storage_class = declaration->declared_storage_class; previous_declaration->storage_class = declaration->storage_class; previous_declaration->parent_scope = scope; return previous_declaration; @@ -2845,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 == ';') { @@ -2853,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); @@ -2867,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; } @@ -3009,12 +3943,13 @@ static void parse_compound_declarators(declaration_t *struct_declaration, type_t *type = make_bitfield_type(base_type, size, source_position); - declaration = allocate_declaration_zero(); - declaration->namespc = NAMESPACE_NORMAL; - declaration->storage_class = STORAGE_CLASS_NONE; - declaration->source_position = source_position; - declaration->modifiers = specifiers->decl_modifiers; - declaration->type = type; + declaration = allocate_declaration_zero(); + declaration->namespc = NAMESPACE_NORMAL; + declaration->declared_storage_class = STORAGE_CLASS_NONE; + declaration->storage_class = STORAGE_CLASS_NONE; + declaration->source_position = source_position; + declaration->modifiers = specifiers->decl_modifiers; + declaration->type = type; } else { declaration = parse_declarator(specifiers,/*may_be_abstract=*/true); @@ -3074,12 +4009,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; @@ -3088,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"); } @@ -3099,7 +4040,7 @@ static type_t *parse_typename(void) declaration_specifiers_t specifiers; memset(&specifiers, 0, sizeof(specifiers)); parse_declaration_specifiers(&specifiers); - if(specifiers.storage_class != STORAGE_CLASS_NONE) { + if(specifiers.declared_storage_class != STORAGE_CLASS_NONE) { /* TODO: improve error message, user does probably not know what a * storage class is... */ @@ -3167,6 +4108,9 @@ static expression_t *parse_string_const(void) } if (token.type != T_WIDE_STRING_LITERAL) { expression_t *const cnst = allocate_expression_zero(EXPR_STRING_LITERAL); + /* note: that we use type_char_ptr here, which is already the + * automatic converted type. revert_automatic_type_conversion + * will construct the array type */ cnst->base.type = type_char_ptr; cnst->string.value = res; return cnst; @@ -3217,15 +4161,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); + + cnst->base.source_position = HERE; + cnst->base.type = token.datatype; + cnst->conste.v.wide_character = token.v.wide_string; - if (cnst->conste.v.chars.size != 1) { + if (cnst->conste.v.wide_character.size != 1) { if (warning.multichar && (c_mode & _GNUC)) { /* TODO */ warningf(HERE, "multi-character character constant"); @@ -3264,12 +4232,13 @@ static declaration_t *create_implicit_function(symbol_t *symbol, free_type(ntype); } - declaration_t *const declaration = allocate_declaration_zero(); - declaration->storage_class = STORAGE_CLASS_EXTERN; - declaration->type = type; - declaration->symbol = symbol; - declaration->source_position = source_position; - declaration->parent_scope = global_scope; + declaration_t *const declaration = allocate_declaration_zero(); + declaration->storage_class = STORAGE_CLASS_EXTERN; + declaration->declared_storage_class = STORAGE_CLASS_EXTERN; + declaration->type = type; + declaration->symbol = symbol; + declaration->source_position = source_position; + declaration->parent_scope = global_scope; scope_t *old_scope = scope; set_scope(global_scope); @@ -3330,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"); } } @@ -3386,6 +4355,19 @@ type_t *revert_automatic_type_conversion(const expression_t *expression) return type_left->pointer.points_to; } + case EXPR_STRING_LITERAL: { + size_t size = expression->string.value.size; + return make_array_type(type_char, size, TYPE_QUALIFIER_NONE); + } + + case EXPR_WIDE_STRING_LITERAL: { + size_t size = expression->wide_string.value.size; + return make_array_type(type_wchar_t, size, TYPE_QUALIFIER_NONE); + } + + case EXPR_COMPOUND_LITERAL: + return expression->compound_literal.type; + default: break; } @@ -3432,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; } @@ -3442,15 +4440,44 @@ static void check_cast_allowed(expression_t *expression, type_t *dest_type) /* TODO check if explicit cast is allowed and issue warnings/errors */ } -static expression_t *parse_cast(void) +static expression_t *parse_compound_literal(type_t *type) { - expression_t *cast = allocate_expression_zero(EXPR_UNARY_CAST); + expression_t *expression = allocate_expression_zero(EXPR_COMPOUND_LITERAL); + + parse_initializer_env_t env; + env.type = type; + env.declaration = NULL; + env.must_be_constant = false; + initializer_t *initializer = parse_initializer(&env); + type = env.type; - cast->base.source_position = token.source_position; + expression->compound_literal.initializer = initializer; + expression->compound_literal.type = type; + 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 == '{') { + return parse_compound_literal(type); + } + + expression_t *cast = allocate_expression_zero(EXPR_UNARY_CAST); + cast->base.source_position = source_position; + expression_t *value = parse_sub_expression(20); check_cast_allowed(value, type); @@ -3459,8 +4486,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); @@ -3487,11 +4519,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 '{': @@ -3508,9 +4546,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) @@ -3522,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; } @@ -3531,26 +4573,56 @@ 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; } static designator_t *parse_designator(void) { - designator_t *result = allocate_ast_zero(sizeof(result[0])); + designator_t *result = allocate_ast_zero(sizeof(result[0])); + result->source_position = HERE; if(token.type != T_IDENTIFIER) { parse_error_expected("while parsing member designator", T_IDENTIFIER, 0); - eat_paren(); return NULL; } result->symbol = token.v.symbol; @@ -3563,11 +4635,11 @@ 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])); - designator->symbol = token.v.symbol; + designator_t *designator = allocate_ast_zero(sizeof(result[0])); + designator->source_position = HERE; + designator->symbol = token.v.symbol; next_token(); last_designator->next = designator; @@ -3576,13 +4648,15 @@ static designator_t *parse_designator(void) } if(token.type == '[') { next_token(); - designator_t *designator = allocate_ast_zero(sizeof(result[0])); - designator->array_access = parse_expression(); - if(designator->array_access == NULL) { - eat_paren(); + 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) { return NULL; } - expect(']'); last_designator->next = designator; last_designator = designator; @@ -3592,8 +4666,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); @@ -3602,14 +4681,39 @@ static expression_t *parse_offsetof(void) expression->base.type = type_size_t; expect('('); - expression->offsetofe.type = parse_typename(); + add_anchor_token(','); + type_t *type = parse_typename(); + rem_anchor_token(','); expect(','); - expression->offsetofe.designator = parse_designator(); + add_anchor_token(')'); + designator_t *designator = parse_designator(); + rem_anchor_token(')'); expect(')'); + expression->offsetofe.type = type; + expression->offsetofe.designator = designator; + + type_path_t path; + memset(&path, 0, sizeof(path)); + path.top_type = type; + path.path = NEW_ARR_F(type_path_entry_t, 0); + + descend_into_subtype(&path); + + if(!walk_designator(&path, designator, true)) { + return create_invalid_expression(); + } + + 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); @@ -3617,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) { @@ -3632,10 +4738,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); @@ -3649,6 +4758,8 @@ static expression_t *parse_va_arg(void) expect(')'); return expression; +end_error: + return create_invalid_expression(); } static expression_t *parse_builtin_symbol(void) @@ -3667,6 +4778,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); @@ -3674,13 +4788,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); @@ -3688,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(); @@ -3697,12 +4819,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; @@ -3727,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; @@ -3754,8 +4882,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); @@ -3772,27 +4905,79 @@ 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(); +} + +/** + * 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. + */ 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(); @@ -3800,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(); @@ -3817,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", &token); - eat_statement(); - + errorf(HERE, "unexpected token %K, expected an expression", &token); return create_invalid_expression(); } @@ -3848,6 +5034,7 @@ static expression_t *parse_array_expression(unsigned precedence, (void) precedence; eat('['); + add_anchor_token(']'); expression_t *inside = parse_expression(); @@ -3883,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; @@ -3902,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); @@ -3913,6 +5103,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) @@ -4014,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; @@ -4037,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; @@ -4057,6 +5252,8 @@ static expression_t *parse_call_expression(unsigned precedence, next_token(); } } + rem_anchor_token(','); + rem_anchor_token(')'); expect(')'); if(function_type != NULL) { @@ -4109,6 +5306,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); @@ -4130,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); @@ -4145,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); @@ -4155,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); @@ -4164,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 */ @@ -4197,6 +5425,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(); } /** @@ -4212,6 +5442,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); @@ -4220,11 +5453,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) @@ -4720,16 +5957,31 @@ 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; + /* 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; 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) @@ -4740,20 +5992,23 @@ 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; 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; @@ -4761,6 +6016,7 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_VA_START: return true; case EXPR_VA_ARG: return true; case EXPR_STATEMENT: return true; // TODO + case EXPR_COMPOUND_LITERAL: return false; case EXPR_UNARY_NEGATE: return false; case EXPR_UNARY_PLUS: return false; @@ -4772,10 +6028,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; @@ -4807,8 +6067,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); @@ -4821,7 +6087,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) @@ -5110,6 +6376,8 @@ static asm_constraint_t *parse_asm_constraints(void) } return result; +end_error: + return NULL; } /** @@ -5157,28 +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 create_invalid_statement(); } /** @@ -5223,6 +6503,8 @@ static statement_t *parse_case_statement(void) statement->case_label.statement = parse_statement(); return statement; +end_error: + return create_invalid_statement(); } /** @@ -5273,6 +6555,8 @@ static statement_t *parse_default_statement(void) statement->case_label.statement = parse_statement(); return statement; +end_error: + return create_invalid_statement(); } /** @@ -5329,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(); @@ -5364,16 +6655,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(); } /** @@ -5410,6 +6708,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) @@ -5434,12 +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 create_invalid_statement(); } /** @@ -5453,15 +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 create_invalid_statement(); } /** @@ -5474,12 +6784,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); @@ -5487,7 +6798,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(';'); } @@ -5503,9 +6815,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); @@ -5514,6 +6828,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(); } /** @@ -5549,6 +6871,8 @@ static statement_t *parse_goto(void) expect(';'); return statement; +end_error: + return create_invalid_statement(); } /** @@ -5570,6 +6894,8 @@ static statement_t *parse_continue(void) expect(';'); return statement; +end_error: + return create_invalid_statement(); } /** @@ -5591,6 +6917,8 @@ static statement_t *parse_break(void) expect(';'); return statement; +end_error: + return create_invalid_statement(); } /** @@ -5598,7 +6926,6 @@ static statement_t *parse_break(void) */ static bool is_local_var_declaration(const declaration_t *declaration) { switch ((storage_class_tag_t) declaration->storage_class) { - case STORAGE_CLASS_NONE: case STORAGE_CLASS_AUTO: case STORAGE_CLASS_REGISTER: { const type_t *type = skip_typeref(declaration->type); @@ -5617,25 +6944,11 @@ static bool is_local_var_declaration(const declaration_t *declaration) { * Check if a given declaration represents a variable. */ static bool is_var_declaration(const declaration_t *declaration) { - switch ((storage_class_tag_t) declaration->storage_class) { - case STORAGE_CLASS_NONE: - case STORAGE_CLASS_EXTERN: - case STORAGE_CLASS_STATIC: - case STORAGE_CLASS_AUTO: - case STORAGE_CLASS_REGISTER: - case STORAGE_CLASS_THREAD: - case STORAGE_CLASS_THREAD_EXTERN: - case STORAGE_CLASS_THREAD_STATIC: { - const type_t *type = skip_typeref(declaration->type); - if(is_type_function(type)) { - return false; - } else { - return true; - } - } - default: + if(declaration->storage_class == STORAGE_CLASS_TYPEDEF) return false; - } + + const type_t *type = skip_typeref(declaration->type); + return !is_type_function(type); } /** @@ -5721,6 +7034,8 @@ static statement_t *parse_return(void) statement->returns.value = return_value; return statement; +end_error: + return create_invalid_statement(); } /** @@ -5763,6 +7078,8 @@ static statement_t *parse_expression_statement(void) expect(';'); return statement; +end_error: + return create_invalid_statement(); } /** @@ -5773,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(); @@ -5827,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: @@ -5865,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; } @@ -5882,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; @@ -5891,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; @@ -5913,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); @@ -6032,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; } @@ -6043,6 +7366,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);