X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=c4883b59bd8fe588f7afc348601210105924a5ee;hb=82daa86313ed2fc1c703f99d1f499de2494d6bf2;hp=7dca240699a08e890e9799b3f5156d7e3c9deeed;hpb=86e613f57ea7f1eac5b020163a1ab045ee198142;p=cparser diff --git a/parser.c b/parser.c index 7dca240..c4883b5 100644 --- a/parser.c +++ b/parser.c @@ -702,6 +702,7 @@ static void scope_pop(scope_t *old_scope) static entity_t *get_entity(const symbol_t *const symbol, namespace_tag_t namespc) { + assert(namespc != NAMESPACE_INVALID); entity_t *entity = symbol->entity; for (; entity != NULL; entity = entity->base.symbol_next) { if (entity->base.namespc == namespc) @@ -916,10 +917,13 @@ static bool is_null_pointer_constant(const expression_t *expression) } type_t *const type = skip_typeref(expression->base.type); - return - is_type_integer(type) && - is_constant_expression(expression) && - !fold_constant_to_bool(expression); + if (!is_type_integer(type)) + return false; + switch (is_constant_expression(expression)) { + case EXPR_CLASS_ERROR: return true; + case EXPR_CLASS_CONSTANT: return !fold_constant_to_bool(expression); + default: return false; + } } /** @@ -1058,8 +1062,7 @@ static assign_error_t semantic_assign(type_t *orig_type_left, (is_type_atomic(type_left, ATOMIC_TYPE_BOOL) && is_type_pointer(type_right))) { return ASSIGN_SUCCESS; - } else if ((is_type_compound(type_left) && is_type_compound(type_right)) - || (is_type_builtin(type_left) && is_type_builtin(type_right))) { + } else if (is_type_compound(type_left) && is_type_compound(type_right)) { type_t *const unqual_type_left = get_unqualified_type(type_left); type_t *const unqual_type_right = get_unqualified_type(type_right); if (types_compatible(unqual_type_left, unqual_type_right)) { @@ -1079,7 +1082,7 @@ static expression_t *parse_constant_expression(void) { expression_t *result = parse_subexpression(PREC_CONDITIONAL); - if (!is_constant_expression(result)) { + if (is_constant_expression(result) == EXPR_CLASS_VARIABLE) { errorf(&result->base.source_position, "expression '%E' is not constant", result); } @@ -1261,7 +1264,7 @@ static attribute_t *parse_attribute_gnu_single(void) symbol_t *symbol = get_symbol_from_token(); if (symbol == NULL) { parse_error_expected("while parsing attribute((", T_IDENTIFIER, NULL); - goto end_error; + return NULL; } const char *name = symbol->string; @@ -1290,9 +1293,6 @@ static attribute_t *parse_attribute_gnu_single(void) attribute->a.arguments = parse_attribute_arguments(); return attribute; - -end_error: - return NULL; } static attribute_t *parse_attribute_gnu(void) @@ -1331,6 +1331,8 @@ static attribute_t *parse_attributes(attribute_t *first) switch (token.type) { case T___attribute__: attribute = parse_attribute_gnu(); + if (attribute == NULL) + continue; break; case T_asm: @@ -1735,8 +1737,9 @@ static initializer_t *initializer_from_expression(type_t *orig_type, */ static bool is_initializer_constant(const expression_t *expression) { - return is_constant_expression(expression) - || is_address_constant(expression); + return + is_constant_expression(expression) != EXPR_CLASS_VARIABLE || + is_address_constant(expression) != EXPR_CLASS_VARIABLE; } /** @@ -1960,7 +1963,7 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, if (iter == NULL) { errorf(&designator->source_position, "'%T' has no member named '%Y'", orig_type, symbol); - goto failed; + return false; } assert(iter->kind == ENTITY_COMPOUND_MEMBER); if (used_in_offsetof) { @@ -1969,7 +1972,7 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, errorf(&designator->source_position, "offsetof designator '%Y' must not specify bitfield", symbol); - goto failed; + return false; } } @@ -1987,7 +1990,7 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, "[%E] designator used for non-array type '%T'", array_index, orig_type); } - goto failed; + return false; } long index = fold_constant_to_int(array_index); @@ -2016,9 +2019,6 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, } } return true; - -failed: - return false; } static void advance_current_object(type_path_t *path, size_t top_path_level) @@ -2154,7 +2154,6 @@ finish_designator: if (type != NULL && is_type_scalar(type)) { sub = parse_scalar_initializer(type, env->must_be_constant); } else { - eat('{'); if (type == NULL) { if (env->entity != NULL) { errorf(HERE, @@ -2163,8 +2162,11 @@ finish_designator: } else { errorf(HERE, "extra brace group at end of initializer"); } - } else + eat('{'); + } else { + eat('{'); descend_into_subtype(path); + } add_anchor_token('}'); sub = parse_sub_initializer(path, orig_type, top_path_level+1, @@ -2411,10 +2413,11 @@ static void append_entity(scope_t *scope, entity_t *entity) static compound_t *parse_compound_type_specifier(bool is_struct) { + source_position_t const pos = *HERE; eat(is_struct ? T_struct : T_union); - symbol_t *symbol = NULL; - compound_t *compound = NULL; + symbol_t *symbol = NULL; + entity_t *entity = NULL; attribute_t *attributes = NULL; if (token.type == T___attribute__) { @@ -2425,46 +2428,40 @@ static compound_t *parse_compound_type_specifier(bool is_struct) if (token.type == T_IDENTIFIER) { /* the compound has a name, check if we have seen it already */ symbol = token.symbol; + entity = get_tag(symbol, kind); next_token(); - entity_t *entity = get_tag(symbol, kind); if (entity != NULL) { - compound = &entity->compound; - if (compound->base.parent_scope != current_scope && + if (entity->base.parent_scope != current_scope && (token.type == '{' || token.type == ';')) { /* we're in an inner scope and have a definition. Shadow * existing definition in outer scope */ - compound = NULL; - } else if (compound->complete && token.type == '{') { - assert(symbol != NULL); - errorf(HERE, "multiple definitions of '%s %Y' (previous definition %P)", + entity = NULL; + } else if (entity->compound.complete && token.type == '{') { + errorf(&pos, "multiple definitions of '%s %Y' (previous definition %P)", is_struct ? "struct" : "union", symbol, - &compound->base.source_position); + &entity->base.source_position); /* clear members in the hope to avoid further errors */ - compound->members.entities = NULL; + entity->compound.members.entities = NULL; } } } else if (token.type != '{') { - if (is_struct) { - parse_error_expected("while parsing struct type specifier", - T_IDENTIFIER, '{', NULL); - } else { - parse_error_expected("while parsing union type specifier", - T_IDENTIFIER, '{', NULL); - } + char const *const msg = + is_struct ? "while parsing struct type specifier" : + "while parsing union type specifier"; + parse_error_expected(msg, T_IDENTIFIER, '{', NULL); return NULL; } - if (compound == NULL) { - entity_t *entity = allocate_entity_zero(kind); - compound = &entity->compound; + if (entity == NULL) { + entity = allocate_entity_zero(kind); - compound->alignment = 1; - compound->base.namespc = NAMESPACE_TAG; - compound->base.source_position = token.source_position; - compound->base.symbol = symbol; - compound->base.parent_scope = current_scope; + entity->compound.alignment = 1; + entity->base.namespc = NAMESPACE_TAG; + entity->base.source_position = pos; + entity->base.symbol = symbol; + entity->base.parent_scope = current_scope; if (symbol != NULL) { environment_push(entity); } @@ -2472,20 +2469,20 @@ static compound_t *parse_compound_type_specifier(bool is_struct) } if (token.type == '{') { - parse_compound_type_entries(compound); + parse_compound_type_entries(&entity->compound); /* ISO/IEC 14882:1998(E) §7.1.3:5 */ if (symbol == NULL) { assert(anonymous_entity == NULL); - anonymous_entity = (entity_t*)compound; + anonymous_entity = entity; } } if (attributes != NULL) { - handle_entity_attributes(attributes, (entity_t*) compound); + handle_entity_attributes(attributes, entity); } - return compound; + return &entity->compound; } static void parse_enum_entries(type_t *const enum_type) @@ -2509,6 +2506,7 @@ static void parse_enum_entries(type_t *const enum_type) entity_t *entity = allocate_entity_zero(ENTITY_ENUM_VALUE); entity->enum_value.enum_type = enum_type; + entity->base.namespc = NAMESPACE_NORMAL; entity->base.symbol = token.symbol; entity->base.source_position = token.source_position; next_token(); @@ -2534,16 +2532,17 @@ end_error: static type_t *parse_enum_specifier(void) { - entity_t *entity; - symbol_t *symbol; + source_position_t const pos = *HERE; + entity_t *entity; + symbol_t *symbol; eat(T_enum); switch (token.type) { case T_IDENTIFIER: symbol = token.symbol; + entity = get_tag(symbol, ENTITY_ENUM); next_token(); - entity = get_tag(symbol, ENTITY_ENUM); if (entity != NULL) { if (entity->base.parent_scope != current_scope && (token.type == '{' || token.type == ';')) { @@ -2551,7 +2550,7 @@ static type_t *parse_enum_specifier(void) * existing definition in outer scope */ entity = NULL; } else if (entity->enume.complete && token.type == '{') { - errorf(HERE, "multiple definitions of 'enum %Y' (previous definition %P)", + errorf(&pos, "multiple definitions of 'enum %Y' (previous definition %P)", symbol, &entity->base.source_position); } } @@ -2571,7 +2570,7 @@ static type_t *parse_enum_specifier(void) if (entity == NULL) { entity = allocate_entity_zero(ENTITY_ENUM); entity->base.namespc = NAMESPACE_TAG; - entity->base.source_position = token.source_position; + entity->base.source_position = pos; entity->base.symbol = symbol; entity->base.parent_scope = current_scope; } @@ -2680,15 +2679,6 @@ typedef enum specifiers_t { SPECIFIER_IMAGINARY = 1 << 18, } specifiers_t; -static type_t *create_builtin_type(symbol_t *const symbol, - type_t *const real_type) -{ - type_t *type = allocate_type_zero(TYPE_BUILTIN); - type->builtin.symbol = symbol; - type->builtin.real_type = real_type; - return identify_new_type(type); -} - static type_t *get_typedef_type(symbol_t *symbol) { entity_t *entity = get_entity(symbol, NAMESPACE_NORMAL); @@ -2823,6 +2813,7 @@ end_error: static entity_t *create_error_entity(symbol_t *symbol, entity_kind_tag_t kind) { entity_t *entity = allocate_entity_zero(kind); + entity->base.namespc = NAMESPACE_NORMAL; entity->base.source_position = *HERE; entity->base.symbol = symbol; if (is_declaration(entity)) { @@ -2888,10 +2879,10 @@ check_thread_storage_class: break; char const* wrong; - case STORAGE_CLASS_AUTO: wrong = "auto"; goto wrong_thread_stoarge_class; - case STORAGE_CLASS_REGISTER: wrong = "register"; goto wrong_thread_stoarge_class; - case STORAGE_CLASS_TYPEDEF: wrong = "typedef"; goto wrong_thread_stoarge_class; -wrong_thread_stoarge_class: + case STORAGE_CLASS_AUTO: wrong = "auto"; goto wrong_thread_storage_class; + case STORAGE_CLASS_REGISTER: wrong = "register"; goto wrong_thread_storage_class; + case STORAGE_CLASS_TYPEDEF: wrong = "typedef"; goto wrong_thread_storage_class; +wrong_thread_storage_class: errorf(HERE, "'__thread' used with '%s'", wrong); break; } @@ -2964,7 +2955,7 @@ wrong_thread_stoarge_class: case T_long: if (type_specifiers & SPECIFIER_LONG_LONG) { - errorf(HERE, "multiple type specifiers given"); + errorf(HERE, "too many long type specifiers given"); } else if (type_specifiers & SPECIFIER_LONG) { type_specifiers |= SPECIFIER_LONG_LONG; } else { @@ -3049,8 +3040,6 @@ wrong_thread_stoarge_class: next_token(); saw_error = true; - if (la1_type == '&' || la1_type == '*') - goto finish_specifiers; continue; } @@ -3387,10 +3376,7 @@ static void parse_parameters(function_type_t *type, scope_t *scope) /* ISO/IEC 14882:1998(E) §C.1.6:1 */ if (!(c_mode & _CXX)) type->unspecified_parameters = true; - goto parameters_finished; - } - - if (has_parameters()) { + } else if (has_parameters()) { function_parameter_t **anchor = &type->parameters; do { switch (token.type) { @@ -3431,7 +3417,6 @@ static void parse_parameters(function_type_t *type, scope_t *scope) } while (next_if(',')); } - parameters_finished: rem_anchor_token(')'); expect(')', end_error); @@ -3452,6 +3437,7 @@ typedef union construct_type_t construct_type_t; typedef struct construct_type_base_t { construct_type_kind_t kind; + source_position_t pos; construct_type_t *next; } construct_type_base_t; @@ -3491,16 +3477,16 @@ static construct_type_t *allocate_declarator_zero(construct_type_kind_t const ki { construct_type_t *const cons = obstack_alloc(&temp_obst, size); memset(cons, 0, size); - cons->kind = kind; + cons->kind = kind; + cons->base.pos = *HERE; return cons; } /* §6.7.5.1 */ static construct_type_t *parse_pointer_declarator(void) { - eat('*'); - construct_type_t *const cons = allocate_declarator_zero(CONSTRUCT_POINTER, sizeof(parsed_pointer_t)); + eat('*'); cons->pointer.type_qualifiers = parse_type_qualifiers(); //cons->pointer.base_variable = base_variable; @@ -3510,12 +3496,11 @@ static construct_type_t *parse_pointer_declarator(void) /* ISO/IEC 14882:1998(E) §8.3.2 */ static construct_type_t *parse_reference_declarator(void) { - eat('&'); - if (!(c_mode & _CXX)) errorf(HERE, "references are only available for C++"); construct_type_t *const cons = allocate_declarator_zero(CONSTRUCT_REFERENCE, sizeof(parsed_reference_t)); + eat('&'); return cons; } @@ -3523,12 +3508,12 @@ static construct_type_t *parse_reference_declarator(void) /* §6.7.5.2 */ static construct_type_t *parse_array_declarator(void) { - eat('['); - add_anchor_token(']'); - construct_type_t *const cons = allocate_declarator_zero(CONSTRUCT_ARRAY, sizeof(parsed_array_t)); parsed_array_t *const array = &cons->array; + eat('['); + add_anchor_token(']'); + bool is_static = next_if(T_static); type_qualifiers_t type_qualifiers = parse_type_qualifiers(); @@ -3560,7 +3545,7 @@ static construct_type_t *parse_array_declarator(void) } if (is_static && size == NULL) - errorf(HERE, "static array parameters require a size"); + errorf(&array->base.pos, "static array parameters require a size"); rem_anchor_token(']'); expect(']', end_error); @@ -3572,6 +3557,8 @@ end_error: /* §6.7.5.3 */ static construct_type_t *parse_function_declarator(scope_t *scope) { + construct_type_t *const cons = allocate_declarator_zero(CONSTRUCT_FUNCTION, sizeof(construct_function_type_t)); + type_t *type = allocate_type_zero(TYPE_FUNCTION); function_type_t *ftype = &type->function; @@ -3580,7 +3567,6 @@ static construct_type_t *parse_function_declarator(scope_t *scope) parse_parameters(ftype, scope); - construct_type_t *const cons = allocate_declarator_zero(CONSTRUCT_FUNCTION, sizeof(construct_function_type_t)); cons->function.function_type = type; return cons; @@ -3647,26 +3633,50 @@ ptr_operator_end: ; } next_token(); break; - case '(': - /* §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); - if (inner_types != NULL) { - /* All later declarators only modify the return type */ - env->must_be_abstract = true; - } - rem_anchor_token(')'); - expect(')', end_error); + + case '(': { + /* Parenthesized declarator or function declarator? */ + token_t const *const la1 = look_ahead(1); + switch (la1->type) { + case T_IDENTIFIER: + if (is_typedef_symbol(la1->symbol)) { + case ')': + /* §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. */ + default: + /* Function declarator. */ + if (!env->may_be_abstract) { + errorf(HERE, "function declarator must have a name"); + goto error_out; + } + } else { + case '&': + case '(': + case '*': + case '[': + case T___attribute__: /* FIXME __attribute__ might also introduce a parameter of a function declarator. */ + /* Paranthesized declarator. */ + next_token(); + add_anchor_token(')'); + inner_types = parse_inner_declarator(env); + if (inner_types != NULL) { + /* All later declarators only modify the return type */ + env->must_be_abstract = true; + } + rem_anchor_token(')'); + expect(')', end_error); + } + break; } break; + } + default: if (env->may_be_abstract) break; parse_error_expected("while parsing declarator", T_IDENTIFIER, '(', NULL); +error_out: eat_until_anchor(); return NULL; } @@ -3714,6 +3724,7 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, { construct_type_t *iter = construct_list; for (; iter != NULL; iter = iter->base.next) { + source_position_t const* const pos = &iter->base.pos; switch (iter->kind) { case CONSTRUCT_INVALID: break; @@ -3726,13 +3737,12 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, type_t *skipped_return_type = skip_typeref(type); /* §6.7.5.3:1 */ if (is_type_function(skipped_return_type)) { - errorf(HERE, "function returning function is not allowed"); + errorf(pos, "function returning function is not allowed"); } else if (is_type_array(skipped_return_type)) { - errorf(HERE, "function returning array is not allowed"); + errorf(pos, "function returning array is not allowed"); } else { if (skipped_return_type->base.qualifiers != 0 && warning.other) { - warningf(HERE, - "type qualifiers in return type of function type are meaningless"); + warningf(pos, "type qualifiers in return type of function type are meaningless"); } } @@ -3744,7 +3754,7 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, case CONSTRUCT_POINTER: { if (is_type_reference(skip_typeref(type))) - errorf(HERE, "cannot declare a pointer to reference"); + errorf(pos, "cannot declare a pointer to reference"); parsed_pointer_t *pointer = &iter->pointer; type = make_based_pointer_type(type, pointer->type_qualifiers, pointer->base_variable); @@ -3753,14 +3763,14 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, case CONSTRUCT_REFERENCE: if (is_type_reference(skip_typeref(type))) - errorf(HERE, "cannot declare a reference to reference"); + errorf(pos, "cannot declare a reference to reference"); type = make_reference_type(type); continue; case CONSTRUCT_ARRAY: { if (is_type_reference(skip_typeref(type))) - errorf(HERE, "cannot declare an array of references"); + errorf(pos, "cannot declare an array of references"); parsed_array_t *array = &iter->array; type_t *array_type = allocate_type_zero(TYPE_ARRAY); @@ -3778,39 +3788,46 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, array_type->array.size_expression = size_expression; if (size_expression != NULL) { - if (is_constant_expression(size_expression)) { - long const size - = fold_constant_to_int(size_expression); - array_type->array.size = size; - array_type->array.size_constant = true; - /* §6.7.5.2:1 If the expression is a constant expression, it shall - * have a value greater than zero. */ - if (size <= 0) { - if (size < 0 || !GNU_MODE) { - errorf(&size_expression->base.source_position, - "size of array must be greater than zero"); - } else if (warning.other) { - warningf(&size_expression->base.source_position, - "zero length arrays are a GCC extension"); + switch (is_constant_expression(size_expression)) { + case EXPR_CLASS_CONSTANT: { + long const size = fold_constant_to_int(size_expression); + array_type->array.size = size; + array_type->array.size_constant = true; + /* §6.7.5.2:1 If the expression is a constant expression, it shall + * have a value greater than zero. */ + if (size <= 0) { + if (size < 0 || !GNU_MODE) { + errorf(&size_expression->base.source_position, + "size of array must be greater than zero"); + } else if (warning.other) { + warningf(&size_expression->base.source_position, + "zero length arrays are a GCC extension"); + } } + break; } - } else { - array_type->array.is_vla = true; + + case EXPR_CLASS_VARIABLE: + array_type->array.is_vla = true; + break; + + case EXPR_CLASS_ERROR: + break; } } type_t *skipped_type = skip_typeref(type); /* §6.7.5.2:1 */ if (is_type_incomplete(skipped_type)) { - errorf(HERE, "array of incomplete type '%T' is not allowed", type); + errorf(pos, "array of incomplete type '%T' is not allowed", type); } else if (is_type_function(skipped_type)) { - errorf(HERE, "array of functions is not allowed"); + errorf(pos, "array of functions is not allowed"); } type = identify_new_type(array_type); continue; } } - internal_errorf(HERE, "invalid type construction found"); + internal_errorf(pos, "invalid type construction found"); } return type; @@ -3878,6 +3895,7 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, entity_t *entity; if (specifiers->storage_class == STORAGE_CLASS_TYPEDEF) { entity = allocate_entity_zero(ENTITY_TYPEDEF); + entity->base.namespc = NAMESPACE_NORMAL; entity->base.symbol = env.symbol; entity->base.source_position = env.source_position; entity->typedefe.type = orig_type; @@ -3984,7 +4002,7 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, storage_class_t storage_class = specifiers->storage_class; entity->declaration.declared_storage_class = storage_class; - if (storage_class == STORAGE_CLASS_NONE && current_function != NULL) + if (storage_class == STORAGE_CLASS_NONE && current_function != NULL) storage_class = STORAGE_CLASS_AUTO; entity->declaration.storage_class = storage_class; } @@ -4046,23 +4064,30 @@ static void check_main(const entity_t *entity) } const function_parameter_t *parm = func_type->parameters; if (parm != NULL) { - type_t *const first_type = parm->type; - if (!types_compatible(skip_typeref(first_type), type_int)) { + type_t *const first_type = skip_typeref(parm->type); + type_t *const first_type_unqual = get_unqualified_type(first_type); + if (!types_compatible(first_type_unqual, type_int)) { warningf(pos, "first argument of 'main' should be 'int', but is '%T'", - first_type); + parm->type); } parm = parm->next; if (parm != NULL) { - type_t *const second_type = parm->type; - if (!types_compatible(skip_typeref(second_type), type_char_ptr_ptr)) { - warningf(pos, "second argument of 'main' should be 'char**', but is '%T'", second_type); + type_t *const second_type = skip_typeref(parm->type); + type_t *const second_type_unqual + = get_unqualified_type(second_type); + if (!types_compatible(second_type_unqual, type_char_ptr_ptr)) { + warningf(pos, "second argument of 'main' should be 'char**', but is '%T'", + parm->type); } parm = parm->next; if (parm != NULL) { - type_t *const third_type = parm->type; - if (!types_compatible(skip_typeref(third_type), type_char_ptr_ptr)) { - warningf(pos, "third argument of 'main' should be 'char**', but is '%T'", third_type); + type_t *const third_type = skip_typeref(parm->type); + type_t *const third_type_unqual + = get_unqualified_type(third_type); + if (!types_compatible(third_type_unqual, type_char_ptr_ptr)) { + warningf(pos, "third argument of 'main' should be 'char**', but is '%T'", + parm->type); } parm = parm->next; if (parm != NULL) @@ -4091,14 +4116,14 @@ static void error_redefined_as_different_kind(const source_position_t *pos, get_entity_kind_name(new_kind), &old->base.source_position); } -static bool is_error_entity(entity_t *const ent) +static bool is_entity_valid(entity_t *const ent) { if (is_declaration(ent)) { return is_type_valid(skip_typeref(ent->declaration.type)); } else if (ent->kind == ENTITY_TYPEDEF) { return is_type_valid(skip_typeref(ent->typedefe.type)); } - return false; + return true; } static bool contains_attribute(const attribute_t *list, const attribute_t *attr) @@ -4200,7 +4225,7 @@ entity_t *record_entity(entity_t *entity, const bool is_definition) if (previous_entity->base.parent_scope == current_scope) { if (previous_entity->kind != entity->kind) { - if (!is_error_entity(previous_entity) && !is_error_entity(entity)) { + if (is_entity_valid(previous_entity) && is_entity_valid(entity)) { error_redefined_as_different_kind(pos, previous_entity, entity->kind); } @@ -4248,7 +4273,7 @@ entity_t *record_entity(entity_t *entity, const bool is_definition) } else { unsigned old_storage_class = prev_decl->storage_class; - if (warning.redundant_decls && + if (warning.redundant_decls && is_definition && !prev_decl->used && !(prev_decl->modifiers & DM_USED) && @@ -4416,19 +4441,26 @@ static bool is_declaration_specifier(const token_t *token, static void parse_init_declarator_rest(entity_t *entity) { - assert(is_declaration(entity)); - declaration_t *const declaration = &entity->declaration; + type_t *orig_type = type_error_type; + if (entity->base.kind == ENTITY_TYPEDEF) { + errorf(&entity->base.source_position, + "typedef '%Y' is initialized (use __typeof__ instead)", + entity->base.symbol); + } else { + assert(is_declaration(entity)); + orig_type = entity->declaration.type; + } eat('='); - type_t *orig_type = declaration->type; - type_t *type = skip_typeref(orig_type); + type_t *type = skip_typeref(orig_type); if (entity->kind == ENTITY_VARIABLE && entity->variable.initializer != NULL) { parser_error_multiple_definition(entity, HERE); } + declaration_t *const declaration = &entity->declaration; bool must_be_constant = false; if (declaration->storage_class == STORAGE_CLASS_STATIC || entity->base.parent_scope == file_scope) { @@ -4578,7 +4610,7 @@ static entity_t *finished_kr_declaration(entity_t *entity, bool is_definition) entity_t *previous_entity = get_entity(symbol, NAMESPACE_NORMAL); if (previous_entity == NULL || previous_entity->base.parent_scope != current_scope) { - errorf(HERE, "expected declaration of a function parameter, found '%Y'", + errorf(&entity->base.source_position, "expected declaration of a function parameter, found '%Y'", symbol); return entity; } @@ -4882,8 +4914,8 @@ static void check_declarations(void) static int determine_truth(expression_t const* const cond) { return - !is_constant_expression(cond) ? 0 : - fold_constant_to_bool(cond) ? 1 : + is_constant_expression(cond) != EXPR_CLASS_CONSTANT ? 0 : + fold_constant_to_bool(cond) ? 1 : -1; } @@ -5093,7 +5125,7 @@ static void check_reachable(statement_t *const stmt) if (!expression_returns(expr)) return; - if (is_constant_expression(expr)) { + if (is_constant_expression(expr) == EXPR_CLASS_CONSTANT) { long const val = fold_constant_to_int(expr); case_label_statement_t * defaults = NULL; for (case_label_statement_t *i = switchs->first_case; i != NULL; i = i->next) { @@ -5555,15 +5587,15 @@ static void parse_external_declaration(void) if (warning.aggregate_return && is_type_compound(skip_typeref(type->function.return_type))) { - warningf(HERE, "function '%Y' returns an aggregate", + warningf(&ndeclaration->base.source_position, "function '%Y' returns an aggregate", ndeclaration->base.symbol); } if (warning.traditional && !type->function.unspecified_parameters) { - warningf(HERE, "traditional C rejects ISO C style function definition of function '%Y'", + warningf(&ndeclaration->base.source_position, "traditional C rejects ISO C style function definition of function '%Y'", ndeclaration->base.symbol); } if (warning.old_style_definition && type->function.unspecified_parameters) { - warningf(HERE, "old-style function definition '%Y'", + warningf(&ndeclaration->base.source_position, "old-style function definition '%Y'", ndeclaration->base.symbol); } @@ -5582,7 +5614,7 @@ static void parse_external_declaration(void) assert(entity->kind == ENTITY_FUNCTION); assert(ndeclaration->kind == ENTITY_FUNCTION); - function_t *function = &entity->function; + function_t *const function = &entity->function; if (ndeclaration != entity) { function->parameters = ndeclaration->function.parameters; } @@ -5617,7 +5649,7 @@ static void parse_external_declaration(void) function_t *old_current_function = current_function; entity_t *old_current_entity = current_entity; current_function = function; - current_entity = (entity_t*) function; + current_entity = entity; current_parent = NULL; goto_first = NULL; @@ -5649,7 +5681,7 @@ static void parse_external_declaration(void) assert(current_parent == NULL); assert(current_function == function); - assert(current_entity == (entity_t*) function); + assert(current_entity == entity); current_entity = old_current_entity; current_function = old_current_function; label_pop_to(label_stack_top); @@ -5679,7 +5711,7 @@ static type_t *make_bitfield_type(type_t *base_type, expression_t *size, bit_size = get_type_size(base_type) * 8; } - if (is_constant_expression(size)) { + if (is_constant_expression(size) == EXPR_CLASS_CONSTANT) { long v = fold_constant_to_int(size); const symbol_t *user_symbol = symbol == NULL ? sym_anonymous : symbol; @@ -6172,7 +6204,7 @@ static expression_t *parse_character_constant(void) literal->literal.value = token.literal; size_t len = literal->literal.value.size; - if (len != 1) { + if (len > 1) { if (!GNU_MODE && !(c_mode & _C99)) { errorf(HERE, "more than 1 character in character constant"); } else if (warning.multichar) { @@ -6196,7 +6228,7 @@ static expression_t *parse_wide_character_constant(void) literal->literal.value = token.literal; size_t len = wstrlen(&literal->literal.value); - if (len != 1) { + if (len > 1) { warningf(HERE, "multi-character character constant"); } @@ -6218,6 +6250,7 @@ static entity_t *create_implicit_function(symbol_t *symbol, entity->declaration.declared_storage_class = STORAGE_CLASS_EXTERN; entity->declaration.type = type; entity->declaration.implicit = true; + entity->base.namespc = NAMESPACE_NORMAL; entity->base.symbol = symbol; entity->base.source_position = *source_position; @@ -6406,7 +6439,8 @@ end_error: static expression_t *parse_reference(void) { - entity_t *entity = parse_qualified_identifier(); + source_position_t const pos = token.source_position; + entity_t *const entity = parse_qualified_identifier(); type_t *orig_type; if (is_declaration(entity)) { @@ -6425,9 +6459,10 @@ static expression_t *parse_reference(void) if (entity->kind == ENTITY_ENUM_VALUE) kind = EXPR_REFERENCE_ENUM_VALUE; - expression_t *expression = allocate_expression_zero(kind); - expression->reference.entity = entity; - expression->base.type = type; + expression_t *expression = allocate_expression_zero(kind); + expression->base.source_position = pos; + expression->base.type = type; + expression->reference.entity = entity; /* this declaration is used */ if (is_declaration(entity)) { @@ -6452,7 +6487,7 @@ static expression_t *parse_reference(void) if (warning.init_self && entity == current_init_decl && !in_type_prop && entity->kind == ENTITY_VARIABLE) { current_init_decl = NULL; - warningf(HERE, "variable '%#T' is initialized by itself", + warningf(&pos, "variable '%#T' is initialized by itself", entity->declaration.type, entity->base.symbol); } @@ -6530,10 +6565,11 @@ static expression_t *parse_compound_literal(type_t *type) */ static expression_t *parse_cast(void) { - add_anchor_token(')'); - source_position_t source_position = token.source_position; + eat('('); + add_anchor_token(')'); + type_t *type = parse_typename(); rem_anchor_token(')'); @@ -6564,10 +6600,11 @@ end_error: */ static expression_t *parse_statement_expression(void) { - add_anchor_token(')'); - expression_t *expression = allocate_expression_zero(EXPR_STATEMENT); + eat('('); + add_anchor_token(')'); + statement_t *statement = parse_compound_statement(true); statement->compound.stmt_expr = true; expression->statement.statement = statement; @@ -6599,22 +6636,21 @@ end_error: */ static expression_t *parse_parenthesized_expression(void) { - eat('('); - - switch (token.type) { + token_t const* const la1 = look_ahead(1); + switch (la1->type) { case '{': /* gcc extension: a statement expression */ return parse_statement_expression(); + case T_IDENTIFIER: + if (is_typedef_symbol(la1->symbol)) { TYPE_QUALIFIERS TYPE_SPECIFIERS - return parse_cast(); - case T_IDENTIFIER: - if (is_typedef_symbol(token.symbol)) { return parse_cast(); } } + eat('('); add_anchor_token(')'); expression_t *result = parse_expression(); result->base.parenthesized = true; @@ -7153,32 +7189,19 @@ static expression_t *parse_primary_expression(void) } errorf(HERE, "unexpected token %K, expected an expression", &token); + eat_until_anchor(); return create_invalid_expression(); } -/** - * Check if the expression has the character type and issue a warning then. - */ -static void check_for_char_index_type(const expression_t *expression) -{ - type_t *const type = expression->base.type; - const type_t *const base_type = skip_typeref(type); - - if (is_type_atomic(base_type, ATOMIC_TYPE_CHAR) && - warning.char_subscripts) { - warningf(&expression->base.source_position, - "array subscript has type '%T'", type); - } -} - static expression_t *parse_array_expression(expression_t *left) { - expression_t *expression = allocate_expression_zero(EXPR_ARRAY_ACCESS); + expression_t *const expr = allocate_expression_zero(EXPR_ARRAY_ACCESS); + array_access_expression_t *const arr = &expr->array_access; eat('['); add_anchor_token(']'); - expression_t *inside = parse_expression(); + expression_t *const inside = parse_expression(); type_t *const orig_type_left = left->base.type; type_t *const orig_type_inside = inside->base.type; @@ -7186,36 +7209,48 @@ static expression_t *parse_array_expression(expression_t *left) type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_inside = skip_typeref(orig_type_inside); - type_t *return_type; - array_access_expression_t *array_access = &expression->array_access; + expression_t *ref; + expression_t *idx; + type_t *idx_type; + type_t *res_type; if (is_type_pointer(type_left)) { - return_type = type_left->pointer.points_to; - array_access->array_ref = left; - array_access->index = inside; - check_for_char_index_type(inside); + ref = left; + idx = inside; + idx_type = type_inside; + res_type = type_left->pointer.points_to; + goto check_idx; } else if (is_type_pointer(type_inside)) { - return_type = type_inside->pointer.points_to; - array_access->array_ref = inside; - array_access->index = left; - array_access->flipped = true; - check_for_char_index_type(left); + arr->flipped = true; + ref = inside; + idx = left; + idx_type = type_left; + res_type = type_inside->pointer.points_to; +check_idx: + res_type = automatic_type_conversion(res_type); + if (!is_type_integer(idx_type)) { + errorf(&idx->base.source_position, "array subscript must have integer type"); + } else if (is_type_atomic(idx_type, ATOMIC_TYPE_CHAR) && warning.char_subscripts) { + warningf(&idx->base.source_position, "array subscript has char type"); + } } else { if (is_type_valid(type_left) && is_type_valid(type_inside)) { errorf(HERE, "array access on object with non-pointer types '%T', '%T'", orig_type_left, orig_type_inside); } - return_type = type_error_type; - array_access->array_ref = left; - array_access->index = inside; + res_type = type_error_type; + ref = left; + idx = inside; } - expression->base.type = automatic_type_conversion(return_type); + arr->array_ref = ref; + arr->index = idx; + arr->base.type = res_type; rem_anchor_token(']'); expect(']', end_error); end_error: - return expression; + return expr; } static expression_t *parse_typeprop(expression_kind_t const kind) @@ -7256,12 +7291,28 @@ typeprop_expression: tp_expression->typeprop.type = orig_type; type_t const* const type = skip_typeref(orig_type); - char const* const wrong_type = - 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; + char const* wrong_type = NULL; + if (is_type_incomplete(type)) { + if (!is_type_atomic(type, ATOMIC_TYPE_VOID) || !GNU_MODE) + wrong_type = "incomplete"; + } else if (type->kind == TYPE_FUNCTION) { + if (GNU_MODE) { + /* function types are allowed (and return 1) */ + if (warning.other) { + char const* const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof"; + warningf(&tp_expression->base.source_position, + "%s expression with function argument returns invalid result", what); + } + } else { + wrong_type = "function"; + } + } else { + if (is_type_incomplete(type)) + wrong_type = "incomplete"; + } + if (type->kind == TYPE_BITFIELD) + wrong_type = "bitfield"; + if (wrong_type != NULL) { char const* const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof"; errorf(&tp_expression->base.source_position, @@ -7288,6 +7339,7 @@ static expression_t *parse_select_expression(expression_t *addr) { assert(token.type == '.' || token.type == T_MINUSGREATER); bool select_left_arrow = (token.type == T_MINUSGREATER); + source_position_t const pos = *HERE; next_token(); if (token.type != T_IDENTIFIER) { @@ -7304,7 +7356,7 @@ static expression_t *parse_select_expression(expression_t *addr) bool saw_error = false; if (is_type_pointer(type)) { if (!select_left_arrow) { - errorf(HERE, + errorf(&pos, "request for member '%Y' in something not a struct or union, but '%T'", symbol, orig_type); saw_error = true; @@ -7312,7 +7364,7 @@ static expression_t *parse_select_expression(expression_t *addr) type_left = skip_typeref(type->pointer.points_to); } else { if (select_left_arrow && is_type_valid(type)) { - errorf(HERE, "left hand side of '->' is not a pointer, but '%T'", orig_type); + errorf(&pos, "left hand side of '->' is not a pointer, but '%T'", orig_type); saw_error = true; } type_left = type; @@ -7322,7 +7374,7 @@ static expression_t *parse_select_expression(expression_t *addr) type_left->kind != TYPE_COMPOUND_UNION) { if (is_type_valid(type_left) && !saw_error) { - errorf(HERE, + errorf(&pos, "request for member '%Y' in something not a struct or union, but '%T'", symbol, type_left); } @@ -7331,17 +7383,17 @@ static expression_t *parse_select_expression(expression_t *addr) compound_t *compound = type_left->compound.compound; if (!compound->complete) { - errorf(HERE, "request for member '%Y' in incomplete type '%T'", + errorf(&pos, "request for member '%Y' in incomplete type '%T'", symbol, type_left); return create_invalid_expression(); } type_qualifiers_t qualifiers = type_left->base.qualifiers; - expression_t *result - = find_create_select(HERE, addr, qualifiers, compound, symbol); + expression_t *result = + find_create_select(&pos, addr, qualifiers, compound, symbol); if (result == NULL) { - errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol); + errorf(&pos, "'%T' has no member named '%Y'", orig_type, symbol); return create_invalid_expression(); } @@ -7389,8 +7441,8 @@ static void check_call_argument(type_t *expected_type, /* report exact scope in error messages (like "in argument 3") */ char buf[64]; snprintf(buf, sizeof(buf), "call argument %u", pos); - report_assign_error(error, expected_type, arg_expr, buf, - &arg_expr->base.source_position); + report_assign_error(error, expected_type, arg_expr, buf, + &arg_expr->base.source_position); } else if (warning.traditional || warning.conversion) { type_t *const promoted_type = get_default_promoted_type(arg_type); if (!types_compatible(expected_type_skip, promoted_type) && @@ -7414,7 +7466,7 @@ static void handle_builtin_argument_restrictions(call_expression_t *call) { /* argument must be constant */ call_argument_t *argument = call->arguments; - if (! is_constant_expression(argument->expression)) { + if (is_constant_expression(argument->expression) == EXPR_CLASS_VARIABLE) { errorf(&call->base.source_position, "argument of '%Y' must be a constant expression", call->function->reference.entity->base.symbol); @@ -7426,7 +7478,7 @@ static void handle_builtin_argument_restrictions(call_expression_t *call) { break; call_argument_t *arg = call->arguments->next; - if (arg != NULL && ! is_constant_expression(arg->expression)) { + if (arg != NULL && is_constant_expression(arg->expression) == EXPR_CLASS_VARIABLE) { errorf(&call->base.source_position, "second argument of '%Y' must be a constant expression", call->function->reference.entity->base.symbol); @@ -7440,7 +7492,7 @@ static void handle_builtin_argument_restrictions(call_expression_t *call) { call_argument_t *locality = NULL; if (rw != NULL) { - if (! is_constant_expression(rw->expression)) { + if (is_constant_expression(rw->expression) == EXPR_CLASS_VARIABLE) { errorf(&call->base.source_position, "second argument of '%Y' must be a constant expression", call->function->reference.entity->base.symbol); @@ -7448,7 +7500,7 @@ static void handle_builtin_argument_restrictions(call_expression_t *call) { locality = rw->next; } if (locality != NULL) { - if (! is_constant_expression(locality->expression)) { + if (is_constant_expression(locality->expression) == EXPR_CLASS_VARIABLE) { errorf(&call->base.source_position, "third argument of '%Y' must be a constant expression", call->function->reference.entity->base.symbol); @@ -7523,9 +7575,9 @@ static expression_t *parse_call_expression(expression_t *expression) } if (parameter != NULL) { - errorf(HERE, "too few arguments to function '%E'", expression); + errorf(&expression->base.source_position, "too few arguments to function '%E'", expression); } else if (argument != NULL && !function_type->variadic) { - errorf(HERE, "too many arguments to function '%E'", expression); + errorf(&argument->expression->base.source_position, "too many arguments to function '%E'", expression); } } @@ -8041,8 +8093,8 @@ static void set_address_taken(expression_t *expression, bool may_be_register) if (entity->declaration.storage_class == STORAGE_CLASS_REGISTER && !may_be_register) { errorf(&expression->base.source_position, - "address of register %s '%Y' requested", - get_entity_kind_name(entity->kind), entity->base.symbol); + "address of register %s '%Y' requested", + get_entity_kind_name(entity->kind), entity->base.symbol); } if (entity->kind == ENTITY_VARIABLE) { @@ -8223,6 +8275,30 @@ static void semantic_binexpr_arithmetic(binary_expression_t *expression) expression->base.type = arithmetic_type; } +static void semantic_binexpr_integer(binary_expression_t *const expression) +{ + expression_t *const left = expression->left; + expression_t *const right = expression->right; + type_t *const orig_type_left = left->base.type; + type_t *const orig_type_right = right->base.type; + type_t *const type_left = skip_typeref(orig_type_left); + type_t *const type_right = skip_typeref(orig_type_right); + + if (!is_type_integer(type_left) || !is_type_integer(type_right)) { + /* TODO: improve error message */ + if (is_type_valid(type_left) && is_type_valid(type_right)) { + errorf(&expression->base.source_position, + "operation needs integer types"); + } + return; + } + + type_t *const result_type = semantic_arithmetic(type_left, type_right); + expression->left = create_implicit_cast(left, result_type); + expression->right = create_implicit_cast(right, result_type); + expression->base.type = result_type; +} + static void warn_div_by_zero(binary_expression_t const *const expression) { if (!warning.div_by_zero || @@ -8231,8 +8307,8 @@ static void warn_div_by_zero(binary_expression_t const *const expression) expression_t const *const right = expression->right; /* The type of the right operand can be different for /= */ - if (is_type_integer(right->base.type) && - is_constant_expression(right) && + if (is_type_integer(right->base.type) && + is_constant_expression(right) == EXPR_CLASS_CONSTANT && !fold_constant_to_bool(right)) { warningf(&expression->base.source_position, "division by zero"); } @@ -8283,7 +8359,7 @@ static bool semantic_shift(binary_expression_t *expression) type_left = promote_integer(type_left); - if (is_constant_expression(right)) { + if (is_constant_expression(right) == EXPR_CLASS_CONSTANT) { long count = fold_constant_to_int(right); if (count < 0) { warningf(&right->base.source_position, @@ -8431,9 +8507,11 @@ static void warn_comparison_in_comparison(const expression_t *const expr) static bool maybe_negative(expression_t const *const expr) { - return - !is_constant_expression(expr) || - fold_constant_to_int(expr) < 0; + switch (is_constant_expression(expr)) { + case EXPR_CLASS_ERROR: return false; + case EXPR_CLASS_CONSTANT: return fold_constant_to_int(expr) < 0; + default: return true; + } } /** @@ -8544,33 +8622,33 @@ static bool is_valid_assignment_lhs(expression_t const* const left) type_t *const type_left = skip_typeref(orig_type_left); if (!is_lvalue(left)) { - errorf(HERE, "left hand side '%E' of assignment is not an lvalue", + errorf(&left->base.source_position, "left hand side '%E' of assignment is not an lvalue", left); return false; } if (left->kind == EXPR_REFERENCE && left->reference.entity->kind == ENTITY_FUNCTION) { - errorf(HERE, "cannot assign to function '%E'", left); + errorf(&left->base.source_position, "cannot assign to function '%E'", left); return false; } if (is_type_array(type_left)) { - errorf(HERE, "cannot assign to array '%E'", left); + errorf(&left->base.source_position, "cannot assign to array '%E'", left); return false; } if (type_left->base.qualifiers & TYPE_QUALIFIER_CONST) { - errorf(HERE, "assignment to readonly location '%E' (type '%T')", left, + errorf(&left->base.source_position, "assignment to read-only location '%E' (type '%T')", left, orig_type_left); return false; } if (is_type_incomplete(type_left)) { - errorf(HERE, "left-hand side '%E' of assignment has incomplete type '%T'", + errorf(&left->base.source_position, "left-hand side '%E' of assignment has incomplete type '%T'", left, orig_type_left); return false; } if (is_type_compound(type_left) && has_const_fields(&type_left->compound)) { - errorf(HERE, "cannot assign to '%E' because compound type '%T' has readonly fields", + errorf(&left->base.source_position, "cannot assign to '%E' because compound type '%T' has read-only fields", left, orig_type_left); return false; } @@ -8922,9 +9000,9 @@ CREATE_BINEXPR_PARSER(T_LESSEQUAL, EXPR_BINARY_LESSEQUAL, PR CREATE_BINEXPR_PARSER(T_GREATEREQUAL, EXPR_BINARY_GREATEREQUAL, PREC_SHIFT, semantic_comparison) CREATE_BINEXPR_PARSER(T_EXCLAMATIONMARKEQUAL, EXPR_BINARY_NOTEQUAL, PREC_RELATIONAL, semantic_comparison) CREATE_BINEXPR_PARSER(T_EQUALEQUAL, EXPR_BINARY_EQUAL, PREC_RELATIONAL, semantic_comparison) -CREATE_BINEXPR_PARSER('&', EXPR_BINARY_BITWISE_AND, PREC_EQUALITY, semantic_binexpr_arithmetic) -CREATE_BINEXPR_PARSER('^', EXPR_BINARY_BITWISE_XOR, PREC_AND, semantic_binexpr_arithmetic) -CREATE_BINEXPR_PARSER('|', EXPR_BINARY_BITWISE_OR, PREC_XOR, semantic_binexpr_arithmetic) +CREATE_BINEXPR_PARSER('&', EXPR_BINARY_BITWISE_AND, PREC_EQUALITY, semantic_binexpr_integer) +CREATE_BINEXPR_PARSER('^', EXPR_BINARY_BITWISE_XOR, PREC_AND, semantic_binexpr_integer) +CREATE_BINEXPR_PARSER('|', EXPR_BINARY_BITWISE_OR, PREC_XOR, semantic_binexpr_integer) CREATE_BINEXPR_PARSER(T_ANDAND, EXPR_BINARY_LOGICAL_AND, PREC_OR, semantic_logical_op) CREATE_BINEXPR_PARSER(T_PIPEPIPE, EXPR_BINARY_LOGICAL_OR, PREC_LOGICAL_AND, semantic_logical_op) CREATE_BINEXPR_PARSER('=', EXPR_BINARY_ASSIGN, PREC_ASSIGNMENT, semantic_binexpr_assign) @@ -9015,7 +9093,7 @@ static void register_expression_parser(parse_expression_function parser, * @param precedence the precedence of the operator */ static void register_infix_parser(parse_expression_infix_function parser, - int token_type, precedence_t precedence) + int token_type, precedence_t precedence) { expression_parser_function_t *entry = &expression_parsers[token_type]; @@ -9271,17 +9349,17 @@ end_error: return create_invalid_statement(); } -static statement_t *parse_label_inner_statement(char const *const label, bool const eat_empty_stmt) +static statement_t *parse_label_inner_statement(statement_t const *const label, char const *const label_kind) { statement_t *inner_stmt; switch (token.type) { case '}': - errorf(HERE, "%s at end of compound statement", label); + errorf(&label->base.source_position, "%s at end of compound statement", label_kind); inner_stmt = create_invalid_statement(); break; case ';': - if (eat_empty_stmt) { + if (label->kind == STATEMENT_LABEL) { /* Eat an empty statement here, to avoid the warning about an empty * statement after a label. label:; is commonly used to have a label * before a closing brace. */ @@ -9293,8 +9371,9 @@ static statement_t *parse_label_inner_statement(char const *const label, bool co default: inner_stmt = parse_statement(); - if (inner_stmt->kind == STATEMENT_DECLARATION) { - errorf(&inner_stmt->base.source_position, "declaration after %s", label); + /* ISO/IEC 14882:1998(E) §6:1/§6.7 Declarations are statements */ + if (inner_stmt->kind == STATEMENT_DECLARATION && !(c_mode & _CXX)) { + errorf(&inner_stmt->base.source_position, "declaration after %s", label_kind); } break; } @@ -9313,11 +9392,9 @@ static statement_t *parse_case_statement(void) expression_t *const expression = parse_expression(); statement->case_label.expression = expression; - if (!is_constant_expression(expression)) { - /* This check does not prevent the error message in all cases of an - * prior error while parsing the expression. At least it catches the - * common case of a mistyped enum entry. */ - if (is_type_valid(skip_typeref(expression->base.type))) { + expression_classification_t const expr_class = is_constant_expression(expression); + if (expr_class != EXPR_CLASS_CONSTANT) { + if (expr_class != EXPR_CLASS_ERROR) { errorf(pos, "case label does not reduce to an integer constant"); } statement->case_label.is_bad = true; @@ -9331,11 +9408,9 @@ static statement_t *parse_case_statement(void) if (next_if(T_DOTDOTDOT)) { expression_t *const end_range = parse_expression(); statement->case_label.end_range = end_range; - if (!is_constant_expression(end_range)) { - /* This check does not prevent the error message in all cases of an - * prior error while parsing the expression. At least it catches the - * common case of a mistyped enum entry. */ - if (is_type_valid(skip_typeref(end_range->base.type))) { + expression_classification_t const end_class = is_constant_expression(end_range); + if (end_class != EXPR_CLASS_CONSTANT) { + if (end_class != EXPR_CLASS_ERROR) { errorf(pos, "case range does not reduce to an integer constant"); } statement->case_label.is_bad = true; @@ -9383,7 +9458,7 @@ end_error: errorf(pos, "case label not within a switch statement"); } - statement->case_label.statement = parse_label_inner_statement("case label", false); + statement->case_label.statement = parse_label_inner_statement(statement, "case label"); POP_PARENT; return statement; @@ -9424,7 +9499,7 @@ end_error: "'default' label not within a switch statement"); } - statement->case_label.statement = parse_label_inner_statement("default label", false); + statement->case_label.statement = parse_label_inner_statement(statement, "default label"); POP_PARENT; return statement; @@ -9459,7 +9534,7 @@ static statement_t *parse_label_statement(void) eat(':'); - statement->label.statement = parse_label_inner_statement("label", true); + statement->label.statement = parse_label_inner_statement(statement, "label"); /* remember the labels in a list for later checking */ *label_anchor = &statement->label; @@ -9806,7 +9881,7 @@ static statement_t *parse_goto(void) else parse_error_expected("while parsing goto", T_IDENTIFIER, NULL); eat_until_anchor(); - goto end_error; + return create_invalid_statement(); } /* remember the goto's in a list for later checking */ @@ -9815,9 +9890,8 @@ static statement_t *parse_goto(void) expect(';', end_error); - return statement; end_error: - return create_invalid_statement(); + return statement; } /** @@ -9971,13 +10045,13 @@ static statement_t *parse_return(void) } } else { assign_error_t error = semantic_assign(return_type, return_value); - report_assign_error(error, return_type, return_value, "'return'", - pos); + report_assign_error(error, return_type, return_value, "'return'", + 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) { + && return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) { const expression_t *expression = return_value->unary.value; if (expression_is_local_variable(expression)) { warningf(pos, "function returns address of local variable"); @@ -9987,10 +10061,10 @@ static statement_t *parse_return(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"); + "'return' without value, in function returning non-void"); } else { warningf(pos, - "'return' without value, in function returning non-void"); + "'return' without value, in function returning non-void"); } } statement->returns.value = return_value; @@ -10103,8 +10177,9 @@ static statement_t *parse_local_label_declaration(void) eat(T___label__); - entity_t *begin = NULL, *end = NULL; - + entity_t *begin = NULL; + entity_t *end = NULL; + entity_t **anchor = &begin; do { if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing local label declaration", @@ -10124,17 +10199,15 @@ static statement_t *parse_local_label_declaration(void) entity->base.source_position = token.source_position; entity->base.symbol = symbol; - if (end != NULL) - end->base.next = entity; - end = entity; - if (begin == NULL) - begin = entity; + *anchor = entity; + anchor = &entity->base.next; + end = entity; environment_push(entity); } next_token(); } while (next_if(',')); - eat(';'); + expect(';', end_error); end_error: statement->declaration.declarations_begin = begin; statement->declaration.declarations_end = end; @@ -10156,7 +10229,7 @@ static void parse_namespace_definition(void) if (entity != NULL && entity->kind != ENTITY_NAMESPACE && entity->base.parent_scope == current_scope) { - if (!is_error_entity(entity)) { + if (is_entity_valid(entity)) { error_redefined_as_different_kind(&token.source_position, entity, ENTITY_NAMESPACE); } @@ -10224,18 +10297,14 @@ static statement_t *intern_parse_statement(void) switch (la1_type) { case '&': case '*': - if (get_entity(token.symbol, NAMESPACE_NORMAL) != NULL) - goto expression_statment; - /* FALLTHROUGH */ - + if (get_entity(token.symbol, NAMESPACE_NORMAL) != NULL) { + default: + statement = parse_expression_statement(); + } else { DECLARATION_START case T_IDENTIFIER: - statement = parse_declaration_statement(); - break; - - default: -expression_statment: - statement = parse_expression_statement(); + statement = parse_declaration_statement(); + } break; } } @@ -10626,7 +10695,6 @@ end_error:; static void parse_linkage_specification(void) { eat(T_extern); - assert(token.type == T_STRING_LITERAL); const char *linkage = parse_string_literals().begin; @@ -10708,6 +10776,7 @@ static void parse_externals(void) add_anchor_token(T_EOF); #ifndef NDEBUG + /* make a copy of the anchor set, so we can check if it is restored after parsing */ unsigned char token_anchor_copy[T_LAST_TOKEN]; memcpy(token_anchor_copy, token_anchor_set, sizeof(token_anchor_copy)); #endif @@ -10715,14 +10784,16 @@ static void parse_externals(void) while (token.type != T_EOF && token.type != '}') { #ifndef NDEBUG bool anchor_leak = false; - for (int i = 0; i != T_LAST_TOKEN; ++i) { + for (int i = 0; i < T_LAST_TOKEN; ++i) { unsigned char count = token_anchor_set[i] - token_anchor_copy[i]; if (count != 0) { + /* the anchor set and its copy differs */ errorf(HERE, "Leaked anchor token %k %d times", i, count); anchor_leak = true; } } if (in_gcc_extension) { + /* an gcc extension scope was not closed */ errorf(HERE, "Leaked __extension__"); anchor_leak = true; } @@ -10889,9 +10960,6 @@ void init_parser(void) init_expression_parsers(); obstack_init(&temp_obst); - - symbol_t *const va_list_sym = symbol_table_insert("__builtin_va_list"); - type_valist = create_builtin_type(va_list_sym, type_void_ptr); } /**