X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=598f61cb2926ee2ed93e494c6e0852104f43f1ef;hb=643026ae19cfdb8e3c891407f155668768028325;hp=b214fc1e3a25f96d3a16764eea7e61a7456307cb;hpb=476ee2175bb415aa90f98a5c2f12390097dcdff2;p=cparser diff --git a/parser.c b/parser.c index b214fc1..598f61c 100644 --- a/parser.c +++ b/parser.c @@ -138,6 +138,7 @@ static bool in_type_prop = false; static bool in_gcc_extension = false; static struct obstack temp_obst; static entity_t *anonymous_entity; +static declaration_t **incomplete_arrays; #define PUSH_PARENT(stmt) \ @@ -246,6 +247,7 @@ static void semantic_comparison(binary_expression_t *expression); case T_union: \ case T_unsigned: \ case T_void: \ + case T_wchar_t: \ COMPLEX_SPECIFIERS \ IMAGINARY_SPECIFIERS @@ -327,6 +329,11 @@ static void *allocate_ast_zero(size_t size) return res; } +/** + * Returns the size of an entity node. + * + * @param kind the entity kind + */ static size_t get_entity_struct_size(entity_kind_t kind) { static const size_t sizes[] = { @@ -348,6 +355,10 @@ static size_t get_entity_struct_size(entity_kind_t kind) return sizes[kind]; } +/** + * Allocate an entity of given kind and initialize all + * fields with zero. + */ static entity_t *allocate_entity_zero(entity_kind_t kind) { size_t size = get_entity_struct_size(kind); @@ -439,7 +450,8 @@ static size_t get_expression_struct_size(expression_kind_t kind) /** * Allocate a statement node of given kind and initialize all - * fields with zero. + * fields with zero. Sets its source position to the position + * of the current token. */ static statement_t *allocate_statement_zero(statement_kind_t kind) { @@ -468,7 +480,8 @@ static expression_t *allocate_expression_zero(expression_kind_t kind) } /** - * Creates a new invalid expression. + * Creates a new invalid expression at the source position + * of the current token. */ static expression_t *create_invalid_expression(void) { @@ -618,7 +631,7 @@ static inline const token_t *look_ahead(int num) } /** - * Adds a token to the token anchor set (a multi-set). + * Adds a token type to the token type anchor set (a multi-set). */ static void add_anchor_token(int token_type) { @@ -626,6 +639,10 @@ static void add_anchor_token(int token_type) ++token_anchor_set[token_type]; } +/** + * Set the number of tokens types of the given type + * to zero and return the old count. + */ static int save_and_reset_anchor_state(int token_type) { assert(0 <= token_type && token_type < T_LAST_TOKEN); @@ -634,6 +651,9 @@ static int save_and_reset_anchor_state(int token_type) return count; } +/** + * Restore the number of token types to the given count. + */ static void restore_anchor_state(int token_type, int count) { assert(0 <= token_type && token_type < T_LAST_TOKEN); @@ -641,7 +661,7 @@ static void restore_anchor_state(int token_type, int count) } /** - * Remove a token from the token anchor set (a multi-set). + * Remove a token type from the token type anchor set (a multi-set). */ static void rem_anchor_token(int token_type) { @@ -650,6 +670,10 @@ static void rem_anchor_token(int token_type) --token_anchor_set[token_type]; } +/** + * Return true if the token type of the current token is + * in the anchor set. + */ static bool at_anchor(void) { if (token.type < 0) @@ -658,7 +682,7 @@ static bool at_anchor(void) } /** - * Eat tokens until a matching token is found. + * Eat tokens until a matching token type is found. */ static void eat_until_matching_token(int type) { @@ -723,6 +747,9 @@ static void eat_until_anchor(void) } } +/** + * Eat a whole block from input tokens. + */ static void eat_block(void) { eat_until_matching_token('{'); @@ -746,7 +773,7 @@ void parse_error_expected(const char *message, ...) } va_list ap; va_start(ap, message); - errorf(HERE, "got '%K', expected %#k", &token, &ap, ", "); + errorf(HERE, "got %K, expected %#k", &token, &ap, ", "); va_end(ap); } @@ -761,11 +788,11 @@ static void type_error_incompatible(const char *msg, } /** - * Expect the the current token is the expected token. + * Expect the current token is the expected token. * If not, generate an error, eat the current statement, * and goto the end_error label. */ -#define expect(expected) \ +#define expect(expected, error_label) \ do { \ if (UNLIKELY(token.type != (expected))) { \ parse_error_expected(NULL, (expected), NULL); \ @@ -774,11 +801,15 @@ static void type_error_incompatible(const char *msg, if (token.type == expected) \ next_token(); \ rem_anchor_token(expected); \ - goto end_error; \ + goto error_label; \ } \ next_token(); \ } while (0) +/** + * Push a given scope on the scope stack and make it the + * current scope + */ static scope_t *scope_push(scope_t *new_scope) { if (current_scope != NULL) { @@ -790,6 +821,9 @@ static scope_t *scope_push(scope_t *new_scope) return old_scope; } +/** + * Pop the current scope from the scope stack. + */ static void scope_pop(scope_t *old_scope) { current_scope = old_scope; @@ -937,6 +971,9 @@ static int get_akind_rank(atomic_type_kind_t akind) return (int) akind; } +/** + * Return the type rank for an atomic type. + */ static int get_rank(const type_t *type) { assert(!is_typeref(type)); @@ -952,6 +989,12 @@ static int get_rank(const type_t *type) return get_akind_rank(type->atomic.akind); } +/** + * Do integer promotion for a given type. + * + * @param type the type to promote + * @return the promoted type + */ static type_t *promote_integer(type_t *type) { if (type->kind == TYPE_BITFIELD) @@ -981,7 +1024,9 @@ static expression_t *create_cast_expression(expression_t *expression, } /** - * Check if a given expression represents the 0 pointer constant. + * Check if a given expression represents a null pointer constant. + * + * @param expression the expression to check */ static bool is_null_pointer_constant(const expression_t *expression) { @@ -1162,7 +1207,7 @@ static expression_t *parse_constant_expression(void) if (!is_constant_expression(result)) { errorf(&result->base.source_position, - "expression '%E' is not constant\n", result); + "expression '%E' is not constant", result); } return result; @@ -1273,7 +1318,7 @@ static int strcmp_underscore(const char *s1, const char *s2) } /** - * Allocate a new gnu temporal attribute. + * Allocate a new gnu temporal attribute of given kind. */ static gnu_attribute_t *allocate_gnu_attribute(gnu_attribute_kind_t kind) { @@ -1287,7 +1332,7 @@ static gnu_attribute_t *allocate_gnu_attribute(gnu_attribute_kind_t kind) } /** - * parse one constant expression argument. + * Parse one constant expression argument of the given attribute. */ static void parse_gnu_attribute_const_arg(gnu_attribute_t *attribute) { @@ -1295,7 +1340,7 @@ static void parse_gnu_attribute_const_arg(gnu_attribute_t *attribute) add_anchor_token(')'); expression = parse_constant_expression(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); attribute->u.argument = fold_constant(expression); return; end_error: @@ -1303,7 +1348,7 @@ end_error: } /** - * parse a list of constant expressions arguments. + * Parse a list of constant expressions arguments of the given attribute. */ static void parse_gnu_attribute_const_arg_list(gnu_attribute_t *attribute) { @@ -1325,14 +1370,14 @@ static void parse_gnu_attribute_const_arg_list(gnu_attribute_t *attribute) } rem_anchor_token(','); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); return; end_error: attribute->invalid = true; } /** - * parse one string literal argument. + * Parse one string literal argument of the given attribute. */ static void parse_gnu_attribute_string_arg(gnu_attribute_t *attribute, string_t *string) @@ -1345,14 +1390,14 @@ static void parse_gnu_attribute_string_arg(gnu_attribute_t *attribute, } *string = parse_string_literals(); rem_anchor_token('('); - expect(')'); + expect(')', end_error); return; end_error: attribute->invalid = true; } /** - * parse one tls model. + * Parse one tls model of the given attribute. */ static void parse_gnu_attribute_tls_model_arg(gnu_attribute_t *attribute) { @@ -1377,7 +1422,7 @@ static void parse_gnu_attribute_tls_model_arg(gnu_attribute_t *attribute) } /** - * parse one tls model. + * Parse one tls model of the given attribute. */ static void parse_gnu_attribute_visibility_arg(gnu_attribute_t *attribute) { @@ -1402,7 +1447,7 @@ static void parse_gnu_attribute_visibility_arg(gnu_attribute_t *attribute) } /** - * parse one (code) model. + * Parse one (code) model of the given attribute. */ static void parse_gnu_attribute_model_arg(gnu_attribute_t *attribute) { @@ -1425,6 +1470,9 @@ static void parse_gnu_attribute_model_arg(gnu_attribute_t *attribute) attribute->invalid = true; } +/** + * Parse one mode of the given attribute. + */ static void parse_gnu_attribute_mode_arg(gnu_attribute_t *attribute) { /* TODO: find out what is allowed here... */ @@ -1434,7 +1482,7 @@ static void parse_gnu_attribute_mode_arg(gnu_attribute_t *attribute) add_anchor_token(')'); if (token.type != T_IDENTIFIER) { - expect(T_IDENTIFIER); + expect(T_IDENTIFIER, end_error); } /* This isn't really correct, the backend should provide a list of machine @@ -1459,14 +1507,14 @@ static void parse_gnu_attribute_mode_arg(gnu_attribute_t *attribute) next_token(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); return; end_error: attribute->invalid = true; } /** - * parse one interrupt argument. + * Parse one interrupt argument of the given attribute. */ static void parse_gnu_attribute_interrupt_arg(gnu_attribute_t *attribute) { @@ -1492,7 +1540,7 @@ static void parse_gnu_attribute_interrupt_arg(gnu_attribute_t *attribute) } /** - * parse ( identifier, const expression, const expression ) + * Parse ( identifier, const expression, const expression ) */ static void parse_gnu_attribute_format_args(gnu_attribute_t *attribute) { @@ -1519,23 +1567,26 @@ static void parse_gnu_attribute_format_args(gnu_attribute_t *attribute) } next_token(); - expect(','); + expect(',', end_error); add_anchor_token(')'); add_anchor_token(','); parse_constant_expression(); rem_anchor_token(','); rem_anchor_token(')'); - expect(','); + expect(',', end_error); add_anchor_token(')'); parse_constant_expression(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); return; end_error: attribute->u.value = true; } +/** + * Check that a given GNU attribute has no arguments. + */ static void check_no_argument(gnu_attribute_t *attribute, const char *name) { if (!attribute->have_arguments) @@ -1633,8 +1684,8 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) gnu_attribute_t *attribute; eat(T___attribute__); - expect('('); - expect('('); + expect('(', end_error); + expect('(', end_error); if (token.type != ')') { /* find the end of the list */ @@ -1850,8 +1901,8 @@ no_arg: next_token(); } } - expect(')'); - expect(')'); + expect(')', end_error); + expect(')', end_error); end_error: *attributes = head; @@ -1873,7 +1924,7 @@ static decl_modifiers_t parse_attributes(gnu_attribute_t **attributes) case T_asm: next_token(); - expect('('); + expect('(', end_error); if (token.type != T_STRING_LITERAL) { parse_error_expected("while parsing assembler attribute", T_STRING_LITERAL, NULL); @@ -1882,7 +1933,7 @@ static decl_modifiers_t parse_attributes(gnu_attribute_t **attributes) } else { parse_string_literals(); } - expect(')'); + expect(')', end_error); continue; case T_cdecl: modifiers |= DM_CDECL; break; @@ -1892,7 +1943,7 @@ static decl_modifiers_t parse_attributes(gnu_attribute_t **attributes) case T___thiscall: /* TODO record modifier */ if (warning.other) - warningf(HERE, "Ignoring declaration modifier '%K'", &token); + warningf(HERE, "Ignoring declaration modifier %K", &token); break; end_error: @@ -2128,7 +2179,6 @@ unary: case EXPR_OFFSETOF: case EXPR_STATEMENT: // TODO case EXPR_LABEL_ADDRESS: - case EXPR_BINARY_BUILTIN_EXPECT: case EXPR_REFERENCE_ENUM_VALUE: return; } @@ -2151,7 +2201,7 @@ static designator_t *parse_designation(void) add_anchor_token(']'); designator->array_index = parse_constant_expression(); rem_anchor_token(']'); - expect(']'); + expect(']', end_error); break; case '.': designator = allocate_ast_zero(sizeof(designator[0])); @@ -2166,7 +2216,7 @@ static designator_t *parse_designation(void) next_token(); break; default: - expect('='); + expect('=', end_error); return result; } @@ -2297,7 +2347,7 @@ static initializer_t *parse_scalar_initializer(type_t *type, mark_vars_read(expression, NULL); if (must_be_constant && !is_initializer_constant(expression)) { errorf(&expression->base.source_position, - "Initialisation expression '%E' is not constant\n", + "Initialisation expression '%E' is not constant", expression); } @@ -2724,9 +2774,9 @@ finish_designator: if (type != NULL) { ascend_from_subtype(path); - expect('}'); + expect('}', end_error); } else { - expect('}'); + expect('}', end_error); goto error_parse_next; } } @@ -2736,7 +2786,7 @@ finish_designator: if (env->must_be_constant && !is_initializer_constant(expression)) { errorf(&expression->base.source_position, - "Initialisation expression '%E' is not constant\n", + "Initialisation expression '%E' is not constant", expression); } @@ -2820,7 +2870,7 @@ error_parse_next: if (token.type == '}') { break; } - expect(','); + expect(',', end_error); if (token.type == '}') { break; } @@ -2885,7 +2935,7 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env) max_index = path.max_index; DEL_ARR_F(path.path); - expect('}'); + expect('}', end_error); } else { /* parse_scalar_initializer() also works in this case: we simply * have an expression without {} around it */ @@ -3075,7 +3125,7 @@ static void parse_enum_entries(type_t *const enum_type) } while (token.type != '}'); rem_anchor_token('}'); - expect('}'); + expect('}', end_error); end_error: ; @@ -3116,7 +3166,7 @@ static type_t *parse_enum_specifier(void) if (token.type == '{') { if (entity->enume.complete) { - errorf(HERE, "multiple definitions of enum %Y (previous definition %P)", + errorf(HERE, "multiple definitions of 'enum %Y' (previous definition %P)", symbol, &entity->base.source_position); } if (symbol != NULL) { @@ -3133,7 +3183,7 @@ static type_t *parse_enum_specifier(void) anonymous_entity = entity; } } else if (!entity->enume.complete && !(c_mode & _GNUC)) { - errorf(HERE, "enum %Y used before definition (incomplete enumes are a GNU extension)", + errorf(HERE, "'enum %Y' used before definition (incomplete enums are a GNU extension)", symbol); } @@ -3155,7 +3205,7 @@ static type_t *parse_typeof(void) type_t *type; - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *expression = NULL; @@ -3192,7 +3242,7 @@ static type_t *parse_typeof(void) in_gcc_extension = old_gcc_extension; rem_anchor_token(')'); - expect(')'); + expect(')', end_error); type_t *typeof_type = allocate_type_zero(TYPE_TYPEOF); typeof_type->typeoft.expression = expression; @@ -3210,18 +3260,19 @@ typedef enum specifiers_t { SPECIFIER_INT = 1 << 3, SPECIFIER_DOUBLE = 1 << 4, SPECIFIER_CHAR = 1 << 5, - SPECIFIER_SHORT = 1 << 6, - SPECIFIER_LONG_LONG = 1 << 7, - SPECIFIER_FLOAT = 1 << 8, - SPECIFIER_BOOL = 1 << 9, - SPECIFIER_VOID = 1 << 10, - SPECIFIER_INT8 = 1 << 11, - SPECIFIER_INT16 = 1 << 12, - SPECIFIER_INT32 = 1 << 13, - SPECIFIER_INT64 = 1 << 14, - SPECIFIER_INT128 = 1 << 15, - SPECIFIER_COMPLEX = 1 << 16, - SPECIFIER_IMAGINARY = 1 << 17, + SPECIFIER_WCHAR_T = 1 << 6, + SPECIFIER_SHORT = 1 << 7, + SPECIFIER_LONG_LONG = 1 << 8, + SPECIFIER_FLOAT = 1 << 9, + SPECIFIER_BOOL = 1 << 10, + SPECIFIER_VOID = 1 << 11, + SPECIFIER_INT8 = 1 << 12, + SPECIFIER_INT16 = 1 << 13, + SPECIFIER_INT32 = 1 << 14, + SPECIFIER_INT64 = 1 << 15, + SPECIFIER_INT128 = 1 << 16, + SPECIFIER_COMPLEX = 1 << 17, + SPECIFIER_IMAGINARY = 1 << 18, } specifiers_t; static type_t *create_builtin_type(symbol_t *const symbol, @@ -3288,7 +3339,7 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe symbol_t *symbol = token.v.symbol; if (symbol == sym_align) { next_token(); - expect('('); + expect('(', end_error); if (token.type != T_INTEGER) goto end_error; if (check_alignment_value(token.v.intvalue)) { @@ -3297,14 +3348,14 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe specifiers->alignment = (unsigned char)token.v.intvalue; } next_token(); - expect(')'); + expect(')', end_error); } else if (symbol == sym_allocate) { next_token(); - expect('('); + expect('(', end_error); if (token.type != T_IDENTIFIER) goto end_error; (void)token.v.symbol; - expect(')'); + expect(')', end_error); } else if (symbol == sym_dllimport) { next_token(); DET_MOD(dllimport, DM_DLLIMPORT); @@ -3331,7 +3382,7 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe DET_MOD(novtable, DM_NOVTABLE); } else if (symbol == sym_property) { next_token(); - expect('('); + expect('(', end_error); for (;;) { bool is_get = false; if (token.type != T_IDENTIFIER) @@ -3344,7 +3395,7 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe goto end_error; } next_token(); - expect('='); + expect('=', end_error); if (token.type != T_IDENTIFIER) goto end_error; if (is_get) { @@ -3367,17 +3418,17 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe } break; } - expect(')'); + expect(')', end_error); } else if (symbol == sym_selectany) { next_token(); DET_MOD(selectany, DM_SELECTANY); } else if (symbol == sym_uuid) { next_token(); - expect('('); + expect('(', end_error); if (token.type != T_STRING_LITERAL) goto end_error; next_token(); - expect(')'); + expect(')', end_error); } else if (symbol == sym_deprecated) { next_token(); if (specifiers->deprecated != 0 && warning.other) @@ -3391,14 +3442,14 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe } else { errorf(HERE, "string literal expected"); } - expect(')'); + expect(')', end_error); } } else if (symbol == sym_noalias) { next_token(); DET_MOD(noalias, DM_NOALIAS); } else { if (warning.other) - warningf(HERE, "Unknown modifier %Y ignored", token.v.symbol); + warningf(HERE, "Unknown modifier '%Y' ignored", token.v.symbol); next_token(); if (token.type == '(') skip_until(')'); @@ -3420,7 +3471,8 @@ static entity_t *create_error_entity(symbol_t *symbol, entity_kind_tag_t kind) entity->declaration.type = type_error_type; entity->declaration.implicit = true; } else if (kind == ENTITY_TYPEDEF) { - entity->typedefe.type = type_error_type; + entity->typedefe.type = type_error_type; + entity->typedefe.builtin = true; } record_entity(entity, false); return entity; @@ -3507,14 +3559,15 @@ static void finish_struct_type(compound_type_t *type) if (offset > size) need_pad = true; - if (warning.padded && need_pad) { - warningf(&compound->base.source_position, - "'%#T' needs padding", type, compound->base.symbol); - } - if (warning.packed && !need_pad) { - warningf(&compound->base.source_position, - "superfluous packed attribute on '%#T'", - type, compound->base.symbol); + if (need_pad) { + if (warning.padded) { + warningf(&compound->base.source_position, "'%T' needs padding", type); + } + } else { + if (compound->modifiers & DM_PACKED && warning.packed) { + warningf(&compound->base.source_position, + "superfluous packed attribute on '%T'", type); + } } type->base.size = offset; @@ -3598,11 +3651,11 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) case T__declspec: next_token(); - expect('('); + expect('(', end_error); add_anchor_token(')'); parse_microsoft_extended_decl_modifier(specifiers); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); break; case T___thread: @@ -3678,6 +3731,7 @@ wrong_thread_stoarge_class: MATCH_SPECIFIER(T_signed, SPECIFIER_SIGNED, "signed"); MATCH_SPECIFIER(T_unsigned, SPECIFIER_UNSIGNED, "unsigned"); MATCH_SPECIFIER(T_void, SPECIFIER_VOID, "void"); + MATCH_SPECIFIER(T_wchar_t, SPECIFIER_WCHAR_T, "wchar_t"); case T__forceinline: /* only in microsoft mode */ @@ -3743,7 +3797,7 @@ wrong_thread_stoarge_class: case T_IDENTIFIER: case '&': case '*': - errorf(HERE, "discarding stray '%K' in declaration specifier", &token); + errorf(HERE, "discarding stray %K in declaration specifier", &token); next_token(); continue; @@ -3763,7 +3817,7 @@ wrong_thread_stoarge_class: case T_IDENTIFIER: case '&': case '*': { - errorf(HERE, "'%K' does not name a type", &token); + errorf(HERE, "%K does not name a type", &token); entity_t *entity = create_error_entity(token.v.symbol, ENTITY_TYPEDEF); @@ -3805,6 +3859,9 @@ finish_specifiers: case SPECIFIER_VOID: atomic_type = ATOMIC_TYPE_VOID; break; + case SPECIFIER_WCHAR_T: + atomic_type = ATOMIC_TYPE_WCHAR_T; + break; case SPECIFIER_CHAR: atomic_type = ATOMIC_TYPE_CHAR; break; @@ -4028,7 +4085,8 @@ static void parse_identifier_list(scope_t *scope) /* a K&R parameter has no type, yet */ next_token(); - append_entity(scope, entity); + if (scope != NULL) + append_entity(scope, entity); if (token.type != ',') { break; @@ -4061,7 +4119,7 @@ static void semantic_parameter_incomplete(const entity_t *entity) type_t *type = skip_typeref(entity->declaration.type); if (is_type_incomplete(type)) { errorf(&entity->base.source_position, - "parameter '%Y' has incomplete type %T", entity->base.symbol, + "parameter '%Y' has incomplete type '%T'", entity->base.symbol, entity->declaration.type); } } @@ -4080,7 +4138,8 @@ static void parse_parameters(function_type_t *type, scope_t *scope) !is_typedef_symbol(token.v.symbol)) { token_type_t la1_type = (token_type_t)look_ahead(1)->type; if (la1_type == ',' || la1_type == ')') { - type->kr_style_parameters = true; + type->kr_style_parameters = true; + type->unspecified_parameters = true; parse_identifier_list(scope); goto parameters_finished; } @@ -4153,7 +4212,7 @@ static void parse_parameters(function_type_t *type, scope_t *scope) parameters_finished: rem_anchor_token(')'); - expect(')'); + expect(')', end_error); end_error: restore_anchor_state(',', saved_comma_state); @@ -4261,7 +4320,7 @@ static construct_type_t *parse_array_declarator(void) } rem_anchor_token(']'); - expect(']'); + expect(']', end_error); end_error: return &array->construct_type; @@ -4343,11 +4402,11 @@ static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env, case T__based: next_token(); - expect('('); + expect('(', end_error); add_anchor_token(')'); parse_microsoft_based(&base_spec); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); continue; default: @@ -4389,15 +4448,20 @@ ptr_operator_end: next_token(); break; case '(': - next_token(); - add_anchor_token(')'); - inner_types = parse_inner_declarator(env, may_be_abstract); - if (inner_types != NULL) { - /* All later declarators only modify the return type */ - env = NULL; + /* §6.7.6:2 footnote 126: Empty parentheses in a type name are + * interpreted as ``function with no parameter specification'', rather + * than redundant parentheses around the omitted identifier. */ + if (look_ahead(1)->type != ')') { + next_token(); + add_anchor_token(')'); + inner_types = parse_inner_declarator(env, may_be_abstract); + if (inner_types != NULL) { + /* All later declarators only modify the return type */ + env = NULL; + } + rem_anchor_token(')'); + expect(')', end_error); } - rem_anchor_token(')'); - expect(')'); break; default: if (may_be_abstract) @@ -4507,7 +4571,7 @@ static void parse_declaration_attributes(entity_t *entity) type_modifiers_t type_modifiers = type->base.modifiers; if (modifiers & DM_TRANSPARENT_UNION) - modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; + type_modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; if (type->base.modifiers != type_modifiers) { type_t *copy = duplicate_type(type); @@ -4721,7 +4785,7 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, env.symbol); } } else if (flags & DECL_IS_PARAMETER) { - orig_type = semantic_parameter(&env.source_position, type, + orig_type = semantic_parameter(&env.source_position, orig_type, specifiers, env.symbol); entity = allocate_entity_zero(ENTITY_PARAMETER); @@ -4894,7 +4958,10 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition) const namespace_tag_t namespc = (namespace_tag_t)entity->base.namespc; const source_position_t *pos = &entity->base.source_position; - assert(symbol != NULL); + /* can happen in error cases */ + if (symbol == NULL) + return entity; + entity_t *previous_entity = get_entity(symbol, namespc); /* pushing the same entity twice will break the stack structure */ assert(previous_entity != entity); @@ -4917,46 +4984,41 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition) } } - if (is_declaration(entity)) { - if (warning.nested_externs - && entity->declaration.storage_class == STORAGE_CLASS_EXTERN - && current_scope != file_scope) { - warningf(pos, "nested extern declaration of '%#T'", - entity->declaration.type, symbol); - } + if (is_declaration(entity) && + warning.nested_externs && + entity->declaration.storage_class == STORAGE_CLASS_EXTERN && + current_scope != file_scope) { + warningf(pos, "nested extern declaration of '%#T'", + entity->declaration.type, symbol); } - if (previous_entity != NULL - && previous_entity->base.parent_scope == ¤t_function->parameters - && current_scope->depth == previous_entity->base.parent_scope->depth+1){ - + if (previous_entity != NULL && + previous_entity->base.parent_scope == ¤t_function->parameters && + previous_entity->base.parent_scope->depth + 1 == current_scope->depth) { assert(previous_entity->kind == ENTITY_PARAMETER); errorf(pos, "declaration '%#T' redeclares the parameter '%#T' (declared %P)", - entity->declaration.type, symbol, - previous_entity->declaration.type, symbol, - &previous_entity->base.source_position); + entity->declaration.type, symbol, + previous_entity->declaration.type, symbol, + &previous_entity->base.source_position); goto finish; } - if (previous_entity != NULL - && previous_entity->base.parent_scope == current_scope) { - + if (previous_entity != NULL && + previous_entity->base.parent_scope == current_scope) { if (previous_entity->kind != entity->kind) { error_redefined_as_different_kind(pos, previous_entity, entity->kind); goto finish; } if (previous_entity->kind == ENTITY_ENUM_VALUE) { - errorf(pos, - "redeclaration of enum entry '%Y' (declared %P)", + errorf(pos, "redeclaration of enum entry '%Y' (declared %P)", symbol, &previous_entity->base.source_position); goto finish; } if (previous_entity->kind == ENTITY_TYPEDEF) { /* TODO: C++ allows this for exactly the same type */ - errorf(pos, - "redefinition of typedef '%Y' (declared %P)", + errorf(pos, "redefinition of typedef '%Y' (declared %P)", symbol, &previous_entity->base.source_position); goto finish; } @@ -4964,50 +5026,47 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition) /* at this point we should have only VARIABLES or FUNCTIONS */ assert(is_declaration(previous_entity) && is_declaration(entity)); + declaration_t *const prev_decl = &previous_entity->declaration; + declaration_t *const decl = &entity->declaration; + /* can happen for K&R style declarations */ - if (previous_entity->kind == ENTITY_PARAMETER - && previous_entity->declaration.type == NULL - && entity->kind == ENTITY_PARAMETER) { - previous_entity->declaration.type = entity->declaration.type; - previous_entity->declaration.storage_class - = entity->declaration.storage_class; - previous_entity->declaration.declared_storage_class - = entity->declaration.declared_storage_class; - previous_entity->declaration.modifiers - = entity->declaration.modifiers; - previous_entity->declaration.deprecated_string - = entity->declaration.deprecated_string; - } - assert(entity->declaration.type != NULL); - - declaration_t *const previous_declaration - = &previous_entity->declaration; - declaration_t *const declaration = &entity->declaration; - type_t *const orig_type = entity->declaration.type; + if (prev_decl->type == NULL && + previous_entity->kind == ENTITY_PARAMETER && + entity->kind == ENTITY_PARAMETER) { + prev_decl->type = decl->type; + prev_decl->storage_class = decl->storage_class; + prev_decl->declared_storage_class = decl->declared_storage_class; + prev_decl->modifiers = decl->modifiers; + prev_decl->deprecated_string = decl->deprecated_string; + return previous_entity; + } + + type_t *const orig_type = decl->type; + assert(orig_type != NULL); type_t *const type = skip_typeref(orig_type); - - type_t *prev_type = skip_typeref(previous_declaration->type); + type_t * prev_type = skip_typeref(prev_decl->type); if (!types_compatible(type, prev_type)) { errorf(pos, "declaration '%#T' is incompatible with '%#T' (declared %P)", - orig_type, symbol, previous_declaration->type, symbol, + orig_type, symbol, prev_decl->type, symbol, &previous_entity->base.source_position); } else { - unsigned old_storage_class = previous_declaration->storage_class; - if (warning.redundant_decls && is_definition - && previous_declaration->storage_class == STORAGE_CLASS_STATIC - && !(previous_declaration->modifiers & DM_USED) - && !previous_declaration->used) { + unsigned old_storage_class = prev_decl->storage_class; + if (warning.redundant_decls && + is_definition && + !prev_decl->used && + !(prev_decl->modifiers & DM_USED) && + prev_decl->storage_class == STORAGE_CLASS_STATIC) { warningf(&previous_entity->base.source_position, "unnecessary static forward declaration for '%#T'", - previous_declaration->type, symbol); + prev_decl->type, symbol); } - unsigned new_storage_class = declaration->storage_class; + unsigned new_storage_class = decl->storage_class; if (is_type_incomplete(prev_type)) { - previous_declaration->type = type; - prev_type = type; + prev_decl->type = type; + prev_type = type; } /* pretend no storage class means extern for function @@ -5015,8 +5074,8 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition) * none nor extern) */ if (entity->kind == ENTITY_FUNCTION) { if (prev_type->function.unspecified_parameters) { - previous_declaration->type = type; - prev_type = type; + prev_decl->type = type; + prev_type = type; } switch (old_storage_class) { @@ -5061,8 +5120,8 @@ warn_redundant_declaration: "static declaration of '%Y' follows non-static declaration (declared %P)", symbol, &previous_entity->base.source_position); } else if (old_storage_class == STORAGE_CLASS_EXTERN) { - previous_declaration->storage_class = STORAGE_CLASS_NONE; - previous_declaration->declared_storage_class = STORAGE_CLASS_NONE; + prev_decl->storage_class = STORAGE_CLASS_NONE; + prev_decl->declared_storage_class = STORAGE_CLASS_NONE; } else { /* ISO/IEC 14882:1998(E) §C.1.2:1 */ if (c_mode & _CXX) @@ -5082,7 +5141,7 @@ error_redeclaration: } } - previous_declaration->modifiers |= declaration->modifiers; + prev_decl->modifiers |= decl->modifiers; if (entity->kind == ENTITY_FUNCTION) { previous_entity->function.is_inline |= entity->function.is_inline; } @@ -5100,9 +5159,9 @@ error_redeclaration: entity->declaration.type, symbol); } } - } else if (warning.missing_declarations - && entity->kind == ENTITY_VARIABLE - && current_scope == file_scope) { + } else if (warning.missing_declarations && + entity->kind == ENTITY_VARIABLE && + current_scope == file_scope) { declaration_t *declaration = &entity->declaration; if (declaration->storage_class == STORAGE_CLASS_NONE) { warningf(pos, "no previous declaration for '%#T'", @@ -5125,7 +5184,7 @@ finish: static void parser_error_multiple_definition(entity_t *entity, const source_position_t *source_position) { - errorf(source_position, "multiple definition of symbol '%Y' (declared %P)", + errorf(source_position, "multiple definition of '%Y' (declared %P)", entity->base.symbol, &entity->base.source_position); } @@ -5239,12 +5298,22 @@ static void check_variable_type_complete(entity_t *ent) if (decl->storage_class != STORAGE_CLASS_NONE) return; - type_t *type = decl->type; - if (!is_type_incomplete(skip_typeref(type))) + type_t *const orig_type = decl->type; + type_t *const type = skip_typeref(orig_type); + if (!is_type_incomplete(type)) return; + /* GCC allows global arrays without size and assigns them a length of one, + * if no different declaration follows */ + if (is_type_array(type) && + c_mode & _GNUC && + ent->base.parent_scope == file_scope) { + ARR_APP1(declaration_t*, incomplete_arrays, decl); + return; + } + errorf(&ent->base.source_position, "variable '%#T' has incomplete type", - type, ent->base.symbol); + orig_type, ent->base.symbol); } @@ -5284,7 +5353,7 @@ static void parse_declaration_rest(entity_t *ndeclaration, ndeclaration = parse_declarator(specifiers, flags); rem_anchor_token('='); } - expect(';'); + expect(';', end_error); end_error: anonymous_entity = NULL; @@ -5310,7 +5379,7 @@ static entity_t *finished_kr_declaration(entity_t *entity, bool is_definition) } if (is_definition) { - errorf(HERE, "parameter %Y is initialised", entity->base.symbol); + errorf(HERE, "parameter '%Y' is initialised", entity->base.symbol); } return record_entity(entity, false); @@ -5373,9 +5442,21 @@ static void parse_kr_declaration_list(entity_t *entity) } /* parse declaration list */ - while (is_declaration_specifier(&token, false)) { - parse_declaration(finished_kr_declaration, DECL_IS_PARAMETER); + for (;;) { + switch (token.type) { + DECLARATION_START + case T___extension__: + /* This covers symbols, which are no type, too, and results in + * better error messages. The typical cases are misspelled type + * names and missing includes. */ + case T_IDENTIFIER: + parse_declaration(finished_kr_declaration, DECL_IS_PARAMETER); + break; + default: + goto decl_list_end; + } } +decl_list_end: /* pop function parameters */ assert(current_scope == &entity->function.parameters); @@ -5626,7 +5707,7 @@ static bool expression_returns(expression_t const *const expr) if (!expression_returns(expr->conditional.condition)) return false; - if (expr->condition.true_expression != NULL + if (expr->conditional.true_expression != NULL && expression_returns(expr->conditional.true_expression)) return true; @@ -5713,14 +5794,16 @@ static void check_reachable(statement_t *const stmt) declaration_statement_t const *const decl = &stmt->declaration; entity_t const * ent = decl->declarations_begin; entity_t const *const last = decl->declarations_end; - for (;; ent = ent->base.next) { - if (ent->kind == ENTITY_VARIABLE && - ent->variable.initializer != NULL && - !initializer_returns(ent->variable.initializer)) { - return; + if (ent != NULL) { + for (;; ent = ent->base.next) { + if (ent->kind == ENTITY_VARIABLE && + ent->variable.initializer != NULL && + !initializer_returns(ent->variable.initializer)) { + return; + } + if (ent == last) + break; } - if (ent == last) - break; } next = stmt->base.next; break; @@ -6138,13 +6221,15 @@ static void check_unreachable(statement_t* const stmt, void *const env) declaration_statement_t const *const decl = &stmt->declaration; entity_t const * ent = decl->declarations_begin; entity_t const *const last = decl->declarations_end; - for (;; ent = ent->base.next) { - if (ent->kind == ENTITY_VARIABLE && - ent->variable.initializer != NULL) { - goto warn_unreachable; + if (ent != NULL) { + for (;; ent = ent->base.next) { + if (ent->kind == ENTITY_VARIABLE && + ent->variable.initializer != NULL) { + goto warn_unreachable; + } + if (ent == last) + return; } - if (ent == last) - return; } } @@ -6461,7 +6546,7 @@ static void parse_compound_declarators(compound_t *compound, break; next_token(); } - expect(';'); + expect(';', end_error); end_error: anonymous_entity = NULL; @@ -6530,7 +6615,7 @@ static expression_t *expected_expression_error(void) { /* skip the error message if the error token was read */ if (token.type != T_ERROR) { - errorf(HERE, "expected expression, got token '%K'", &token); + errorf(HERE, "expected expression, got token %K", &token); } next_token(); @@ -6798,7 +6883,7 @@ static type_t *get_builtin_symbol_type(symbol_t *symbol) case T___builtin_expect: return make_function_2_type(type_long, type_long, type_long); default: - internal_errorf(HERE, "not implemented builtin symbol found"); + internal_errorf(HERE, "not implemented builtin identifier found"); } } @@ -6898,14 +6983,15 @@ static expression_t *parse_reference(void) if (entity == NULL) { if (!strict_mode && look_ahead(1)->type == '(') { /* an implicitly declared function */ - if (warning.implicit_function_declaration) { - warningf(HERE, "implicit declaration of function '%Y'", - symbol); + if (warning.error_implicit_function_declaration) { + errorf(HERE, "implicit declaration of function '%Y'", symbol); + } else if (warning.implicit_function_declaration) { + warningf(HERE, "implicit declaration of function '%Y'", symbol); } entity = create_implicit_function(symbol, HERE); } else { - errorf(HERE, "unknown symbol '%Y' found.", symbol); + errorf(HERE, "unknown identifier '%Y' found.", symbol); entity = create_error_entity(symbol, ENTITY_VARIABLE); } } @@ -7062,7 +7148,7 @@ static expression_t *parse_cast(void) type_t *type = parse_typename(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); if (token.type == '{') { return parse_compound_literal(type); @@ -7112,7 +7198,7 @@ static expression_t *parse_statement_expression(void) expression->base.type = type; rem_anchor_token(')'); - expect(')'); + expect(')', end_error); end_error: return expression; @@ -7141,8 +7227,9 @@ static expression_t *parse_parenthesized_expression(void) add_anchor_token(')'); expression_t *result = parse_expression(); + result->base.parenthesized = true; rem_anchor_token(')'); - expect(')'); + expect(')', end_error); end_error: return result; @@ -7248,7 +7335,7 @@ static designator_t *parse_designator(void) designator->source_position = *HERE; designator->array_index = parse_expression(); rem_anchor_token(']'); - expect(']'); + expect(']', end_error); if (designator->array_index == NULL) { return NULL; } @@ -7275,15 +7362,15 @@ static expression_t *parse_offsetof(void) eat(T___builtin_offsetof); - expect('('); + expect('(', end_error); add_anchor_token(','); type_t *type = parse_typename(); rem_anchor_token(','); - expect(','); + expect(',', end_error); add_anchor_token(')'); designator_t *designator = parse_designator(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); expression->offsetofe.type = type; expression->offsetofe.designator = designator; @@ -7315,11 +7402,11 @@ static expression_t *parse_va_start(void) eat(T___builtin_va_start); - expect('('); + expect('(', end_error); add_anchor_token(','); expression->va_starte.ap = parse_assignment_expression(); rem_anchor_token(','); - expect(','); + expect(',', end_error); expression_t *const expr = parse_assignment_expression(); if (expr->kind == EXPR_REFERENCE) { entity_t *const entity = expr->reference.entity; @@ -7331,10 +7418,10 @@ static expression_t *parse_va_start(void) } else { expression->va_starte.parameter = &entity->variable; } - expect(')'); + expect(')', end_error); return expression; } - expect(')'); + expect(')', end_error); end_error: return create_invalid_expression(); } @@ -7348,11 +7435,11 @@ static expression_t *parse_va_arg(void) eat(T___builtin_va_arg); - expect('('); + expect('(', end_error); expression->va_arge.ap = parse_assignment_expression(); - expect(','); + expect(',', end_error); expression->base.type = parse_typename(); - expect(')'); + expect(')', end_error); return expression; end_error: @@ -7384,11 +7471,11 @@ static expression_t *parse_builtin_constant(void) eat(T___builtin_constant_p); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression->builtin_constant.value = parse_assignment_expression(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); expression->base.type = type_int; return expression; @@ -7405,7 +7492,7 @@ static expression_t *parse_builtin_prefetch(void) eat(T___builtin_prefetch); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression->builtin_prefetch.adr = parse_assignment_expression(); if (token.type == ',') { @@ -7417,7 +7504,7 @@ static expression_t *parse_builtin_prefetch(void) expression->builtin_prefetch.locality = parse_assignment_expression(); } rem_anchor_token(')'); - expect(')'); + expect(')', end_error); expression->base.type = type_void; return expression; @@ -7457,11 +7544,11 @@ static expression_t *parse_compare_builtin(void) expression->base.source_position = *HERE; next_token(); - expect('('); + expect('(', end_error); expression->binary.left = parse_assignment_expression(); - expect(','); + expect(',', end_error); expression->binary.right = parse_assignment_expression(); - expect(')'); + expect(')', end_error); type_t *const orig_type_left = expression->binary.left->base.type; type_t *const orig_type_right = expression->binary.right->base.type; @@ -7484,20 +7571,20 @@ end_error: #if 0 /** - * Parses a __builtin_expect() expression. + * Parses a __builtin_expect(, end_error) expression. */ -static expression_t *parse_builtin_expect(void) +static expression_t *parse_builtin_expect(void, end_error) { expression_t *expression = allocate_expression_zero(EXPR_BINARY_BUILTIN_EXPECT); eat(T___builtin_expect); - expect('('); + expect('(', end_error); expression->binary.left = parse_assignment_expression(); - expect(','); + expect(',', end_error); expression->binary.right = parse_constant_expression(); - expect(')'); + expect(')', end_error); expression->base.type = expression->binary.left->base.type; @@ -7516,11 +7603,11 @@ static expression_t *parse_assume(void) eat(T__assume); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression->unary.value = parse_assignment_expression(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); expression->base.type = type_void; return expression; @@ -7625,7 +7712,7 @@ static expression_t *parse_noop_expression(void) } rem_anchor_token(','); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); end_error: return cnst; @@ -7682,7 +7769,7 @@ static expression_t *parse_primary_expression(void) case T___noop: return parse_noop_expression(); } - errorf(HERE, "unexpected token '%K', expected an expression", &token); + errorf(HERE, "unexpected token %K, expected an expression", &token); return create_invalid_expression(); } @@ -7743,7 +7830,7 @@ static expression_t *parse_array_expression(expression_t *left) expression->base.type = automatic_type_conversion(return_type); rem_anchor_token(']'); - expect(']'); + expect(']', end_error); end_error: return expression; } @@ -7766,7 +7853,7 @@ static expression_t *parse_typeprop(expression_kind_t const kind) add_anchor_token(')'); orig_type = parse_typename(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); if (token.type == '{') { /* It was not sizeof(type) after all. It is sizeof of an expression @@ -7787,9 +7874,10 @@ typeprop_expression: tp_expression->typeprop.type = orig_type; type_t const* const type = skip_typeref(orig_type); char const* const wrong_type = - is_type_incomplete(type) ? "incomplete" : - type->kind == TYPE_FUNCTION ? "function designator" : - type->kind == TYPE_BITFIELD ? "bitfield" : + GNU_MODE && is_type_atomic(type, ATOMIC_TYPE_VOID) ? NULL : + is_type_incomplete(type) ? "incomplete" : + type->kind == TYPE_FUNCTION ? "function designator" : + type->kind == TYPE_BITFIELD ? "bitfield" : NULL; if (wrong_type != NULL) { char const* const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof"; @@ -7873,7 +7961,7 @@ static expression_t *parse_select_expression(expression_t *compound) symbol, type_left); } create_error_entry: - return create_invalid_expression(); + entry = create_error_entity(symbol, ENTITY_COMPOUND_MEMBER); } assert(is_declaration(entry)); @@ -8008,7 +8096,7 @@ static expression_t *parse_call_expression(expression_t *expression) } rem_anchor_token(','); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); if (function_type == NULL) return result; @@ -8102,12 +8190,25 @@ static void warn_reference_address_as_bool(expression_t const* expr) } } +static void warn_assignment_in_condition(const expression_t *const expr) +{ + if (!warning.parentheses) + return; + if (expr->base.kind != EXPR_BINARY_ASSIGN) + return; + if (expr->base.parenthesized) + return; + warningf(&expr->base.source_position, + "suggest parentheses around assignment used as truth value"); +} + static void semantic_condition(expression_t const *const expr, char const *const context) { type_t *const type = skip_typeref(expr->base.type); if (is_type_scalar(type)) { warn_reference_address_as_bool(expr); + warn_assignment_in_condition(expr); } else if (is_type_valid(type)) { errorf(&expr->base.source_position, "%s must have scalar type", context); @@ -8140,7 +8241,8 @@ static expression_t *parse_conditional_expression(expression_t *expression) true_expression = parse_expression(); } rem_anchor_token(':'); - expect(':'); + expect(':', end_error); +end_error:; expression_t *false_expression = parse_sub_expression(c_mode & _CXX ? PREC_ASSIGNMENT : PREC_CONDITIONAL); @@ -8249,8 +8351,6 @@ static expression_t *parse_conditional_expression(expression_t *expression) = create_implicit_cast(false_expression, result_type); conditional->base.type = result_type; return result; -end_error: - return create_invalid_expression(); } /** @@ -8277,11 +8377,11 @@ static expression_t *parse_builtin_classify_type(void) eat(T___builtin_classify_type); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *expression = parse_expression(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); result->classify_type.type_expression = expression; return result; @@ -8303,7 +8403,7 @@ static expression_t *parse_delete(void) if (token.type == '[') { next_token(); result->kind = EXPR_UNARY_DELETE_ARRAY; - expect(']'); + expect(']', end_error); end_error:; } @@ -8399,8 +8499,9 @@ static bool is_lvalue(const expression_t *expression) { /* TODO: doesn't seem to be consistent with §6.3.2.1 (1) */ switch (expression->kind) { - case EXPR_REFERENCE: case EXPR_ARRAY_ACCESS: + case EXPR_COMPOUND_LITERAL: + case EXPR_REFERENCE: case EXPR_SELECT: case EXPR_UNARY_DEREFERENCE: return true; @@ -8843,6 +8944,25 @@ static void warn_string_literal_address(expression_t const* expr) } } +static void warn_comparison_in_comparison(const expression_t *const expr) +{ + if (expr->base.parenthesized) + return; + switch (expr->base.kind) { + case EXPR_BINARY_LESS: + case EXPR_BINARY_GREATER: + case EXPR_BINARY_LESSEQUAL: + case EXPR_BINARY_GREATEREQUAL: + case EXPR_BINARY_NOTEQUAL: + case EXPR_BINARY_EQUAL: + warningf(&expr->base.source_position, + "comparisons like 'x <= y < z' do not have their mathematical meaning"); + break; + default: + break; + } +} + /** * Check the semantics of comparison expressions. * @@ -8872,6 +8992,11 @@ static void semantic_comparison(binary_expression_t *expression) } } + if (warning.parentheses) { + warn_comparison_in_comparison(left); + warn_comparison_in_comparison(right); + } + type_t *orig_type_left = left->base.type; type_t *orig_type_right = right->base.type; type_t *type_left = skip_typeref(orig_type_left); @@ -9062,6 +9187,16 @@ static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression) } } +static void warn_logical_and_within_or(const expression_t *const expr) +{ + if (expr->base.kind != EXPR_BINARY_LOGICAL_AND) + return; + if (expr->base.parenthesized) + return; + warningf(&expr->base.source_position, + "suggest parentheses around && within ||"); +} + /** * Check the semantic restrictions of a logical expression. */ @@ -9071,6 +9206,11 @@ static void semantic_logical_op(binary_expression_t *expression) * §6.5.14:2 Each of the operands shall have scalar type. */ semantic_condition(expression->left, "left operand of logical operator"); semantic_condition(expression->right, "right operand of logical operator"); + if (expression->base.kind == EXPR_BINARY_LOGICAL_OR && + warning.parentheses) { + warn_logical_and_within_or(expression->left); + warn_logical_and_within_or(expression->right); + } expression->base.type = c_mode & _CXX ? type_bool : type_int; } @@ -9217,7 +9357,6 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_BINARY_COMMA: return expression_has_effect(expr->binary.right); - case EXPR_BINARY_BUILTIN_EXPECT: return true; case EXPR_BINARY_ISGREATER: return false; case EXPR_BINARY_ISGREATEREQUAL: return false; case EXPR_BINARY_ISLESS: return false; @@ -9460,11 +9599,11 @@ static asm_argument_t *parse_asm_arguments(bool is_out) } argument->symbol = token.v.symbol; - expect(']'); + expect(']', end_error); } argument->constraints = parse_string_literals(); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *expression = parse_expression(); rem_anchor_token(')'); @@ -9524,7 +9663,7 @@ static asm_argument_t *parse_asm_arguments(bool is_out) mark_vars_read(expression, NULL); } argument->expression = expression; - expect(')'); + expect(')', end_error); set_address_taken(expression, true); @@ -9583,7 +9722,7 @@ static statement_t *parse_asm_statement(void) asm_statement->is_volatile = true; } - expect('('); + expect('(', end_error); add_anchor_token(')'); add_anchor_token(':'); asm_statement->asm_text = parse_string_literals(); @@ -9613,8 +9752,8 @@ static statement_t *parse_asm_statement(void) end_of_asm: rem_anchor_token(')'); - expect(')'); - expect(';'); + expect(')', end_error); + expect(';', end_error); if (asm_statement->outputs == NULL) { /* GCC: An 'asm' instruction without any output operands will be treated @@ -9680,7 +9819,7 @@ static statement_t *parse_case_statement(void) PUSH_PARENT(statement); - expect(':'); + expect(':', end_error); end_error: if (current_switch != NULL) { @@ -9731,7 +9870,7 @@ static statement_t *parse_default_statement(void) PUSH_PARENT(statement); - expect(':'); + expect(':', end_error); if (current_switch != NULL) { const case_label_statement_t *def_label = current_switch->default_label; if (def_label != NULL) { @@ -9839,7 +9978,7 @@ static statement_t *parse_if(void) add_anchor_token('{'); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *const expr = parse_expression(); statement->ifs.condition = expr; @@ -9848,18 +9987,24 @@ static statement_t *parse_if(void) semantic_condition(expr, "condition of 'if'-statment"); mark_vars_read(expr, NULL); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); end_error: rem_anchor_token('{'); add_anchor_token(T_else); - statement->ifs.true_statement = parse_statement(); + statement_t *const true_stmt = parse_statement(); + statement->ifs.true_statement = true_stmt; rem_anchor_token(T_else); if (token.type == T_else) { next_token(); statement->ifs.false_statement = parse_statement(); + } else if (warning.parentheses && + true_stmt->kind == STATEMENT_IF && + true_stmt->ifs.false_statement != NULL) { + warningf(&true_stmt->base.source_position, + "suggest explicit braces to avoid ambiguous 'else'"); } POP_PARENT; @@ -9918,7 +10063,7 @@ static statement_t *parse_switch(void) PUSH_PARENT(statement); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *const expr = parse_expression(); mark_vars_read(expr, NULL); @@ -9938,7 +10083,7 @@ static statement_t *parse_switch(void) type = type_error_type; } statement->switchs.expression = create_implicit_cast(expr, type); - expect(')'); + expect(')', end_error); rem_anchor_token(')'); switch_statement_t *rem = current_switch; @@ -9982,7 +10127,7 @@ static statement_t *parse_while(void) PUSH_PARENT(statement); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *const cond = parse_expression(); statement->whiles.condition = cond; @@ -9991,7 +10136,7 @@ static statement_t *parse_while(void) semantic_condition(cond, "condition of 'while'-statement"); mark_vars_read(cond, NULL); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); statement->whiles.body = parse_loop_body(statement); @@ -10017,8 +10162,8 @@ static statement_t *parse_do(void) statement->do_while.body = parse_loop_body(statement); rem_anchor_token(T_while); - expect(T_while); - expect('('); + expect(T_while, end_error); + expect('(', end_error); add_anchor_token(')'); expression_t *const cond = parse_expression(); statement->do_while.condition = cond; @@ -10027,8 +10172,8 @@ static statement_t *parse_do(void) semantic_condition(cond, "condition of 'do-while'-statement"); mark_vars_read(cond, NULL); rem_anchor_token(')'); - expect(')'); - expect(';'); + expect(')', end_error); + expect(';', end_error); POP_PARENT; return statement; @@ -10046,14 +10191,14 @@ static statement_t *parse_for(void) eat(T_for); + expect('(', end_error1); + add_anchor_token(')'); + PUSH_PARENT(statement); size_t const top = environment_top(); scope_t *old_scope = scope_push(&statement->fors.scope); - expect('('); - add_anchor_token(')'); - if (token.type == ';') { next_token(); } else if (is_declaration_specifier(&token, false)) { @@ -10068,7 +10213,7 @@ static statement_t *parse_for(void) "initialisation of 'for'-statement has no effect"); } rem_anchor_token(';'); - expect(';'); + expect(';', end_error2); } if (token.type != ';') { @@ -10081,7 +10226,7 @@ static statement_t *parse_for(void) mark_vars_read(cond, NULL); rem_anchor_token(';'); } - expect(';'); + expect(';', end_error2); if (token.type != ')') { expression_t *const step = parse_expression(); statement->fors.step = step; @@ -10091,7 +10236,7 @@ static statement_t *parse_for(void) "step of 'for'-statement has no effect"); } } - expect(')'); + expect(')', end_error2); rem_anchor_token(')'); statement->fors.body = parse_loop_body(statement); @@ -10102,13 +10247,15 @@ static statement_t *parse_for(void) POP_PARENT; return statement; -end_error: +end_error2: POP_PARENT; rem_anchor_token(')'); assert(current_scope == &statement->fors.scope); scope_pop(old_scope); environment_pop_to(top); + /* fallthrough */ +end_error1: return create_invalid_statement(); } @@ -10160,7 +10307,7 @@ static statement_t *parse_goto(void) *goto_anchor = &statement->gotos; goto_anchor = &statement->gotos.next; - expect(';'); + expect(';', end_error); return statement; end_error: @@ -10179,7 +10326,7 @@ static statement_t *parse_continue(void) statement_t *statement = allocate_statement_zero(STATEMENT_CONTINUE); eat(T_continue); - expect(';'); + expect(';', end_error); end_error: return statement; @@ -10197,7 +10344,7 @@ static statement_t *parse_break(void) statement_t *statement = allocate_statement_zero(STATEMENT_BREAK); eat(T_break); - expect(';'); + expect(';', end_error); end_error: return statement; @@ -10215,7 +10362,7 @@ static statement_t *parse_leave_statement(void) statement_t *statement = allocate_statement_zero(STATEMENT_LEAVE); eat(T___leave); - expect(';'); + expect(';', end_error); end_error: return statement; @@ -10291,38 +10438,58 @@ static statement_t *parse_return(void) assert(is_type_function(func_type)); type_t *const return_type = skip_typeref(func_type->function.return_type); + source_position_t const *const pos = &statement->base.source_position; if (return_value != NULL) { type_t *return_value_type = skip_typeref(return_value->base.type); - if (is_type_atomic(return_type, ATOMIC_TYPE_VOID) && - !is_type_atomic(return_value_type, ATOMIC_TYPE_VOID)) { - if (warning.other) { - warningf(&statement->base.source_position, - "'return' with a value, in function returning void"); + if (is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { + if (is_type_atomic(return_value_type, ATOMIC_TYPE_VOID)) { + /* ISO/IEC 14882:1998(E) §6.6.3:2 */ + /* Only warn in C mode, because GCC does the same */ + if (c_mode & _CXX || strict_mode) { + errorf(pos, + "'return' with a value, in function returning 'void'"); + } else if (warning.other) { + warningf(pos, + "'return' with a value, in function returning 'void'"); + } + } else if (!(c_mode & _CXX)) { /* ISO/IEC 14882:1998(E) §6.6.3:3 */ + /* Only warn in C mode, because GCC does the same */ + if (strict_mode) { + errorf(pos, + "'return' with expression in function return 'void'"); + } else if (warning.other) { + warningf(pos, + "'return' with expression in function return 'void'"); + } } - return_value = NULL; } else { assign_error_t error = semantic_assign(return_type, return_value); report_assign_error(error, return_type, return_value, "'return'", - &statement->base.source_position); - return_value = create_implicit_cast(return_value, return_type); + pos); } + return_value = create_implicit_cast(return_value, return_type); /* check for returning address of a local var */ if (warning.other && return_value != NULL && return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) { const expression_t *expression = return_value->unary.value; if (expression_is_local_variable(expression)) { - warningf(&statement->base.source_position, - "function returns address of local variable"); + warningf(pos, "function returns address of local variable"); } } } else if (warning.other && !is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { - warningf(&statement->base.source_position, - "'return' without value, in function returning non-void"); + /* ISO/IEC 14882:1998(E) §6.6.3:3 */ + if (c_mode & _CXX || strict_mode) { + errorf(pos, + "'return' without value, in function returning non-void"); + } else { + warningf(pos, + "'return' without value, in function returning non-void"); + } } statement->returns.value = return_value; - expect(';'); + expect(';', end_error); end_error: return statement; @@ -10363,7 +10530,7 @@ static statement_t *parse_expression_statement(void) statement->expression.expression = expr; mark_vars_read(expr, ENT_ANY); - expect(';'); + expect(';', end_error); end_error: return statement; @@ -10389,7 +10556,7 @@ static statement_t *parse_ms_try_statment(void) if (token.type == T___except) { eat(T___except); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *const expr = parse_expression(); mark_vars_read(expr, NULL); @@ -10403,7 +10570,7 @@ static statement_t *parse_ms_try_statment(void) } statement->ms_try.except_expression = create_implicit_cast(expr, type); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); statement->ms_try.final_statement = parse_compound_statement(false); } else if (token.type == T__finally) { eat(T___finally); @@ -10514,9 +10681,9 @@ static void parse_namespace_definition(void) size_t const top = environment_top(); scope_t *old_scope = scope_push(&entity->namespacee.members); - expect('{'); + expect('{', end_error); parse_externals(); - expect('}'); + expect('}', end_error); end_error: assert(current_scope == &entity->namespacee.members); @@ -10610,7 +10777,7 @@ expression_statment: break; default: - errorf(HERE, "unexpected token '%K' while parsing statement", &token); + errorf(HERE, "unexpected token %K while parsing statement", &token); statement = create_invalid_statement(); if (!at_anchor()) next_token(); @@ -10656,6 +10823,94 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) eat('{'); add_anchor_token('}'); + /* tokens, which can start a statement */ + /* TODO MS, __builtin_FOO */ + add_anchor_token('!'); + add_anchor_token('&'); + add_anchor_token('('); + add_anchor_token('*'); + add_anchor_token('+'); + add_anchor_token('-'); + add_anchor_token('{'); + add_anchor_token('~'); + add_anchor_token(T_CHARACTER_CONSTANT); + add_anchor_token(T_COLONCOLON); + add_anchor_token(T_FLOATINGPOINT); + add_anchor_token(T_IDENTIFIER); + add_anchor_token(T_INTEGER); + add_anchor_token(T_MINUSMINUS); + add_anchor_token(T_PLUSPLUS); + add_anchor_token(T_STRING_LITERAL); + add_anchor_token(T_WIDE_CHARACTER_CONSTANT); + add_anchor_token(T_WIDE_STRING_LITERAL); + add_anchor_token(T__Bool); + add_anchor_token(T__Complex); + add_anchor_token(T__Imaginary); + add_anchor_token(T___FUNCTION__); + add_anchor_token(T___PRETTY_FUNCTION__); + add_anchor_token(T___alignof__); + add_anchor_token(T___attribute__); + add_anchor_token(T___builtin_va_start); + add_anchor_token(T___extension__); + add_anchor_token(T___func__); + add_anchor_token(T___imag__); + add_anchor_token(T___label__); + add_anchor_token(T___real__); + add_anchor_token(T___thread); + add_anchor_token(T_asm); + add_anchor_token(T_auto); + add_anchor_token(T_bool); + add_anchor_token(T_break); + add_anchor_token(T_case); + add_anchor_token(T_char); + add_anchor_token(T_class); + add_anchor_token(T_const); + add_anchor_token(T_const_cast); + add_anchor_token(T_continue); + add_anchor_token(T_default); + add_anchor_token(T_delete); + add_anchor_token(T_double); + add_anchor_token(T_do); + add_anchor_token(T_dynamic_cast); + add_anchor_token(T_enum); + add_anchor_token(T_extern); + add_anchor_token(T_false); + add_anchor_token(T_float); + add_anchor_token(T_for); + add_anchor_token(T_goto); + add_anchor_token(T_if); + add_anchor_token(T_inline); + add_anchor_token(T_int); + add_anchor_token(T_long); + add_anchor_token(T_new); + add_anchor_token(T_operator); + add_anchor_token(T_register); + add_anchor_token(T_reinterpret_cast); + add_anchor_token(T_restrict); + add_anchor_token(T_return); + add_anchor_token(T_short); + add_anchor_token(T_signed); + add_anchor_token(T_sizeof); + add_anchor_token(T_static); + add_anchor_token(T_static_cast); + add_anchor_token(T_struct); + add_anchor_token(T_switch); + add_anchor_token(T_template); + add_anchor_token(T_this); + add_anchor_token(T_throw); + add_anchor_token(T_true); + add_anchor_token(T_try); + add_anchor_token(T_typedef); + add_anchor_token(T_typeid); + add_anchor_token(T_typename); + add_anchor_token(T_typeof); + add_anchor_token(T_union); + add_anchor_token(T_unsigned); + add_anchor_token(T_using); + add_anchor_token(T_void); + add_anchor_token(T_volatile); + add_anchor_token(T_wchar_t); + add_anchor_token(T_while); size_t const top = environment_top(); scope_t *old_scope = scope_push(&statement->compound.scope); @@ -10714,6 +10969,92 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) } end_error: + rem_anchor_token(T_while); + rem_anchor_token(T_wchar_t); + rem_anchor_token(T_volatile); + rem_anchor_token(T_void); + rem_anchor_token(T_using); + rem_anchor_token(T_unsigned); + rem_anchor_token(T_union); + rem_anchor_token(T_typeof); + rem_anchor_token(T_typename); + rem_anchor_token(T_typeid); + rem_anchor_token(T_typedef); + rem_anchor_token(T_try); + rem_anchor_token(T_true); + rem_anchor_token(T_throw); + rem_anchor_token(T_this); + rem_anchor_token(T_template); + rem_anchor_token(T_switch); + rem_anchor_token(T_struct); + rem_anchor_token(T_static_cast); + rem_anchor_token(T_static); + rem_anchor_token(T_sizeof); + rem_anchor_token(T_signed); + rem_anchor_token(T_short); + rem_anchor_token(T_return); + rem_anchor_token(T_restrict); + rem_anchor_token(T_reinterpret_cast); + rem_anchor_token(T_register); + rem_anchor_token(T_operator); + rem_anchor_token(T_new); + rem_anchor_token(T_long); + rem_anchor_token(T_int); + rem_anchor_token(T_inline); + rem_anchor_token(T_if); + rem_anchor_token(T_goto); + rem_anchor_token(T_for); + rem_anchor_token(T_float); + rem_anchor_token(T_false); + rem_anchor_token(T_extern); + rem_anchor_token(T_enum); + rem_anchor_token(T_dynamic_cast); + rem_anchor_token(T_do); + rem_anchor_token(T_double); + rem_anchor_token(T_delete); + rem_anchor_token(T_default); + rem_anchor_token(T_continue); + rem_anchor_token(T_const_cast); + rem_anchor_token(T_const); + rem_anchor_token(T_class); + rem_anchor_token(T_char); + rem_anchor_token(T_case); + rem_anchor_token(T_break); + rem_anchor_token(T_bool); + rem_anchor_token(T_auto); + rem_anchor_token(T_asm); + rem_anchor_token(T___thread); + rem_anchor_token(T___real__); + rem_anchor_token(T___label__); + rem_anchor_token(T___imag__); + rem_anchor_token(T___func__); + rem_anchor_token(T___extension__); + rem_anchor_token(T___builtin_va_start); + rem_anchor_token(T___attribute__); + rem_anchor_token(T___alignof__); + rem_anchor_token(T___PRETTY_FUNCTION__); + rem_anchor_token(T___FUNCTION__); + rem_anchor_token(T__Imaginary); + rem_anchor_token(T__Complex); + rem_anchor_token(T__Bool); + rem_anchor_token(T_WIDE_STRING_LITERAL); + rem_anchor_token(T_WIDE_CHARACTER_CONSTANT); + rem_anchor_token(T_STRING_LITERAL); + rem_anchor_token(T_PLUSPLUS); + rem_anchor_token(T_MINUSMINUS); + rem_anchor_token(T_INTEGER); + rem_anchor_token(T_IDENTIFIER); + rem_anchor_token(T_FLOATINGPOINT); + rem_anchor_token(T_COLONCOLON); + rem_anchor_token(T_CHARACTER_CONSTANT); + rem_anchor_token('~'); + rem_anchor_token('{'); + rem_anchor_token('-'); + rem_anchor_token('+'); + rem_anchor_token('*'); + rem_anchor_token('('); + rem_anchor_token('&'); + rem_anchor_token('!'); rem_anchor_token('}'); assert(current_scope == &statement->compound.scope); scope_pop(old_scope); @@ -10765,14 +11106,14 @@ static void parse_global_asm(void) statement_t *statement = allocate_statement_zero(STATEMENT_ASM); eat(T_asm); - expect('('); + expect('(', end_error); statement->asms.asm_text = parse_string_literals(); statement->base.next = unit->global_asm; unit->global_asm = statement; - expect(')'); - expect(';'); + expect(')', end_error); + expect(';', end_error); end_error:; } @@ -10799,7 +11140,7 @@ static void parse_linkage_specification(void) if (token.type == '{') { next_token(); parse_externals(); - expect('}'); + expect('}', end_error); } else { parse_external(); } @@ -10849,7 +11190,7 @@ static void parse_external(void) /* FALLTHROUGH */ default: - errorf(HERE, "stray '%K' outside of function", &token); + errorf(HERE, "stray %K outside of function", &token); if (token.type == '(' || token.type == '{' || token.type == '[') eat_until_matching_token(token.type); next_token(); @@ -10906,7 +11247,7 @@ static void parse_translation_unit(void) if (token.type == T_EOF) break; - errorf(HERE, "stray '%K' outside of function", &token); + errorf(HERE, "stray %K outside of function", &token); if (token.type == '(' || token.type == '{' || token.type == '[') eat_until_matching_token(token.type); next_token(); @@ -10956,14 +11297,50 @@ translation_unit_t *finish_parsing(void) return result; } +/* GCC allows global arrays without size and assigns them a length of one, + * if no different declaration follows */ +static void complete_incomplete_arrays(void) +{ + size_t n = ARR_LEN(incomplete_arrays); + for (size_t i = 0; i != n; ++i) { + declaration_t *const decl = incomplete_arrays[i]; + type_t *const orig_type = decl->type; + type_t *const type = skip_typeref(orig_type); + + if (!is_type_incomplete(type)) + continue; + + if (warning.other) { + warningf(&decl->base.source_position, + "array '%#T' assumed to have one element", + orig_type, decl->base.symbol); + } + + type_t *const new_type = duplicate_type(type); + new_type->array.size_constant = true; + new_type->array.has_implicit_size = true; + new_type->array.size = 1; + + type_t *const result = typehash_insert(new_type); + if (type != result) + free_type(type); + + decl->type = result; + } +} + void parse(void) { lookahead_bufpos = 0; for (int i = 0; i < MAX_LOOKAHEAD + 2; ++i) { next_token(); } - current_linkage = c_mode & _CXX ? LINKAGE_CXX : LINKAGE_C; + current_linkage = c_mode & _CXX ? LINKAGE_CXX : LINKAGE_C; + incomplete_arrays = NEW_ARR_F(declaration_t*, 0); parse_translation_unit(); + complete_incomplete_arrays(); + DEL_ARR_F(incomplete_arrays); + incomplete_arrays = NULL; } /**