X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=84891eb0e0370b252668f82868f4ef746f3d011f;hb=2fe4650c6929d9d1f4159cb8227994204bf2edbd;hp=cd0abf2bd30b66b4f7edf7c859db170a0b3b6f13;hpb=54306dd35ee80ee878aa7bd2b1c16d135059c3d1;p=cparser diff --git a/parser.c b/parser.c index cd0abf2..84891eb 100644 --- a/parser.c +++ b/parser.c @@ -48,15 +48,44 @@ typedef struct { unsigned short namespc; } stack_entry_t; +typedef struct gnu_attribute_t gnu_attribute_t; +struct gnu_attribute_t { + gnu_attribute_kind_t kind; + gnu_attribute_t *next; + bool invalid; + bool have_arguments; + union { + size_t value; + string_t string; + } u; +}; + typedef struct declaration_specifiers_t declaration_specifiers_t; struct declaration_specifiers_t { source_position_t source_position; unsigned char declared_storage_class; - bool is_inline; - decl_modifiers_t decl_modifiers; + unsigned char alignment; /**< Alignment, 0 if not set. */ + unsigned int is_inline : 1; + unsigned int deprecated : 1; + decl_modifiers_t decl_modifiers; /**< MS __declspec extended modifier mask */ + gnu_attribute_t *gnu_attributes; /**< list of GNU attributes */ + 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; @@ -70,18 +99,44 @@ static declaration_t *last_declaration = NULL; static declaration_t *current_function = NULL; static switch_statement_t *current_switch = NULL; static statement_t *current_loop = NULL; +static ms_try_statement_t *current_try = NULL; 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 source_position_t null_position = { NULL, 0 }; + +/* 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 +#define HERE &token.source_position static type_t *type_valist; -static statement_t *parse_compound_statement(void); +static statement_t *parse_compound_statement(bool inside_expression_statement); static statement_t *parse_statement(void); static expression_t *parse_sub_expression(unsigned precedence); @@ -107,7 +162,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 \ @@ -135,6 +190,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 @@ -161,7 +217,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; } @@ -173,6 +230,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,26 +246,15 @@ static size_t get_statement_struct_size(statement_kind_t kind) [STATEMENT_WHILE] = sizeof(while_statement_t), [STATEMENT_DO_WHILE] = sizeof(do_while_statement_t), [STATEMENT_FOR] = sizeof(for_statement_t), - [STATEMENT_ASM] = sizeof(asm_statement_t) + [STATEMENT_ASM] = sizeof(asm_statement_t), + [STATEMENT_MS_TRY] = sizeof(ms_try_statement_t), + [STATEMENT_LEAVE] = sizeof(leave_statement_t) }; assert(kind <= sizeof(sizes) / sizeof(sizes[0])); assert(sizes[kind] != 0); return sizes[kind]; } -/** - * Allocate a statement node of given kind and initialize all - * fields with zero. - */ -static statement_t *allocate_statement_zero(statement_kind_t kind) -{ - size_t size = get_statement_struct_size(kind); - statement_t *res = allocate_ast_zero(size); - - res->base.kind = kind; - return res; -} - /** * Returns the size of an expression node. * @@ -221,7 +269,7 @@ static size_t get_expression_struct_size(expression_kind_t kind) [EXPR_CHARACTER_CONSTANT] = sizeof(const_expression_t), [EXPR_WIDE_CHARACTER_CONSTANT] = sizeof(const_expression_t), [EXPR_STRING_LITERAL] = sizeof(string_literal_expression_t), - [EXPR_WIDE_STRING_LITERAL] = sizeof(wide_string_literal_expression_t), + [EXPR_WIDE_STRING_LITERAL] = sizeof(wide_string_literal_expression_t), [EXPR_COMPOUND_LITERAL] = sizeof(compound_literal_expression_t), [EXPR_CALL] = sizeof(call_expression_t), [EXPR_UNARY_FIRST] = sizeof(unary_expression_t), @@ -232,8 +280,7 @@ static size_t get_expression_struct_size(expression_kind_t kind) [EXPR_SIZEOF] = sizeof(typeprop_expression_t), [EXPR_ALIGNOF] = sizeof(typeprop_expression_t), [EXPR_CLASSIFY_TYPE] = sizeof(classify_type_expression_t), - [EXPR_FUNCTION] = sizeof(string_literal_expression_t), - [EXPR_PRETTY_FUNCTION] = sizeof(string_literal_expression_t), + [EXPR_FUNCNAME] = sizeof(funcname_expression_t), [EXPR_BUILTIN_SYMBOL] = sizeof(builtin_symbol_expression_t), [EXPR_BUILTIN_CONSTANT_P] = sizeof(builtin_constant_expression_t), [EXPR_BUILTIN_PREFETCH] = sizeof(builtin_prefetch_expression_t), @@ -253,6 +300,19 @@ static size_t get_expression_struct_size(expression_kind_t kind) return sizes[kind]; } +/** + * Allocate a statement node of given kind and initialize all + * fields with zero. + */ +static statement_t *allocate_statement_zero(statement_kind_t kind) +{ + size_t size = get_statement_struct_size(kind); + statement_t *res = allocate_ast_zero(size); + + res->base.kind = kind; + return res; +} + /** * Allocate an expression node of given kind and initialize all * fields with zero. @@ -267,6 +327,36 @@ static expression_t *allocate_expression_zero(expression_kind_t kind) return res; } +/** + * Creates a new invalid expression. + */ +static expression_t *create_invalid_expression(void) +{ + expression_t *expression = allocate_expression_zero(EXPR_INVALID); + expression->base.source_position = token.source_position; + return expression; +} + +/** + * 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 a type node. * @@ -276,6 +366,8 @@ static size_t get_type_struct_size(type_kind_t kind) { static const size_t sizes[] = { [TYPE_ATOMIC] = sizeof(atomic_type_t), + [TYPE_COMPLEX] = sizeof(complex_type_t), + [TYPE_IMAGINARY] = sizeof(imaginary_type_t), [TYPE_BITFIELD] = sizeof(bitfield_type_t), [TYPE_COMPOUND_STRUCT] = sizeof(compound_type_t), [TYPE_COMPOUND_UNION] = sizeof(compound_type_t), @@ -297,14 +389,14 @@ static size_t get_type_struct_size(type_kind_t kind) * Allocate a type node of given kind and initialize all * fields with zero. */ -static type_t *allocate_type_zero(type_kind_t kind, source_position_t source_position) +static type_t *allocate_type_zero(type_kind_t kind, const source_position_t *source_position) { size_t size = get_type_struct_size(kind); type_t *res = obstack_alloc(type_obst, size); memset(res, 0, size); res->base.kind = kind; - res->base.source_position = source_position; + res->base.source_position = *source_position; return res; } @@ -363,7 +455,6 @@ static size_t label_top(void) return ARR_LEN(label_stack); } - /** * Return the next token. */ @@ -391,107 +482,138 @@ static inline const token_t *look_ahead(int num) return &lookahead_buffer[pos]; } -#define eat(token_type) do { assert(token.type == token_type); next_token(); } while(0) - /** - * Report a parse error because an expected token was not found. + * Adds a token to the token anchor set (a multi-set). */ -static void parse_error_expected(const char *message, ...) -{ - if(message != NULL) { - errorf(HERE, "%s", message); - } - va_list ap; - va_start(ap, message); - errorf(HERE, "got %K, expected %#k", &token, &ap, ", "); - va_end(ap); +static void add_anchor_token(int token_type) { + assert(0 <= token_type && token_type < T_LAST_TOKEN); + ++token_anchor_set[token_type]; } /** - * Report a type error. + * Remove a token from the token anchor set (a multi-set). */ -static void type_error(const char *msg, const source_position_t source_position, - type_t *type) -{ - errorf(source_position, "%s, but found type '%T'", msg, type); +static void rem_anchor_token(int token_type) { + assert(0 <= token_type && token_type < T_LAST_TOKEN); + --token_anchor_set[token_type]; } -/** - * Report an incompatible type. - */ -static void type_error_incompatible(const char *msg, - const source_position_t source_position, type_t *type1, type_t *type2) -{ - errorf(source_position, "%s, incompatible types: '%T' - '%T'", msg, type1, type2); +static bool at_anchor(void) { + if(token.type < 0) + return false; + return token_anchor_set[token.type]; } /** - * Eat an complete block, ie. '{ ... }'. + * Eat tokens until a matching token is found. */ -static void eat_block(void) -{ - if(token.type == '{') - next_token(); +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)) { - while(token.type != '}') { - if(token.type == T_EOF) - return; - if(token.type == '{') { - eat_block(); - continue; + 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('}'); } /** - * Eat a statement until an ';' token. + * Eat input tokens until an anchor is found. */ -static void eat_statement(void) -{ - while(token.type != ';') { +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) - return; - if(token.type == '}') - return; - if(token.type == '{') { - eat_block(); - continue; - } + break; next_token(); } - eat(';'); +} + +static void eat_block(void) { + eat_until_matching_token('{'); + if(token.type == '}') + next_token(); } /** - * Eat a parenthesed term, ie. '( ... )'. + * eat all token until a ';' is reached or a stop token is found. */ -static void eat_paren(void) -{ - if(token.type == '(') +static void eat_statement(void) { + eat_until_matching_token(';'); + if(token.type == ';') next_token(); +} - while(token.type != ')') { - if(token.type == T_EOF) - return; - if(token.type == ')' || token.type == ';' || token.type == '}') { - return; - } - if(token.type == ')') { - next_token(); - return; - } - if(token.type == '(') { - eat_paren(); - continue; - } - if(token.type == '{') { - eat_block(); - continue; - } - next_token(); +#define eat(token_type) do { assert(token.type == token_type); next_token(); } while(0) + +/** + * Report a parse error because an expected token was not found. + */ +static +#if defined __GNUC__ && __GNUC__ >= 4 +__attribute__((sentinel)) +#endif +void parse_error_expected(const char *message, ...) +{ + if(message != NULL) { + errorf(HERE, "%s", message); } + va_list ap; + va_start(ap, message); + errorf(HERE, "got %K, expected %#k", &token, &ap, ", "); + va_end(ap); +} + +/** + * Report a type error. + */ +static void type_error(const char *msg, const source_position_t *source_position, + type_t *type) +{ + errorf(source_position, "%s, but found type '%T'", msg, type); +} + +/** + * Report an incompatible type. + */ +static void type_error_incompatible(const char *msg, + const source_position_t *source_position, type_t *type1, type_t *type2) +{ + errorf(source_position, "%s, incompatible types: '%T' - '%T'", + msg, type1, type2); } /** @@ -499,36 +621,18 @@ static void eat_paren(void) * If not, generate an error, eat the current statement, * and goto the end_error label. */ -#define expect(expected) \ - do { \ - if(UNLIKELY(token.type != (expected))) { \ - parse_error_expected(NULL, (expected), 0); \ - eat_statement(); \ - goto end_error; \ - } \ - next_token(); \ - } while(0) - -#define expect_block(expected) \ - do { \ - if(UNLIKELY(token.type != (expected))) { \ - parse_error_expected(NULL, (expected), 0); \ - eat_block(); \ - return NULL; \ - } \ - next_token(); \ +#define expect(expected) \ + do { \ + if(UNLIKELY(token.type != (expected))) { \ + parse_error_expected(NULL, (expected), NULL); \ + add_anchor_token(expected); \ + eat_until_anchor(); \ + rem_anchor_token(expected); \ + goto end_error; \ + } \ + next_token(); \ } while(0) -#define expect_void(expected) \ - do { \ - if(UNLIKELY(token.type != (expected))) { \ - parse_error_expected(NULL, (expected), 0); \ - eat_statement(); \ - return; \ - } \ - next_token(); \ - } while(0) - static void set_scope(scope_t *new_scope) { if(scope != NULL) { @@ -673,7 +777,7 @@ static void label_pop_to(size_t new_top) static int get_rank(const type_t *type) { assert(!is_typeref(type)); - /* The C-standard allows promoting to int or unsigned int (see § 7.2.2 + /* The C-standard allows promoting enums to int or unsigned int (see § 7.2.2 * and esp. footnote 108). However we can't fold constants (yet), so we * can't decide whether unsigned int is possible, while int always works. * (unsigned int would be preferable when possible... for stuff like @@ -688,7 +792,7 @@ static int get_rank(const type_t *type) static type_t *promote_integer(type_t *type) { if(type->kind == TYPE_BITFIELD) - type = type->bitfield.base; + type = type->bitfield.base_type; if(get_rank(type) < ATOMIC_TYPE_INT) type = type_int; @@ -756,55 +860,68 @@ static expression_t *create_implicit_cast(expression_t *expression, /** Implements the rules from § 6.5.16.1 */ static type_t *semantic_assign(type_t *orig_type_left, const expression_t *const right, - const char *context) + const char *context, + const source_position_t *source_position) { type_t *const orig_type_right = right->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); - if ((is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) || - (is_type_pointer(type_left) && is_null_pointer_constant(right)) || - (is_type_atomic(type_left, ATOMIC_TYPE_BOOL) - && is_type_pointer(type_right))) { - return orig_type_left; - } + if(is_type_pointer(type_left)) { + if(is_null_pointer_constant(right)) { + return orig_type_left; + } else if(is_type_pointer(type_right)) { + type_t *points_to_left + = skip_typeref(type_left->pointer.points_to); + type_t *points_to_right + = skip_typeref(type_right->pointer.points_to); + + /* the left type has all qualifiers from the right type */ + unsigned missing_qualifiers + = points_to_right->base.qualifiers & ~points_to_left->base.qualifiers; + if(missing_qualifiers != 0) { + errorf(source_position, + "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointed-to type", type_left, context, type_right, missing_qualifiers); + return orig_type_left; + } - if (is_type_pointer(type_left) && is_type_pointer(type_right)) { - type_t *points_to_left = skip_typeref(type_left->pointer.points_to); - type_t *points_to_right = skip_typeref(type_right->pointer.points_to); + points_to_left = get_unqualified_type(points_to_left); + points_to_right = get_unqualified_type(points_to_right); - /* the left type has all qualifiers from the right type */ - unsigned missing_qualifiers - = points_to_right->base.qualifiers & ~points_to_left->base.qualifiers; - if(missing_qualifiers != 0) { - errorf(HERE, "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointed-to type", type_left, context, type_right, missing_qualifiers); - return orig_type_left; - } + if (is_type_atomic(points_to_left, ATOMIC_TYPE_VOID) || + is_type_atomic(points_to_right, ATOMIC_TYPE_VOID)) { + return orig_type_left; + } - points_to_left = get_unqualified_type(points_to_left); - points_to_right = get_unqualified_type(points_to_right); + if (!types_compatible(points_to_left, points_to_right)) { + warningf(source_position, + "destination type '%T' in %s is incompatible with '%E' of type '%T'", + orig_type_left, context, right, orig_type_right); + } - if (is_type_atomic(points_to_left, ATOMIC_TYPE_VOID) || - is_type_atomic(points_to_right, ATOMIC_TYPE_VOID)) { + return orig_type_left; + } else if(is_type_integer(type_right)) { + warningf(source_position, + "%s makes pointer '%T' from integer '%T' without a cast", + context, orig_type_left, orig_type_right); return orig_type_left; } - - if (!types_compatible(points_to_left, points_to_right)) { - warningf(right->base.source_position, - "destination type '%T' in %s is incompatible with '%E' of type '%T'", - orig_type_left, context, right, orig_type_right); - } - + } else if ((is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) || + (is_type_atomic(type_left, ATOMIC_TYPE_BOOL) + && is_type_pointer(type_right))) { return orig_type_left; - } - - if ((is_type_compound(type_left) && is_type_compound(type_right)) + } else 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)) { return orig_type_left; } + } else if (is_type_integer(type_left) && is_type_pointer(type_right)) { + warningf(source_position, + "%s makes integer '%T' from pointer '%T' without a cast", + context, orig_type_left, orig_type_right); + return orig_type_left; } if (!is_type_valid(type_left)) @@ -822,7 +939,8 @@ static expression_t *parse_constant_expression(void) expression_t *result = parse_sub_expression(7); if(!is_constant_expression(result)) { - errorf(result->base.source_position, "expression '%E' is not constant\n", result); + errorf(&result->base.source_position, + "expression '%E' is not constant\n", result); } return result; @@ -848,7 +966,7 @@ static type_t *make_global_typedef(const char *name, type_t *type) record_declaration(declaration); - type_t *typedef_type = allocate_type_zero(TYPE_TYPEDEF, builtin_source_position); + type_t *typedef_type = allocate_type_zero(TYPE_TYPEDEF, &builtin_source_position); typedef_type->typedeft.declaration = declaration; return typedef_type; @@ -869,46 +987,615 @@ static string_t parse_string_literals(void) return result; } -static void parse_attributes(void) +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", + [GNU_AK_CONSTRUCTOR] = "constructor", + [GNU_AK_DESTRUCTOR] = "destructor", + [GNU_AK_NOTHROW] = "nothrow", + [GNU_AK_TRANSPARENT_UNION] = "transparent_union", + [GNU_AK_COMMON] = "coommon", + [GNU_AK_NOCOMMON] = "nocommon", + [GNU_AK_PACKED] = "packed", + [GNU_AK_SHARED] = "shared", + [GNU_AK_NOTSHARED] = "notshared", + [GNU_AK_USED] = "used", + [GNU_AK_UNUSED] = "unused", + [GNU_AK_NO_INSTRUMENT_FUNCTION] = "no_instrument_function", + [GNU_AK_WARN_UNUSED_RESULT] = "warn_unused_result", + [GNU_AK_LONGCALL] = "longcall", + [GNU_AK_SHORTCALL] = "shortcall", + [GNU_AK_LONG_CALL] = "long_call", + [GNU_AK_SHORT_CALL] = "short_call", + [GNU_AK_FUNCTION_VECTOR] = "function_vector", + [GNU_AK_INTERRUPT] = "interrupt", + [GNU_AK_INTERRUPT_HANDLER] = "interrupt_handler", + [GNU_AK_NMI_HANDLER] = "nmi_handler", + [GNU_AK_NESTING] = "nesting", + [GNU_AK_NEAR] = "near", + [GNU_AK_FAR] = "far", + [GNU_AK_SIGNAL] = "signal", + [GNU_AK_EIGTHBIT_DATA] = "eightbit_data", + [GNU_AK_TINY_DATA] = "tiny_data", + [GNU_AK_SAVEALL] = "saveall", + [GNU_AK_FLATTEN] = "flatten", + [GNU_AK_SSEREGPARM] = "sseregparm", + [GNU_AK_EXTERNALLY_VISIBLE] = "externally_visible", + [GNU_AK_RETURN_TWICE] = "return_twice", + [GNU_AK_MAY_ALIAS] = "may_alias", + [GNU_AK_MS_STRUCT] = "ms_struct", + [GNU_AK_GCC_STRUCT] = "gcc_struct", + [GNU_AK_DLLIMPORT] = "dllimport", + [GNU_AK_DLLEXPORT] = "dllexport", + [GNU_AK_ALIGNED] = "aligned", + [GNU_AK_ALIAS] = "alias", + [GNU_AK_SECTION] = "section", + [GNU_AK_FORMAT] = "format", + [GNU_AK_FORMAT_ARG] = "format_arg", + [GNU_AK_WEAKREF] = "weakref", + [GNU_AK_NONNULL] = "nonnull", + [GNU_AK_TLS_MODEL] = "tls_model", + [GNU_AK_VISIBILITY] = "visibility", + [GNU_AK_REGPARM] = "regparm", + [GNU_AK_MODEL] = "model", + [GNU_AK_TRAP_EXIT] = "trap_exit", + [GNU_AK_SP_SWITCH] = "sp_switch", + [GNU_AK_SENTINEL] = "sentinel" +}; + +/** + * 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); +} + +/** + * Allocate a new gnu temporal attribute. + */ +static gnu_attribute_t *allocate_gnu_attribute(gnu_attribute_kind_t kind) { + gnu_attribute_t *attribute = obstack_alloc(&temp_obst, sizeof(*attribute)); + attribute->kind = kind; + attribute->next = NULL; + attribute->invalid = false; + attribute->have_arguments = false; + + return attribute; + return attribute; +} + +/** + * parse one constant expression argument. + */ +static void parse_gnu_attribute_const_arg(gnu_attribute_t *attribute) { + expression_t *expression; + add_anchor_token(')'); + expression = parse_constant_expression(); + rem_anchor_token(')'); + expect(')'); + (void)expression; + return; +end_error: + attribute->invalid = true; +} + +/** + * parse a list of constant expressions arguments. + */ +static void parse_gnu_attribute_const_arg_list(gnu_attribute_t *attribute) { + expression_t *expression; + add_anchor_token(')'); + add_anchor_token(','); + while(true){ + expression = parse_constant_expression(); + if(token.type != ',') + break; + next_token(); + } + rem_anchor_token(','); + rem_anchor_token(')'); + expect(')'); + (void)expression; + return; +end_error: + attribute->invalid = true; +} + +/** + * parse one string literal argument. + */ +static void parse_gnu_attribute_string_arg(gnu_attribute_t *attribute, + string_t *string) { - while(true) { - switch(token.type) { - case T___attribute__: { + add_anchor_token('('); + if(token.type != T_STRING_LITERAL) { + parse_error_expected("while parsing attribute directive", + T_STRING_LITERAL, NULL); + goto end_error; + } + *string = parse_string_literals(); + rem_anchor_token('('); + expect(')'); + return; +end_error: + attribute->invalid = true; +} + +/** + * parse one tls model. + */ +static void parse_gnu_attribute_tls_model_arg(gnu_attribute_t *attribute) { + static const char *tls_models[] = { + "global-dynamic", + "local-dynamic", + "initial-exec", + "local-exec" + }; + string_t string = { NULL, 0 }; + parse_gnu_attribute_string_arg(attribute, &string); + if(string.begin != NULL) { + for(size_t i = 0; i < 4; ++i) { + if(strcmp(tls_models[i], string.begin) == 0) { + attribute->u.value = i; + return; + } + } + } + errorf(HERE, "'%s' is an unrecognized tls model", string.begin); + attribute->invalid = true; +} + +/** + * parse one tls model. + */ +static void parse_gnu_attribute_visibility_arg(gnu_attribute_t *attribute) { + static const char *visibilities[] = { + "default", + "protected", + "hidden", + "internal" + }; + string_t string = { NULL, 0 }; + parse_gnu_attribute_string_arg(attribute, &string); + if(string.begin != NULL) { + for(size_t i = 0; i < 4; ++i) { + if(strcmp(visibilities[i], string.begin) == 0) { + attribute->u.value = i; + return; + } + } + } + errorf(HERE, "'%s' is an unrecognized visibility", string.begin); + attribute->invalid = true; +} + +/** + * parse one (code) model. + */ +static void parse_gnu_attribute_model_arg(gnu_attribute_t *attribute) { + static const char *visibilities[] = { + "small", + "medium", + "large" + }; + string_t string = { NULL, 0 }; + parse_gnu_attribute_string_arg(attribute, &string); + if(string.begin != NULL) { + for(int i = 0; i < 3; ++i) { + if(strcmp(visibilities[i], string.begin) == 0) { + attribute->u.value = i; + return; + } + } + } + errorf(HERE, "'%s' is an unrecognized model", string.begin); + attribute->invalid = true; +} + +/** + * parse one interrupt argument. + */ +static void parse_gnu_attribute_interrupt_arg(gnu_attribute_t *attribute) { + static const char *interrupts[] = { + "IRQ", + "FIQ", + "SWI", + "ABORT", + "UNDEF" + }; + string_t string = { NULL, 0 }; + parse_gnu_attribute_string_arg(attribute, &string); + if(string.begin != NULL) { + for(size_t i = 0; i < 5; ++i) { + if(strcmp(interrupts[i], string.begin) == 0) { + attribute->u.value = i; + return; + } + } + } + errorf(HERE, "'%s' is an interrupt", string.begin); + attribute->invalid = true; +} + +/** + * parse ( identifier, const expression, const expression ) + */ +static void parse_gnu_attribute_format_args(gnu_attribute_t *attribute) { + static const char *format_names[] = { + "printf", + "scanf", + "strftime", + "strfmon" + }; + int i; + + if(token.type != T_IDENTIFIER) { + parse_error_expected("while parsing format attribute directive", T_IDENTIFIER, NULL); + goto end_error; + } + const char *name = token.v.symbol->string; + for(i = 0; i < 4; ++i) { + if(strcmp_underscore(format_names[i], name) == 0) + break; + } + if(i >= 4) { + if(warning.attribute) + warningf(HERE, "'%s' is an unrecognized format function type", name); + } + next_token(); + + expect(','); + add_anchor_token(')'); + add_anchor_token(','); + parse_constant_expression(); + rem_anchor_token(','); + rem_anchor_token('('); + + expect(','); + add_anchor_token(')'); + parse_constant_expression(); + rem_anchor_token('('); + expect(')'); + return; +end_error: + attribute->u.value = true; +} + +/** + * 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 + * constructor + * destructor + * nothrow + * transparent_union + * common + * nocommon + * packed + * shared + * notshared + * used + * unused + * no_instrument_function + * warn_unused_result + * longcall + * shortcall + * long_call + * short_call + * function_vector + * interrupt_handler + * nmi_handler + * nesting + * near + * far + * signal + * eightbit_data + * tiny_data + * saveall + * flatten + * sseregparm + * externally_visible + * return_twice + * may_alias + * ms_struct + * gcc_struct + * dllimport + * dllexport + * + * The following attributes are parsed with arguments + * aligned( const expression ) + * alias( string literal ) + * section( string literal ) + * format( identifier, const expression, const expression ) + * format_arg( const expression ) + * tls_model( string literal ) + * visibility( string literal ) + * regparm( const expression ) + * model( string leteral ) + * trap_exit( const expression ) + * sp_switch( string literal ) + * + * The following attributes might have arguments + * weak_ref( string literal ) + * non_null( const expression // ',' ) + * interrupt( string literal ) + * sentinel( constant expression ) + */ +static void parse_gnu_attribute(gnu_attribute_t **attributes) +{ + gnu_attribute_t *head = *attributes; + gnu_attribute_t *last = *attributes; + gnu_attribute_t *attribute; + + eat(T___attribute__); + expect('('); + expect('('); + + if(token.type != ')') { + /* find the end of the list */ + if(last != NULL) { + while(last->next != NULL) + last = last->next; + } + + /* non-empty attribute list */ + 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, NULL); + break; + } + const symbol_t *sym = token.v.symbol; + name = sym->string; next_token(); - expect_void('('); - int depth = 1; - while(depth > 0) { - switch(token.type) { - case T_EOF: - errorf(HERE, "EOF while parsing attribute"); + int i; + for(i = 0; i < GNU_AK_LAST; ++i) { + if(strcmp_underscore(gnu_attribute_names[i], name) == 0) break; - case '(': + } + gnu_attribute_kind_t kind = (gnu_attribute_kind_t)i; + + attribute = NULL; + if(kind == GNU_AK_LAST) { + if(warning.attribute) + warningf(HERE, "'%s' attribute directive ignored", name); + + /* skip possible arguments */ + if(token.type == '(') { + eat_until_matching_token(')'); + } + } else { + /* check for arguments */ + attribute = allocate_gnu_attribute(kind); + if(token.type == '(') { next_token(); - depth++; + if(token.type == ')') { + /* empty args are allowed */ + next_token(); + } else + attribute->have_arguments = true; + } + + switch(kind) { + case GNU_AK_CONST: + case GNU_AK_VOLATILE: + case GNU_AK_CDECL: + case GNU_AK_STDCALL: + case GNU_AK_FASTCALL: + case GNU_AK_DEPRECATED: + case GNU_AK_NOINLINE: + case GNU_AK_NORETURN: + case GNU_AK_NAKED: + case GNU_AK_PURE: + case GNU_AK_ALWAYS_INLINE: + case GNU_AK_MALLOC: + case GNU_AK_WEAK: + case GNU_AK_CONSTRUCTOR: + case GNU_AK_DESTRUCTOR: + case GNU_AK_NOTHROW: + case GNU_AK_TRANSPARENT_UNION: + case GNU_AK_COMMON: + case GNU_AK_NOCOMMON: + case GNU_AK_PACKED: + case GNU_AK_SHARED: + case GNU_AK_NOTSHARED: + case GNU_AK_USED: + case GNU_AK_UNUSED: + case GNU_AK_NO_INSTRUMENT_FUNCTION: + case GNU_AK_WARN_UNUSED_RESULT: + case GNU_AK_LONGCALL: + case GNU_AK_SHORTCALL: + case GNU_AK_LONG_CALL: + case GNU_AK_SHORT_CALL: + case GNU_AK_FUNCTION_VECTOR: + case GNU_AK_INTERRUPT_HANDLER: + case GNU_AK_NMI_HANDLER: + case GNU_AK_NESTING: + case GNU_AK_NEAR: + case GNU_AK_FAR: + case GNU_AK_SIGNAL: + case GNU_AK_EIGTHBIT_DATA: + case GNU_AK_TINY_DATA: + case GNU_AK_SAVEALL: + case GNU_AK_FLATTEN: + case GNU_AK_SSEREGPARM: + case GNU_AK_EXTERNALLY_VISIBLE: + case GNU_AK_RETURN_TWICE: + case GNU_AK_MAY_ALIAS: + case GNU_AK_MS_STRUCT: + case GNU_AK_GCC_STRUCT: + case GNU_AK_DLLIMPORT: + case GNU_AK_DLLEXPORT: + if(attribute->have_arguments) { + /* should have no arguments */ + errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); + eat_until_matching_token('('); + /* we have already consumed '(', so we stop before ')', eat it */ + eat(')'); + attribute->invalid = true; + } break; - case ')': - next_token(); - depth--; + + case GNU_AK_ALIGNED: + case GNU_AK_FORMAT_ARG: + case GNU_AK_REGPARM: + case GNU_AK_TRAP_EXIT: + if(!attribute->have_arguments) { + /* should have arguments */ + errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); + attribute->invalid = true; + } else + parse_gnu_attribute_const_arg(attribute); break; - default: - next_token(); + case GNU_AK_ALIAS: + case GNU_AK_SECTION: + case GNU_AK_SP_SWITCH: + if(!attribute->have_arguments) { + /* should have arguments */ + errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); + attribute->invalid = true; + } else + parse_gnu_attribute_string_arg(attribute, &attribute->u.string); + break; + case GNU_AK_FORMAT: + if(!attribute->have_arguments) { + /* should have arguments */ + errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); + attribute->invalid = true; + } else + parse_gnu_attribute_format_args(attribute); + break; + case GNU_AK_WEAKREF: + /* may have one string argument */ + if(attribute->have_arguments) + parse_gnu_attribute_string_arg(attribute, &attribute->u.string); + break; + case GNU_AK_NONNULL: + if(attribute->have_arguments) + parse_gnu_attribute_const_arg_list(attribute); + break; + case GNU_AK_TLS_MODEL: + if(!attribute->have_arguments) { + /* should have arguments */ + errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); + } else + parse_gnu_attribute_tls_model_arg(attribute); + break; + case GNU_AK_VISIBILITY: + if(!attribute->have_arguments) { + /* should have arguments */ + errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); + } else + parse_gnu_attribute_visibility_arg(attribute); + break; + case GNU_AK_MODEL: + if(!attribute->have_arguments) { + /* should have arguments */ + errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); + } else + parse_gnu_attribute_model_arg(attribute); + case GNU_AK_INTERRUPT: + /* may have one string argument */ + if(attribute->have_arguments) + parse_gnu_attribute_interrupt_arg(attribute); + break; + case GNU_AK_SENTINEL: + /* may have one string argument */ + if(attribute->have_arguments) + parse_gnu_attribute_const_arg(attribute); + break; + case GNU_AK_LAST: + /* already handled */ + break; + } + } + if(attribute != NULL) { + if(last != NULL) { + last->next = attribute; + last = attribute; + } else { + head = last = attribute; } } + + if(token.type != ',') + break; + next_token(); + } + } + expect(')'); + expect(')'); +end_error: + *attributes = head; +} + +/** + * Parse GNU attributes. + */ +static void parse_attributes(gnu_attribute_t **attributes) +{ + while(true) { + switch(token.type) { + case T___attribute__: { + parse_gnu_attribute(attributes); 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(); + T_STRING_LITERAL, NULL); + eat_until_matching_token('('); break; } else { parse_string_literals(); } - expect_void(')'); + expect(')'); break; default: goto attributes_finished; @@ -916,7 +1603,8 @@ static void parse_attributes(void) } attributes_finished: - ; +end_error: + return; } static designator_t *parse_designation(void) @@ -931,7 +1619,9 @@ static designator_t *parse_designation(void) designator = allocate_ast_zero(sizeof(designator[0])); designator->source_position = token.source_position; next_token(); + add_anchor_token(']'); designator->array_index = parse_constant_expression(); + rem_anchor_token(']'); expect(']'); break; case '.': @@ -940,7 +1630,7 @@ static designator_t *parse_designation(void) next_token(); if(token.type != T_IDENTIFIER) { parse_error_expected("while parsing designator", - T_IDENTIFIER, 0); + T_IDENTIFIER, NULL); return NULL; } designator->symbol = token.v.symbol; @@ -988,6 +1678,9 @@ static initializer_t *initializer_from_wide_string(array_type_t *const type, return initializer; } +/** + * Build an initializer from a given expression. + */ static initializer_t *initializer_from_expression(type_t *orig_type, expression_t *expression) { @@ -1026,7 +1719,8 @@ static initializer_t *initializer_from_expression(type_t *orig_type, } } - type_t *const res_type = semantic_assign(type, expression, "initializer"); + type_t *const res_type = semantic_assign(type, expression, "initializer", + &expression->base.source_position); if (res_type == NULL) return NULL; @@ -1036,12 +1730,20 @@ static initializer_t *initializer_from_expression(type_t *orig_type, return result; } +/** + * Checks if a given expression can be used as an constant initializer. + */ static bool is_initializer_constant(const expression_t *expression) { return is_constant_expression(expression) || is_address_constant(expression); } +/** + * Parses an scalar initializer. + * + * § 6.7.8.11; eat {} without warning + */ static initializer_t *parse_scalar_initializer(type_t *type, bool must_be_constant) { @@ -1057,7 +1759,7 @@ static initializer_t *parse_scalar_initializer(type_t *type, expression_t *expression = parse_assignment_expression(); if(must_be_constant && !is_initializer_constant(expression)) { - errorf(expression->base.source_position, + errorf(&expression->base.source_position, "Initialisation expression '%E' is not constant\n", expression); } @@ -1065,9 +1767,9 @@ static initializer_t *parse_scalar_initializer(type_t *type, initializer_t *initializer = initializer_from_expression(type, expression); if(initializer == NULL) { - errorf(expression->base.source_position, - "expression '%E' doesn't match expected type '%T'", - expression, type); + errorf(&expression->base.source_position, + "expression '%E' (type '%T') doesn't match expected type '%T'", + expression, expression->base.type, type); /* TODO */ return NULL; } @@ -1090,57 +1792,74 @@ static initializer_t *parse_scalar_initializer(type_t *type, return initializer; } +/** + * An entry in the type path. + */ typedef struct type_path_entry_t type_path_entry_t; struct type_path_entry_t { - type_t *type; + type_t *type; /**< the upper top type. restored to path->top_tye if this entry is popped. */ union { - size_t index; - declaration_t *compound_entry; + size_t index; /**< For array types: the current index. */ + declaration_t *compound_entry; /**< For compound types: the current declaration. */ } v; }; +/** + * A type path expression a position inside compound or array types. + */ typedef struct type_path_t type_path_t; struct type_path_t { - type_path_entry_t *path; + type_path_entry_t *path; /**< An flexible array containing the current path. */ type_t *top_type; /**< type of the element the path points */ size_t max_index; /**< largest index in outermost array */ - bool invalid; }; +/** + * Prints a type path for debugging. + */ static __attribute__((unused)) void debug_print_type_path( const type_path_t *path) { size_t len = ARR_LEN(path->path); - if(path->invalid) { - fprintf(stderr, "invalid path"); - return; - } - for(size_t i = 0; i < len; ++i) { const type_path_entry_t *entry = & path->path[i]; type_t *type = skip_typeref(entry->type); if(is_type_compound(type)) { + /* in gcc mode structs can have no members */ + if(entry->v.compound_entry == NULL) { + assert(i == len-1); + continue; + } fprintf(stderr, ".%s", entry->v.compound_entry->symbol->string); } else if(is_type_array(type)) { - fprintf(stderr, "[%u]", entry->v.index); + fprintf(stderr, "[%zd]", entry->v.index); } else { fprintf(stderr, "-INVALID-"); } } - fprintf(stderr, " ("); - print_type(path->top_type); - fprintf(stderr, ")"); + if(path->top_type != NULL) { + fprintf(stderr, " ("); + print_type(path->top_type); + fprintf(stderr, ")"); + } } +/** + * Return the top type path entry, ie. in a path + * (type).a.b returns the b. + */ static type_path_entry_t *get_type_path_top(const type_path_t *path) { size_t len = ARR_LEN(path->path); assert(len > 0); - return & path->path[len-1]; + return &path->path[len-1]; } +/** + * Enlarge the type path by an (empty) element. + */ static type_path_entry_t *append_to_type_path(type_path_t *path) { size_t len = ARR_LEN(path->path); @@ -1151,6 +1870,10 @@ static type_path_entry_t *append_to_type_path(type_path_t *path) return result; } +/** + * Descending into a sub-type. Enter the scope of the current + * top_type. + */ static void descend_into_subtype(type_path_t *path) { type_t *orig_top_type = path->top_type; @@ -1164,9 +1887,13 @@ static void descend_into_subtype(type_path_t *path) if(is_type_compound(top_type)) { declaration_t *declaration = top_type->compound.declaration; declaration_t *entry = declaration->scope.declarations; + top->v.compound_entry = entry; - top->v.compound_entry = entry; - path->top_type = entry->type; + if(entry != NULL) { + path->top_type = entry->type; + } else { + path->top_type = NULL; + } } else { assert(is_type_array(top_type)); @@ -1175,6 +1902,10 @@ static void descend_into_subtype(type_path_t *path) } } +/** + * Pop an entry from the given type path, ie. returning from + * (type).a.b to (type).a + */ static void ascend_from_subtype(type_path_t *path) { type_path_entry_t *top = get_type_path_top(path); @@ -1185,10 +1916,13 @@ static void ascend_from_subtype(type_path_t *path) ARR_RESIZE(type_path_entry_t, path->path, len-1); } +/** + * Pop entries from the given type path until the given + * path level is reached. + */ static void ascend_to(type_path_t *path, size_t top_path_level) { size_t len = ARR_LEN(path->path); - assert(len >= top_path_level); while(len > top_path_level) { ascend_from_subtype(path); @@ -1209,7 +1943,7 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, symbol_t *symbol = designator->symbol; if(!is_type_compound(type)) { if(is_type_valid(type)) { - errorf(designator->source_position, + errorf(&designator->source_position, "'.%Y' designator used for non-compound type '%T'", symbol, orig_type); } @@ -1224,14 +1958,14 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, } } if(iter == NULL) { - errorf(designator->source_position, + 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, + errorf(&designator->source_position, "offsetof designator '%Y' may not specify bitfield", symbol); goto failed; @@ -1247,7 +1981,7 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, if(!is_type_array(type)) { if(is_type_valid(type)) { - errorf(designator->source_position, + errorf(&designator->source_position, "[%E] designator used for non-array type '%T'", array_index, orig_type); } @@ -1260,16 +1994,16 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, long index = fold_constant(array_index); if(!used_in_offsetof) { if(index < 0) { - errorf(designator->source_position, + 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); + errorf(&designator->source_position, + "designator [%E] (%d) exceeds array size %d", + array_index, index, array_size); goto failed; } } @@ -1285,8 +2019,6 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, descend_into_subtype(path); } } - - path->invalid = false; return true; failed: @@ -1295,9 +2027,6 @@ failed: static void advance_current_object(type_path_t *path, size_t top_path_level) { - if(path->invalid) - return; - type_path_entry_t *top = get_type_path_top(path); type_t *type = skip_typeref(top->type); @@ -1331,10 +2060,24 @@ static void advance_current_object(type_path_t *path, size_t top_path_level) ascend_from_subtype(path); advance_current_object(path, top_path_level); } else { - path->invalid = true; + path->top_type = NULL; + } +} + +/** + * skip until token is found. + */ +static void skip_until(int type) { + while(token.type != type) { + if(token.type == T_EOF) + return; + next_token(); } } +/** + * skip any {...} blocks until a closing bracket is reached. + */ static void skip_initializers(void) { if(token.type == '{') @@ -1351,17 +2094,39 @@ static void skip_initializers(void) } } +static initializer_t *create_empty_initializer(void) +{ + static initializer_t empty_initializer + = { .list = { { INITIALIZER_LIST }, 0 } }; + return &empty_initializer; +} + +/** + * Parse a part of an initialiser for a struct or union, + */ static initializer_t *parse_sub_initializer(type_path_t *path, - type_t *outer_type, size_t top_path_level, bool must_be_constant) + type_t *outer_type, size_t top_path_level, + parse_initializer_env_t *env) { + if(token.type == '}') { + /* empty initializer */ + return create_empty_initializer(); + } + type_t *orig_type = path->top_type; - type_t *type = skip_typeref(orig_type); + type_t *type = NULL; - /* we can't do usefull stuff if we didn't even parse the type. Skip the - * initializers in this case. */ - if(!is_type_valid(type)) { - skip_initializers(); - return NULL; + if (orig_type == NULL) { + /* We are initializing an empty compound. */ + } else { + type = skip_typeref(orig_type); + + /* we can't do usefull stuff if we didn't even parse the type. Skip the + * initializers in this case. */ + if(!is_type_valid(type)) { + skip_initializers(); + return create_empty_initializer(); + } } initializer_t **initializers = NEW_ARR_F(initializer_t*, 0); @@ -1387,29 +2152,47 @@ static initializer_t *parse_sub_initializer(type_path_t *path, initializer_t *sub; if(token.type == '{') { - if(is_type_scalar(type)) { - sub = parse_scalar_initializer(type, must_be_constant); + if(type != NULL && is_type_scalar(type)) { + sub = parse_scalar_initializer(type, env->must_be_constant); } else { eat('{'); - descend_into_subtype(path); - + if(type == NULL) { + if (env->declaration != NULL) + errorf(HERE, "extra brace group at end of initializer for '%Y'", + env->declaration->symbol); + else + errorf(HERE, "extra brace group at end of initializer"); + } else + descend_into_subtype(path); + + add_anchor_token('}'); sub = parse_sub_initializer(path, orig_type, top_path_level+1, - must_be_constant); + env); + rem_anchor_token('}'); - ascend_from_subtype(path); - - expect_block('}'); + if(type != NULL) { + ascend_from_subtype(path); + expect('}'); + } else { + expect('}'); + goto error_parse_next; + } } } else { /* must be an expression */ expression_t *expression = parse_assignment_expression(); - if(must_be_constant && !is_initializer_constant(expression)) { - errorf(expression->base.source_position, + if(env->must_be_constant && !is_initializer_constant(expression)) { + errorf(&expression->base.source_position, "Initialisation expression '%E' is not constant\n", expression); } + if(type == NULL) { + /* we are already outside, ... */ + goto error_excess; + } + /* handle { "string" } special case */ if((expression->kind == EXPR_STRING_LITERAL || expression->kind == EXPR_WIDE_STRING_LITERAL) @@ -1441,7 +2224,7 @@ static initializer_t *parse_sub_initializer(type_path_t *path, goto end_error; } if(is_type_scalar(type)) { - errorf(expression->base.source_position, + errorf(&expression->base.source_position, "expression '%E' doesn't match expected type '%T'", expression, orig_type); goto end_error; @@ -1461,9 +2244,19 @@ static initializer_t *parse_sub_initializer(type_path_t *path, path->max_index = index; } - /* append to initializers list */ - ARR_APP1(initializer_t*, initializers, sub); + if(type != NULL) { + /* append to initializers list */ + ARR_APP1(initializer_t*, initializers, sub); + } else { +error_excess: + if(env->declaration != NULL) + warningf(HERE, "excess elements in struct initializer for '%Y'", + env->declaration->symbol); + else + warningf(HERE, "excess elements in struct initializer"); + } +error_parse_next: if(token.type == '}') { break; } @@ -1472,9 +2265,15 @@ static initializer_t *parse_sub_initializer(type_path_t *path, break; } - advance_current_object(path, top_path_level); - orig_type = path->top_type; - type = skip_typeref(orig_type); + if(type != NULL) { + /* advance to the next declaration if we are not at the end */ + advance_current_object(path, top_path_level); + orig_type = path->top_type; + if(orig_type != NULL) + type = skip_typeref(orig_type); + else + type = NULL; + } } size_t len = ARR_LEN(initializers); @@ -1485,6 +2284,7 @@ static initializer_t *parse_sub_initializer(type_path_t *path, memcpy(&result->list.initializers, initializers, len * sizeof(initializers[0])); + DEL_ARR_F(initializers); ascend_to(path, top_path_level); return result; @@ -1496,22 +2296,17 @@ end_error: return NULL; } -typedef struct parse_initializer_env_t { - type_t *type; /* the type of the initializer. In case of an - array type with unspecified size this gets - adjusted to the actual size. */ - initializer_t *initializer; /* initializer will be filled in here */ - bool must_be_constant; -} parse_initializer_env_t; - -static void parse_initializer(parse_initializer_env_t *env) +/** + * Parses an initializer. Parsers either a compound literal + * (env->declaration == NULL) or an initializer of a declaration. + */ +static initializer_t *parse_initializer(parse_initializer_env_t *env) { type_t *type = skip_typeref(env->type); initializer_t *result = NULL; size_t max_index; if(is_type_scalar(type)) { - /* TODO: § 6.7.8.11; eat {} without warning */ result = parse_scalar_initializer(type, env->must_be_constant); } else if(token.type == '{') { eat('{'); @@ -1523,15 +2318,16 @@ static void parse_initializer(parse_initializer_env_t *env) descend_into_subtype(&path); - result = parse_sub_initializer(&path, env->type, 1, - env->must_be_constant); + add_anchor_token('}'); + result = parse_sub_initializer(&path, env->type, 1, env); + rem_anchor_token('}'); max_index = path.max_index; DEL_ARR_F(path.path); - expect_void('}'); + expect('}'); } else { - /* parse_scalar_initializer also works in this case: we simply + /* parse_scalar_initializer() also works in this case: we simply * have an expression without {} around it */ result = parse_scalar_initializer(type, env->must_be_constant); } @@ -1555,7 +2351,7 @@ static void parse_initializer(parse_initializer_env_t *env) break; default: - panic("invalid initializer type"); + internal_errorf(HERE, "invalid initializer type"); } expression_t *cnst = allocate_expression_zero(EXPR_CONST); @@ -1570,13 +2366,16 @@ static void parse_initializer(parse_initializer_env_t *env) env->type = new_type; } - env->initializer = result; + return result; +end_error: + return NULL; } static declaration_t *append_declaration(declaration_t *declaration); static declaration_t *parse_compound_type_specifier(bool is_struct) { + gnu_attribute_t *attributes = NULL; if(is_struct) { eat(T_struct); } else { @@ -1587,8 +2386,7 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) declaration_t *declaration = NULL; if (token.type == T___attribute__) { - /* TODO */ - parse_attributes(); + parse_attributes(&attributes); } if(token.type == T_IDENTIFIER) { @@ -1603,10 +2401,10 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) } else if(token.type != '{') { if(is_struct) { parse_error_expected("while parsing struct type specifier", - T_IDENTIFIER, '{', 0); + T_IDENTIFIER, '{', NULL); } else { parse_error_expected("while parsing union type specifier", - T_IDENTIFIER, '{', 0); + T_IDENTIFIER, '{', NULL); } return NULL; @@ -1635,7 +2433,7 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) declaration->init.is_defined = true; parse_compound_type_entries(declaration); - parse_attributes(); + parse_attributes(&attributes); } return declaration; @@ -1651,10 +2449,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); + parse_error_expected("while parsing enum entry", T_IDENTIFIER, NULL); eat_block(); + rem_anchor_token('}'); return; } @@ -1681,17 +2481,21 @@ 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) { - eat(T_enum); - - declaration_t *declaration; - symbol_t *symbol; + gnu_attribute_t *attributes = NULL; + declaration_t *declaration; + symbol_t *symbol; + eat(T_enum); if(token.type == T_IDENTIFIER) { symbol = token.v.symbol; next_token(); @@ -1699,7 +2503,7 @@ static type_t *parse_enum_specifier(void) declaration = get_declaration(symbol, NAMESPACE_ENUM); } else if(token.type != '{') { parse_error_expected("while parsing enum type specifier", - T_IDENTIFIER, '{', 0); + T_IDENTIFIER, '{', NULL); return NULL; } else { declaration = NULL; @@ -1714,7 +2518,7 @@ static type_t *parse_enum_specifier(void) declaration->parent_scope = scope; } - type_t *const type = allocate_type_zero(TYPE_ENUM, declaration->source_position); + type_t *const type = allocate_type_zero(TYPE_ENUM, &declaration->source_position); type->enumt.declaration = declaration; if(token.type == '{') { @@ -1728,7 +2532,7 @@ static type_t *parse_enum_specifier(void) declaration->init.is_defined = 1; parse_enum_entries(type); - parse_attributes(); + parse_attributes(&attributes); } return type; @@ -1753,6 +2557,7 @@ static type_t *parse_typeof(void) type_t *type; expect('('); + add_anchor_token(')'); expression_t *expression = NULL; @@ -1785,9 +2590,10 @@ restart: break; } + rem_anchor_token(')'); expect(')'); - type_t *typeof_type = allocate_type_zero(TYPE_TYPEOF, expression->base.source_position); + type_t *typeof_type = allocate_type_zero(TYPE_TYPEOF, &expression->base.source_position); typeof_type->typeoft.expression = expression; typeof_type->typeoft.typeof_type = type; @@ -1808,38 +2614,199 @@ typedef enum { SPECIFIER_FLOAT = 1 << 8, SPECIFIER_BOOL = 1 << 9, SPECIFIER_VOID = 1 << 10, -#ifdef PROVIDE_COMPLEX - SPECIFIER_COMPLEX = 1 << 11, - SPECIFIER_IMAGINARY = 1 << 12, -#endif + SPECIFIER_INT8 = 1 << 11, + SPECIFIER_INT16 = 1 << 12, + SPECIFIER_INT32 = 1 << 13, + SPECIFIER_INT64 = 1 << 14, + SPECIFIER_INT128 = 1 << 15, + SPECIFIER_COMPLEX = 1 << 16, + SPECIFIER_IMAGINARY = 1 << 17, } specifiers_t; static type_t *create_builtin_type(symbol_t *const symbol, type_t *const real_type) { - type_t *type = allocate_type_zero(TYPE_BUILTIN, builtin_source_position); + type_t *type = allocate_type_zero(TYPE_BUILTIN, &builtin_source_position); type->builtin.symbol = symbol; type->builtin.real_type = real_type; type_t *result = typehash_insert(type); - if (type != result) { + if(type != result) { free_type(type); } - - return result; -} - -static type_t *get_typedef_type(symbol_t *symbol) -{ - declaration_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL); - if(declaration == NULL - || declaration->storage_class != STORAGE_CLASS_TYPEDEF) - return NULL; - - type_t *type = allocate_type_zero(TYPE_TYPEDEF, declaration->source_position); - type->typedeft.declaration = declaration; - - return type; + + return result; +} + +static type_t *get_typedef_type(symbol_t *symbol) +{ + declaration_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL); + if(declaration == NULL || + declaration->storage_class != STORAGE_CLASS_TYPEDEF) + return NULL; + + type_t *type = allocate_type_zero(TYPE_TYPEDEF, &declaration->source_position); + type->typedeft.declaration = declaration; + + return type; +} + +/** + * check for the allowed MS alignment values. + */ +static bool check_elignment_value(long long intvalue) { + if(intvalue < 1 || intvalue > 8192) { + errorf(HERE, "illegal alignment value"); + return false; + } + unsigned v = (unsigned)intvalue; + for(unsigned i = 1; i <= 8192; i += i) { + if (i == v) + return true; + } + errorf(HERE, "alignment must be power of two"); + return false; +} + +#define DET_MOD(name, tag) do { \ + if(*modifiers & tag) warningf(HERE, #name " used more than once"); \ + *modifiers |= tag; \ +} while(0) + +static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *specifiers) +{ + decl_modifiers_t *modifiers = &specifiers->decl_modifiers; + + while(true) { + if(token.type == T_restrict) { + next_token(); + DET_MOD(restrict, DM_RESTRICT); + goto end_loop; + } else if(token.type != T_IDENTIFIER) + break; + symbol_t *symbol = token.v.symbol; + if(symbol == sym_align) { + next_token(); + expect('('); + if(token.type != T_INTEGER) + goto end_error; + if(check_elignment_value(token.v.intvalue)) { + if(specifiers->alignment != 0) + warningf(HERE, "align used more than once"); + specifiers->alignment = (unsigned char)token.v.intvalue; + } + next_token(); + expect(')'); + } else if(symbol == sym_allocate) { + next_token(); + expect('('); + if(token.type != T_IDENTIFIER) + goto end_error; + (void)token.v.symbol; + expect(')'); + } else if(symbol == sym_dllimport) { + next_token(); + DET_MOD(dllimport, DM_DLLIMPORT); + } else if(symbol == sym_dllexport) { + next_token(); + DET_MOD(dllexport, DM_DLLEXPORT); + } else if(symbol == sym_thread) { + next_token(); + DET_MOD(thread, DM_THREAD); + } else if(symbol == sym_naked) { + next_token(); + DET_MOD(naked, DM_NAKED); + } else if(symbol == sym_noinline) { + next_token(); + DET_MOD(noinline, DM_NOINLINE); + } else if(symbol == sym_noreturn) { + next_token(); + DET_MOD(noreturn, DM_NORETURN); + } else if(symbol == sym_nothrow) { + next_token(); + DET_MOD(nothrow, DM_NOTHROW); + } else if(symbol == sym_novtable) { + next_token(); + DET_MOD(novtable, DM_NOVTABLE); + } else if(symbol == sym_property) { + next_token(); + expect('('); + for(;;) { + bool is_get = false; + if(token.type != T_IDENTIFIER) + goto end_error; + if(token.v.symbol == sym_get) { + is_get = true; + } else if(token.v.symbol == sym_put) { + } else { + errorf(HERE, "Bad property name '%Y'", token.v.symbol); + goto end_error; + } + next_token(); + expect('='); + if(token.type != T_IDENTIFIER) + goto end_error; + if(is_get) { + if(specifiers->get_property_sym != NULL) { + errorf(HERE, "get property name already specified"); + } else { + specifiers->get_property_sym = token.v.symbol; + } + } else { + if(specifiers->put_property_sym != NULL) { + errorf(HERE, "put property name already specified"); + } else { + specifiers->put_property_sym = token.v.symbol; + } + } + next_token(); + if(token.type == ',') { + next_token(); + continue; + } + break; + } + expect(')'); + } else if(symbol == sym_selectany) { + next_token(); + DET_MOD(selectany, DM_SELECTANY); + } else if(symbol == sym_uuid) { + next_token(); + expect('('); + if(token.type != T_STRING_LITERAL) + goto end_error; + next_token(); + expect(')'); + } else if(symbol == sym_deprecated) { + next_token(); + if(specifiers->deprecated != 0) + warningf(HERE, "deprecated used more than once"); + specifiers->deprecated = 1; + if(token.type == '(') { + next_token(); + if(token.type == T_STRING_LITERAL) { + specifiers->deprecated_string = token.v.string.begin; + next_token(); + } else { + errorf(HERE, "string literal expected"); + } + expect(')'); + } + } else if(symbol == sym_noalias) { + next_token(); + DET_MOD(noalias, DM_NOALIAS); + } else { + warningf(HERE, "Unknown modifier %Y ignored", token.v.symbol); + next_token(); + if(token.type == '(') + skip_until(')'); + } +end_loop: + if (token.type == ',') + next_token(); + } +end_error: + return; } static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) @@ -1870,6 +2837,15 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) MATCH_STORAGE_CLASS(T_auto, STORAGE_CLASS_AUTO) MATCH_STORAGE_CLASS(T_register, STORAGE_CLASS_REGISTER) + case T__declspec: + next_token(); + expect('('); + add_anchor_token(')'); + parse_microsoft_extended_decl_modifier(specifiers); + rem_anchor_token(')'); + expect(')'); + break; + case T___thread: switch (specifiers->declared_storage_class) { case STORAGE_CLASS_NONE: @@ -1901,6 +2877,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 */ @@ -1927,11 +2908,15 @@ 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") -#ifdef PROVIDE_COMPLEX + 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") 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; @@ -1975,7 +2960,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) break; case T___attribute__: - parse_attributes(); + parse_attributes(&specifiers->gnu_attributes); break; case T_IDENTIFIER: { @@ -2059,6 +3044,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; @@ -2071,26 +3102,18 @@ finish_specifiers: case SPECIFIER_BOOL: atomic_type = ATOMIC_TYPE_BOOL; break; -#ifdef PROVIDE_COMPLEX case SPECIFIER_FLOAT | SPECIFIER_COMPLEX: - atomic_type = ATOMIC_TYPE_FLOAT_COMPLEX; - break; - case SPECIFIER_DOUBLE | SPECIFIER_COMPLEX: - atomic_type = ATOMIC_TYPE_DOUBLE_COMPLEX; - break; - case SPECIFIER_LONG | SPECIFIER_DOUBLE | SPECIFIER_COMPLEX: - atomic_type = ATOMIC_TYPE_LONG_DOUBLE_COMPLEX; - break; case SPECIFIER_FLOAT | SPECIFIER_IMAGINARY: - atomic_type = ATOMIC_TYPE_FLOAT_IMAGINARY; + atomic_type = ATOMIC_TYPE_FLOAT; break; + case SPECIFIER_DOUBLE | SPECIFIER_COMPLEX: case SPECIFIER_DOUBLE | SPECIFIER_IMAGINARY: - atomic_type = ATOMIC_TYPE_DOUBLE_IMAGINARY; + atomic_type = ATOMIC_TYPE_DOUBLE; break; + case SPECIFIER_LONG | SPECIFIER_DOUBLE | SPECIFIER_COMPLEX: case SPECIFIER_LONG | SPECIFIER_DOUBLE | SPECIFIER_IMAGINARY: - atomic_type = ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY; + atomic_type = ATOMIC_TYPE_LONG_DOUBLE; break; -#endif default: /* invalid specifier combination, give an error message */ if(type_specifiers == 0) { @@ -2114,9 +3137,19 @@ finish_specifiers: atomic_type = ATOMIC_TYPE_INVALID; } - type = allocate_type_zero(TYPE_ATOMIC, builtin_source_position); - type->atomic.akind = atomic_type; - newtype = 1; + if(type_specifiers & SPECIFIER_COMPLEX && + atomic_type != ATOMIC_TYPE_INVALID) { + type = allocate_type_zero(TYPE_COMPLEX, &builtin_source_position); + type->complex.akind = atomic_type; + } else if(type_specifiers & SPECIFIER_IMAGINARY && + atomic_type != ATOMIC_TYPE_INVALID) { + type = allocate_type_zero(TYPE_IMAGINARY, &builtin_source_position); + type->imaginary.akind = atomic_type; + } else { + type = allocate_type_zero(TYPE_ATOMIC, &builtin_source_position); + type->atomic.akind = atomic_type; + } + newtype = 1; } else { if(type_specifiers != 0) { errorf(HERE, "multiple datatypes in declaration"); @@ -2124,6 +3157,7 @@ finish_specifiers: } type->base.qualifiers = type_qualifiers; + /* FIXME: check type qualifiers here */ type_t *result = typehash_insert(type); if(newtype && result != type) { @@ -2131,6 +3165,8 @@ finish_specifiers: } specifiers->type = result; +end_error: + return; } static type_qualifiers_t parse_type_qualifiers(void) @@ -2143,6 +3179,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; @@ -2336,6 +3378,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])); @@ -2362,6 +3405,7 @@ static construct_type_t *parse_array_declarator(void) array->size = parse_assignment_expression(); } + rem_anchor_token(']'); expect(']'); return (construct_type_t*) array; @@ -2372,12 +3416,13 @@ end_error: static construct_type_t *parse_function_declarator(declaration_t *declaration) { eat('('); + add_anchor_token(')'); type_t *type; if(declaration != NULL) { - type = allocate_type_zero(TYPE_FUNCTION, declaration->source_position); + type = allocate_type_zero(TYPE_FUNCTION, &declaration->source_position); } else { - type = allocate_type_zero(TYPE_FUNCTION, token.source_position); + type = allocate_type_zero(TYPE_FUNCTION, HERE); } declaration_t *parameters = parse_parameters(&type->function); @@ -2391,11 +3436,11 @@ static construct_type_t *parse_function_declarator(declaration_t *declaration) construct_function_type->construct_type.kind = CONSTRUCT_FUNCTION; construct_function_type->function_type = type; + rem_anchor_token(')'); expect(')'); - return (construct_type_t*) construct_function_type; end_error: - return NULL; + return (construct_type_t*) construct_function_type; } static construct_type_t *parse_inner_declarator(declaration_t *declaration, @@ -2405,6 +3450,7 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration, * how to construct the final declarator type */ construct_type_t *first = NULL; construct_type_t *last = NULL; + gnu_attribute_t *attributes = NULL; /* pointers */ while(token.type == '*') { @@ -2420,7 +3466,7 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration, } /* TODO: find out if this is correct */ - parse_attributes(); + parse_attributes(&attributes); construct_type_t *inner_types = NULL; @@ -2436,13 +3482,15 @@ 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: if(may_be_abstract) break; - parse_error_expected("while parsing declarator", T_IDENTIFIER, '(', 0); + parse_error_expected("while parsing declarator", T_IDENTIFIER, '(', NULL); /* avoid a loop in the outermost scope, because eat_statement doesn't * eat '}' */ if(token.type == '}' && current_function == NULL) { @@ -2482,7 +3530,7 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration, } declarator_finished: - parse_attributes(); + parse_attributes(&attributes); /* append inner_types at the end of the list, we don't to set last anymore * as it's not needed anymore */ @@ -2505,7 +3553,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; @@ -2529,7 +3577,7 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, case CONSTRUCT_POINTER: { parsed_pointer_t *parsed_pointer = (parsed_pointer_t*) iter; - type_t *pointer_type = allocate_type_zero(TYPE_POINTER, (source_position_t){NULL, 0}); + type_t *pointer_type = allocate_type_zero(TYPE_POINTER, &null_position); pointer_type->pointer.points_to = type; pointer_type->base.qualifiers = parsed_pointer->type_qualifiers; @@ -2539,7 +3587,7 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, case CONSTRUCT_ARRAY: { parsed_array_t *parsed_array = (parsed_array_t*) iter; - type_t *array_type = allocate_type_zero(TYPE_ARRAY, (source_position_t){NULL, 0}); + type_t *array_type = allocate_type_zero(TYPE_ARRAY, &null_position); expression_t *size_expression = parsed_array->size; if(size_expression != NULL) { @@ -2593,7 +3641,11 @@ static declaration_t *parse_declarator( { declaration_t *const declaration = allocate_declaration_zero(); declaration->declared_storage_class = specifiers->declared_storage_class; - declaration->modifiers = specifiers->decl_modifiers; + declaration->decl_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; @@ -2602,6 +3654,11 @@ static declaration_t *parse_declarator( declaration->storage_class = STORAGE_CLASS_AUTO; } + if(specifiers->alignment != 0) { + /* TODO: add checks here */ + declaration->alignment = specifiers->alignment; + } + construct_type_t *construct_type = parse_inner_declarator(declaration, may_be_abstract); type_t *const type = specifiers->type; @@ -2650,36 +3707,42 @@ static declaration_t *append_declaration(declaration_t* const declaration) static void check_type_of_main(const declaration_t *const decl, const function_type_t *const func_type) { if (decl->storage_class == STORAGE_CLASS_STATIC) { - warningf(decl->source_position, "'main' is normally a non-static function"); + warningf(&decl->source_position, + "'main' is normally a non-static function"); } if (skip_typeref(func_type->return_type) != type_int) { - warningf(decl->source_position, "return type of 'main' should be 'int', but is '%T'", func_type->return_type); + warningf(&decl->source_position, + "return type of 'main' should be 'int', but is '%T'", + func_type->return_type); } const function_parameter_t *parm = func_type->parameters; if (parm != NULL) { type_t *const first_type = parm->type; if (!types_compatible(skip_typeref(first_type), type_int)) { - warningf(decl->source_position, "first argument of 'main' should be 'int', but is '%T'", first_type); + warningf(&decl->source_position, + "first argument of 'main' should be 'int', but is '%T'", first_type); } parm = parm->next; if (parm != NULL) { type_t *const second_type = parm->type; if (!types_compatible(skip_typeref(second_type), type_char_ptr_ptr)) { - warningf(decl->source_position, "second argument of 'main' should be 'char**', but is '%T'", second_type); + warningf(&decl->source_position, + "second argument of 'main' should be 'char**', but is '%T'", second_type); } parm = parm->next; if (parm != NULL) { type_t *const third_type = parm->type; if (!types_compatible(skip_typeref(third_type), type_char_ptr_ptr)) { - warningf(decl->source_position, "third argument of 'main' should be 'char**', but is '%T'", third_type); + warningf(&decl->source_position, + "third argument of 'main' should be 'char**', but is '%T'", third_type); } parm = parm->next; if (parm != NULL) { - warningf(decl->source_position, "'main' takes only zero, two or three arguments"); + warningf(&decl->source_position, "'main' takes only zero, two or three arguments"); } } } else { - warningf(decl->source_position, "'main' takes only zero, two or three arguments"); + warningf(&decl->source_position, "'main' takes only zero, two or three arguments"); } } } @@ -2704,7 +3767,7 @@ static declaration_t *internal_record_declaration( if (is_type_function(type) && type->function.unspecified_parameters && warning.strict_prototypes) { - warningf(declaration->source_position, + warningf(&declaration->source_position, "function declaration '%#T' is not a prototype", orig_type, declaration->symbol); } @@ -2726,15 +3789,19 @@ static declaration_t *internal_record_declaration( const type_t *prev_type = skip_typeref(previous_declaration->type); if (!types_compatible(type, prev_type)) { - errorf(declaration->source_position, - "declaration '%#T' is incompatible with " - "previous declaration '%#T'", - orig_type, symbol, previous_declaration->type, symbol); - errorf(previous_declaration->source_position, - "previous declaration of '%Y' was here", symbol); + errorf(&declaration->source_position, + "declaration '%#T' is incompatible with '%#T' (declared %P)", + orig_type, symbol, previous_declaration->type, symbol, + &previous_declaration->source_position); } 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' (declared %P)", + symbol, &previous_declaration->source_position); + return previous_declaration; + } + unsigned new_storage_class = declaration->storage_class; if(is_type_incomplete(prev_type)) { @@ -2755,7 +3822,7 @@ static declaration_t *internal_record_declaration( if (warning.missing_prototypes && prev_type->function.unspecified_parameters && !is_sym_main(symbol)) { - warningf(declaration->source_position, + warningf(&declaration->source_position, "no previous prototype for '%#T'", orig_type, symbol); } @@ -2772,20 +3839,16 @@ static declaration_t *internal_record_declaration( new_storage_class == STORAGE_CLASS_EXTERN) { warn_redundant_declaration: if (warning.redundant_decls) { - warningf(declaration->source_position, - "redundant declaration for '%Y'", symbol); - warningf(previous_declaration->source_position, - "previous declaration of '%Y' was here", - symbol); + warningf(&declaration->source_position, + "redundant declaration for '%Y' (declared %P)", + symbol, &previous_declaration->source_position); } } else if (current_function == NULL) { if (old_storage_class != STORAGE_CLASS_STATIC && new_storage_class == STORAGE_CLASS_STATIC) { - errorf(declaration->source_position, - "static declaration of '%Y' follows non-static declaration", - symbol); - errorf(previous_declaration->source_position, - "previous declaration of '%Y' was here", symbol); + errorf(&declaration->source_position, + "static declaration of '%Y' follows non-static declaration (declared %P)", + symbol, &previous_declaration->source_position); } else { if (old_storage_class != STORAGE_CLASS_EXTERN && !is_function_definition) { goto warn_redundant_declaration; @@ -2797,15 +3860,14 @@ warn_redundant_declaration: } } else { if (old_storage_class == new_storage_class) { - errorf(declaration->source_position, - "redeclaration of '%Y'", symbol); + errorf(&declaration->source_position, + "redeclaration of '%Y' (declared %P)", + symbol, &previous_declaration->source_position); } else { - errorf(declaration->source_position, - "redeclaration of '%Y' with different linkage", - symbol); + errorf(&declaration->source_position, + "redeclaration of '%Y' with different linkage (declared %P)", + symbol, &previous_declaration->source_position); } - errorf(previous_declaration->source_position, - "previous declaration of '%Y' was here", symbol); } } return previous_declaration; @@ -2813,10 +3875,10 @@ warn_redundant_declaration: } else if (is_function_definition) { if (declaration->storage_class != STORAGE_CLASS_STATIC) { if (warning.missing_prototypes && !is_sym_main(symbol)) { - warningf(declaration->source_position, + warningf(&declaration->source_position, "no previous prototype for '%#T'", orig_type, symbol); } else if (warning.missing_declarations && !is_sym_main(symbol)) { - warningf(declaration->source_position, + warningf(&declaration->source_position, "no previous declaration for '%#T'", orig_type, symbol); } @@ -2827,7 +3889,7 @@ warn_redundant_declaration: declaration->storage_class == STORAGE_CLASS_NONE || declaration->storage_class == STORAGE_CLASS_THREAD )) { - warningf(declaration->source_position, + warningf(&declaration->source_position, "no previous declaration for '%#T'", orig_type, symbol); } @@ -2851,12 +3913,10 @@ static declaration_t *record_function_definition(declaration_t *declaration) } static void parser_error_multiple_definition(declaration_t *declaration, - const source_position_t source_position) + const source_position_t *source_position) { - errorf(source_position, "multiple definition of symbol '%Y'", - declaration->symbol); - errorf(declaration->source_position, - "this is the location of the previous definition."); + errorf(source_position, "multiple definition of symbol '%Y' (declared %P)", + declaration->symbol, &declaration->source_position); } static bool is_declaration_specifier(const token_t *token, @@ -2886,7 +3946,7 @@ static void parse_init_declarator_rest(declaration_t *declaration) type_t *type = skip_typeref(orig_type); if(declaration->init.initializer != NULL) { - parser_error_multiple_definition(declaration, token.source_position); + parser_error_multiple_definition(declaration, HERE); } bool must_be_constant = false; @@ -2899,7 +3959,9 @@ static void parse_init_declarator_rest(declaration_t *declaration) parse_initializer_env_t env; env.type = orig_type; env.must_be_constant = must_be_constant; - parse_initializer(&env); + env.declaration = declaration; + + initializer_t *initializer = parse_initializer(&env); if(env.type != orig_type) { orig_type = env.type; @@ -2908,11 +3970,11 @@ static void parse_init_declarator_rest(declaration_t *declaration) } if(is_type_function(type)) { - errorf(declaration->source_position, + errorf(&declaration->source_position, "initializers not allowed for function types at declator '%Y' (type '%T')", declaration->symbol, orig_type); } else { - declaration->init.initializer = env.initializer; + declaration->init.initializer = initializer; } } @@ -2927,9 +3989,11 @@ static void parse_anonymous_declaration_rest( declaration->type = specifiers->type; declaration->declared_storage_class = specifiers->declared_storage_class; declaration->source_position = specifiers->source_position; + declaration->decl_modifiers = specifiers->decl_modifiers; if (declaration->declared_storage_class != STORAGE_CLASS_NONE) { - warningf(declaration->source_position, "useless storage class in empty declaration"); + warningf(&declaration->source_position, + "useless storage class in empty declaration"); } declaration->storage_class = STORAGE_CLASS_NONE; @@ -2938,7 +4002,8 @@ static void parse_anonymous_declaration_rest( case TYPE_COMPOUND_STRUCT: case TYPE_COMPOUND_UNION: { if (type->compound.declaration->symbol == NULL) { - warningf(declaration->source_position, "unnamed struct/union that defines no instances"); + warningf(&declaration->source_position, + "unnamed struct/union that defines no instances"); } break; } @@ -2947,7 +4012,7 @@ static void parse_anonymous_declaration_rest( break; default: - warningf(declaration->source_position, "empty declaration"); + warningf(&declaration->source_position, "empty declaration"); break; } @@ -2958,6 +4023,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); @@ -2967,7 +4035,7 @@ static void parse_declaration_rest(declaration_t *ndeclaration, if (type->kind != TYPE_FUNCTION && declaration->is_inline && is_type_valid(type)) { - warningf(declaration->source_position, + warningf(&declaration->source_position, "variable '%Y' declared 'inline'\n", declaration->symbol); } @@ -2981,7 +4049,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) @@ -3139,7 +4212,7 @@ static void check_labels(void) label->used = true; if (label->source_position.input_name == NULL) { print_in_function(); - errorf(goto_statement->base.source_position, + errorf(&goto_statement->base.source_position, "label '%Y' used but not defined", label->symbol); } } @@ -3153,7 +4226,7 @@ static void check_labels(void) if (! label->used) { print_in_function(); - warningf(label_statement->base.source_position, + warningf(&label_statement->base.source_position, "label '%Y' defined but not used", label->symbol); } } @@ -3173,8 +4246,8 @@ static void check_declarations(void) for (; parameter != NULL; parameter = parameter->next) { if (! parameter->used) { print_in_function(); - warningf(parameter->source_position, - "unused parameter '%Y'", parameter->symbol); + warningf(¶meter->source_position, + "unused parameter '%Y'", parameter->symbol); } } } @@ -3188,7 +4261,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 == ';') { @@ -3196,9 +4272,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); @@ -3209,8 +4293,8 @@ static void parse_external_declaration(void) parse_kr_declaration_list(ndeclaration); if(token.type != '{') { - parse_error_expected("while parsing function definition", '{', 0); - eat_statement(); + parse_error_expected("while parsing function definition", '{', NULL); + eat_until_matching_token(';'); return; } @@ -3263,7 +4347,7 @@ static void parse_external_declaration(void) } if(declaration->init.statement != NULL) { - parser_error_multiple_definition(declaration, token.source_position); + parser_error_multiple_definition(declaration, HERE); eat_block(); goto end_of_parse_external_declaration; } else { @@ -3272,7 +4356,7 @@ static void parse_external_declaration(void) declaration_t *old_current_function = current_function; current_function = declaration; - declaration->init.statement = parse_compound_statement(); + declaration->init.statement = parse_compound_statement(false); first_err = true; check_labels(); check_declarations(); @@ -3288,12 +4372,13 @@ end_of_parse_external_declaration: environment_pop_to(top); } -static type_t *make_bitfield_type(type_t *base, expression_t *size, - source_position_t source_position) +static type_t *make_bitfield_type(type_t *base_type, expression_t *size, + source_position_t *source_position) { - type_t *type = allocate_type_zero(TYPE_BITFIELD, source_position); - type->bitfield.base = base; - type->bitfield.size = size; + type_t *type = allocate_type_zero(TYPE_BITFIELD, source_position); + + type->bitfield.base_type = base_type; + type->bitfield.size = size; return type; } @@ -3339,7 +4424,7 @@ static void parse_compound_declarators(declaration_t *struct_declaration, declaration_t *declaration; if(token.type == ':') { - source_position_t source_position = HERE; + source_position_t source_position = *HERE; next_token(); type_t *base_type = specifiers->type; @@ -3350,14 +4435,14 @@ static void parse_compound_declarators(declaration_t *struct_declaration, base_type); } - type_t *type = make_bitfield_type(base_type, size, source_position); + type_t *type = make_bitfield_type(base_type, size, &source_position); 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->decl_modifiers = specifiers->decl_modifiers; declaration->type = type; } else { declaration = parse_declarator(specifiers,/*may_be_abstract=*/true); @@ -3366,7 +4451,7 @@ static void parse_compound_declarators(declaration_t *struct_declaration, type_t *type = skip_typeref(orig_type); if(token.type == ':') { - source_position_t source_position = HERE; + source_position_t source_position = *HERE; next_token(); expression_t *size = parse_constant_expression(); @@ -3375,7 +4460,7 @@ static void parse_compound_declarators(declaration_t *struct_declaration, "integer type", orig_type); } - type_t *bitfield_type = make_bitfield_type(orig_type, size, source_position); + type_t *bitfield_type = make_bitfield_type(orig_type, size, &source_position); declaration->type = bitfield_type; } else { /* TODO we ignore arrays for now... what is missing is a check @@ -3399,10 +4484,9 @@ static void parse_compound_declarators(declaration_t *struct_declaration, if(prev_decl != NULL) { assert(prev_decl->symbol == symbol); - errorf(declaration->source_position, - "multiple declarations of symbol '%Y'", symbol); - errorf(prev_decl->source_position, - "previous declaration of '%Y' was here", symbol); + errorf(&declaration->source_position, + "multiple declarations of symbol '%Y' (declared %P)", + symbol, &prev_decl->source_position); } } @@ -3418,12 +4502,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; @@ -3432,6 +4520,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"); } @@ -3472,16 +4562,6 @@ struct expression_parser_function_t { expression_parser_function_t expression_parsers[T_LAST_TOKEN]; -/** - * Creates a new invalid expression. - */ -static expression_t *create_invalid_expression(void) -{ - expression_t *expression = allocate_expression_zero(EXPR_INVALID); - expression->base.source_position = token.source_position; - return expression; -} - /** * Prints an error message if an expression was expected but not read */ @@ -3552,7 +4632,7 @@ static expression_t *parse_string_const(void) static expression_t *parse_int_const(void) { expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->base.source_position = HERE; + cnst->base.source_position = *HERE; cnst->base.type = token.datatype; cnst->conste.v.int_value = token.v.intvalue; @@ -3568,7 +4648,7 @@ static expression_t *parse_character_constant(void) { expression_t *cnst = allocate_expression_zero(EXPR_CHARACTER_CONSTANT); - cnst->base.source_position = HERE; + cnst->base.source_position = *HERE; cnst->base.type = token.datatype; cnst->conste.v.character = token.v.string; @@ -3592,7 +4672,7 @@ 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.source_position = *HERE; cnst->base.type = token.datatype; cnst->conste.v.wide_character = token.v.wide_string; @@ -3624,7 +4704,7 @@ static expression_t *parse_float_const(void) } static declaration_t *create_implicit_function(symbol_t *symbol, - const source_position_t source_position) + const source_position_t *source_position) { type_t *ntype = allocate_type_zero(TYPE_FUNCTION, source_position); ntype->function.return_type = type_int; @@ -3640,7 +4720,7 @@ static declaration_t *create_implicit_function(symbol_t *symbol, declaration->declared_storage_class = STORAGE_CLASS_EXTERN; declaration->type = type; declaration->symbol = symbol; - declaration->source_position = source_position; + declaration->source_position = *source_position; declaration->parent_scope = global_scope; scope_t *old_scope = scope; @@ -3671,7 +4751,7 @@ static type_t *make_function_1_type(type_t *return_type, type_t *argument_type) memset(parameter, 0, sizeof(parameter[0])); parameter->type = argument_type; - type_t *type = allocate_type_zero(TYPE_FUNCTION, builtin_source_position); + type_t *type = allocate_type_zero(TYPE_FUNCTION, &builtin_source_position); type->function.return_type = return_type; type->function.parameters = parameter; @@ -3702,7 +4782,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"); } } @@ -3717,7 +4797,7 @@ static type_t *automatic_type_conversion(type_t *orig_type) if(is_type_array(type)) { array_type_t *array_type = &type->array; type_t *element_type = array_type->element_type; - unsigned qualifiers = array_type->type.qualifiers; + unsigned qualifiers = array_type->base.qualifiers; return make_pointer_type(element_type, qualifiers); } @@ -3782,9 +4862,9 @@ static expression_t *parse_reference(void) expression_t *expression = allocate_expression_zero(EXPR_REFERENCE); reference_expression_t *ref = &expression->reference; - ref->symbol = token.v.symbol; + symbol_t *const symbol = token.v.symbol; - declaration_t *declaration = get_declaration(ref->symbol, NAMESPACE_NORMAL); + declaration_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL); source_position_t source_position = token.source_position; next_token(); @@ -3794,13 +4874,13 @@ static expression_t *parse_reference(void) /* an implicitly defined function */ if (warning.implicit_function_declaration) { warningf(HERE, "implicit declaration of function '%Y'", - ref->symbol); + symbol); } - declaration = create_implicit_function(ref->symbol, - source_position); + declaration = create_implicit_function(symbol, + &source_position); } else { - errorf(HERE, "unknown symbol '%Y' found.", ref->symbol); + errorf(HERE, "unknown symbol '%Y' found.", symbol); return create_invalid_expression(); } } @@ -3817,6 +4897,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; } @@ -3833,12 +4929,13 @@ static expression_t *parse_compound_literal(type_t *type) parse_initializer_env_t env; env.type = type; + env.declaration = NULL; env.must_be_constant = false; - parse_initializer(&env); + initializer_t *initializer = parse_initializer(&env); type = env.type; + expression->compound_literal.initializer = initializer; expression->compound_literal.type = type; - expression->compound_literal.initializer = env.initializer; expression->base.type = automatic_type_conversion(type); return expression; @@ -3853,6 +4950,8 @@ static expression_t *parse_cast(void) type_t *type = parse_typename(); + /* matching add_anchor_token() is at call site */ + rem_anchor_token(')'); expect(')'); if(token.type == '{') { @@ -3881,7 +4980,7 @@ static expression_t *parse_statement_expression(void) { expression_t *expression = allocate_expression_zero(EXPR_STATEMENT); - statement_t *statement = parse_compound_statement(); + statement_t *statement = parse_compound_statement(true); expression->statement.statement = statement; expression->base.source_position = statement->base.source_position; @@ -3896,7 +4995,7 @@ static expression_t *parse_statement_expression(void) type = stmt->expression.expression->base.type; } } else { - warningf(expression->base.source_position, "empty statement expression ({})"); + warningf(&expression->base.source_position, "empty statement expression ({})"); } expression->base.type = type; @@ -3913,6 +5012,7 @@ end_error: static expression_t *parse_brace_expression(void) { eat('('); + add_anchor_token(')'); switch(token.type) { case '{': @@ -3929,6 +5029,7 @@ static expression_t *parse_brace_expression(void) } expression_t *result = parse_expression(); + rem_anchor_token(')'); expect(')'); return result; @@ -3945,8 +5046,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; } @@ -3954,14 +5056,44 @@ static expression_t *parse_function_keyword(void) static expression_t *parse_pretty_function_keyword(void) { eat(T___PRETTY_FUNCTION__); - /* TODO */ if (current_function == NULL) { errorf(HERE, "'__PRETTY_FUNCTION__' used outside of a function"); } - expression_t *expression = allocate_expression_zero(EXPR_PRETTY_FUNCTION); - expression->base.type = type_char_ptr; + expression_t *expression = allocate_expression_zero(EXPR_FUNCNAME); + expression->base.type = type_char_ptr; + expression->funcname.kind = FUNCNAME_PRETTY_FUNCTION; + + return expression; +} + +static expression_t *parse_funcsig_keyword(void) +{ + eat(T___FUNCSIG__); + + if (current_function == NULL) { + errorf(HERE, "'__FUNCSIG__' used outside of a function"); + } + + expression_t *expression = allocate_expression_zero(EXPR_FUNCNAME); + expression->base.type = type_char_ptr; + expression->funcname.kind = FUNCNAME_FUNCSIG; + + return expression; +} + +static expression_t *parse_funcdname_keyword(void) +{ + eat(T___FUNCDNAME__); + + if (current_function == NULL) { + errorf(HERE, "'__FUNCDNAME__' used outside of a function"); + } + + expression_t *expression = allocate_expression_zero(EXPR_FUNCNAME); + expression->base.type = type_char_ptr; + expression->funcname.kind = FUNCNAME_FUNCDNAME; return expression; } @@ -3969,12 +5101,11 @@ static expression_t *parse_pretty_function_keyword(void) static designator_t *parse_designator(void) { designator_t *result = allocate_ast_zero(sizeof(result[0])); - result->source_position = HERE; + result->source_position = *HERE; if(token.type != T_IDENTIFIER) { parse_error_expected("while parsing member designator", - T_IDENTIFIER, 0); - eat_paren(); + T_IDENTIFIER, NULL); return NULL; } result->symbol = token.v.symbol; @@ -3986,12 +5117,11 @@ static designator_t *parse_designator(void) next_token(); if(token.type != T_IDENTIFIER) { parse_error_expected("while parsing member designator", - T_IDENTIFIER, 0); - eat_paren(); + T_IDENTIFIER, NULL); return NULL; } designator_t *designator = allocate_ast_zero(sizeof(result[0])); - designator->source_position = HERE; + designator->source_position = *HERE; designator->symbol = token.v.symbol; next_token(); @@ -4001,14 +5131,15 @@ static designator_t *parse_designator(void) } if(token.type == '[') { next_token(); + add_anchor_token(']'); designator_t *designator = allocate_ast_zero(sizeof(result[0])); - designator->source_position = HERE; + designator->source_position = *HERE; designator->array_index = parse_expression(); + rem_anchor_token(']'); + expect(']'); if(designator->array_index == NULL) { - eat_paren(); return NULL; } - expect(']'); last_designator->next = designator; last_designator = designator; @@ -4033,9 +5164,13 @@ static expression_t *parse_offsetof(void) expression->base.type = type_size_t; expect('('); + add_anchor_token(','); type_t *type = parse_typename(); + rem_anchor_token(','); expect(','); + add_anchor_token(')'); designator_t *designator = parse_designator(); + rem_anchor_token(')'); expect(')'); expression->offsetofe.type = type; @@ -4069,7 +5204,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) { @@ -4083,7 +5220,8 @@ static expression_t *parse_va_start(void) return expression; } } - errorf(expr->base.source_position, "second argument of 'va_start' must be last parameter of the current function"); + errorf(&expr->base.source_position, + "second argument of 'va_start' must be last parameter of the current function"); end_error: return create_invalid_expression(); } @@ -4134,7 +5272,9 @@ static expression_t *parse_builtin_constant(void) expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_CONSTANT_P); expect('('); + add_anchor_token(')'); expression->builtin_constant.value = parse_assignment_expression(); + rem_anchor_token(')'); expect(')'); expression->base.type = type_int; @@ -4153,6 +5293,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(); @@ -4162,6 +5303,7 @@ static expression_t *parse_builtin_prefetch(void) next_token(); expression->builtin_prefetch.locality = parse_assignment_expression(); } + rem_anchor_token(')'); expect(')'); expression->base.type = type_void; @@ -4197,10 +5339,10 @@ 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; + expression->base.source_position = *HERE; next_token(); expect('('); @@ -4217,7 +5359,7 @@ static expression_t *parse_compare_builtin(void) if(!is_type_float(type_left) && !is_type_float(type_right)) { if (is_type_valid(type_left) && is_type_valid(type_right)) { type_error_incompatible("invalid operands in comparison", - expression->base.source_position, orig_type_left, orig_type_right); + &expression->base.source_position, orig_type_left, orig_type_right); } } else { semantic_comparison(&expression->binary); @@ -4255,13 +5397,15 @@ end_error: * Parses a MS assume() expression. */ static expression_t *parse_assume(void) { - eat(T_assume); + eat(T__assume); expression_t *expression = allocate_expression_zero(EXPR_UNARY_ASSUME); expect('('); + add_anchor_token(')'); expression->unary.value = parse_assignment_expression(); + rem_anchor_token(')'); expect(')'); expression->base.type = type_void; @@ -4270,6 +5414,45 @@ end_error: return create_invalid_expression(); } +/** + * Parse a microsoft __noop expression. + */ +static expression_t *parse_noop_expression(void) { + source_position_t source_position = *HERE; + eat(T___noop); + + if (token.type == '(') { + /* parse arguments */ + eat('('); + add_anchor_token(')'); + add_anchor_token(','); + + if(token.type != ')') { + while(true) { + (void)parse_assignment_expression(); + if(token.type != ',') + break; + next_token(); + } + } + } + rem_anchor_token(','); + rem_anchor_token(')'); + expect(')'); + + /* the result is a (int)0 */ + expression_t *cnst = allocate_expression_zero(EXPR_CONST); + cnst->base.source_position = source_position; + cnst->base.type = type_int; + cnst->conste.v.int_value = 0; + cnst->conste.is_ms_noop = true; + + return cnst; + +end_error: + return create_invalid_expression(); +} + /** * Parses a primary expression. */ @@ -4286,6 +5469,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(); @@ -4303,14 +5488,13 @@ static expression_t *parse_primary_expression(void) case T___builtin_isunordered: return parse_compare_builtin(); case T___builtin_constant_p: return parse_builtin_constant(); case T___builtin_prefetch: return parse_builtin_prefetch(); - case T_assume: return parse_assume(); + case T__assume: return parse_assume(); case '(': return parse_brace_expression(); + case T___noop: return parse_noop_expression(); } errorf(HERE, "unexpected token %K, expected an expression", &token); - eat_statement(); - return create_invalid_expression(); } @@ -4323,8 +5507,8 @@ static void check_for_char_index_type(const expression_t *expression) { if (is_type_atomic(base_type, ATOMIC_TYPE_CHAR) && warning.char_subscripts) { - warningf(expression->base.source_position, - "array subscript has type '%T'", type); + warningf(&expression->base.source_position, + "array subscript has type '%T'", type); } } @@ -4334,6 +5518,7 @@ static expression_t *parse_array_expression(unsigned precedence, (void) precedence; eat('['); + add_anchor_token(']'); expression_t *inside = parse_expression(); @@ -4369,8 +5554,9 @@ 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); + parse_error_expected("Problem while parsing array access", ']', NULL); return expression; } next_token(); @@ -4388,7 +5574,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); @@ -4428,7 +5616,7 @@ static expression_t *parse_select_expression(unsigned precedence, select->select.compound = compound; if(token.type != T_IDENTIFIER) { - parse_error_expected("while parsing select", T_IDENTIFIER, 0); + parse_error_expected("while parsing select", T_IDENTIFIER, NULL); return select; } symbol_t *symbol = token.v.symbol; @@ -4484,7 +5672,7 @@ static expression_t *parse_select_expression(unsigned precedence, expression_t *extract = allocate_expression_zero(EXPR_UNARY_BITFIELD_EXTRACT); extract->unary.value = select; - extract->base.type = expression_type->bitfield.base; + extract->base.type = expression_type->bitfield.base_type; return extract; } @@ -4502,6 +5690,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; @@ -4525,6 +5714,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; @@ -4545,6 +5736,8 @@ static expression_t *parse_call_expression(unsigned precedence, next_token(); } } + rem_anchor_token(','); + rem_anchor_token(')'); expect(')'); if(function_type != NULL) { @@ -4555,10 +5748,12 @@ static expression_t *parse_call_expression(unsigned precedence, type_t *expected_type = parameter->type; /* TODO report scope in error messages */ expression_t *const arg_expr = argument->expression; - type_t *const res_type = semantic_assign(expected_type, arg_expr, "function call"); + type_t *const res_type = semantic_assign(expected_type, arg_expr, + "function call", + &arg_expr->base.source_position); if (res_type == NULL) { /* TODO improve error message */ - errorf(arg_expr->base.source_position, + errorf(&arg_expr->base.source_position, "Cannot call function with argument '%E' of type '%T' where type '%T' is expected", arg_expr, arg_expr->base.type, expected_type); } else { @@ -4620,6 +5815,7 @@ static expression_t *parse_conditional_expression(unsigned precedence, expression_t *expression) { eat('?'); + add_anchor_token(':'); expression_t *result = allocate_expression_zero(EXPR_CONDITIONAL); @@ -4631,10 +5827,11 @@ static expression_t *parse_conditional_expression(unsigned precedence, type_t *const condition_type = skip_typeref(condition_type_orig); if (!is_type_scalar(condition_type) && is_type_valid(condition_type)) { type_error("expected a scalar type in conditional condition", - expression->base.source_position, condition_type_orig); + &expression->base.source_position, condition_type_orig); } expression_t *true_expression = parse_expression(); + rem_anchor_token(':'); expect(':'); expression_t *false_expression = parse_sub_expression(precedence); @@ -4645,7 +5842,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); @@ -4654,28 +5860,46 @@ 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 */ if (is_type_valid(true_type) && is_type_valid(false_type)) { type_error_incompatible("while parsing conditional", - expression->base.source_position, true_type, + &expression->base.source_position, true_type, false_type); } result_type = type_error_type; @@ -4715,7 +5939,9 @@ static expression_t *parse_builtin_classify_type(const unsigned precedence) result->base.type = type_int; expect('('); + add_anchor_token(')'); expression_t *expression = parse_sub_expression(precedence); + rem_anchor_token(')'); expect(')'); result->classify_type.type_expression = expression; @@ -4815,9 +6041,9 @@ static void semantic_take_addr(unary_expression_t *expression) declaration_t *const declaration = value->reference.declaration; if(declaration != NULL) { if (declaration->storage_class == STORAGE_CLASS_REGISTER) { - errorf(expression->base.source_position, - "address of register variable '%Y' requested", - declaration->symbol); + errorf(&expression->base.source_position, + "address of register variable '%Y' requested", + declaration->symbol); } declaration->address_taken = 1; } @@ -4833,7 +6059,7 @@ static expression_t *parse_##unexpression_type(unsigned precedence) \ \ expression_t *unary_expression \ = allocate_expression_zero(unexpression_type); \ - unary_expression->base.source_position = HERE; \ + unary_expression->base.source_position = *HERE; \ unary_expression->unary.value = parse_sub_expression(precedence); \ \ sfunc(&unary_expression->unary); \ @@ -5045,11 +6271,34 @@ static void semantic_comparison(binary_expression_t *expression) /* TODO non-arithmetic types */ if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { + /* test for signed vs unsigned compares */ if (warning.sign_compare && (expression->base.kind != EXPR_BINARY_EQUAL && expression->base.kind != EXPR_BINARY_NOTEQUAL) && (is_type_signed(type_left) != is_type_signed(type_right))) { - warningf(expression->base.source_position, + + /* check if 1 of the operands is a constant, in this case we just + * check wether we can safely represent the resulting constant in + * the type of the other operand. */ + expression_t *const_expr = NULL; + expression_t *other_expr = NULL; + + if(is_constant_expression(left)) { + const_expr = left; + other_expr = right; + } else if(is_constant_expression(right)) { + const_expr = right; + other_expr = left; + } + + type_t *other_type = skip_typeref(other_expr->base.type); + if(const_expr != NULL) { + long val = fold_constant(const_expr); + /* TODO: check if val can be represented by other_type */ + (void) other_type; + (void) val; + } + warningf(&expression->base.source_position, "comparison between signed and unsigned"); } type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); @@ -5060,7 +6309,7 @@ static void semantic_comparison(binary_expression_t *expression) (expression->base.kind == EXPR_BINARY_EQUAL || expression->base.kind == EXPR_BINARY_NOTEQUAL) && is_type_float(arithmetic_type)) { - warningf(expression->base.source_position, + warningf(&expression->base.source_position, "comparing floating point with == or != is unsafe"); } } else if (is_type_pointer(type_left) && is_type_pointer(type_right)) { @@ -5071,7 +6320,7 @@ static void semantic_comparison(binary_expression_t *expression) expression->left = create_implicit_cast(left, type_right); } else if (is_type_valid(type_left) && is_type_valid(type_right)) { type_error_incompatible("invalid operands in comparison", - expression->base.source_position, + &expression->base.source_position, type_left, type_right); } expression->base.type = type_int; @@ -5205,9 +6454,9 @@ static void semantic_binexpr_assign(binary_expression_t *expression) } type_t *const res_type = semantic_assign(orig_type_left, expression->right, - "assignment"); + "assignment", &left->base.source_position); if (res_type == NULL) { - errorf(expression->base.source_position, + errorf(&expression->base.source_position, "cannot assign to '%T' from '%T'", orig_type_left, expression->right->base.type); } else { @@ -5235,7 +6484,8 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_UNKNOWN: break; case EXPR_INVALID: return true; /* do NOT warn */ case EXPR_REFERENCE: return false; - case EXPR_CONST: return false; + /* suppress the warning for microsoft __noop operations */ + case EXPR_CONST: return expr->conste.is_ms_noop; case EXPR_CHARACTER_CONSTANT: return false; case EXPR_WIDE_CHARACTER_CONSTANT: return false; case EXPR_STRING_LITERAL: return false; @@ -5267,8 +6517,7 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_CLASSIFY_TYPE: return false; case EXPR_ALIGNOF: return false; - case EXPR_FUNCTION: return false; - case EXPR_PRETTY_FUNCTION: return false; + case EXPR_FUNCNAME: return false; case EXPR_BUILTIN_SYMBOL: break; /* handled in EXPR_CALL */ case EXPR_BUILTIN_CONSTANT_P: return false; case EXPR_BUILTIN_PREFETCH: return true; @@ -5347,7 +6596,7 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_BINARY_ISUNORDERED: return false; } - panic("unexpected expression"); + internal_errorf(HERE, "unexpected expression"); } static void semantic_comma(binary_expression_t *expression) @@ -5355,7 +6604,8 @@ static void semantic_comma(binary_expression_t *expression) if (warning.unused_value) { const expression_t *const left = expression->left; if (!expression_has_effect(left)) { - warningf(left->base.source_position, "left-hand operand of comma expression has no effect"); + warningf(&left->base.source_position, + "left-hand operand of comma expression has no effect"); } } expression->base.type = expression->right->base.type; @@ -5366,7 +6616,7 @@ static expression_t *parse_##binexpression_type(unsigned precedence, \ expression_t *left) \ { \ eat(token_type); \ - source_position_t pos = HERE; \ + source_position_t pos = *HERE; \ \ expression_t *right = parse_sub_expression(precedence + lr); \ \ @@ -5610,7 +6860,7 @@ static asm_constraint_t *parse_asm_constraints(void) eat('['); if(token.type != T_IDENTIFIER) { parse_error_expected("while parsing asm constraint", - T_IDENTIFIER, 0); + T_IDENTIFIER, NULL); return NULL; } constraint->symbol = token.v.symbol; @@ -5685,30 +6935,40 @@ static statement_t *parse_asm_statement(void) } expect('('); + add_anchor_token(')'); + add_anchor_token(':'); asm_statement->asm_text = parse_string_literals(); - if(token.type != ':') + if(token.type != ':') { + rem_anchor_token(':'); goto end_of_asm; + } eat(':'); asm_statement->inputs = parse_asm_constraints(); - if(token.type != ':') + if(token.type != ':') { + rem_anchor_token(':'); goto end_of_asm; + } eat(':'); asm_statement->outputs = parse_asm_constraints(); - if(token.type != ':') + if(token.type != ':') { + rem_anchor_token(':'); goto end_of_asm; + } + rem_anchor_token(':'); eat(':'); asm_statement->clobbers = parse_asm_clobbers(); end_of_asm: + rem_anchor_token(')'); expect(')'); expect(';'); return statement; end_error: - return NULL; + return create_invalid_statement(); } /** @@ -5733,8 +6993,8 @@ static statement_t *parse_case_statement(void) expect(':'); if (! is_constant_expression(statement->case_label.expression)) { - errorf(statement->base.source_position, - "case label does not reduce to an integer constant"); + errorf(&statement->base.source_position, + "case label does not reduce to an integer constant"); } else { /* TODO: check if the case label is already known */ if (current_switch != NULL) { @@ -5746,15 +7006,15 @@ static statement_t *parse_case_statement(void) current_switch->last_case->next = &statement->case_label; } } else { - errorf(statement->base.source_position, - "case label not within a switch statement"); + errorf(&statement->base.source_position, + "case label not within a switch statement"); } } statement->case_label.statement = parse_statement(); return statement; end_error: - return NULL; + return create_invalid_statement(); } /** @@ -5786,9 +7046,8 @@ static statement_t *parse_default_statement(void) if (current_switch != NULL) { const case_label_statement_t *def_label = find_default_label(current_switch); if (def_label != NULL) { - errorf(HERE, "multiple default labels in one switch"); - errorf(def_label->base.source_position, - "this is the first default label"); + errorf(HERE, "multiple default labels in one switch (previous declared %P)", + &def_label->base.source_position); } else { /* link all cases into the switch statement */ if (current_switch->last_case == NULL) { @@ -5799,14 +7058,14 @@ static statement_t *parse_default_statement(void) } } } else { - errorf(statement->base.source_position, + errorf(&statement->base.source_position, "'default' label not within a switch statement"); } statement->case_label.statement = parse_statement(); return statement; end_error: - return NULL; + return create_invalid_statement(); } /** @@ -5847,9 +7106,8 @@ static statement_t *parse_label_statement(void) /* if source position is already set then the label is defined twice, * otherwise it was just mentioned in a goto so far */ if(label->source_position.input_name != NULL) { - errorf(HERE, "duplicate label '%Y'", symbol); - errorf(label->source_position, "previous definition of '%Y' was here", - symbol); + errorf(HERE, "duplicate label '%Y' (declared %P)", + symbol, &label->source_position); } else { label->source_position = token.source_position; } @@ -5863,13 +7121,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(); @@ -5898,10 +7163,15 @@ static statement_t *parse_if(void) statement->base.source_position = token.source_position; expect('('); + add_anchor_token(')'); statement->ifs.condition = parse_expression(); + rem_anchor_token(')'); expect(')'); + add_anchor_token(T_else); statement->ifs.true_statement = parse_statement(); + rem_anchor_token(T_else); + if(token.type == T_else) { next_token(); statement->ifs.false_statement = parse_statement(); @@ -5909,7 +7179,7 @@ static statement_t *parse_if(void) return statement; end_error: - return NULL; + return create_invalid_statement(); } /** @@ -5928,7 +7198,7 @@ static statement_t *parse_switch(void) if (is_type_integer(type)) { type = promote_integer(type); } else if (is_type_valid(type)) { - errorf(expr->base.source_position, + errorf(&expr->base.source_position, "switch quantity is not an integer, but '%T'", type); type = type_error_type; } @@ -5940,14 +7210,14 @@ static statement_t *parse_switch(void) statement->switchs.body = parse_statement(); current_switch = rem; - if (warning.switch_default - && find_default_label(&statement->switchs) == NULL) { - warningf(statement->base.source_position, "switch has no default case"); + if(warning.switch_default && + find_default_label(&statement->switchs) == NULL) { + warningf(&statement->base.source_position, "switch has no default case"); } return statement; end_error: - return NULL; + return create_invalid_statement(); } static statement_t *parse_loop_body(statement_t *const loop) @@ -5972,14 +7242,16 @@ static statement_t *parse_while(void) statement->base.source_position = token.source_position; expect('('); + add_anchor_token(')'); statement->whiles.condition = parse_expression(); + rem_anchor_token(')'); expect(')'); statement->whiles.body = parse_loop_body(statement); return statement; end_error: - return NULL; + return create_invalid_statement(); } /** @@ -5993,17 +7265,21 @@ static statement_t *parse_do(void) statement->base.source_position = token.source_position; + add_anchor_token(T_while); statement->do_while.body = parse_loop_body(statement); + rem_anchor_token(T_while); expect(T_while); expect('('); + add_anchor_token(')'); statement->do_while.condition = parse_expression(); + rem_anchor_token(')'); expect(')'); expect(';'); return statement; end_error: - return NULL; + return create_invalid_statement(); } /** @@ -6016,21 +7292,25 @@ 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); } else { + add_anchor_token(';'); 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"); + if (warning.unused_value && !expression_has_effect(init)) { + warningf(&init->base.source_position, + "initialisation of 'for'-statement has no effect"); } + rem_anchor_token(';'); expect(';'); } } else { @@ -6038,16 +7318,20 @@ static statement_t *parse_for(void) } if(token.type != ';') { + add_anchor_token(';'); statement->fors.condition = parse_expression(); + rem_anchor_token(';'); } expect(';'); if(token.type != ')') { 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"); + if (warning.unused_value && !expression_has_effect(step)) { + warningf(&step->base.source_position, + "step of 'for'-statement has no effect"); } } + rem_anchor_token(')'); expect(')'); statement->fors.body = parse_loop_body(statement); @@ -6056,8 +7340,14 @@ static statement_t *parse_for(void) environment_pop_to(top); return statement; + end_error: - return NULL; + rem_anchor_token(')'); + assert(scope == &statement->fors.scope); + set_scope(last_scope); + environment_pop_to(top); + + return create_invalid_statement(); } /** @@ -6068,7 +7358,7 @@ static statement_t *parse_goto(void) eat(T_goto); if(token.type != T_IDENTIFIER) { - parse_error_expected("while parsing goto", T_IDENTIFIER, 0); + parse_error_expected("while parsing goto", T_IDENTIFIER, NULL); eat_statement(); return NULL; } @@ -6094,7 +7384,7 @@ static statement_t *parse_goto(void) return statement; end_error: - return NULL; + return create_invalid_statement(); } /** @@ -6105,7 +7395,7 @@ static statement_t *parse_continue(void) statement_t *statement; if (current_loop == NULL) { errorf(HERE, "continue statement not within loop"); - statement = NULL; + statement = create_invalid_statement(); } else { statement = allocate_statement_zero(STATEMENT_CONTINUE); @@ -6117,7 +7407,7 @@ static statement_t *parse_continue(void) return statement; end_error: - return NULL; + return create_invalid_statement(); } /** @@ -6128,7 +7418,7 @@ static statement_t *parse_break(void) statement_t *statement; if (current_switch == NULL && current_loop == NULL) { errorf(HERE, "break statement not within loop or switch"); - statement = NULL; + statement = create_invalid_statement(); } else { statement = allocate_statement_zero(STATEMENT_BREAK); @@ -6140,7 +7430,30 @@ static statement_t *parse_break(void) return statement; end_error: - return NULL; + return create_invalid_statement(); +} + +/** + * Parse a __leave statement. + */ +static statement_t *parse_leave(void) +{ + statement_t *statement; + if (current_try == NULL) { + errorf(HERE, "__leave statement not within __try"); + statement = create_invalid_statement(); + } else { + statement = allocate_statement_zero(STATEMENT_LEAVE); + + statement->base.source_position = token.source_position; + } + + eat(T___leave); + expect(';'); + + return statement; +end_error: + return create_invalid_statement(); } /** @@ -6205,11 +7518,11 @@ declaration_t *expr_is_variable(const expression_t *expression) */ static statement_t *parse_return(void) { - eat(T_return); - statement_t *statement = allocate_statement_zero(STATEMENT_RETURN); statement->base.source_position = token.source_position; + eat(T_return); + expression_t *return_value = NULL; if(token.type != ';') { return_value = parse_expression(); @@ -6225,14 +7538,14 @@ static statement_t *parse_return(void) if(is_type_atomic(return_type, ATOMIC_TYPE_VOID) && !is_type_atomic(return_value_type, ATOMIC_TYPE_VOID)) { - warningf(statement->base.source_position, + warningf(&statement->base.source_position, "'return' with a value, in function returning void"); return_value = NULL; } else { type_t *const res_type = semantic_assign(return_type, - return_value, "'return'"); + return_value, "'return'", &statement->base.source_position); if (res_type == NULL) { - errorf(statement->base.source_position, + errorf(&statement->base.source_position, "cannot return something of type '%T' in function returning '%T'", return_value->base.type, return_type); } else { @@ -6243,13 +7556,13 @@ static statement_t *parse_return(void) if (return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) { const expression_t *expression = return_value->unary.value; if (is_local_variable(expression)) { - warningf(statement->base.source_position, + warningf(&statement->base.source_position, "function returns address of local variable"); } } } else { if(!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { - warningf(statement->base.source_position, + warningf(&statement->base.source_position, "'return' without value, in function returning non-void"); } } @@ -6257,7 +7570,7 @@ static statement_t *parse_return(void) return statement; end_error: - return NULL; + return create_invalid_statement(); } /** @@ -6293,25 +7606,68 @@ static statement_t *parse_expression_statement(void) expression_t *const expr = parse_expression(); statement->expression.expression = expr; - if (warning.unused_value && !expression_has_effect(expr)) { - warningf(expr->base.source_position, "statement has no effect"); - } - expect(';'); return statement; end_error: - return NULL; + return create_invalid_statement(); +} + +/** + * Parse a microsoft __try { } __finally { } or + * __try{ } __except() { } + */ +static statement_t *parse_ms_try_statment(void) { + statement_t *statement = allocate_statement_zero(STATEMENT_MS_TRY); + + statement->base.source_position = token.source_position; + eat(T___try); + + ms_try_statement_t *rem = current_try; + current_try = &statement->ms_try; + statement->ms_try.try_statement = parse_compound_statement(false); + current_try = rem; + + if(token.type == T___except) { + eat(T___except); + expect('('); + add_anchor_token(')'); + expression_t *const expr = parse_expression(); + type_t * type = skip_typeref(expr->base.type); + if (is_type_integer(type)) { + type = promote_integer(type); + } else if (is_type_valid(type)) { + errorf(&expr->base.source_position, + "__expect expression is not an integer, but '%T'", type); + type = type_error_type; + } + statement->ms_try.except_expression = create_implicit_cast(expr, type); + rem_anchor_token(')'); + expect(')'); + statement->ms_try.final_statement = parse_compound_statement(false); + } else if(token.type == T__finally) { + eat(T___finally); + statement->ms_try.final_statement = parse_compound_statement(false); + } else { + parse_error_expected("while parsing __try statement", T___except, T___finally, NULL); + return create_invalid_statement(); + } + return statement; +end_error: + return create_invalid_statement(); } /** * Parse a statement. + * There's also parse_statement() which additionally checks for + * "statement has no effect" warnings */ -static statement_t *parse_statement(void) +static statement_t *intern_parse_statement(void) { - statement_t *statement = NULL; + statement_t *statement = NULL; /* declaration or statement */ + add_anchor_token(';'); switch(token.type) { case T_asm: statement = parse_asm_statement(); @@ -6326,7 +7682,7 @@ static statement_t *parse_statement(void) break; case '{': - statement = parse_compound_statement(); + statement = parse_compound_statement(false); break; case T_if: @@ -6361,16 +7717,20 @@ static statement_t *parse_statement(void) statement = parse_break(); break; + case T___leave: + statement = parse_leave(); + break; + case T_return: statement = parse_return(); 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: @@ -6400,13 +7760,39 @@ static statement_t *parse_statement(void) statement = parse_declaration_statement(); break; + case T___try: + statement = parse_ms_try_statment(); + break; + default: statement = parse_expression_statement(); break; } + rem_anchor_token(';'); + + assert(statement != NULL + && statement->base.source_position.input_name != NULL); + + return statement; +} + +/** + * parse a statement and emits "statement has no effect" warning if needed + * (This is really a wrapper around intern_parse_statement with check for 1 + * single warning. It is needed, because for statement expressions we have + * to avoid the warning on the last statement) + */ +static statement_t *parse_statement(void) +{ + statement_t *statement = intern_parse_statement(); - assert(statement == NULL - || statement->base.source_position.input_name != NULL); + if(statement->kind == STATEMENT_EXPRESSION && warning.unused_value) { + expression_t *expression = statement->expression.expression; + if(!expression_has_effect(expression)) { + warningf(&expression->base.source_position, + "statement has no effect"); + } + } return statement; } @@ -6414,13 +7800,14 @@ static statement_t *parse_statement(void) /** * Parse a compound statement. */ -static statement_t *parse_compound_statement(void) +static statement_t *parse_compound_statement(bool inside_expression_statement) { statement_t *statement = allocate_statement_zero(STATEMENT_COMPOUND); statement->base.source_position = token.source_position; eat('{'); + add_anchor_token('}'); int top = environment_top(); scope_t *last_scope = scope; @@ -6429,9 +7816,13 @@ static statement_t *parse_compound_statement(void) statement_t *last_statement = NULL; while(token.type != '}' && token.type != T_EOF) { - statement_t *sub_statement = parse_statement(); - if(sub_statement == NULL) + statement_t *sub_statement = intern_parse_statement(); + 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; @@ -6448,10 +7839,31 @@ static statement_t *parse_compound_statement(void) if(token.type == '}') { next_token(); } else { - errorf(statement->base.source_position, + errorf(&statement->base.source_position, "end of file while looking for closing '}'"); } + /* look over all statements again to produce no effect warnings */ + if(warning.unused_value) { + statement_t *sub_statement = statement->compound.statements; + for( ; sub_statement != NULL; sub_statement = sub_statement->base.next) { + if(sub_statement->kind != STATEMENT_EXPRESSION) + continue; + /* don't emit a warning for the last expression in an expression + * statement as it has always an effect */ + if(inside_expression_statement && sub_statement->base.next == NULL) + continue; + + expression_t *expression = sub_statement->expression.expression; + if(!expression_has_effect(expression)) { + warningf(&expression->base.source_position, + "statement has no effect"); + } + } + } + +end_error: + rem_anchor_token('}'); assert(scope == &statement->compound.scope); set_scope(last_scope); environment_pop_to(top); @@ -6505,7 +7917,7 @@ static void check_unused_globals(void) s = "defined"; } - warningf(decl->source_position, "'%#T' %s but not used", + warningf(&decl->source_position, "'%#T' %s but not used", type, decl->symbol, s); } } @@ -6571,9 +7983,6 @@ translation_unit_t *parse(void) DEL_ARR_F(environment_stack); DEL_ARR_F(label_stack); - if(error_count > 0) - return NULL; - return unit; } @@ -6582,6 +7991,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);