X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=7e77c60099f3fcb279adba1eb5b26c5d3963e050;hb=900afec9b0ae74985195a125e8f8e7aa54460543;hp=ac95ff21169d4e540ef59c92bbcde8c949bbce21;hpb=00e4820e568d974c8f682cb2c546a3cce7f5c7b8;p=cparser diff --git a/parser.c b/parser.c index ac95ff2..7e77c60 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) \ @@ -327,11 +328,17 @@ 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[] = { [ENTITY_VARIABLE] = sizeof(variable_t), - [ENTITY_COMPOUND_MEMBER] = sizeof(variable_t), + [ENTITY_PARAMETER] = sizeof(parameter_t), + [ENTITY_COMPOUND_MEMBER] = sizeof(compound_member_t), [ENTITY_FUNCTION] = sizeof(function_t), [ENTITY_TYPEDEF] = sizeof(typedef_t), [ENTITY_STRUCT] = sizeof(compound_t), @@ -347,6 +354,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); @@ -438,7 +449,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) { @@ -467,7 +479,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) { @@ -617,7 +630,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) { @@ -625,6 +638,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); @@ -633,6 +650,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); @@ -640,7 +660,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) { @@ -649,6 +669,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) @@ -657,7 +681,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) { @@ -722,6 +746,9 @@ static void eat_until_anchor(void) } } +/** + * Eat a whole block from input tokens. + */ static void eat_block(void) { eat_until_matching_token('{'); @@ -760,11 +787,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); \ @@ -773,23 +800,32 @@ 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) -static void scope_push(scope_t *new_scope) +/** + * 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) { new_scope->depth = current_scope->depth + 1; } - new_scope->parent = current_scope; - current_scope = new_scope; + + scope_t *old_scope = current_scope; + current_scope = new_scope; + return old_scope; } -static void scope_pop(void) +/** + * Pop the current scope from the scope stack. + */ +static void scope_pop(scope_t *old_scope) { - current_scope = current_scope->parent; + current_scope = old_scope; } /** @@ -934,6 +970,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)); @@ -949,6 +988,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) @@ -978,7 +1023,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) { @@ -1159,7 +1206,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; @@ -1270,7 +1317,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) { @@ -1284,7 +1331,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) { @@ -1292,7 +1339,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: @@ -1300,7 +1347,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) { @@ -1322,14 +1369,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) @@ -1342,14 +1389,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) { @@ -1374,7 +1421,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) { @@ -1399,7 +1446,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) { @@ -1422,6 +1469,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... */ @@ -1431,7 +1481,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 @@ -1456,14 +1506,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) { @@ -1489,7 +1539,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) { @@ -1516,23 +1566,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) @@ -1630,8 +1683,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 */ @@ -1847,8 +1900,8 @@ no_arg: next_token(); } } - expect(')'); - expect(')'); + expect(')', end_error); + expect(')', end_error); end_error: *attributes = head; @@ -1870,7 +1923,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); @@ -1879,7 +1932,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; @@ -1900,39 +1953,40 @@ end_error: } } -static void mark_vars_read(expression_t *expr, variable_t *lhs_var); +static void mark_vars_read(expression_t *expr, entity_t *lhs_ent); -static variable_t *determine_lhs_var(expression_t *const expr, - variable_t *lhs_var) +static entity_t *determine_lhs_ent(expression_t *const expr, + entity_t *lhs_ent) { switch (expr->kind) { case EXPR_REFERENCE: { entity_t *const entity = expr->reference.entity; - /* we should only find variables as lavlues... */ - if (entity->base.kind != ENTITY_VARIABLE) + /* we should only find variables as lvalues... */ + if (entity->base.kind != ENTITY_VARIABLE + && entity->base.kind != ENTITY_PARAMETER) return NULL; - return &entity->variable; + return entity; } case EXPR_ARRAY_ACCESS: { - expression_t *const ref = expr->array_access.array_ref; - variable_t * var = NULL; + expression_t *const ref = expr->array_access.array_ref; + entity_t * ent = NULL; if (is_type_array(skip_typeref(revert_automatic_type_conversion(ref)))) { - var = determine_lhs_var(ref, lhs_var); - lhs_var = var; + ent = determine_lhs_ent(ref, lhs_ent); + lhs_ent = ent; } else { - mark_vars_read(expr->select.compound, lhs_var); + mark_vars_read(expr->select.compound, lhs_ent); } - mark_vars_read(expr->array_access.index, lhs_var); - return var; + mark_vars_read(expr->array_access.index, lhs_ent); + return ent; } case EXPR_SELECT: { if (is_type_compound(skip_typeref(expr->base.type))) { - return determine_lhs_var(expr->select.compound, lhs_var); + return determine_lhs_ent(expr->select.compound, lhs_ent); } else { - mark_vars_read(expr->select.compound, lhs_var); + mark_vars_read(expr->select.compound, lhs_ent); return NULL; } } @@ -1941,7 +1995,7 @@ static variable_t *determine_lhs_var(expression_t *const expr, expression_t *const val = expr->unary.value; if (val->kind == EXPR_UNARY_TAKE_ADDRESS) { /* *&x is a NOP */ - return determine_lhs_var(val->unary.value, lhs_var); + return determine_lhs_ent(val->unary.value, lhs_ent); } else { mark_vars_read(val, NULL); return NULL; @@ -1954,10 +2008,10 @@ static variable_t *determine_lhs_var(expression_t *const expr, } } -#define VAR_ANY ((variable_t*)-1) +#define ENT_ANY ((entity_t*)-1) /** - * Mark declarations, which are read. This is used to deted variables, which + * Mark declarations, which are read. This is used to detect variables, which * are never read. * Example: * x = x + 1; @@ -1968,17 +2022,21 @@ static variable_t *determine_lhs_var(expression_t *const expr, * x and y are not detected as "not read", because multiple variables are * involved. */ -static void mark_vars_read(expression_t *const expr, variable_t *lhs_var) +static void mark_vars_read(expression_t *const expr, entity_t *lhs_ent) { switch (expr->kind) { case EXPR_REFERENCE: { entity_t *const entity = expr->reference.entity; - if (entity->kind != ENTITY_VARIABLE) + if (entity->kind != ENTITY_VARIABLE + && entity->kind != ENTITY_PARAMETER) return; - variable_t *variable = &entity->variable; - if (lhs_var != variable && lhs_var != VAR_ANY) { - variable->read = true; + if (lhs_ent != entity && lhs_ent != ENT_ANY) { + if (entity->kind == ENTITY_VARIABLE) { + entity->variable.read = true; + } else { + entity->parameter.read = true; + } } return; } @@ -1995,32 +2053,33 @@ static void mark_vars_read(expression_t *const expr, variable_t *lhs_var) // TODO lhs_decl should depend on whether true/false have an effect mark_vars_read(expr->conditional.condition, NULL); if (expr->conditional.true_expression != NULL) - mark_vars_read(expr->conditional.true_expression, lhs_var); - mark_vars_read(expr->conditional.false_expression, lhs_var); + mark_vars_read(expr->conditional.true_expression, lhs_ent); + mark_vars_read(expr->conditional.false_expression, lhs_ent); return; case EXPR_SELECT: - if (lhs_var == VAR_ANY && !is_type_compound(skip_typeref(expr->base.type))) - lhs_var = NULL; - mark_vars_read(expr->select.compound, lhs_var); + if (lhs_ent == ENT_ANY + && !is_type_compound(skip_typeref(expr->base.type))) + lhs_ent = NULL; + mark_vars_read(expr->select.compound, lhs_ent); return; case EXPR_ARRAY_ACCESS: { expression_t *const ref = expr->array_access.array_ref; - mark_vars_read(ref, lhs_var); - lhs_var = determine_lhs_var(ref, lhs_var); - mark_vars_read(expr->array_access.index, lhs_var); + mark_vars_read(ref, lhs_ent); + lhs_ent = determine_lhs_ent(ref, lhs_ent); + mark_vars_read(expr->array_access.index, lhs_ent); return; } case EXPR_VA_ARG: - mark_vars_read(expr->va_arge.ap, lhs_var); + mark_vars_read(expr->va_arge.ap, lhs_ent); return; case EXPR_UNARY_CAST: /* Special case: Use void cast to mark a variable as "read" */ if (is_type_atomic(skip_typeref(expr->base.type), ATOMIC_TYPE_VOID)) - lhs_var = NULL; + lhs_ent = NULL; goto unary; @@ -2031,8 +2090,8 @@ static void mark_vars_read(expression_t *const expr, variable_t *lhs_var) case EXPR_UNARY_DEREFERENCE: case EXPR_UNARY_DELETE: case EXPR_UNARY_DELETE_ARRAY: - if (lhs_var == VAR_ANY) - lhs_var = NULL; + if (lhs_ent == ENT_ANY) + lhs_ent = NULL; goto unary; case EXPR_UNARY_NEGATE: @@ -2047,7 +2106,7 @@ static void mark_vars_read(expression_t *const expr, variable_t *lhs_var) case EXPR_UNARY_CAST_IMPLICIT: case EXPR_UNARY_ASSUME: unary: - mark_vars_read(expr->unary.value, lhs_var); + mark_vars_read(expr->unary.value, lhs_ent); return; case EXPR_BINARY_ADD: @@ -2075,8 +2134,8 @@ unary: case EXPR_BINARY_ISLESSEQUAL: case EXPR_BINARY_ISLESSGREATER: case EXPR_BINARY_ISUNORDERED: - mark_vars_read(expr->binary.left, lhs_var); - mark_vars_read(expr->binary.right, lhs_var); + mark_vars_read(expr->binary.left, lhs_ent); + mark_vars_read(expr->binary.right, lhs_ent); return; case EXPR_BINARY_ASSIGN: @@ -2090,15 +2149,15 @@ unary: case EXPR_BINARY_BITWISE_AND_ASSIGN: case EXPR_BINARY_BITWISE_XOR_ASSIGN: case EXPR_BINARY_BITWISE_OR_ASSIGN: { - if (lhs_var == VAR_ANY) - lhs_var = NULL; - lhs_var = determine_lhs_var(expr->binary.left, lhs_var); - mark_vars_read(expr->binary.right, lhs_var); + if (lhs_ent == ENT_ANY) + lhs_ent = NULL; + lhs_ent = determine_lhs_ent(expr->binary.left, lhs_ent); + mark_vars_read(expr->binary.right, lhs_ent); return; } case EXPR_VA_START: - determine_lhs_var(expr->va_starte.ap, lhs_var); + determine_lhs_ent(expr->va_starte.ap, lhs_ent); return; case EXPR_UNKNOWN: @@ -2119,7 +2178,6 @@ unary: case EXPR_OFFSETOF: case EXPR_STATEMENT: // TODO case EXPR_LABEL_ADDRESS: - case EXPR_BINARY_BUILTIN_EXPECT: case EXPR_REFERENCE_ENUM_VALUE: return; } @@ -2142,7 +2200,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])); @@ -2157,7 +2215,7 @@ static designator_t *parse_designation(void) next_token(); break; default: - expect('='); + expect('=', end_error); return result; } @@ -2288,7 +2346,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); } @@ -2715,9 +2773,9 @@ finish_designator: if (type != NULL) { ascend_from_subtype(path); - expect('}'); + expect('}', end_error); } else { - expect('}'); + expect('}', end_error); goto error_parse_next; } } @@ -2727,7 +2785,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); } @@ -2811,7 +2869,7 @@ error_parse_next: if (token.type == '}') { break; } - expect(','); + expect(',', end_error); if (token.type == '}') { break; } @@ -2876,7 +2934,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 */ @@ -3066,7 +3124,7 @@ static void parse_enum_entries(type_t *const enum_type) } while (token.type != '}'); rem_anchor_token('}'); - expect('}'); + expect('}', end_error); end_error: ; @@ -3107,7 +3165,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) { @@ -3124,7 +3182,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); } @@ -3146,7 +3204,7 @@ static type_t *parse_typeof(void) type_t *type; - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *expression = NULL; @@ -3183,7 +3241,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; @@ -3279,7 +3337,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)) { @@ -3288,14 +3346,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); @@ -3322,7 +3380,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) @@ -3335,7 +3393,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) { @@ -3358,17 +3416,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) @@ -3382,14 +3440,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(')'); @@ -3411,7 +3469,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; @@ -3442,7 +3501,7 @@ static void parse_microsoft_based(based_spec_t *based_spec) if (is_type_valid(type)) { if (! is_type_pointer(skip_typeref(type))) { - errorf(HERE, "variable in __based modifier must have pointer type instead of %T", type); + errorf(HERE, "variable in __based modifier must have pointer type instead of '%T'", type); } if (variable->base.base.parent_scope != file_scope) { errorf(HERE, "a nonstatic local variable may not be used in a __based specification"); @@ -3498,14 +3557,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; @@ -3589,11 +3649,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: @@ -4012,7 +4072,7 @@ static type_qualifiers_t parse_type_qualifiers(void) static void parse_identifier_list(scope_t *scope) { do { - entity_t *entity = allocate_entity_zero(ENTITY_VARIABLE); + entity_t *entity = allocate_entity_zero(ENTITY_PARAMETER); entity->base.source_position = token.source_position; entity->base.namespc = NAMESPACE_NORMAL; entity->base.symbol = token.v.symbol; @@ -4028,35 +4088,6 @@ static void parse_identifier_list(scope_t *scope) } while (token.type == T_IDENTIFIER); } -static void semantic_parameter(declaration_t *declaration) -{ - /* TODO: improve error messages */ - source_position_t const* const pos = &declaration->base.source_position; - - /* §6.9.1:6 The declarations in the declaration list shall contain no - * storage-class specifier other than register and no - * initializations. */ - switch (declaration->declared_storage_class) { - /* Allowed storage classes */ - case STORAGE_CLASS_NONE: - case STORAGE_CLASS_REGISTER: - break; - - default: - errorf(pos, "parameter may only have none or register storage class"); - break; - } - - /* §6.7.5.3:4 After adjustment, the parameters in a parameter type list in - * a function declarator that is part of a definition of that - * function shall not have incomplete type. */ - type_t *type = declaration->type; - if (is_type_incomplete(skip_typeref(type))) { - errorf(pos, "parameter '%#T' has incomplete type", - type, declaration->base.symbol); - } -} - static entity_t *parse_parameter(void) { declaration_specifiers_t specifiers; @@ -4070,6 +4101,22 @@ static entity_t *parse_parameter(void) return entity; } +static void semantic_parameter_incomplete(const entity_t *entity) +{ + assert(entity->kind == ENTITY_PARAMETER); + + /* §6.7.5.3:4 After adjustment, the parameters in a parameter type + * list in a function declarator that is part of a + * definition of that function shall not have + * incomplete type. */ + 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, + entity->declaration.type); + } +} + /** * Parses function type parameters (and optionally creates variable_t entities * for them in a scope) @@ -4126,7 +4173,7 @@ static void parse_parameters(function_type_t *type, scope_t *scope) && skip_typeref(entity->declaration.type) == type_void) { goto parameters_finished; } - semantic_parameter(&entity->declaration); + semantic_parameter_incomplete(entity); parameter = obstack_alloc(type_obst, sizeof(parameter[0])); memset(parameter, 0, sizeof(parameter[0])); @@ -4157,7 +4204,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); @@ -4265,7 +4312,7 @@ static construct_type_t *parse_array_declarator(void) } rem_anchor_token(']'); - expect(']'); + expect(']', end_error); end_error: return &array->construct_type; @@ -4347,11 +4394,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: @@ -4393,15 +4440,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) @@ -4511,7 +4563,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); @@ -4637,6 +4689,39 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, type_ static type_t *automatic_type_conversion(type_t *orig_type); +static type_t *semantic_parameter(const source_position_t *pos, + type_t *type, + const declaration_specifiers_t *specifiers, + symbol_t *symbol) +{ + /* §6.7.5.3:7 A declaration of a parameter as ``array of type'' + * shall be adjusted to ``qualified pointer to type'', + * [...] + * §6.7.5.3:8 A declaration of a parameter as ``function returning + * type'' shall be adjusted to ``pointer to function + * returning type'', as in 6.3.2.1. */ + type = automatic_type_conversion(type); + + if (specifiers->is_inline && is_type_valid(type)) { + errorf(pos, "parameter '%Y' declared 'inline'", symbol); + } + + /* §6.9.1:6 The declarations in the declaration list shall contain + * no storage-class specifier other than register and no + * initializations. */ + if (specifiers->thread_local || ( + specifiers->storage_class != STORAGE_CLASS_NONE && + specifiers->storage_class != STORAGE_CLASS_REGISTER) + ) { + errorf(pos, "invalid storage class for parameter '%Y'", symbol); + } + + /* delay test for incomplete type, because we might have (void) + * which is legal but incomplete... */ + + return type; +} + static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, declarator_flags_t flags) { @@ -4676,29 +4761,26 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, } } } else { + /* create a declaration type entity */ if (flags & DECL_CREATE_COMPOUND_MEMBER) { - entity = allocate_entity_zero(ENTITY_COMPOUND_MEMBER); + entity = allocate_entity_zero(ENTITY_COMPOUND_MEMBER); if (specifiers->is_inline && is_type_valid(type)) { errorf(&env.source_position, "compound member '%Y' declared 'inline'", env.symbol); } - if (specifiers->thread_local || - specifiers->storage_class != STORAGE_CLASS_NONE) { - errorf(&env.source_position, - "compound member '%Y' must have no storage class", - env.symbol); - } + if (specifiers->thread_local || + specifiers->storage_class != STORAGE_CLASS_NONE) { + errorf(&env.source_position, + "compound member '%Y' must have no storage class", + env.symbol); + } } else if (flags & DECL_IS_PARAMETER) { - /* §6.7.5.3:7 A declaration of a parameter as ``array of type'' - * shall be adjusted to ``qualified pointer to type'', - * [...] - * §6.7.5.3:8 A declaration of a parameter as ``function returning - * type'' shall be adjusted to ``pointer to function - * returning type'', as in 6.3.2.1. */ - orig_type = automatic_type_conversion(type); - goto create_variable; + orig_type = semantic_parameter(&env.source_position, orig_type, + specifiers, env.symbol); + + entity = allocate_entity_zero(ENTITY_PARAMETER); } else if (is_type_function(type)) { entity = allocate_entity_zero(ENTITY_FUNCTION); @@ -4706,15 +4788,14 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, entity->function.parameters = env.parameters; if (specifiers->thread_local || ( - specifiers->storage_class != STORAGE_CLASS_EXTERN && - specifiers->storage_class != STORAGE_CLASS_NONE && - specifiers->storage_class != STORAGE_CLASS_STATIC) - ) { + specifiers->storage_class != STORAGE_CLASS_EXTERN && + specifiers->storage_class != STORAGE_CLASS_NONE && + specifiers->storage_class != STORAGE_CLASS_STATIC) + ) { errorf(&env.source_position, - "invalid storage class for function '%Y'", env.symbol); + "invalid storage class for function '%Y'", env.symbol); } } else { -create_variable: entity = allocate_entity_zero(ENTITY_VARIABLE); entity->variable.get_property_sym = specifiers->get_property_sym; @@ -4726,7 +4807,7 @@ create_variable: if (specifiers->is_inline && is_type_valid(type)) { errorf(&env.source_position, - "variable '%Y' declared 'inline'", env.symbol); + "variable '%Y' declared 'inline'", env.symbol); } entity->variable.thread_local = specifiers->thread_local; @@ -4760,10 +4841,8 @@ create_variable: storage_class_t storage_class = specifiers->storage_class; entity->declaration.declared_storage_class = storage_class; - if (storage_class == STORAGE_CLASS_NONE - && current_scope != file_scope) { + if (storage_class == STORAGE_CLASS_NONE && current_scope != file_scope) storage_class = STORAGE_CLASS_AUTO; - } entity->declaration.storage_class = storage_class; } @@ -4853,26 +4932,6 @@ static bool is_sym_main(const symbol_t *const sym) return strcmp(sym->string, "main") == 0; } -static const char *get_entity_kind_name(entity_kind_t kind) -{ - switch ((entity_kind_tag_t) kind) { - case ENTITY_FUNCTION: return "function"; - case ENTITY_VARIABLE: return "variable"; - case ENTITY_COMPOUND_MEMBER: return "compound type member"; - case ENTITY_STRUCT: return "struct"; - case ENTITY_UNION: return "union"; - case ENTITY_ENUM: return "enum"; - case ENTITY_ENUM_VALUE: return "enum value"; - case ENTITY_LABEL: return "label"; - case ENTITY_LOCAL_LABEL: return "local label"; - case ENTITY_TYPEDEF: return "typedef"; - case ENTITY_NAMESPACE: return "namespace"; - case ENTITY_INVALID: break; - } - - panic("Invalid entity kind encountered in get_entity_kind_name"); -} - static void error_redefined_as_different_kind(const source_position_t *pos, const entity_t *old, entity_kind_t new_kind) { @@ -4891,7 +4950,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); @@ -4914,46 +4976,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){ - - assert(previous_entity->kind == ENTITY_VARIABLE); + 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; } @@ -4961,50 +5018,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_VARIABLE - && previous_entity->declaration.type == NULL - && entity->kind == ENTITY_VARIABLE) { - 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 @@ -5012,8 +5066,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) { @@ -5045,7 +5099,8 @@ warn_redundant_declaration: if (!is_definition && warning.redundant_decls && is_type_valid(prev_type) && - strcmp(previous_entity->base.source_position.input_name, "") != 0) { + strcmp(previous_entity->base.source_position.input_name, + "") != 0) { warningf(pos, "redundant declaration for '%Y' (declared %P)", symbol, &previous_entity->base.source_position); @@ -5057,8 +5112,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) @@ -5078,7 +5133,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; } @@ -5096,9 +5151,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'", @@ -5121,7 +5176,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); } @@ -5235,18 +5290,29 @@ 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); } static void parse_declaration_rest(entity_t *ndeclaration, const declaration_specifiers_t *specifiers, - parsed_declaration_func finished_declaration) + parsed_declaration_func finished_declaration, + declarator_flags_t flags) { add_anchor_token(';'); add_anchor_token(','); @@ -5276,10 +5342,10 @@ static void parse_declaration_rest(entity_t *ndeclaration, eat(','); add_anchor_token('='); - ndeclaration = parse_declarator(specifiers, DECL_FLAGS_NONE); + ndeclaration = parse_declarator(specifiers, flags); rem_anchor_token('='); } - expect(';'); + expect(';', end_error); end_error: anonymous_entity = NULL; @@ -5305,13 +5371,14 @@ 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); } -static void parse_declaration(parsed_declaration_func finished_declaration) +static void parse_declaration(parsed_declaration_func finished_declaration, + declarator_flags_t flags) { declaration_specifiers_t specifiers; memset(&specifiers, 0, sizeof(specifiers)); @@ -5323,8 +5390,8 @@ static void parse_declaration(parsed_declaration_func finished_declaration) if (token.type == ';') { parse_anonymous_declaration_rest(&specifiers); } else { - entity_t *entity = parse_declarator(&specifiers, DECL_FLAGS_NONE); - parse_declaration_rest(entity, &specifiers, finished_declaration); + entity_t *entity = parse_declarator(&specifiers, flags); + parse_declaration_rest(entity, &specifiers, finished_declaration, flags); } } @@ -5356,8 +5423,8 @@ static void parse_kr_declaration_list(entity_t *entity) add_anchor_token('{'); /* push function parameters */ - size_t const top = environment_top(); - scope_push(&entity->function.parameters); + size_t const top = environment_top(); + scope_t *old_scope = scope_push(&entity->function.parameters); entity_t *parameter = entity->function.parameters.entities; for ( ; parameter != NULL; parameter = parameter->base.next) { @@ -5367,13 +5434,25 @@ static void parse_kr_declaration_list(entity_t *entity) } /* parse declaration list */ - while (is_declaration_specifier(&token, false)) { - parse_declaration(finished_kr_declaration); + 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); - scope_pop(); + scope_pop(old_scope); environment_pop_to(top); /* update function type */ @@ -5382,26 +5461,25 @@ static void parse_kr_declaration_list(entity_t *entity) function_parameter_t *parameters = NULL; function_parameter_t *last_parameter = NULL; - entity_t *parameter_declaration = entity->function.parameters.entities; - for (; parameter_declaration != NULL; - parameter_declaration = parameter_declaration->base.next) { - type_t *parameter_type = parameter_declaration->declaration.type; + parameter = entity->function.parameters.entities; + for (; parameter != NULL; parameter = parameter->base.next) { + type_t *parameter_type = parameter->declaration.type; if (parameter_type == NULL) { if (strict_mode) { errorf(HERE, "no type specified for function parameter '%Y'", - parameter_declaration->base.symbol); + parameter->base.symbol); } else { if (warning.implicit_int) { warningf(HERE, "no type specified for function parameter '%Y', using 'int'", - parameter_declaration->base.symbol); + parameter->base.symbol); } - parameter_type = type_int; - parameter_declaration->declaration.type = parameter_type; + parameter_type = type_int; + parameter->declaration.type = parameter_type; } } - semantic_parameter(¶meter_declaration->declaration); - parameter_type = parameter_declaration->declaration.type; + semantic_parameter_incomplete(parameter); + parameter_type = parameter->declaration.type; /* * we need the default promoted types for the function type @@ -5490,8 +5568,7 @@ static void check_labels(void) } } -static void warn_unused_decl(entity_t *entity, entity_t *end, - char const *const what) +static void warn_unused_entity(entity_t *entity, entity_t *end) { for (; entity != NULL; entity = entity->base.next) { if (!is_declaration(entity)) @@ -5503,10 +5580,12 @@ static void warn_unused_decl(entity_t *entity, entity_t *end, if (!declaration->used) { print_in_function(); + const char *what = get_entity_kind_name(entity->kind); warningf(&entity->base.source_position, "%s '%Y' is unused", what, entity->base.symbol); } else if (entity->kind == ENTITY_VARIABLE && !entity->variable.read) { print_in_function(); + const char *what = get_entity_kind_name(entity->kind); warningf(&entity->base.source_position, "%s '%Y' is never read", what, entity->base.symbol); } @@ -5523,13 +5602,13 @@ static void check_unused_variables(statement_t *const stmt, void *const env) switch (stmt->kind) { case STATEMENT_DECLARATION: { declaration_statement_t const *const decls = &stmt->declaration; - warn_unused_decl(decls->declarations_begin, decls->declarations_end, - "variable"); + warn_unused_entity(decls->declarations_begin, + decls->declarations_end); return; } case STATEMENT_FOR: - warn_unused_decl(stmt->fors.scope.entities, NULL, "variable"); + warn_unused_entity(stmt->fors.scope.entities, NULL); return; default: @@ -5547,7 +5626,7 @@ static void check_declarations(void) /* do not issue unused warnings for main */ if (!is_sym_main(current_function->base.base.symbol)) { - warn_unused_decl(scope->entities, NULL, "parameter"); + warn_unused_entity(scope->entities, NULL); } } if (warning.unused_variable) { @@ -5616,11 +5695,15 @@ static bool expression_returns(expression_t const *const expr) case EXPR_CONDITIONAL: // TODO handle constant expression - return - expression_returns(expr->conditional.condition) && ( - expression_returns(expr->conditional.true_expression) || - expression_returns(expr->conditional.false_expression) - ); + + if (!expression_returns(expr->conditional.condition)) + return false; + + if (expr->conditional.true_expression != NULL + && expression_returns(expr->conditional.true_expression)) + return true; + + return expression_returns(expr->conditional.false_expression); case EXPR_SELECT: return expression_returns(expr->select.compound); @@ -5703,14 +5786,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; @@ -6120,9 +6205,26 @@ static void check_unreachable(statement_t* const stmt, void *const env) case STATEMENT_COMPOUND: if (stmt->compound.statements != NULL) return; - /* FALLTHROUGH*/ + goto warn_unreachable; + + case STATEMENT_DECLARATION: { + /* Only warn if there is at least one declarator with an initializer. + * This typically occurs in switch statements. */ + 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 == last) + return; + } + } default: +warn_unreachable: if (!stmt->base.reachable) warningf(&stmt->base.source_position, "statement is unreachable"); return; @@ -6164,7 +6266,8 @@ static void parse_external_declaration(void) case ',': case ';': case '=': - parse_declaration_rest(ndeclaration, &specifiers, record_entity); + parse_declaration_rest(ndeclaration, &specifiers, record_entity, + DECL_FLAGS_NONE); return; } @@ -6230,8 +6333,8 @@ static void parse_external_declaration(void) type = skip_typeref(entity->declaration.type); /* push function parameters and switch scope */ - size_t const top = environment_top(); - scope_push(&function->parameters); + size_t const top = environment_top(); + scope_t *old_scope = scope_push(&function->parameters); entity_t *parameter = function->parameters.entities; for (; parameter != NULL; parameter = parameter->base.next) { @@ -6292,7 +6395,7 @@ static void parse_external_declaration(void) } assert(current_scope == &function->parameters); - scope_pop(); + scope_pop(old_scope); environment_pop_to(top); } @@ -6433,7 +6536,7 @@ static void parse_compound_declarators(compound_t *compound, break; next_token(); } - expect(';'); + expect(';', end_error); end_error: anonymous_entity = NULL; @@ -6502,7 +6605,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(); @@ -6770,7 +6873,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"); } } @@ -6870,14 +6973,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); } } @@ -6920,6 +7024,8 @@ static expression_t *parse_reference(void) if (entity->kind == ENTITY_VARIABLE) { /* access of a variable from an outer function */ entity->variable.address_taken = true; + } else if (entity->kind == ENTITY_PARAMETER) { + entity->parameter.address_taken = true; } current_function->need_closure = true; } @@ -7032,7 +7138,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); @@ -7082,7 +7188,7 @@ static expression_t *parse_statement_expression(void) expression->base.type = type; rem_anchor_token(')'); - expect(')'); + expect(')', end_error); end_error: return expression; @@ -7112,7 +7218,7 @@ static expression_t *parse_parenthesized_expression(void) add_anchor_token(')'); expression_t *result = parse_expression(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); end_error: return result; @@ -7218,7 +7324,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; } @@ -7245,15 +7351,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; @@ -7285,26 +7391,26 @@ 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; if (entity->base.parent_scope != ¤t_function->parameters || entity->base.next != NULL - || entity->kind != ENTITY_VARIABLE) { + || entity->kind != ENTITY_PARAMETER) { errorf(&expr->base.source_position, "second argument of 'va_start' must be last parameter of the current function"); } else { expression->va_starte.parameter = &entity->variable; } - expect(')'); + expect(')', end_error); return expression; } - expect(')'); + expect(')', end_error); end_error: return create_invalid_expression(); } @@ -7318,11 +7424,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: @@ -7354,11 +7460,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; @@ -7375,7 +7481,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 == ',') { @@ -7387,7 +7493,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; @@ -7427,11 +7533,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; @@ -7454,20 +7560,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; @@ -7486,11 +7592,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; @@ -7595,7 +7701,7 @@ static expression_t *parse_noop_expression(void) } rem_anchor_token(','); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); end_error: return cnst; @@ -7713,7 +7819,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; } @@ -7736,7 +7842,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 @@ -7843,7 +7949,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)); @@ -7978,7 +8084,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; @@ -8110,7 +8216,7 @@ static expression_t *parse_conditional_expression(expression_t *expression) true_expression = parse_expression(); } rem_anchor_token(':'); - expect(':'); + expect(':', end_error); expression_t *false_expression = parse_sub_expression(c_mode & _CXX ? PREC_ASSIGNMENT : PREC_CONDITIONAL); @@ -8247,11 +8353,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; @@ -8273,7 +8379,7 @@ static expression_t *parse_delete(void) if (token.type == '[') { next_token(); result->kind = EXPR_UNARY_DELETE_ARRAY; - expect(']'); + expect(']', end_error); end_error:; } @@ -8486,17 +8592,22 @@ static void set_address_taken(expression_t *expression, bool may_be_register) entity_t *const entity = expression->reference.entity; - if (entity->kind != ENTITY_VARIABLE) + if (entity->kind != ENTITY_VARIABLE && entity->kind != ENTITY_PARAMETER) return; if (entity->declaration.storage_class == STORAGE_CLASS_REGISTER && !may_be_register) { errorf(&expression->base.source_position, - "address of register variable '%Y' requested", - entity->base.symbol); + "address of register %s '%Y' requested", + get_entity_kind_name(entity->kind), entity->base.symbol); } - entity->variable.address_taken = true; + if (entity->kind == ENTITY_VARIABLE) { + entity->variable.address_taken = true; + } else { + assert(entity->kind == ENTITY_PARAMETER); + entity->parameter.address_taken = true; + } } /** @@ -8930,8 +9041,14 @@ static bool is_valid_assignment_lhs(expression_t const* const left) return false; } + if (left->kind == EXPR_REFERENCE + && left->reference.entity->kind == ENTITY_FUNCTION) { + errorf(HERE, "cannot assign to function '%E'", left); + return false; + } + if (is_type_array(type_left)) { - errorf(HERE, "cannot assign to arrays ('%E')", left); + errorf(HERE, "cannot assign to array '%E'", left); return false; } if (type_left->base.qualifiers & TYPE_QUALIFIER_CONST) { @@ -9176,7 +9293,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; @@ -9419,11 +9535,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(')'); @@ -9483,7 +9599,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); @@ -9542,7 +9658,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(); @@ -9572,8 +9688,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 @@ -9639,7 +9755,8 @@ static statement_t *parse_case_statement(void) PUSH_PARENT(statement); - expect(':'); + expect(':', end_error); +end_error: if (current_switch != NULL) { if (! statement->case_label.is_bad) { @@ -9676,9 +9793,6 @@ static statement_t *parse_case_statement(void) POP_PARENT; return statement; -end_error: - POP_PARENT; - return create_invalid_statement(); } /** @@ -9692,7 +9806,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) { @@ -9800,7 +9914,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; @@ -9809,7 +9923,7 @@ 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('{'); @@ -9879,7 +9993,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); @@ -9899,7 +10013,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; @@ -9943,7 +10057,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; @@ -9952,7 +10066,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); @@ -9978,8 +10092,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; @@ -9988,8 +10102,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; @@ -10007,69 +10121,71 @@ static statement_t *parse_for(void) eat(T_for); - PUSH_PARENT(statement); + expect('(', end_error1); + add_anchor_token(')'); - size_t const top = environment_top(); - scope_push(&statement->fors.scope); + PUSH_PARENT(statement); - expect('('); - add_anchor_token(')'); + size_t const top = environment_top(); + scope_t *old_scope = scope_push(&statement->fors.scope); if (token.type == ';') { next_token(); } else if (is_declaration_specifier(&token, false)) { - parse_declaration(record_entity); + parse_declaration(record_entity, DECL_FLAGS_NONE); } else { add_anchor_token(';'); expression_t *const init = parse_expression(); statement->fors.initialisation = init; - mark_vars_read(init, VAR_ANY); + mark_vars_read(init, ENT_ANY); if (warning.unused_value && !expression_has_effect(init)) { warningf(&init->base.source_position, "initialisation of 'for'-statement has no effect"); } rem_anchor_token(';'); - expect(';'); + expect(';', end_error2); } if (token.type != ';') { add_anchor_token(';'); expression_t *const cond = parse_expression(); statement->fors.condition = cond; - /* §6.8.5:2 The controlling expression of an iteration statement shall - * have scalar type. */ + /* §6.8.5:2 The controlling expression of an iteration statement + * shall have scalar type. */ semantic_condition(cond, "condition of 'for'-statement"); 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; - mark_vars_read(step, VAR_ANY); + mark_vars_read(step, ENT_ANY); if (warning.unused_value && !expression_has_effect(step)) { warningf(&step->base.source_position, "step of 'for'-statement has no effect"); } } - expect(')'); + expect(')', end_error2); rem_anchor_token(')'); statement->fors.body = parse_loop_body(statement); assert(current_scope == &statement->fors.scope); - scope_pop(); + scope_pop(old_scope); environment_pop_to(top); POP_PARENT; return statement; -end_error: +end_error2: POP_PARENT; rem_anchor_token(')'); assert(current_scope == &statement->fors.scope); - scope_pop(); + scope_pop(old_scope); environment_pop_to(top); + /* fallthrough */ +end_error1: return create_invalid_statement(); } @@ -10121,7 +10237,7 @@ static statement_t *parse_goto(void) *goto_anchor = &statement->gotos; goto_anchor = &statement->gotos.next; - expect(';'); + expect(';', end_error); return statement; end_error: @@ -10140,7 +10256,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; @@ -10158,7 +10274,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; @@ -10176,7 +10292,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; @@ -10283,7 +10399,7 @@ static statement_t *parse_return(void) } statement->returns.value = return_value; - expect(';'); + expect(';', end_error); end_error: return statement; @@ -10297,10 +10413,11 @@ static statement_t *parse_declaration_statement(void) statement_t *statement = allocate_statement_zero(STATEMENT_DECLARATION); entity_t *before = current_scope->last_entity; - if (GNU_MODE) + if (GNU_MODE) { parse_external_declaration(); - else - parse_declaration(record_entity); + } else { + parse_declaration(record_entity, DECL_FLAGS_NONE); + } if (before == NULL) { statement->declaration.declarations_begin = current_scope->entities; @@ -10321,9 +10438,9 @@ static statement_t *parse_expression_statement(void) expression_t *const expr = parse_expression(); statement->expression.expression = expr; - mark_vars_read(expr, VAR_ANY); + mark_vars_read(expr, ENT_ANY); - expect(';'); + expect(';', end_error); end_error: return statement; @@ -10349,7 +10466,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); @@ -10363,7 +10480,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); @@ -10471,16 +10588,16 @@ static void parse_namespace_definition(void) environment_push(entity); append_entity(current_scope, entity); - size_t const top = environment_top(); - scope_push(&entity->namespacee.members); + 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); - scope_pop(); + scope_pop(old_scope); environment_pop_to(top); } @@ -10616,9 +10733,97 @@ 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_push(&statement->compound.scope); + size_t const top = environment_top(); + scope_t *old_scope = scope_push(&statement->compound.scope); statement_t **anchor = &statement->compound.statements; bool only_decls_so_far = true; @@ -10674,9 +10879,95 @@ 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(); + scope_pop(old_scope); environment_pop_to(top); POP_PARENT; @@ -10725,14 +11016,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:; } @@ -10759,7 +11050,7 @@ static void parse_linkage_specification(void) if (token.type == '{') { next_token(); parse_externals(); - expect('}'); + expect('}', end_error); } else { parse_external(); } @@ -10775,8 +11066,11 @@ static void parse_external(void) DECLARATION_START_NO_EXTERN case T_IDENTIFIER: case T___extension__: - case '(': /* for function declarations with implicit return type and - * parenthesized declarator, i.e. (f)(void); */ + /* tokens below are for implicit int */ + case '&': /* & x; -> int& x; (and error later, because C++ has no + implicit int) */ + case '*': /* * x; -> int* x; */ + case '(': /* (x); -> int (x); */ parse_external_declaration(); return; @@ -10898,9 +11192,8 @@ void start_parsing(void) translation_unit_t *finish_parsing(void) { - /* do NOT use scope_pop() here, this will crash, will it by hand */ assert(current_scope == &unit->scope); - current_scope = NULL; + scope_pop(NULL); assert(file_scope == &unit->scope); check_unused_globals(); @@ -10914,14 +11207,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; } /**