X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=8977956e83b1cbbbd2bfcb37555677c46a7e5e03;hb=b732f96b591a9c4a4333bd1c1d4356723f362f6d;hp=83935121fb920bb9d99b1cae501b8983642e9b3b;hpb=07db3a904e974fc00e29e184c038889354d187e6;p=cparser diff --git a/parser.c b/parser.c index 8393512..8977956 100644 --- a/parser.c +++ b/parser.c @@ -99,6 +99,7 @@ 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; @@ -131,11 +132,11 @@ static const symbol_t *sym_noalias = NULL; 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); @@ -245,7 +246,9 @@ 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); @@ -363,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), @@ -485,6 +490,18 @@ static void add_anchor_token(int token_type) { ++token_anchor_set[token_type]; } +static int save_and_reset_anchor_state(int token_type) { + assert(0 <= token_type && token_type < T_LAST_TOKEN); + int count = token_anchor_set[token_type]; + token_anchor_set[token_type] = 0; + return count; +} + +static void restore_anchor_state(int token_type, int count) { + assert(0 <= token_type && token_type < T_LAST_TOKEN); + token_anchor_set[token_type] = count; +} + /** * Remove a token from the token anchor set (a multi-set). */ @@ -564,8 +581,7 @@ static void eat_block(void) { } /** - * eat all token until a ';' is reached - * or a stop token is found. + * eat all token until a ';' is reached or a stop token is found. */ static void eat_statement(void) { eat_until_matching_token(';'); @@ -578,14 +594,18 @@ static void eat_statement(void) { /** * Report a parse error because an expected token was not found. */ -static void parse_error_expected(const char *message, ...) +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, "a "); + errorf(HERE, "got %K, expected %#k", &token, &ap, ", "); va_end(ap); } @@ -604,7 +624,8 @@ static void type_error(const char *msg, const source_position_t *source_position 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); + errorf(source_position, "%s, incompatible types: '%T' - '%T'", + msg, type1, type2); } /** @@ -612,16 +633,18 @@ static void type_error_incompatible(const char *msg, * 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); \ - add_anchor_token(expected); \ - eat_until_anchor(); \ - rem_anchor_token(expected); \ - goto end_error; \ - } \ - next_token(); \ +#define expect(expected) \ + do { \ + if(UNLIKELY(token.type != (expected))) { \ + parse_error_expected(NULL, (expected), NULL); \ + add_anchor_token(expected); \ + eat_until_anchor(); \ + if (token.type == expected) \ + next_token(); \ + rem_anchor_token(expected); \ + goto end_error; \ + } \ + next_token(); \ } while(0) static void set_scope(scope_t *new_scope) @@ -768,7 +791,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 @@ -783,7 +806,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; @@ -930,7 +953,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; @@ -1038,6 +1062,7 @@ static const char *gnu_attribute_names[GNU_AK_LAST] = { [GNU_AK_TLS_MODEL] = "tls_model", [GNU_AK_VISIBILITY] = "visibility", [GNU_AK_REGPARM] = "regparm", + [GNU_AK_MODE] = "mode", [GNU_AK_MODEL] = "model", [GNU_AK_TRAP_EXIT] = "trap_exit", [GNU_AK_SP_SWITCH] = "sp_switch", @@ -1065,10 +1090,13 @@ static int strcmp_underscore(const char *s1, const char *s2) { */ 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; + attribute->kind = kind; + attribute->next = NULL; + attribute->invalid = false; + attribute->have_arguments = false; + + return attribute; + return attribute; } /** @@ -1111,10 +1139,13 @@ end_error: /** * parse one string literal argument. */ -static void parse_gnu_attribute_string_arg(gnu_attribute_t *attribute, string_t *string) { +static void parse_gnu_attribute_string_arg(gnu_attribute_t *attribute, + string_t *string) +{ add_anchor_token('('); if(token.type != T_STRING_LITERAL) { - parse_error_expected("while parsing attribute directive", T_STRING_LITERAL); + parse_error_expected("while parsing attribute directive", + T_STRING_LITERAL, NULL); goto end_error; } *string = parse_string_literals(); @@ -1196,6 +1227,21 @@ static void parse_gnu_attribute_model_arg(gnu_attribute_t *attribute) { attribute->invalid = true; } +static void parse_gnu_attribute_mode_arg(gnu_attribute_t *attribute) +{ + /* TODO: find out what is allowed here... */ + + /* at least: byte, word, pointer, list of machine modes + * __XXX___ is interpreted as XXX */ + add_anchor_token(')'); + expect(T_IDENTIFIER); + rem_anchor_token(')'); + expect(')'); + return; +end_error: + attribute->invalid = true; +} + /** * parse one interrupt argument. */ @@ -1234,7 +1280,7 @@ static void parse_gnu_attribute_format_args(gnu_attribute_t *attribute) { int i; if(token.type != T_IDENTIFIER) { - parse_error_expected("while parsing format attribute directive", T_IDENTIFIER); + parse_error_expected("while parsing format attribute directive", T_IDENTIFIER, NULL); goto end_error; } const char *name = token.v.symbol->string; @@ -1369,7 +1415,7 @@ static void parse_gnu_attribute(gnu_attribute_t **attributes) /* __attribute__((cdecl)), WITH ms mode */ name = "cdecl"; } else if(token.type != T_IDENTIFIER) { - parse_error_expected("while parsing GNU attribute", T_IDENTIFIER); + parse_error_expected("while parsing GNU attribute", T_IDENTIFIER, NULL); break; } const symbol_t *sym = token.v.symbol; @@ -1520,8 +1566,18 @@ static void parse_gnu_attribute(gnu_attribute_t **attributes) if(!attribute->have_arguments) { /* should have arguments */ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - } else + } else { parse_gnu_attribute_model_arg(attribute); + } + break; + case GNU_AK_MODE: + if(!attribute->have_arguments) { + /* should have arguments */ + errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); + } else { + parse_gnu_attribute_mode_arg(attribute); + } + break; case GNU_AK_INTERRUPT: /* may have one string argument */ if(attribute->have_arguments) @@ -1573,7 +1629,7 @@ static void parse_attributes(gnu_attribute_t **attributes) expect('('); if(token.type != T_STRING_LITERAL) { parse_error_expected("while parsing assembler attribute", - T_STRING_LITERAL); + T_STRING_LITERAL, NULL); eat_until_matching_token('('); break; } else { @@ -1614,7 +1670,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; @@ -2060,7 +2116,7 @@ static void skip_until(int type) { } /** - * skip any {...} blocks until a closing braket is reached. + * skip any {...} blocks until a closing bracket is reached. */ static void skip_initializers(void) { @@ -2385,10 +2441,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; @@ -2400,7 +2456,7 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) (is_struct ? NAMESPACE_STRUCT : NAMESPACE_UNION); declaration->source_position = token.source_position; declaration->symbol = symbol; - declaration->parent_scope = scope; + declaration->parent_scope = scope; if (symbol != NULL) { environment_push(declaration); } @@ -2408,13 +2464,13 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) } if(token.type == '{') { - if(declaration->init.is_defined) { + if (declaration->init.complete) { assert(symbol != NULL); errorf(HERE, "multiple definitions of '%s %Y'", is_struct ? "struct" : "union", symbol); declaration->scope.declarations = NULL; } - declaration->init.is_defined = true; + declaration->init.complete = true; parse_compound_type_entries(declaration); parse_attributes(&attributes); @@ -2436,7 +2492,7 @@ static void parse_enum_entries(type_t *const enum_type) 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; @@ -2487,7 +2543,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; @@ -2506,14 +2562,14 @@ static type_t *parse_enum_specifier(void) type->enumt.declaration = declaration; if(token.type == '{') { - if(declaration->init.is_defined) { + if(declaration->init.complete) { errorf(HERE, "multiple definitions of enum %Y", symbol); } if (symbol != NULL) { environment_push(declaration); } append_declaration(declaration); - declaration->init.is_defined = 1; + declaration->init.complete = true; parse_enum_entries(type); parse_attributes(&attributes); @@ -2603,10 +2659,8 @@ typedef enum { SPECIFIER_INT32 = 1 << 13, SPECIFIER_INT64 = 1 << 14, SPECIFIER_INT128 = 1 << 15, -#ifdef PROVIDE_COMPLEX SPECIFIER_COMPLEX = 1 << 16, SPECIFIER_IMAGINARY = 1 << 17, -#endif } specifiers_t; static type_t *create_builtin_type(symbol_t *const symbol, @@ -2617,7 +2671,7 @@ static type_t *create_builtin_type(symbol_t *const symbol, type->builtin.real_type = real_type; type_t *result = typehash_insert(type); - if (type != result) { + if(type != result) { free_type(type); } @@ -2627,8 +2681,8 @@ static type_t *create_builtin_type(symbol_t *const symbol, 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) + if(declaration == NULL || + declaration->storage_class != STORAGE_CLASS_TYPEDEF) return NULL; type_t *type = allocate_type_zero(TYPE_TYPEDEF, &declaration->source_position); @@ -2746,7 +2800,7 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe } } next_token(); - if(token.type == ',') { + if(token.type == ',') { next_token(); continue; } @@ -2899,10 +2953,9 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) MATCH_SPECIFIER(T__int32, SPECIFIER_INT32, "_int32") MATCH_SPECIFIER(T__int64, SPECIFIER_INT64, "_int64") MATCH_SPECIFIER(T__int128, SPECIFIER_INT128, "_int128") -#ifdef PROVIDE_COMPLEX MATCH_SPECIFIER(T__Complex, SPECIFIER_COMPLEX, "_Complex") MATCH_SPECIFIER(T__Imaginary, SPECIFIER_IMAGINARY, "_Imaginary") -#endif + case T__forceinline: /* only in microsoft mode */ specifiers->decl_modifiers |= DM_FORCEINLINE; @@ -3089,26 +3142,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) { @@ -3132,9 +3177,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"); @@ -3195,8 +3250,9 @@ static declaration_t *parse_identifier_list(void) } last_declaration = declaration; - if(token.type != ',') + if (token.type != ',') { break; + } next_token(); } while(token.type == T_IDENTIFIER); @@ -3249,24 +3305,30 @@ static declaration_t *parse_parameter(void) static declaration_t *parse_parameters(function_type_t *type) { + declaration_t *declarations = NULL; + + eat('('); + add_anchor_token(')'); + int saved_comma_state = save_and_reset_anchor_state(','); + if(token.type == T_IDENTIFIER) { symbol_t *symbol = token.v.symbol; if(!is_typedef_symbol(symbol)) { type->kr_style_parameters = true; - return parse_identifier_list(); + declarations = parse_identifier_list(); + goto parameters_finished; } } if(token.type == ')') { type->unspecified_parameters = 1; - return NULL; + goto parameters_finished; } if(token.type == T_void && look_ahead(1)->type == ')') { next_token(); - return NULL; + goto parameters_finished; } - declaration_t *declarations = NULL; declaration_t *declaration; declaration_t *last_declaration = NULL; function_parameter_t *parameter; @@ -3277,7 +3339,7 @@ static declaration_t *parse_parameters(function_type_t *type) case T_DOTDOTDOT: next_token(); type->variadic = 1; - return declarations; + goto parameters_finished; case T_IDENTIFIER: case T___extension__: @@ -3300,12 +3362,25 @@ static declaration_t *parse_parameters(function_type_t *type) break; default: - return declarations; + goto parameters_finished; + } + if (token.type != ',') { + goto parameters_finished; } - if(token.type != ',') - return declarations; next_token(); } + + +parameters_finished: + rem_anchor_token(')'); + expect(')'); + + restore_anchor_state(',', saved_comma_state); + return declarations; + +end_error: + restore_anchor_state(',', saved_comma_state); + return NULL; } typedef enum { @@ -3400,9 +3475,6 @@ 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); @@ -3421,10 +3493,6 @@ static construct_type_t *parse_function_declarator(declaration_t *declaration) construct_function_type->construct_type.kind = CONSTRUCT_FUNCTION; construct_function_type->function_type = type; - rem_anchor_token(')'); - expect(')'); - -end_error: return (construct_type_t*) construct_function_type; } @@ -3475,7 +3543,7 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration, 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) { @@ -3626,7 +3694,7 @@ static declaration_t *parse_declarator( { declaration_t *const declaration = allocate_declaration_zero(); declaration->declared_storage_class = specifiers->declared_storage_class; - declaration->modifiers = specifiers->decl_modifiers; + declaration->decl_modifiers = specifiers->decl_modifiers; declaration->deprecated = specifiers->deprecated; declaration->deprecated_string = specifiers->deprecated_string; declaration->get_property_sym = specifiers->get_property_sym; @@ -3855,6 +3923,9 @@ warn_redundant_declaration: } } } + + if (declaration->is_inline) + previous_declaration->is_inline = true; return previous_declaration; } } else if (is_function_definition) { @@ -3905,18 +3976,18 @@ static void parser_error_multiple_definition(declaration_t *declaration, } static bool is_declaration_specifier(const token_t *token, - bool only_type_specifiers) + bool only_specifiers_qualifiers) { switch(token->type) { TYPE_SPECIFIERS + TYPE_QUALIFIERS return true; case T_IDENTIFIER: return is_typedef_symbol(token->v.symbol); case T___extension__: STORAGE_CLASSES - TYPE_QUALIFIERS - return !only_type_specifiers; + return !only_specifiers_qualifiers; default: return false; @@ -3974,7 +4045,7 @@ static void parse_anonymous_declaration_rest( declaration->type = specifiers->type; declaration->declared_storage_class = specifiers->declared_storage_class; declaration->source_position = specifiers->source_position; - declaration->modifiers = specifiers->decl_modifiers; + declaration->decl_modifiers = specifiers->decl_modifiers; if (declaration->declared_storage_class != STORAGE_CLASS_NONE) { warningf(&declaration->source_position, @@ -4090,10 +4161,10 @@ static void parse_declaration(parsed_declaration_func finished_declaration) static void parse_kr_declaration_list(declaration_t *declaration) { type_t *type = skip_typeref(declaration->type); - if(!is_type_function(type)) + if (!is_type_function(type)) return; - if(!type->function.kr_style_parameters) + if (!type->function.kr_style_parameters) return; /* push function parameters */ @@ -4102,14 +4173,14 @@ static void parse_kr_declaration_list(declaration_t *declaration) set_scope(&declaration->scope); declaration_t *parameter = declaration->scope.declarations; - for( ; parameter != NULL; parameter = parameter->next) { + for ( ; parameter != NULL; parameter = parameter->next) { assert(parameter->parent_scope == NULL); parameter->parent_scope = scope; environment_push(parameter); } /* parse declaration list */ - while(is_declaration_specifier(&token, false)) { + while (is_declaration_specifier(&token, false)) { parse_declaration(finished_kr_declaration); } @@ -4120,7 +4191,6 @@ static void parse_kr_declaration_list(declaration_t *declaration) /* update function type */ type_t *new_type = duplicate_type(type); - new_type->function.kr_style_parameters = false; function_parameter_t *parameters = NULL; function_parameter_t *last_parameter = NULL; @@ -4158,7 +4228,11 @@ static void parse_kr_declaration_list(declaration_t *declaration) } last_parameter = function_parameter; } + + /* § 6.9.1.7: A K&R style parameter list does NOT act as a function + * prototype */ new_type->function.parameters = parameters; + new_type->function.unspecified_parameters = true; type = typehash_insert(new_type); if(type != new_type) { @@ -4278,7 +4352,7 @@ static void parse_external_declaration(void) parse_kr_declaration_list(ndeclaration); if(token.type != '{') { - parse_error_expected("while parsing function definition", '{', 0); + parse_error_expected("while parsing function definition", '{', NULL); eat_until_matching_token(';'); return; } @@ -4298,7 +4372,9 @@ static void parse_external_declaration(void) /* § 6.7.5.3 (14) a function definition with () means no * parameters (and not unspecified parameters) */ - if(type->function.unspecified_parameters) { + if(type->function.unspecified_parameters + && type->function.parameters == NULL + && !type->function.kr_style_parameters) { type_t *duplicate = duplicate_type(type); duplicate->function.unspecified_parameters = false; @@ -4341,7 +4417,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(); @@ -4357,12 +4433,13 @@ end_of_parse_external_declaration: environment_pop_to(top); } -static type_t *make_bitfield_type(type_t *base, expression_t *size, +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; } @@ -4426,7 +4503,7 @@ static void parse_compound_declarators(declaration_t *struct_declaration, 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); @@ -4705,18 +4782,11 @@ static declaration_t *create_implicit_function(symbol_t *symbol, declaration->type = type; declaration->symbol = symbol; declaration->source_position = *source_position; - declaration->parent_scope = global_scope; - - scope_t *old_scope = scope; - set_scope(global_scope); - environment_push(declaration); - /* prepends the declaration to the global declarations list */ - declaration->next = scope->declarations; - scope->declarations = declaration; - - assert(scope == global_scope); - set_scope(old_scope); + bool strict_prototypes_old = warning.strict_prototypes; + warning.strict_prototypes = false; + record_declaration(declaration); + warning.strict_prototypes = strict_prototypes_old; return declaration; } @@ -4747,6 +4817,20 @@ static type_t *make_function_1_type(type_t *return_type, type_t *argument_type) return result; } +static type_t *make_function_0_type(type_t *return_type) +{ + type_t *type = allocate_type_zero(TYPE_FUNCTION, &builtin_source_position); + type->function.return_type = return_type; + type->function.parameters = NULL; + + type_t *result = typehash_insert(type); + if(result != type) { + free_type(type); + } + + return result; +} + /** * Creates a function type for some function like builtins. * @@ -4757,6 +4841,8 @@ static type_t *get_builtin_symbol_type(symbol_t *symbol) switch(symbol->ID) { case T___builtin_alloca: return make_function_1_type(type_void_ptr, type_size_t); + case T___builtin_huge_val: + return make_function_0_type(type_double); case T___builtin_nan: return make_function_1_type(type_double, type_char_ptr); case T___builtin_nanf: @@ -4781,7 +4867,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); } @@ -4846,9 +4932,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(); @@ -4858,13 +4944,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, + 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(); } } @@ -4964,7 +5050,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; @@ -5089,7 +5175,7 @@ static designator_t *parse_designator(void) if(token.type != T_IDENTIFIER) { parse_error_expected("while parsing member designator", - T_IDENTIFIER, 0); + T_IDENTIFIER, NULL); return NULL; } result->symbol = token.v.symbol; @@ -5101,7 +5187,7 @@ static designator_t *parse_designator(void) next_token(); if(token.type != T_IDENTIFIER) { parse_error_expected("while parsing member designator", - T_IDENTIFIER, 0); + T_IDENTIFIER, NULL); return NULL; } designator_t *designator = allocate_ast_zero(sizeof(result[0])); @@ -5463,6 +5549,7 @@ static expression_t *parse_primary_expression(void) case T___builtin_nan: case T___builtin_nand: case T___builtin_nanf: + case T___builtin_huge_val: case T___builtin_va_end: return parse_builtin_symbol(); case T___builtin_isgreater: case T___builtin_isgreaterequal: @@ -5540,7 +5627,7 @@ static expression_t *parse_array_expression(unsigned precedence, 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(); @@ -5551,20 +5638,47 @@ static expression_t *parse_array_expression(unsigned precedence, return expression; } -static expression_t *parse_typeprop(expression_kind_t kind, unsigned precedence) +static expression_t *parse_typeprop(expression_kind_t const kind, + source_position_t const pos, + unsigned const precedence) { expression_t *tp_expression = allocate_expression_zero(kind); - tp_expression->base.type = type_size_t; + tp_expression->base.type = type_size_t; + tp_expression->base.source_position = pos; + + char const* const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof"; - if(token.type == '(' && is_declaration_specifier(look_ahead(1), true)) { + if (token.type == '(' && is_declaration_specifier(look_ahead(1), true)) { next_token(); add_anchor_token(')'); - tp_expression->typeprop.type = parse_typename(); + type_t* const type = parse_typename(); + tp_expression->typeprop.type = type; + + char const* const wrong_type = + is_type_incomplete(type) ? "incomplete" : + type->kind == TYPE_FUNCTION ? "function designator" : + type->kind == TYPE_BITFIELD ? "bitfield" : + NULL; + if (wrong_type != NULL) { + errorf(&pos, "operand of %s expression must not be %s type '%T'", what, wrong_type, type); + } + rem_anchor_token(')'); expect(')'); } else { expression_t *expression = parse_sub_expression(precedence); - expression->base.type = revert_automatic_type_conversion(expression); + + type_t* const type = revert_automatic_type_conversion(expression); + expression->base.type = type; + + char const* const wrong_type = + is_type_incomplete(type) ? "incomplete" : + type->kind == TYPE_FUNCTION ? "function designator" : + type->kind == TYPE_BITFIELD ? "bitfield" : + NULL; + if (wrong_type != NULL) { + errorf(&pos, "operand of %s expression must not be expression of %s type '%T'", what, wrong_type, type); + } tp_expression->typeprop.type = expression->base.type; tp_expression->typeprop.tp_expression = expression; @@ -5577,14 +5691,16 @@ end_error: static expression_t *parse_sizeof(unsigned precedence) { + source_position_t pos = *HERE; eat(T_sizeof); - return parse_typeprop(EXPR_SIZEOF, precedence); + return parse_typeprop(EXPR_SIZEOF, pos, precedence); } static expression_t *parse_alignof(unsigned precedence) { + source_position_t pos = *HERE; eat(T___alignof__); - return parse_typeprop(EXPR_SIZEOF, precedence); + return parse_typeprop(EXPR_ALIGNOF, pos, precedence); } static expression_t *parse_select_expression(unsigned precedence, @@ -5600,7 +5716,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; @@ -5633,7 +5749,7 @@ static expression_t *parse_select_expression(unsigned precedence, declaration_t *const declaration = type_left->compound.declaration; - if(!declaration->init.is_defined) { + if(!declaration->init.complete) { errorf(HERE, "request for member '%Y' of incomplete type '%T'", symbol, type_left); return create_invalid_expression(); @@ -5656,7 +5772,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; } @@ -6255,10 +6371,33 @@ 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))) { + + /* 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; + } + + if(const_expr != NULL) { + type_t *other_type = skip_typeref(other_expr->base.type); + 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"); } @@ -6821,7 +6960,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; @@ -7319,7 +7458,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; } @@ -7356,7 +7495,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); @@ -7379,7 +7518,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); @@ -7394,6 +7533,29 @@ end_error: 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(); +} + /** * Check if a given declaration represents a local variable. */ @@ -7544,10 +7706,6 @@ 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; @@ -7555,12 +7713,58 @@ end_error: 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(';'); @@ -7578,7 +7782,7 @@ static statement_t *parse_statement(void) break; case '{': - statement = parse_compound_statement(); + statement = parse_compound_statement(false); break; case T_if: @@ -7613,6 +7817,10 @@ static statement_t *parse_statement(void) statement = parse_break(); break; + case T___leave: + statement = parse_leave(); + break; + case T_return: statement = parse_return(); break; @@ -7652,6 +7860,10 @@ 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; @@ -7664,10 +7876,31 @@ static statement_t *parse_statement(void) 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(); + + 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; +} + /** * 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); @@ -7683,7 +7916,7 @@ 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(); + 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()) @@ -7710,6 +7943,25 @@ static statement_t *parse_compound_statement(void) "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);