X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=da35413185447100f6f618cf2d0edf8b0ae827d7;hb=f619e0f8119ae30ecd0e4a56505b99fdf0de1ee4;hp=67f83eaa908d520724d510522531fc5ae3530e6d;hpb=032760cdf02b03c4815b4c840e19a97b294b083e;p=cparser diff --git a/parser.c b/parser.c index 67f83ea..da35413 100644 --- a/parser.c +++ b/parser.c @@ -23,6 +23,7 @@ #include #include +#include "adt/strutil.h" #include "parser.h" #include "diagnostic.h" #include "format_check.h" @@ -36,7 +37,7 @@ #include "entity_t.h" #include "attribute_t.h" #include "lang_features.h" -#include "walk_statements.h" +#include "walk.h" #include "warning.h" #include "printer.h" #include "adt/bitfiddle.h" @@ -89,20 +90,17 @@ static scope_t *current_scope = NULL; /** Point to the current function declaration if inside a function. */ static function_t *current_function = NULL; static entity_t *current_entity = NULL; -static entity_t *current_init_decl = NULL; static switch_statement_t *current_switch = NULL; static statement_t *current_loop = NULL; static statement_t *current_parent = NULL; static ms_try_statement_t *current_try = NULL; -static linkage_kind_t current_linkage = LINKAGE_INVALID; +static linkage_kind_t current_linkage; static goto_statement_t *goto_first = NULL; static goto_statement_t **goto_anchor = NULL; static label_statement_t *label_first = NULL; static label_statement_t **label_anchor = NULL; /** current translation unit. */ static translation_unit_t *unit = NULL; -/** true if we are in a type property context (evaluation only for type) */ -static bool in_type_prop = false; /** true if we are in an __extension__ context. */ static bool in_gcc_extension = false; static struct obstack temp_obst; @@ -117,14 +115,30 @@ static elf_visibility_tag_t default_visibility = ELF_VISIBILITY_DEFAULT; ((void)(current_parent = new_parent)) #define POP_PARENT() (assert(current_parent == new_parent), (void)(current_parent = old_parent)) +#define PUSH_SCOPE(scope) \ + size_t const top = environment_top(); \ + scope_t *const new_scope = (scope); \ + scope_t *const old_scope = scope_push(new_scope) +#define POP_SCOPE() (assert(current_scope == new_scope), scope_pop(old_scope), environment_pop_to(top)) + +#define PUSH_EXTENSION() \ + (void)0; \ + bool const old_gcc_extension = in_gcc_extension; \ + while (next_if(T___extension__)) { \ + in_gcc_extension = true; \ + } \ + do {} while (0) +#define POP_EXTENSION() \ + ((void)(in_gcc_extension = old_gcc_extension)) + /** special symbol used for anonymous entities. */ static symbol_t *sym_anonymous = NULL; /** The token anchor set */ -static unsigned char token_anchor_set[T_LAST_TOKEN]; +static unsigned short token_anchor_set[T_LAST_TOKEN]; /** The current source position. */ -#define HERE (&token.source_position) +#define HERE (&token.base.source_position) /** true if we are in GCC mode. */ #define GNU_MODE ((c_mode & _GNUC) || in_gcc_extension) @@ -270,8 +284,8 @@ static void semantic_comparison(binary_expression_t *expression); static size_t get_statement_struct_size(statement_kind_t kind) { static const size_t sizes[] = { - [STATEMENT_INVALID] = sizeof(invalid_statement_t), - [STATEMENT_EMPTY] = sizeof(empty_statement_t), + [STATEMENT_ERROR] = sizeof(statement_base_t), + [STATEMENT_EMPTY] = sizeof(statement_base_t), [STATEMENT_COMPOUND] = sizeof(compound_statement_t), [STATEMENT_RETURN] = sizeof(return_statement_t), [STATEMENT_DECLARATION] = sizeof(declaration_statement_t), @@ -303,7 +317,7 @@ static size_t get_statement_struct_size(statement_kind_t kind) static size_t get_expression_struct_size(expression_kind_t kind) { static const size_t sizes[] = { - [EXPR_INVALID] = sizeof(expression_base_t), + [EXPR_ERROR] = sizeof(expression_base_t), [EXPR_REFERENCE] = sizeof(reference_expression_t), [EXPR_REFERENCE_ENUM_VALUE] = sizeof(reference_expression_t), [EXPR_LITERAL_BOOLEAN] = sizeof(literal_expression_t), @@ -359,7 +373,7 @@ static statement_t *allocate_statement_zero(statement_kind_t kind) res->base.kind = kind; res->base.parent = current_parent; - res->base.source_position = token.source_position; + res->base.source_position = token.base.source_position; return res; } @@ -376,7 +390,7 @@ static expression_t *allocate_expression_zero(expression_kind_t kind) res->base.kind = kind; res->base.type = type_error_type; - res->base.source_position = token.source_position; + res->base.source_position = token.base.source_position; return res; } @@ -384,17 +398,19 @@ static expression_t *allocate_expression_zero(expression_kind_t kind) * Creates a new invalid expression at the source position * of the current token. */ -static expression_t *create_invalid_expression(void) +static expression_t *create_error_expression(void) { - return allocate_expression_zero(EXPR_INVALID); + expression_t *expression = allocate_expression_zero(EXPR_ERROR); + expression->base.type = type_error_type; + return expression; } /** * Creates a new invalid statement. */ -static statement_t *create_invalid_statement(void) +static statement_t *create_error_statement(void) { - return allocate_statement_zero(STATEMENT_INVALID); + return allocate_statement_zero(STATEMENT_ERROR); } /** @@ -471,7 +487,7 @@ static inline void next_token(void) static inline bool next_if(int const type) { - if (token.type == type) { + if (token.kind == type) { next_token(); return true; } else { @@ -492,41 +508,41 @@ static inline const token_t *look_ahead(size_t num) /** * Adds a token type to the token type anchor set (a multi-set). */ -static void add_anchor_token(int token_type) +static void add_anchor_token(int token_kind) { - assert(0 <= token_type && token_type < T_LAST_TOKEN); - ++token_anchor_set[token_type]; + assert(0 <= token_kind && token_kind < T_LAST_TOKEN); + ++token_anchor_set[token_kind]; } /** * 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) +static int save_and_reset_anchor_state(int token_kind) { - assert(0 <= token_type && token_type < T_LAST_TOKEN); - int count = token_anchor_set[token_type]; - token_anchor_set[token_type] = 0; + assert(0 <= token_kind && token_kind < T_LAST_TOKEN); + int count = token_anchor_set[token_kind]; + token_anchor_set[token_kind] = 0; return count; } /** * Restore the number of token types to the given count. */ -static void restore_anchor_state(int token_type, int count) +static void restore_anchor_state(int token_kind, int count) { - assert(0 <= token_type && token_type < T_LAST_TOKEN); - token_anchor_set[token_type] = count; + assert(0 <= token_kind && token_kind < T_LAST_TOKEN); + token_anchor_set[token_kind] = count; } /** * Remove a token type from the token type anchor set (a multi-set). */ -static void rem_anchor_token(int token_type) +static void rem_anchor_token(int token_kind) { - assert(0 <= token_type && token_type < T_LAST_TOKEN); - assert(token_anchor_set[token_type] != 0); - --token_anchor_set[token_type]; + assert(0 <= token_kind && token_kind < T_LAST_TOKEN); + assert(token_anchor_set[token_kind] != 0); + --token_anchor_set[token_kind]; } /** @@ -535,9 +551,9 @@ static void rem_anchor_token(int token_type) */ static bool at_anchor(void) { - if (token.type < 0) + if (token.kind < 0) return false; - return token_anchor_set[token.type]; + return token_anchor_set[token.kind]; } /** @@ -556,11 +572,11 @@ static void eat_until_matching_token(int type) unsigned parenthesis_count = 0; unsigned brace_count = 0; unsigned bracket_count = 0; - while (token.type != end_token || + while (token.kind != end_token || parenthesis_count != 0 || brace_count != 0 || bracket_count != 0) { - switch (token.type) { + switch (token.kind) { case T_EOF: return; case '(': ++parenthesis_count; break; case '{': ++brace_count; break; @@ -580,7 +596,7 @@ static void eat_until_matching_token(int type) if (bracket_count > 0) --bracket_count; check_stop: - if (token.type == end_token && + if (token.kind == end_token && parenthesis_count == 0 && brace_count == 0 && bracket_count == 0) @@ -599,9 +615,9 @@ check_stop: */ static void eat_until_anchor(void) { - while (token_anchor_set[token.type] == 0) { - if (token.type == '(' || token.type == '{' || token.type == '[') - eat_until_matching_token(token.type); + while (token_anchor_set[token.kind] == 0) { + if (token.kind == '(' || token.kind == '{' || token.kind == '[') + eat_until_matching_token(token.kind); next_token(); } } @@ -615,7 +631,7 @@ static void eat_block(void) next_if('}'); } -#define eat(token_type) (assert(token.type == (token_type)), next_token()) +#define eat(token_kind) (assert(token.kind == (token_kind)), next_token()) /** * Report a parse error because an expected token was not found. @@ -652,12 +668,12 @@ static void type_error_incompatible(const char *msg, */ #define expect(expected, error_label) \ do { \ - if (UNLIKELY(token.type != (expected))) { \ + if (UNLIKELY(token.kind != (expected))) { \ parse_error_expected(NULL, (expected), NULL); \ add_anchor_token(expected); \ eat_until_anchor(); \ rem_anchor_token(expected); \ - if (token.type != (expected)) \ + if (token.kind != (expected)) \ goto error_label; \ } \ next_token(); \ @@ -692,7 +708,6 @@ 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 ((namespace_tag_t)entity->base.namespc == namespc) @@ -725,7 +740,7 @@ static void stack_push(stack_entry_t **stack_ptr, entity_t *entity) { symbol_t *symbol = entity->base.symbol; entity_namespace_t namespc = entity->base.namespc; - assert(namespc != NAMESPACE_INVALID); + assert(namespc != 0); /* replace/add entity into entity list of the symbol */ entity_t **anchor; @@ -839,22 +854,11 @@ static void label_pop_to(size_t new_top) stack_pop_to(&label_stack, new_top); } -static int get_akind_rank(atomic_type_kind_t akind) +static atomic_type_kind_t get_akind(const type_t *type) { - return (int) akind; -} - -/** - * Return the type rank for an atomic type. - */ -static int get_rank(const type_t *type) -{ - assert(!is_typeref(type)); - if (type->kind == TYPE_ENUM) - return get_akind_rank(type->enumt.akind); - - assert(type->kind == TYPE_ATOMIC); - return get_akind_rank(type->atomic.akind); + assert(type->kind == TYPE_ATOMIC || type->kind == TYPE_COMPLEX + || type->kind == TYPE_IMAGINARY || type->kind == TYPE_ENUM); + return type->atomic.akind; } /** @@ -865,32 +869,12 @@ static int get_rank(const type_t *type) */ static type_t *promote_integer(type_t *type) { - if (type->kind == TYPE_BITFIELD) - type = type->bitfield.base_type; - - if (get_rank(type) < get_akind_rank(ATOMIC_TYPE_INT)) + if (get_akind_rank(get_akind(type)) < get_akind_rank(ATOMIC_TYPE_INT)) type = type_int; return type; } -/** - * Create a cast expression. - * - * @param expression the expression to cast - * @param dest_type the destination type - */ -static expression_t *create_cast_expression(expression_t *expression, - type_t *dest_type) -{ - expression_t *cast = allocate_expression_zero(EXPR_UNARY_CAST_IMPLICIT); - - cast->unary.value = expression; - cast->base.type = dest_type; - - return cast; -} - /** * Check if a given expression represents a null pointer constant. * @@ -899,8 +883,7 @@ static expression_t *create_cast_expression(expression_t *expression, static bool is_null_pointer_constant(const expression_t *expression) { /* skip void* cast */ - if (expression->kind == EXPR_UNARY_CAST || - expression->kind == EXPR_UNARY_CAST_IMPLICIT) { + if (expression->kind == EXPR_UNARY_CAST) { type_t *const type = skip_typeref(expression->base.type); if (types_compatible(type, type_void_ptr)) expression = expression->unary.value; @@ -930,7 +913,12 @@ static expression_t *create_implicit_cast(expression_t *expression, if (source_type == dest_type) return expression; - return create_cast_expression(expression, dest_type); + expression_t *cast = allocate_expression_zero(EXPR_UNARY_CAST); + cast->unary.value = expression; + cast->base.type = dest_type; + cast->base.implicit = true; + + return cast; } typedef enum assign_error_t { @@ -1070,36 +1058,20 @@ static void warn_string_concat(const source_position_t *pos) static string_t parse_string_literals(void) { - assert(token.type == T_STRING_LITERAL); - string_t result = token.literal; + assert(token.kind == T_STRING_LITERAL); + string_t result = token.string.string; next_token(); - while (token.type == T_STRING_LITERAL) { - warn_string_concat(&token.source_position); - result = concat_strings(&result, &token.literal); + while (token.kind == T_STRING_LITERAL) { + warn_string_concat(&token.base.source_position); + result = concat_strings(&result, &token.string.string); next_token(); } return result; } -/** - * compare two string, ignoring double underscores on the second. - */ -static int strcmp_underscore(const char *s1, const char *s2) -{ - if (s2[0] == '_' && s2[1] == '_') { - size_t len2 = strlen(s2); - size_t len1 = strlen(s1); - if (len1 == len2-4 && s2[len2-2] == '_' && s2[len2-1] == '_') { - return strncmp(s1, s2+2, len2-4); - } - } - - return strcmp(s1, s2); -} - static attribute_t *allocate_attribute_zero(attribute_kind_t kind) { attribute_t *attribute = allocate_ast_zero(sizeof(*attribute)); @@ -1140,13 +1112,13 @@ static attribute_argument_t *parse_attribute_arguments(void) { attribute_argument_t *first = NULL; attribute_argument_t **anchor = &first; - if (token.type != ')') do { + if (token.kind != ')') do { attribute_argument_t *argument = allocate_ast_zero(sizeof(*argument)); /* is it an identifier */ - if (token.type == T_IDENTIFIER - && (look_ahead(1)->type == ',' || look_ahead(1)->type == ')')) { - symbol_t *symbol = token.symbol; + if (token.kind == T_IDENTIFIER + && (look_ahead(1)->kind == ',' || look_ahead(1)->kind == ')')) { + symbol_t *symbol = token.identifier.symbol; argument->kind = ATTRIBUTE_ARGUMENT_SYMBOL; argument->v.symbol = symbol; next_token(); @@ -1186,9 +1158,9 @@ end_error: static symbol_t *get_symbol_from_token(void) { - switch(token.type) { + switch(token.kind) { case T_IDENTIFIER: - return token.symbol; + return token.identifier.symbol; case T_auto: case T_char: case T_double: @@ -1218,7 +1190,7 @@ static symbol_t *get_symbol_from_token(void) case T_volatile: case T_inline: /* maybe we need more tokens ... add them on demand */ - return get_token_symbol(&token); + return get_token_kind_symbol(token.kind); default: return NULL; } @@ -1244,8 +1216,7 @@ static attribute_t *parse_attribute_gnu_single(void) } const char *attribute_name = get_attribute_name(kind); - if (attribute_name != NULL - && strcmp_underscore(attribute_name, name) == 0) + if (attribute_name != NULL && streq_underscore(attribute_name, name)) break; } @@ -1268,7 +1239,7 @@ static attribute_t *parse_attribute_gnu(void) expect('(', end_error); expect('(', end_error); - if (token.type != ')') do { + if (token.kind != ')') do { attribute_t *attribute = parse_attribute_gnu_single(); if (attribute == NULL) goto end_error; @@ -1292,7 +1263,7 @@ static attribute_t *parse_attributes(attribute_t *first) anchor = &(*anchor)->next; attribute_t *attribute; - switch (token.type) { + switch (token.kind) { case T___attribute__: attribute = parse_attribute_gnu(); if (attribute == NULL) @@ -1362,19 +1333,17 @@ static entity_t *determine_lhs_ent(expression_t *const expr, ent = determine_lhs_ent(ref, lhs_ent); lhs_ent = ent; } else { - mark_vars_read(expr->select.compound, lhs_ent); + mark_vars_read(ref, lhs_ent); } mark_vars_read(expr->array_access.index, lhs_ent); return ent; } case EXPR_SELECT: { - if (is_type_compound(skip_typeref(expr->base.type))) { + mark_vars_read(expr->select.compound, lhs_ent); + if (is_type_compound(skip_typeref(expr->base.type))) return determine_lhs_ent(expr->select.compound, lhs_ent); - } else { - mark_vars_read(expr->select.compound, lhs_ent); - return NULL; - } + return NULL; } case EXPR_UNARY_DEREFERENCE: { @@ -1451,10 +1420,13 @@ static void mark_vars_read(expression_t *const expr, entity_t *lhs_ent) return; case EXPR_ARRAY_ACCESS: { + mark_vars_read(expr->array_access.index, lhs_ent); expression_t *const ref = expr->array_access.array_ref; + if (!is_type_array(skip_typeref(revert_automatic_type_conversion(ref)))) { + if (lhs_ent == ENT_ANY) + lhs_ent = NULL; + } mark_vars_read(ref, lhs_ent); - lhs_ent = determine_lhs_ent(ref, lhs_ent); - mark_vars_read(expr->array_access.index, lhs_ent); return; } @@ -1493,7 +1465,6 @@ static void mark_vars_read(expression_t *const expr, entity_t *lhs_ent) case EXPR_UNARY_POSTFIX_DECREMENT: case EXPR_UNARY_PREFIX_INCREMENT: case EXPR_UNARY_PREFIX_DECREMENT: - case EXPR_UNARY_CAST_IMPLICIT: case EXPR_UNARY_ASSUME: unary: mark_vars_read(expr->unary.value, lhs_ent); @@ -1551,8 +1522,7 @@ unary: return; EXPR_LITERAL_CASES - case EXPR_UNKNOWN: - case EXPR_INVALID: + case EXPR_ERROR: case EXPR_STRING_LITERAL: case EXPR_WIDE_STRING_LITERAL: case EXPR_COMPOUND_LITERAL: // TODO init? @@ -1579,10 +1549,10 @@ static designator_t *parse_designation(void) for (;;) { designator_t *designator; - switch (token.type) { + switch (token.kind) { case '[': designator = allocate_ast_zero(sizeof(designator[0])); - designator->source_position = token.source_position; + designator->source_position = token.base.source_position; next_token(); add_anchor_token(']'); designator->array_index = parse_constant_expression(); @@ -1591,14 +1561,14 @@ static designator_t *parse_designation(void) break; case '.': designator = allocate_ast_zero(sizeof(designator[0])); - designator->source_position = token.source_position; + designator->source_position = token.base.source_position; next_token(); - if (token.type != T_IDENTIFIER) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing designator", T_IDENTIFIER, NULL); return NULL; } - designator->symbol = token.symbol; + designator->symbol = token.identifier.symbol; next_token(); break; default: @@ -1714,12 +1684,12 @@ static initializer_t *parse_scalar_initializer(type_t *type, { /* there might be extra {} hierarchies */ int braces = 0; - if (token.type == '{') { + if (token.kind == '{') { warningf(WARN_OTHER, HERE, "extra curly braces around scalar initializer"); do { eat('{'); ++braces; - } while (token.type == '{'); + } while (token.kind == '{'); } expression_t *expression = parse_assignment_expression(); @@ -1743,7 +1713,7 @@ static initializer_t *parse_scalar_initializer(type_t *type, bool additional_warning_displayed = false; while (braces > 0) { next_if(','); - if (token.type != '}') { + if (token.kind != '}') { if (!additional_warning_displayed) { warningf(WARN_OTHER, HERE, "additional elements in scalar initializer"); additional_warning_displayed = true; @@ -1847,11 +1817,10 @@ static void descend_into_subtype(type_path_t *path) top->type = top_type; if (is_type_compound(top_type)) { - compound_t *compound = top_type->compound.compound; - entity_t *entry = compound->members.entities; + compound_t *const compound = top_type->compound.compound; + entity_t *const entry = skip_unnamed_bitfields(compound->members.entities); if (entry != NULL) { - assert(entry->kind == ENTITY_COMPOUND_MEMBER); top->v.compound_entry = &entry->declaration; path->top_type = entry->declaration.type; } else { @@ -1928,14 +1897,11 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, return false; } assert(iter->kind == ENTITY_COMPOUND_MEMBER); - if (used_in_offsetof) { - type_t *real_type = skip_typeref(iter->declaration.type); - if (real_type->kind == TYPE_BITFIELD) { - errorf(&designator->source_position, - "offsetof designator '%Y' must not specify bitfield", - symbol); - return false; - } + if (used_in_offsetof && iter->compound_member.bitfield) { + errorf(&designator->source_position, + "offsetof designator '%Y' must not specify bitfield", + symbol); + return false; } top->type = orig_type; @@ -1994,7 +1960,7 @@ static void advance_current_object(type_path_t *path, size_t top_path_level) } else if (is_type_struct(type)) { declaration_t *entry = top->v.compound_entry; - entity_t *next_entity = entry->base.next; + entity_t *const next_entity = skip_unnamed_bitfields(entry->base.next); if (next_entity != NULL) { assert(is_declaration(next_entity)); entry = &next_entity->declaration; @@ -2039,10 +2005,10 @@ static void skip_initializers(void) { next_if('{'); - while (token.type != '}') { - if (token.type == T_EOF) + while (token.kind != '}') { + if (token.kind == T_EOF) return; - if (token.type == '{') { + if (token.kind == '{') { eat_block(); continue; } @@ -2064,7 +2030,7 @@ static initializer_t *parse_sub_initializer(type_path_t *path, type_t *outer_type, size_t top_path_level, parse_initializer_env_t *env) { - if (token.type == '}') { + if (token.kind == '}') { /* empty initializer */ return create_empty_initializer(); } @@ -2082,14 +2048,14 @@ static initializer_t *parse_sub_initializer(type_path_t *path, while (true) { designator_t *designator = NULL; - if (token.type == '.' || token.type == '[') { + if (token.kind == '.' || token.kind == '[') { designator = parse_designation(); goto finish_designator; - } else if (token.type == T_IDENTIFIER && look_ahead(1)->type == ':') { + } else if (token.kind == T_IDENTIFIER && look_ahead(1)->kind == ':') { /* GNU-style designator ("identifier: value") */ designator = allocate_ast_zero(sizeof(designator[0])); - designator->source_position = token.source_position; - designator->symbol = token.symbol; + designator->source_position = token.base.source_position; + designator->symbol = token.identifier.symbol; eat(T_IDENTIFIER); eat(':'); @@ -2112,7 +2078,7 @@ finish_designator: initializer_t *sub; - if (token.type == '{') { + if (token.kind == '{') { if (type != NULL && is_type_scalar(type)) { sub = parse_scalar_initializer(type, env->must_be_constant); } else { @@ -2180,7 +2146,7 @@ finish_designator: sub = initializer_from_expression(outer_type, expression); if (sub != NULL) { next_if(','); - if (token.type != '}') { + if (token.kind != '}') { warningf(WARN_OTHER, HERE, "excessive elements in initializer for type '%T'", orig_type); } /* TODO: eat , ... */ @@ -2225,11 +2191,11 @@ finish_designator: ARR_APP1(initializer_t*, initializers, sub); error_parse_next: - if (token.type == '}') { + if (token.kind == '}') { break; } expect(',', end_error); - if (token.type == '}') { + if (token.kind == '}') { break; } @@ -2288,7 +2254,7 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env) if (is_type_scalar(type)) { result = parse_scalar_initializer(type, env->must_be_constant); - } else if (token.type == '{') { + } else if (token.kind == '{') { eat('{'); type_path_t path; @@ -2375,31 +2341,31 @@ static compound_t *parse_compound_type_specifier(bool is_struct) entity_t *entity = NULL; attribute_t *attributes = NULL; - if (token.type == T___attribute__) { + if (token.kind == T___attribute__) { attributes = parse_attributes(NULL); } entity_kind_tag_t const kind = is_struct ? ENTITY_STRUCT : ENTITY_UNION; - if (token.type == T_IDENTIFIER) { + if (token.kind == T_IDENTIFIER) { /* the compound has a name, check if we have seen it already */ - symbol = token.symbol; + symbol = token.identifier.symbol; entity = get_tag(symbol, kind); next_token(); if (entity != NULL) { if (entity->base.parent_scope != current_scope && - (token.type == '{' || token.type == ';')) { + (token.kind == '{' || token.kind == ';')) { /* we're in an inner scope and have a definition. Shadow * existing definition in outer scope */ entity = NULL; - } else if (entity->compound.complete && token.type == '{') { + } else if (entity->compound.complete && token.kind == '{') { source_position_t const *const ppos = &entity->base.source_position; errorf(&pos, "multiple definitions of '%N' (previous definition %P)", entity, ppos); /* clear members in the hope to avoid further errors */ entity->compound.members.entities = NULL; } } - } else if (token.type != '{') { + } else if (token.kind != '{') { char const *const msg = is_struct ? "while parsing struct type specifier" : "while parsing union type specifier"; @@ -2419,7 +2385,7 @@ static compound_t *parse_compound_type_specifier(bool is_struct) append_entity(current_scope, entity); } - if (token.type == '{') { + if (token.kind == '{') { parse_compound_type_entries(&entity->compound); /* ISO/IEC 14882:1998(E) §7.1.3:5 */ @@ -2440,7 +2406,7 @@ static void parse_enum_entries(type_t *const enum_type) { eat('{'); - if (token.type == '}') { + if (token.kind == '}') { errorf(HERE, "empty enum not allowed"); next_token(); return; @@ -2448,16 +2414,18 @@ static void parse_enum_entries(type_t *const enum_type) add_anchor_token('}'); do { - if (token.type != T_IDENTIFIER) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing enum entry", T_IDENTIFIER, NULL); eat_block(); rem_anchor_token('}'); return; } - entity_t *const entity = allocate_entity_zero(ENTITY_ENUM_VALUE, NAMESPACE_NORMAL, token.symbol); + symbol_t *symbol = token.identifier.symbol; + entity_t *const entity + = allocate_entity_zero(ENTITY_ENUM_VALUE, NAMESPACE_NORMAL, symbol); entity->enum_value.enum_type = enum_type; - entity->base.source_position = token.source_position; + entity->base.source_position = token.base.source_position; next_token(); if (next_if('=')) { @@ -2470,7 +2438,7 @@ static void parse_enum_entries(type_t *const enum_type) } record_entity(entity, false); - } while (next_if(',') && token.type != '}'); + } while (next_if(',') && token.kind != '}'); rem_anchor_token('}'); expect('}', end_error); @@ -2486,19 +2454,19 @@ static type_t *parse_enum_specifier(void) symbol_t *symbol; eat(T_enum); - switch (token.type) { + switch (token.kind) { case T_IDENTIFIER: - symbol = token.symbol; + symbol = token.identifier.symbol; entity = get_tag(symbol, ENTITY_ENUM); next_token(); if (entity != NULL) { if (entity->base.parent_scope != current_scope && - (token.type == '{' || token.type == ';')) { + (token.kind == '{' || token.kind == ';')) { /* we're in an inner scope and have a definition. Shadow * existing definition in outer scope */ entity = NULL; - } else if (entity->enume.complete && token.type == '{') { + } else if (entity->enume.complete && token.kind == '{') { source_position_t const *const ppos = &entity->base.source_position; errorf(&pos, "multiple definitions of '%N' (previous definition %P)", entity, ppos); } @@ -2522,11 +2490,11 @@ static type_t *parse_enum_specifier(void) entity->base.parent_scope = current_scope; } - type_t *const type = allocate_type_zero(TYPE_ENUM); - type->enumt.enume = &entity->enume; - type->enumt.akind = ATOMIC_TYPE_INT; + type_t *const type = allocate_type_zero(TYPE_ENUM); + type->enumt.enume = &entity->enume; + type->enumt.base.akind = ATOMIC_TYPE_INT; - if (token.type == '{') { + if (token.kind == '{') { if (symbol != NULL) { environment_push(entity); } @@ -2568,17 +2536,9 @@ static type_t *parse_typeof(void) expression_t *expression = NULL; - bool old_type_prop = in_type_prop; - bool old_gcc_extension = in_gcc_extension; - in_type_prop = true; - - while (next_if(T___extension__)) { - /* This can be a prefix to a typename or an expression. */ - in_gcc_extension = true; - } - switch (token.type) { + switch (token.kind) { case T_IDENTIFIER: - if (is_typedef_symbol(token.symbol)) { + if (is_typedef_symbol(token.identifier.symbol)) { DECLARATION_START type = parse_typename(); } else { @@ -2588,8 +2548,6 @@ static type_t *parse_typeof(void) } break; } - in_type_prop = old_type_prop; - in_gcc_extension = old_gcc_extension; rem_anchor_token(')'); expect(')', end_error); @@ -2645,17 +2603,17 @@ static attribute_t *parse_attribute_ms_property(attribute_t *attribute) = allocate_ast_zero(sizeof(*property)); do { - if (token.type != T_IDENTIFIER) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing property declspec", T_IDENTIFIER, NULL); goto end_error; } symbol_t **prop; - symbol_t *symbol = token.symbol; - if (strcmp(symbol->string, "put") == 0) { + symbol_t *symbol = token.identifier.symbol; + if (streq(symbol->string, "put")) { prop = &property->put_symbol; - } else if (strcmp(symbol->string, "get") == 0) { + } else if (streq(symbol->string, "get")) { prop = &property->get_symbol; } else { errorf(HERE, "expected put or get in property declspec"); @@ -2663,13 +2621,13 @@ static attribute_t *parse_attribute_ms_property(attribute_t *attribute) } eat(T_IDENTIFIER); expect('=', end_error); - if (token.type != T_IDENTIFIER) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing property declspec", T_IDENTIFIER, NULL); goto end_error; } if (prop != NULL) - *prop = token.symbol; + *prop = token.identifier.symbol; next_token(); } while (next_if(',')); @@ -2686,12 +2644,12 @@ static attribute_t *parse_microsoft_extended_decl_modifier_single(void) attribute_kind_t kind = ATTRIBUTE_UNKNOWN; if (next_if(T_restrict)) { kind = ATTRIBUTE_MS_RESTRICT; - } else if (token.type == T_IDENTIFIER) { - const char *name = token.symbol->string; + } else if (token.kind == T_IDENTIFIER) { + const char *name = token.identifier.symbol->string; for (attribute_kind_t k = ATTRIBUTE_MS_FIRST; k <= ATTRIBUTE_MS_LAST; ++k) { const char *attribute_name = get_attribute_name(k); - if (attribute_name != NULL && strcmp(attribute_name, name) == 0) { + if (attribute_name != NULL && streq(attribute_name, name)) { kind = k; break; } @@ -2771,20 +2729,19 @@ static entity_t *create_error_entity(symbol_t *symbol, entity_kind_tag_t kind) static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) { - type_t *type = NULL; - type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE; - unsigned type_specifiers = 0; - bool newtype = false; - bool saw_error = false; - bool old_gcc_extension = in_gcc_extension; + type_t *type = NULL; + type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE; + unsigned type_specifiers = 0; + bool newtype = false; + bool saw_error = false; memset(specifiers, 0, sizeof(*specifiers)); - specifiers->source_position = token.source_position; + specifiers->source_position = token.base.source_position; while (true) { specifiers->attributes = parse_attributes(specifiers->attributes); - switch (token.type) { + switch (token.kind) { /* storage class */ #define MATCH_STORAGE_CLASS(token, class) \ case token: \ @@ -2848,11 +2805,6 @@ wrong_thread_storage_class: MATCH_TYPE_QUALIFIER(T___uptr, TYPE_QUALIFIER_UPTR); MATCH_TYPE_QUALIFIER(T___sptr, TYPE_QUALIFIER_SPTR); - case T___extension__: - next_token(); - in_gcc_extension = true; - break; - /* type specifiers */ #define MATCH_SPECIFIER(token, specifier, name) \ case token: \ @@ -2940,7 +2892,7 @@ wrong_thread_storage_class: /* Be somewhat resilient to typos like 'unsigned lng* f()' in a * declaration, so it doesn't generate errors about expecting '(' or * '{' later on. */ - switch (look_ahead(1)->type) { + switch (look_ahead(1)->kind) { STORAGE_CLASSES TYPE_SPECIFIERS case T_const: @@ -2960,12 +2912,12 @@ wrong_thread_storage_class: } } - type_t *const typedef_type = get_typedef_type(token.symbol); + type_t *const typedef_type = get_typedef_type(token.identifier.symbol); if (typedef_type == NULL) { /* Be somewhat resilient to typos like 'vodi f()' at the beginning of a * declaration, so it doesn't generate 'implicit int' followed by more * errors later on. */ - token_type_t const la1_type = (token_type_t)look_ahead(1)->type; + token_kind_t const la1_type = (token_kind_t)look_ahead(1)->kind; switch (la1_type) { DECLARATION_START case T_IDENTIFIER: @@ -2973,8 +2925,9 @@ wrong_thread_storage_class: case '*': { errorf(HERE, "%K does not name a type", &token); - entity_t *entity = - create_error_entity(token.symbol, ENTITY_TYPEDEF); + symbol_t *symbol = token.identifier.symbol; + entity_t *entity + = create_error_entity(symbol, ENTITY_TYPEDEF); type = allocate_type_zero(TYPE_TYPEDEF); type->typedeft.typedefe = &entity->typedefe; @@ -3003,8 +2956,6 @@ wrong_thread_storage_class: finish_specifiers: specifiers->attributes = parse_attributes(specifiers->attributes); - in_gcc_extension = old_gcc_extension; - if (type == NULL || (saw_error && type_specifiers != 0)) { atomic_type_kind_t atomic_type; @@ -3167,15 +3118,13 @@ warn_about_long_long: } if (type_specifiers & SPECIFIER_COMPLEX) { - type = allocate_type_zero(TYPE_COMPLEX); - type->complex.akind = atomic_type; + type = allocate_type_zero(TYPE_COMPLEX); } else if (type_specifiers & SPECIFIER_IMAGINARY) { - type = allocate_type_zero(TYPE_IMAGINARY); - type->imaginary.akind = atomic_type; + type = allocate_type_zero(TYPE_IMAGINARY); } else { - type = allocate_type_zero(TYPE_ATOMIC); - type->atomic.akind = atomic_type; + type = allocate_type_zero(TYPE_ATOMIC); } + type->atomic.akind = atomic_type; newtype = true; } else if (type_specifiers != 0) { errorf(&specifiers->source_position, "multiple datatypes in declaration"); @@ -3204,7 +3153,7 @@ static type_qualifiers_t parse_type_qualifiers(void) type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE; while (true) { - switch (token.type) { + switch (token.kind) { /* type qualifiers */ MATCH_TYPE_QUALIFIER(T_const, TYPE_QUALIFIER_CONST); MATCH_TYPE_QUALIFIER(T_restrict, TYPE_QUALIFIER_RESTRICT); @@ -3227,15 +3176,16 @@ static type_qualifiers_t parse_type_qualifiers(void) */ static void parse_identifier_list(scope_t *scope) { + assert(token.kind == T_IDENTIFIER); do { - entity_t *const entity = allocate_entity_zero(ENTITY_PARAMETER, NAMESPACE_NORMAL, token.symbol); - entity->base.source_position = token.source_position; + entity_t *const entity = allocate_entity_zero(ENTITY_PARAMETER, NAMESPACE_NORMAL, token.identifier.symbol); + entity->base.source_position = token.base.source_position; /* a K&R parameter has no type, yet */ next_token(); if (scope != NULL) append_entity(scope, entity); - } while (next_if(',') && token.type == T_IDENTIFIER); + } while (next_if(',') && token.kind == T_IDENTIFIER); } static entity_t *parse_parameter(void) @@ -3266,18 +3216,19 @@ static void semantic_parameter_incomplete(const entity_t *entity) static bool has_parameters(void) { /* func(void) is not a parameter */ - if (token.type == T_IDENTIFIER) { - entity_t const *const entity = get_entity(token.symbol, NAMESPACE_NORMAL); + if (token.kind == T_IDENTIFIER) { + entity_t const *const entity + = get_entity(token.identifier.symbol, NAMESPACE_NORMAL); if (entity == NULL) return true; if (entity->kind != ENTITY_TYPEDEF) return true; if (skip_typeref(entity->typedefe.type) != type_void) return true; - } else if (token.type != T_void) { + } else if (token.kind != T_void) { return true; } - if (look_ahead(1)->type != ')') + if (look_ahead(1)->kind != ')') return true; next_token(); return false; @@ -3293,9 +3244,9 @@ static void parse_parameters(function_type_t *type, scope_t *scope) add_anchor_token(')'); int saved_comma_state = save_and_reset_anchor_state(','); - if (token.type == T_IDENTIFIER && - !is_typedef_symbol(token.symbol)) { - token_type_t la1_type = (token_type_t)look_ahead(1)->type; + if (token.kind == T_IDENTIFIER + && !is_typedef_symbol(token.identifier.symbol)) { + token_kind_t la1_type = (token_kind_t)look_ahead(1)->kind; if (la1_type == ',' || la1_type == ')') { type->kr_style_parameters = true; parse_identifier_list(scope); @@ -3303,21 +3254,20 @@ static void parse_parameters(function_type_t *type, scope_t *scope) } } - if (token.type == ')') { + if (token.kind == ')') { /* ISO/IEC 14882:1998(E) §C.1.6:1 */ if (!(c_mode & _CXX)) type->unspecified_parameters = true; } else if (has_parameters()) { function_parameter_t **anchor = &type->parameters; do { - switch (token.type) { + switch (token.kind) { case T_DOTDOTDOT: next_token(); type->variadic = true; goto parameters_finished; case T_IDENTIFIER: - case T___extension__: DECLARATION_START { entity_t *entity = parse_parameter(); @@ -3357,8 +3307,7 @@ end_error: } typedef enum construct_type_kind_t { - CONSTRUCT_INVALID, - CONSTRUCT_POINTER, + CONSTRUCT_POINTER = 1, CONSTRUCT_REFERENCE, CONSTRUCT_FUNCTION, CONSTRUCT_ARRAY @@ -3456,10 +3405,10 @@ static construct_type_t *parse_array_declarator(void) array->is_static = is_static; expression_t *size = NULL; - if (token.type == '*' && look_ahead(1)->type == ']') { + if (token.kind == '*' && look_ahead(1)->kind == ']') { array->is_variable = true; next_token(); - } else if (token.type != ']') { + } else if (token.kind != ']') { size = parse_assignment_expression(); /* §6.7.5.2:1 Array size must have integer type */ @@ -3526,7 +3475,7 @@ static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env) for (;;) { construct_type_t *type; //variable_t *based = NULL; /* MS __based extension */ - switch (token.type) { + switch (token.kind) { case '&': type = parse_reference_declarator(); break; @@ -3554,13 +3503,13 @@ static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env) ptr_operator_end: ; construct_type_t *inner_types = NULL; - switch (token.type) { + switch (token.kind) { case T_IDENTIFIER: if (env->must_be_abstract) { errorf(HERE, "no identifier expected in typename"); } else { - env->symbol = token.symbol; - env->source_position = token.source_position; + env->symbol = token.identifier.symbol; + env->source_position = token.base.source_position; } next_token(); break; @@ -3568,9 +3517,9 @@ ptr_operator_end: ; case '(': { /* Parenthesized declarator or function declarator? */ token_t const *const la1 = look_ahead(1); - switch (la1->type) { + switch (la1->kind) { case T_IDENTIFIER: - if (is_typedef_symbol(la1->symbol)) { + if (is_typedef_symbol(la1->identifier.symbol)) { case ')': /* §6.7.6:2 footnote 126: Empty parentheses in a type name are * interpreted as ``function with no parameter specification'', rather @@ -3614,7 +3563,7 @@ ptr_operator_end: ; for (;;) { construct_type_t *type; - switch (token.type) { + switch (token.kind) { case '(': { scope_t *scope = NULL; if (!env->must_be_abstract) { @@ -3655,8 +3604,6 @@ static type_t *construct_declarator_type(construct_type_t *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; case CONSTRUCT_FUNCTION: { construct_function_type_t *function = &iter->function; type_t *function_type = function->function_type; @@ -3671,7 +3618,7 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, errorf(pos, "function returning array is not allowed"); } else { if (skipped_return_type->base.qualifiers != 0) { - warningf(WARN_OTHER, pos, "type qualifiers in return type of function type are meaningless"); + warningf(WARN_IGNORED_QUALIFIERS, pos, "type qualifiers in return type of function type are meaningless"); } } @@ -3925,6 +3872,10 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, handle_entity_attributes(attributes, entity); } + if (entity->kind == ENTITY_FUNCTION && !freestanding) { + adapt_special_functions(&entity->function); + } + return entity; } @@ -4015,7 +3966,7 @@ warn_arg_count: */ static bool is_sym_main(const symbol_t *const sym) { - return strcmp(sym->string, "main") == 0; + return streq(sym->string, "main"); } static void error_redefined_as_different_kind(const source_position_t *pos, @@ -4141,8 +4092,22 @@ entity_t *record_entity(entity_t *entity, const bool is_definition) goto finish; } if (previous_entity->kind == ENTITY_TYPEDEF) { - /* TODO: C++ allows this for exactly the same type */ - errorf(pos, "redefinition of '%N' (declared %P)", entity, ppos); + type_t *const type = skip_typeref(entity->typedefe.type); + type_t *const prev_type + = skip_typeref(previous_entity->typedefe.type); + if (c_mode & _CXX) { + /* C++ allows double typedef if they are identical + * (after skipping typedefs) */ + if (type == prev_type) + goto finish; + } else { + /* GCC extension: redef in system headers is allowed */ + if ((pos->is_system_header || ppos->is_system_header) && + types_compatible(type, prev_type)) + goto finish; + } + errorf(pos, "redefinition of '%N' (declared %P)", + entity, ppos); goto finish; } @@ -4222,7 +4187,7 @@ warn_redundant_declaration: ; merge_in_attributes(decl, prev_decl->attributes); } else if (!is_definition && is_type_valid(prev_type) && - strcmp(ppos->input_name, "") != 0) { + !pos->is_system_header) { warningf(WARN_REDUNDANT_DECLS, pos, "redundant declaration for '%Y' (declared %P)", symbol, ppos); } } else if (current_function == NULL) { @@ -4302,11 +4267,11 @@ static void parser_error_multiple_definition(entity_t *entity, static bool is_declaration_specifier(const token_t *token) { - switch (token->type) { + switch (token->kind) { DECLARATION_START return true; case T_IDENTIFIER: - return is_typedef_symbol(token->symbol); + return is_typedef_symbol(token->identifier.symbol); default: return false; @@ -4350,10 +4315,8 @@ static void parse_init_declarator_rest(entity_t *entity) env.type = orig_type; env.must_be_constant = must_be_constant; env.entity = entity; - current_init_decl = entity; initializer_t *initializer = parse_initializer(&env); - current_init_decl = NULL; if (entity->kind == ENTITY_VARIABLE) { /* §6.7.5:22 array initializers for arrays with unknown size @@ -4430,9 +4393,9 @@ static void parse_declaration_rest(entity_t *ndeclaration, add_anchor_token(';'); add_anchor_token(','); while (true) { - entity_t *entity = finished_declaration(ndeclaration, token.type == '='); + entity_t *entity = finished_declaration(ndeclaration, token.kind == '='); - if (token.type == '=') { + if (token.kind == '=') { parse_init_declarator_rest(entity); } else if (entity->kind == ENTITY_VARIABLE) { /* ISO/IEC 14882:1998(E) §8.5.3:3 The initializer can be omitted @@ -4494,7 +4457,7 @@ static void parse_declaration(parsed_declaration_func finished_declaration, parse_declaration_specifiers(&specifiers); rem_anchor_token(';'); - if (token.type == ';') { + if (token.kind == ';') { parse_anonymous_declaration_rest(&specifiers); } else { entity_t *entity = parse_declarator(&specifiers, flags); @@ -4529,9 +4492,7 @@ static void parse_kr_declaration_list(entity_t *entity) add_anchor_token('{'); - /* push function parameters */ - size_t const top = environment_top(); - scope_t *old_scope = scope_push(&entity->function.parameters); + PUSH_SCOPE(&entity->function.parameters); entity_t *parameter = entity->function.parameters.entities; for ( ; parameter != NULL; parameter = parameter->base.next) { @@ -4542,9 +4503,8 @@ static void parse_kr_declaration_list(entity_t *entity) /* parse declaration list */ for (;;) { - switch (token.type) { + switch (token.kind) { 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. */ @@ -4557,10 +4517,7 @@ static void parse_kr_declaration_list(entity_t *entity) } decl_list_end: - /* pop function parameters */ - assert(current_scope == &entity->function.parameters); - scope_pop(old_scope); - environment_pop_to(top); + POP_SCOPE(); /* update function type */ type_t *new_type = duplicate_type(type); @@ -4807,7 +4764,7 @@ static bool expression_returns(expression_t const *const expr) case EXPR_BUILTIN_CONSTANT_P: case EXPR_BUILTIN_TYPES_COMPATIBLE_P: case EXPR_OFFSETOF: - case EXPR_INVALID: + case EXPR_ERROR: return true; case EXPR_STATEMENT: { @@ -4859,9 +4816,6 @@ static bool expression_returns(expression_t const *const expr) return expression_returns(expr->binary.left) && expression_returns(expr->binary.right); - - case EXPR_UNKNOWN: - break; } panic("unhandled expression"); @@ -4904,7 +4858,7 @@ static void check_reachable(statement_t *const stmt) statement_t *last = stmt; statement_t *next; switch (stmt->kind) { - case STATEMENT_INVALID: + case STATEMENT_ERROR: case STATEMENT_EMPTY: case STATEMENT_ASM: next = stmt->base.next; @@ -5176,7 +5130,7 @@ found_break_parent: } switch (next->kind) { - case STATEMENT_INVALID: + case STATEMENT_ERROR: case STATEMENT_EMPTY: case STATEMENT_DECLARATION: case STATEMENT_EXPRESSION: @@ -5377,7 +5331,7 @@ static void parse_external_declaration(void) rem_anchor_token(';'); /* must be a declaration */ - if (token.type == ';') { + if (token.kind == ';') { parse_anonymous_declaration_rest(&specifiers); return; } @@ -5396,7 +5350,7 @@ static void parse_external_declaration(void) rem_anchor_token(','); /* must be a declaration */ - switch (token.type) { + switch (token.kind) { case ',': case ';': case '=': @@ -5408,7 +5362,7 @@ static void parse_external_declaration(void) /* must be a function definition */ parse_kr_declaration_list(ndeclaration); - if (token.type != '{') { + if (token.kind != '{') { parse_error_expected("while parsing function definition", '{', NULL); eat_until_matching_token(';'); return; @@ -5463,9 +5417,7 @@ static void parse_external_declaration(void) assert(is_declaration(entity)); type = skip_typeref(entity->declaration.type); - /* push function parameters and switch scope */ - size_t const top = environment_top(); - scope_t *old_scope = scope_push(&function->parameters); + PUSH_SCOPE(&function->parameters); entity_t *parameter = function->parameters.entities; for (; parameter != NULL; parameter = parameter->base.next) { @@ -5526,48 +5478,7 @@ static void parse_external_declaration(void) label_pop_to(label_stack_top); } - assert(current_scope == &function->parameters); - scope_pop(old_scope); - environment_pop_to(top); -} - -static type_t *make_bitfield_type(type_t *base_type, expression_t *size, - source_position_t *source_position, - const symbol_t *symbol) -{ - type_t *type = allocate_type_zero(TYPE_BITFIELD); - - type->bitfield.base_type = base_type; - type->bitfield.size_expression = size; - - il_size_t bit_size; - type_t *skipped_type = skip_typeref(base_type); - if (!is_type_integer(skipped_type)) { - errorf(source_position, "bitfield base type '%T' is not an integer type", base_type); - bit_size = 0; - } else { - bit_size = get_type_size(base_type) * 8; - } - - 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; - - if (v < 0) { - errorf(source_position, "negative width in bit-field '%Y'", - user_symbol); - } else if (v == 0 && symbol != NULL) { - errorf(source_position, "zero width for bit-field '%Y'", - user_symbol); - } else if (bit_size > 0 && (il_size_t)v > bit_size) { - errorf(source_position, "width of '%Y' exceeds its type", - user_symbol); - } else { - type->bitfield.bit_size = v; - } - } - - return type; + POP_SCOPE(); } static entity_t *find_compound_entry(compound_t *compound, symbol_t *symbol) @@ -5628,12 +5539,19 @@ static expression_t *create_select(const source_position_t *pos, type_t *entry_type = entry->declaration.type; type_t *res_type = get_qualified_type(entry_type, qualifiers); + /* bitfields need special treatment */ + if (entry->compound_member.bitfield) { + unsigned bit_size = entry->compound_member.bit_size; + /* if fewer bits than an int, convert to int (see §6.3.1.1) */ + if (bit_size < get_atomic_type_size(ATOMIC_TYPE_INT) * BITS_PER_BYTE) { + res_type = type_int; + } + } + /* we always do the auto-type conversions; the & and sizeof parser contains * code to revert this! */ select->base.type = automatic_type_conversion(res_type); - if (res_type->kind == TYPE_BITFIELD) { - select->base.type = res_type->bitfield.base_type; - } + return select; } @@ -5667,7 +5585,7 @@ static expression_t *find_create_select(const source_position_t *pos, expression_t *sub_addr = create_select(pos, addr, qualifiers, iter); sub_addr->base.source_position = *pos; - sub_addr->select.implicit = true; + sub_addr->base.implicit = true; return find_create_select(pos, sub_addr, qualifiers, sub_compound, symbol); } @@ -5680,38 +5598,77 @@ static expression_t *find_create_select(const source_position_t *pos, return NULL; } +static void parse_bitfield_member(entity_t *entity) +{ + eat(':'); + + expression_t *size = parse_constant_expression(); + long size_long; + + assert(entity->kind == ENTITY_COMPOUND_MEMBER); + type_t *type = entity->declaration.type; + if (!is_type_integer(skip_typeref(type))) { + errorf(HERE, "bitfield base type '%T' is not an integer type", + type); + } + + if (is_constant_expression(size) != EXPR_CLASS_CONSTANT) { + /* error already reported by parse_constant_expression */ + size_long = get_type_size(type) * 8; + } else { + size_long = fold_constant_to_int(size); + + const symbol_t *symbol = entity->base.symbol; + const symbol_t *user_symbol + = symbol == NULL ? sym_anonymous : symbol; + unsigned bit_size = get_type_size(type) * 8; + if (size_long < 0) { + errorf(HERE, "negative width in bit-field '%Y'", user_symbol); + } else if (size_long == 0 && symbol != NULL) { + errorf(HERE, "zero width for bit-field '%Y'", user_symbol); + } else if (bit_size > 0 && (unsigned)size_long > bit_size) { + errorf(HERE, "width of bitfield '%Y' exceeds its type", + user_symbol); + } else { + /* hope that people don't invent crazy types with more bits + * than our struct can hold */ + assert(size_long < + (1 << sizeof(entity->compound_member.bit_size)*8)); + } + } + + entity->compound_member.bitfield = true; + entity->compound_member.bit_size = (unsigned char)size_long; +} + static void parse_compound_declarators(compound_t *compound, const declaration_specifiers_t *specifiers) { do { entity_t *entity; - if (token.type == ':') { - source_position_t source_position = *HERE; - next_token(); - - type_t *base_type = specifiers->type; - expression_t *size = parse_constant_expression(); + if (token.kind == ':') { + /* anonymous bitfield */ + type_t *type = specifiers->type; + entity_t *entity = allocate_entity_zero(ENTITY_COMPOUND_MEMBER, + NAMESPACE_NORMAL, NULL); + entity->base.source_position = *HERE; + entity->declaration.declared_storage_class = STORAGE_CLASS_NONE; + entity->declaration.storage_class = STORAGE_CLASS_NONE; + entity->declaration.type = type; - type_t *type = make_bitfield_type(base_type, size, - &source_position, NULL); + parse_bitfield_member(entity); attribute_t *attributes = parse_attributes(NULL); attribute_t **anchor = &attributes; while (*anchor != NULL) anchor = &(*anchor)->next; *anchor = specifiers->attributes; - - entity = allocate_entity_zero(ENTITY_COMPOUND_MEMBER, NAMESPACE_NORMAL, NULL); - entity->base.source_position = source_position; - entity->declaration.declared_storage_class = STORAGE_CLASS_NONE; - entity->declaration.storage_class = STORAGE_CLASS_NONE; - entity->declaration.type = type; - entity->declaration.attributes = attributes; - if (attributes != NULL) { handle_entity_attributes(attributes, entity); } + entity->declaration.attributes = attributes; + append_entity(&compound->members, entity); } else { entity = parse_declarator(specifiers, @@ -5732,17 +5689,10 @@ static void parse_compound_declarators(compound_t *compound, } } - if (token.type == ':') { - source_position_t source_position = *HERE; - next_token(); - expression_t *size = parse_constant_expression(); - - type_t *type = entity->declaration.type; - type_t *bitfield_type = make_bitfield_type(type, size, - &source_position, entity->base.symbol); + if (token.kind == ':') { + parse_bitfield_member(entity); attribute_t *attributes = parse_attributes(NULL); - entity->declaration.type = bitfield_type; handle_entity_attributes(attributes, entity); } else { type_t *orig_type = entity->declaration.type; @@ -5752,8 +5702,8 @@ static void parse_compound_declarators(compound_t *compound, } else if (is_type_incomplete(type)) { /* §6.7.2.1:16 flexible array member */ if (!is_type_array(type) || - token.type != ';' || - look_ahead(1)->type != '}') { + token.kind != ';' || + look_ahead(1)->kind != '}') { errorf(pos, "'%N' has incomplete type '%T'", entity, orig_type); } } @@ -5775,12 +5725,15 @@ static void parse_compound_type_entries(compound_t *compound) add_anchor_token('}'); for (;;) { - switch (token.type) { + switch (token.kind) { DECLARATION_START + case T___extension__: case T_IDENTIFIER: { + PUSH_EXTENSION(); declaration_specifiers_t specifiers; parse_declaration_specifiers(&specifiers); parse_compound_declarators(compound, &specifiers); + POP_EXTENSION(); break; } @@ -5833,12 +5786,12 @@ static expression_parser_function_t expression_parsers[T_LAST_TOKEN]; static expression_t *expected_expression_error(void) { /* skip the error message if the error token was read */ - if (token.type != T_ERROR) { + if (token.kind != T_ERROR) { errorf(HERE, "expected expression, got token %K", &token); } next_token(); - return create_invalid_expression(); + return create_error_expression(); } static type_t *get_string_type(void) @@ -5856,17 +5809,17 @@ static type_t *get_wide_string_type(void) */ static expression_t *parse_string_literal(void) { - source_position_t begin = token.source_position; - string_t res = token.literal; - bool is_wide = (token.type == T_WIDE_STRING_LITERAL); + source_position_t begin = token.base.source_position; + string_t res = token.string.string; + bool is_wide = (token.kind == T_WIDE_STRING_LITERAL); next_token(); - while (token.type == T_STRING_LITERAL - || token.type == T_WIDE_STRING_LITERAL) { - warn_string_concat(&token.source_position); - res = concat_strings(&res, &token.literal); + while (token.kind == T_STRING_LITERAL + || token.kind == T_WIDE_STRING_LITERAL) { + warn_string_concat(&token.base.source_position); + res = concat_strings(&res, &token.string.string); next_token(); - is_wide |= token.type == T_WIDE_STRING_LITERAL; + is_wide |= token.kind == T_WIDE_STRING_LITERAL; } expression_t *literal; @@ -5899,17 +5852,18 @@ static expression_t *parse_boolean_literal(bool value) static void warn_traditional_suffix(void) { - warningf(WARN_TRADITIONAL, HERE, "traditional C rejects the '%Y' suffix", token.symbol); + warningf(WARN_TRADITIONAL, HERE, "traditional C rejects the '%S' suffix", + &token.number.suffix); } static void check_integer_suffix(void) { - symbol_t *suffix = token.symbol; - if (suffix == NULL) + const string_t *suffix = &token.number.suffix; + if (suffix->size == 0) return; bool not_traditional = false; - const char *c = suffix->string; + const char *c = suffix->begin; if (*c == 'l' || *c == 'L') { ++c; if (*c == *(c-1)) { @@ -5933,8 +5887,8 @@ static void check_integer_suffix(void) } } if (*c != '\0') { - errorf(&token.source_position, - "invalid suffix '%s' on integer constant", suffix->string); + errorf(&token.base.source_position, + "invalid suffix '%S' on integer constant", suffix); } else if (not_traditional) { warn_traditional_suffix(); } @@ -5942,13 +5896,13 @@ static void check_integer_suffix(void) static type_t *check_floatingpoint_suffix(void) { - symbol_t *suffix = token.symbol; - type_t *type = type_double; - if (suffix == NULL) + const string_t *suffix = &token.number.suffix; + type_t *type = type_double; + if (suffix->size == 0) return type; bool not_traditional = false; - const char *c = suffix->string; + const char *c = suffix->begin; if (*c == 'f' || *c == 'F') { ++c; type = type_float; @@ -5957,8 +5911,8 @@ static type_t *check_floatingpoint_suffix(void) type = type_long_double; } if (*c != '\0') { - errorf(&token.source_position, - "invalid suffix '%s' on floatingpoint constant", suffix->string); + errorf(&token.base.source_position, + "invalid suffix '%S' on floatingpoint constant", suffix); } else if (not_traditional) { warn_traditional_suffix(); } @@ -5974,7 +5928,7 @@ static expression_t *parse_number_literal(void) expression_kind_t kind; type_t *type; - switch (token.type) { + switch (token.kind) { case T_INTEGER: kind = EXPR_LITERAL_INTEGER; check_integer_suffix(); @@ -6004,8 +5958,8 @@ static expression_t *parse_number_literal(void) expression_t *literal = allocate_expression_zero(kind); literal->base.type = type; - literal->literal.value = token.literal; - literal->literal.suffix = token.symbol; + literal->literal.value = token.number.number; + literal->literal.suffix = token.number.suffix; next_token(); /* integer type depends on the size of the number and the size @@ -6023,7 +5977,7 @@ static expression_t *parse_character_constant(void) { expression_t *literal = allocate_expression_zero(EXPR_LITERAL_CHARACTER); literal->base.type = c_mode & _CXX ? type_char : type_int; - literal->literal.value = token.literal; + literal->literal.value = token.string.string; size_t len = literal->literal.value.size; if (len > 1) { @@ -6046,7 +6000,7 @@ static expression_t *parse_wide_character_constant(void) { expression_t *literal = allocate_expression_zero(EXPR_LITERAL_WIDE_CHARACTER); literal->base.type = type_int; - literal->literal.value = token.literal; + literal->literal.value = token.string.string; size_t len = wstrlen(&literal->literal.value); if (len > 1) { @@ -6124,8 +6078,7 @@ type_t *revert_automatic_type_conversion(const expression_t *expression) entity_t *entity = expression->select.compound_entry; assert(is_declaration(entity)); type_t *type = entity->declaration.type; - return get_qualified_type(type, - expression->base.type->base.qualifiers); + return get_qualified_type(type, expression->base.type->base.qualifiers); } case EXPR_UNARY_DEREFERENCE: { @@ -6198,11 +6151,11 @@ static entity_t *parse_qualified_identifier(void) entity_t *entity; while (true) { - if (token.type != T_IDENTIFIER) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing identifier", T_IDENTIFIER, NULL); return create_error_entity(sym_anonymous, ENTITY_VARIABLE); } - symbol = token.symbol; + symbol = token.identifier.symbol; pos = *HERE; next_token(); @@ -6233,9 +6186,10 @@ static entity_t *parse_qualified_identifier(void) } if (entity == NULL) { - if (!strict_mode && token.type == '(') { + if (!strict_mode && token.kind == '(') { /* an implicitly declared function */ - warningf(WARN_IMPLICIT_FUNCTION_DECLARATION, &pos, "implicit declaration of function '%Y'", symbol); + warningf(WARN_IMPLICIT_FUNCTION_DECLARATION, &pos, + "implicit declaration of function '%Y'", symbol); entity = create_implicit_function(symbol, &pos); } else { errorf(&pos, "unknown identifier '%Y' found.", symbol); @@ -6248,7 +6202,7 @@ static entity_t *parse_qualified_identifier(void) static expression_t *parse_reference(void) { - source_position_t const pos = token.source_position; + source_position_t const pos = token.base.source_position; entity_t *const entity = parse_qualified_identifier(); type_t *orig_type; @@ -6293,11 +6247,6 @@ static expression_t *parse_reference(void) check_deprecated(&pos, entity); - if (entity == current_init_decl && !in_type_prop && entity->kind == ENTITY_VARIABLE) { - current_init_decl = NULL; - warningf(WARN_INIT_SELF, &pos, "variable '%#N' is initialized by itself", entity); - } - return expression; } @@ -6379,7 +6328,7 @@ static expression_t *parse_cast(void) rem_anchor_token(')'); expect(')', end_error); - if (token.type == '{') { + if (token.kind == '{') { return parse_compound_literal(&pos, type); } @@ -6396,7 +6345,7 @@ static expression_t *parse_cast(void) return cast; end_error: - return create_invalid_expression(); + return create_error_expression(); } /** @@ -6442,13 +6391,13 @@ end_error: static expression_t *parse_parenthesized_expression(void) { token_t const* const la1 = look_ahead(1); - switch (la1->type) { + switch (la1->kind) { case '{': /* gcc extension: a statement expression */ return parse_statement_expression(); case T_IDENTIFIER: - if (is_typedef_symbol(la1->symbol)) { + if (is_typedef_symbol(la1->identifier.symbol)) { DECLARATION_START return parse_cast(); } @@ -6532,25 +6481,25 @@ static designator_t *parse_designator(void) designator_t *result = allocate_ast_zero(sizeof(result[0])); result->source_position = *HERE; - if (token.type != T_IDENTIFIER) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing member designator", T_IDENTIFIER, NULL); return NULL; } - result->symbol = token.symbol; + result->symbol = token.identifier.symbol; next_token(); designator_t *last_designator = result; while (true) { if (next_if('.')) { - if (token.type != T_IDENTIFIER) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing member designator", T_IDENTIFIER, NULL); return NULL; } designator_t *designator = allocate_ast_zero(sizeof(result[0])); designator->source_position = *HERE; - designator->symbol = token.symbol; + designator->symbol = token.identifier.symbol; next_token(); last_designator->next = designator; @@ -6611,14 +6560,14 @@ static expression_t *parse_offsetof(void) descend_into_subtype(&path); if (!walk_designator(&path, designator, true)) { - return create_invalid_expression(); + return create_error_expression(); } DEL_ARR_F(path.path); return expression; end_error: - return create_invalid_expression(); + return create_error_expression(); } /** @@ -6654,7 +6603,7 @@ static expression_t *parse_va_start(void) } expect(')', end_error); end_error: - return create_invalid_expression(); + return create_error_expression(); } /** @@ -6678,7 +6627,7 @@ static expression_t *parse_va_arg(void) return expression; end_error: - return create_invalid_expression(); + return create_error_expression(); } /** @@ -6707,7 +6656,7 @@ static expression_t *parse_va_copy(void) return expression; end_error: - return create_invalid_expression(); + return create_error_expression(); } /** @@ -6728,7 +6677,7 @@ static expression_t *parse_builtin_constant(void) return expression; end_error: - return create_invalid_expression(); + return create_error_expression(); } /** @@ -6753,7 +6702,7 @@ static expression_t *parse_builtin_types_compatible(void) return expression; end_error: - return create_invalid_expression(); + return create_error_expression(); } /** @@ -6763,7 +6712,7 @@ static expression_t *parse_compare_builtin(void) { expression_t *expression; - switch (token.type) { + switch (token.kind) { case T___builtin_isgreater: expression = allocate_expression_zero(EXPR_BINARY_ISGREATER); break; @@ -6810,7 +6759,7 @@ static expression_t *parse_compare_builtin(void) return expression; end_error: - return create_invalid_expression(); + return create_error_expression(); } /** @@ -6831,7 +6780,7 @@ static expression_t *parse_assume(void) expression->base.type = type_void; return expression; end_error: - return create_invalid_expression(); + return create_error_expression(); } /** @@ -6839,10 +6788,10 @@ end_error: */ static label_t *get_label(void) { - assert(token.type == T_IDENTIFIER); + assert(token.kind == T_IDENTIFIER); assert(current_function != NULL); - entity_t *label = get_entity(token.symbol, NAMESPACE_LABEL); + entity_t *label = get_entity(token.identifier.symbol, NAMESPACE_LABEL); /* If we find a local label, we already created the declaration. */ if (label != NULL && label->kind == ENTITY_LOCAL_LABEL) { if (label->base.parent_scope != current_scope) { @@ -6851,7 +6800,7 @@ static label_t *get_label(void) } } else if (label == NULL || label->base.parent_scope != ¤t_function->parameters) { /* There is no matching label in the same function, so create a new one. */ - label = allocate_entity_zero(ENTITY_LABEL, NAMESPACE_LABEL, token.symbol); + label = allocate_entity_zero(ENTITY_LABEL, NAMESPACE_LABEL, token.identifier.symbol); label_push(label); } @@ -6864,11 +6813,11 @@ static label_t *get_label(void) */ static expression_t *parse_label_address(void) { - source_position_t source_position = token.source_position; + source_position_t source_position = token.base.source_position; eat(T_ANDAND); - if (token.type != T_IDENTIFIER) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing label address", T_IDENTIFIER, NULL); - return create_invalid_expression(); + return create_error_expression(); } label_t *const label = get_label(); @@ -6897,13 +6846,13 @@ static expression_t *parse_noop_expression(void) eat(T___noop); - if (token.type == '(') { + if (token.kind == '(') { /* parse arguments */ eat('('); add_anchor_token(')'); add_anchor_token(','); - if (token.type != ')') do { + if (token.kind != ')') do { (void)parse_assignment_expression(); } while (next_if(',')); } @@ -6920,7 +6869,7 @@ end_error: */ static expression_t *parse_primary_expression(void) { - switch (token.type) { + switch (token.kind) { case T_false: return parse_boolean_literal(false); case T_true: return parse_boolean_literal(true); case T_INTEGER: @@ -6962,7 +6911,7 @@ static expression_t *parse_primary_expression(void) case T_COLONCOLON: return parse_reference(); case T_IDENTIFIER: - if (!is_typedef_symbol(token.symbol)) { + if (!is_typedef_symbol(token.identifier.symbol)) { return parse_reference(); } /* FALLTHROUGH */ @@ -6972,13 +6921,13 @@ static expression_t *parse_primary_expression(void) parse_declaration_specifiers(&specifiers); type_t const *const type = parse_abstract_declarator(specifiers.type); errorf(&pos, "encountered type '%T' while parsing expression", type); - return create_invalid_expression(); + return create_error_expression(); } } errorf(HERE, "unexpected token %K, expected an expression", &token); eat_until_anchor(); - return create_invalid_expression(); + return create_error_expression(); } static expression_t *parse_array_expression(expression_t *left) @@ -7040,6 +6989,12 @@ end_error: return expr; } +static bool is_bitfield(const expression_t *expression) +{ + return expression->kind == EXPR_SELECT + && expression->select.compound_entry->compound_member.bitfield; +} + static expression_t *parse_typeprop(expression_kind_t const kind) { expression_t *tp_expression = allocate_expression_zero(kind); @@ -7047,13 +7002,9 @@ static expression_t *parse_typeprop(expression_kind_t const kind) eat(kind == EXPR_SIZEOF ? T_sizeof : T___alignof__); - /* we only refer to a type property, mark this case */ - bool old = in_type_prop; - in_type_prop = true; - type_t *orig_type; expression_t *expression; - if (token.type == '(' && is_declaration_specifier(look_ahead(1))) { + if (token.kind == '(' && is_declaration_specifier(look_ahead(1))) { source_position_t const pos = *HERE; next_token(); add_anchor_token(')'); @@ -7061,7 +7012,7 @@ static expression_t *parse_typeprop(expression_kind_t const kind) rem_anchor_token(')'); expect(')', end_error); - if (token.type == '{') { + if (token.kind == '{') { /* It was not sizeof(type) after all. It is sizeof of an expression * starting with a compound literal */ expression = parse_compound_literal(&pos, orig_type); @@ -7071,6 +7022,12 @@ static expression_t *parse_typeprop(expression_kind_t const kind) expression = parse_subexpression(PREC_UNARY); typeprop_expression: + if (is_bitfield(expression)) { + char const* const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof"; + errorf(&tp_expression->base.source_position, + "operand of %s expression must not be a bitfield", what); + } + tp_expression->typeprop.tp_expression = expression; orig_type = revert_automatic_type_conversion(expression); @@ -7092,12 +7049,7 @@ typeprop_expression: } 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"; @@ -7107,7 +7059,6 @@ typeprop_expression: } end_error: - in_type_prop = old; return tp_expression; } @@ -7123,16 +7074,16 @@ static expression_t *parse_alignof(void) static expression_t *parse_select_expression(expression_t *addr) { - assert(token.type == '.' || token.type == T_MINUSGREATER); - bool select_left_arrow = (token.type == T_MINUSGREATER); + assert(token.kind == '.' || token.kind == T_MINUSGREATER); + bool select_left_arrow = (token.kind == T_MINUSGREATER); source_position_t const pos = *HERE; next_token(); - if (token.type != T_IDENTIFIER) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing select", T_IDENTIFIER, NULL); - return create_invalid_expression(); + return create_error_expression(); } - symbol_t *symbol = token.symbol; + symbol_t *symbol = token.identifier.symbol; next_token(); type_t *const orig_type = addr->base.type; @@ -7164,14 +7115,14 @@ static expression_t *parse_select_expression(expression_t *addr) "request for member '%Y' in something not a struct or union, but '%T'", symbol, type_left); } - return create_invalid_expression(); + return create_error_expression(); } compound_t *compound = type_left->compound.compound; if (!compound->complete) { errorf(&pos, "request for member '%Y' in incomplete type '%T'", symbol, type_left); - return create_invalid_expression(); + return create_error_expression(); } type_qualifiers_t qualifiers = type_left->base.qualifiers; @@ -7180,7 +7131,7 @@ static expression_t *parse_select_expression(expression_t *addr) if (result == NULL) { errorf(&pos, "'%T' has no member named '%Y'", orig_type, symbol); - return create_invalid_expression(); + return create_error_expression(); } return result; @@ -7244,32 +7195,25 @@ static void check_call_argument(type_t *expected_type, /** * Handle the semantic restrictions of builtin calls */ -static void handle_builtin_argument_restrictions(call_expression_t *call) { - switch (call->function->reference.entity->function.btk) { - case bk_gnu_builtin_return_address: - case bk_gnu_builtin_frame_address: { +static void handle_builtin_argument_restrictions(call_expression_t *call) +{ + entity_t *entity = call->function->reference.entity; + switch (entity->function.btk) { + case BUILTIN_FIRM: + switch (entity->function.b.firm_builtin_kind) { + case ir_bk_return_address: + case ir_bk_frame_address: { /* argument must be constant */ call_argument_t *argument = call->arguments; 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); - } - break; - } - case bk_gnu_builtin_object_size: - if (call->arguments == NULL) - break; - - call_argument_t *arg = call->arguments->next; - 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", + "argument of '%Y' must be a constant expression", call->function->reference.entity->base.symbol); } break; - case bk_gnu_builtin_prefetch: + } + case ir_bk_prefetch: /* second and third argument must be constant if existent */ if (call->arguments == NULL) break; @@ -7279,22 +7223,37 @@ static void handle_builtin_argument_restrictions(call_expression_t *call) { if (rw != NULL) { 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); + "second argument of '%Y' must be a constant expression", + call->function->reference.entity->base.symbol); } locality = rw->next; } if (locality != NULL) { 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); + "third argument of '%Y' must be a constant expression", + call->function->reference.entity->base.symbol); } locality = rw->next; } break; default: break; + } + + case BUILTIN_OBJECT_SIZE: + if (call->arguments == NULL) + break; + + call_argument_t *arg = call->arguments->next; + 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); + } + break; + default: + break; } } @@ -7333,7 +7292,7 @@ static expression_t *parse_call_expression(expression_t *expression) add_anchor_token(')'); add_anchor_token(','); - if (token.type != ')') { + if (token.kind != ')') { call_argument_t **anchor = &call->arguments; do { call_argument_t *argument = allocate_ast_zero(sizeof(*argument)); @@ -7390,7 +7349,7 @@ static expression_t *parse_call_expression(expression_t *expression) if (expression->kind == EXPR_REFERENCE) { reference_expression_t *reference = &expression->reference; if (reference->entity->kind == ENTITY_FUNCTION && - reference->entity->function.btk != bk_none) + reference->entity->function.btk != BUILTIN_NONE) handle_builtin_argument_restrictions(call); } @@ -7490,7 +7449,7 @@ static expression_t *parse_conditional_expression(expression_t *expression) expression_t *true_expression = expression; bool gnu_cond = false; - if (GNU_MODE && token.type == ':') { + if (GNU_MODE && token.kind == ':') { gnu_cond = true; } else { true_expression = parse_expression(); @@ -7592,12 +7551,9 @@ types_incompatible: */ static expression_t *parse_extension(void) { - eat(T___extension__); - - bool old_gcc_extension = in_gcc_extension; - in_gcc_extension = true; + PUSH_EXTENSION(); expression_t *expression = parse_subexpression(PREC_UNARY); - in_gcc_extension = old_gcc_extension; + POP_EXTENSION(); return expression; } @@ -7620,7 +7576,7 @@ static expression_t *parse_builtin_classify_type(void) return result; end_error: - return create_invalid_expression(); + return create_error_expression(); } /** @@ -7669,7 +7625,7 @@ static expression_t *parse_throw(void) eat(T_throw); expression_t *value = NULL; - switch (token.type) { + switch (token.kind) { EXPRESSION_START { value = parse_assignment_expression(); /* ISO/IEC 14882:1998(E) §15.1:3 */ @@ -7771,6 +7727,13 @@ static void semantic_incdec(unary_expression_t *expression) expression->base.type = orig_type; } +static void promote_unary_int_expr(unary_expression_t *const expr, type_t *const type) +{ + type_t *const res_type = promote_integer(type); + expr->base.type = res_type; + expr->value = create_implicit_cast(expr->value, res_type); +} + static void semantic_unexpr_arithmetic(unary_expression_t *expression) { type_t *const orig_type = expression->value->base.type; @@ -7782,9 +7745,11 @@ static void semantic_unexpr_arithmetic(unary_expression_t *expression) "operation needs an arithmetic type"); } return; + } else if (is_type_integer(type)) { + promote_unary_int_expr(expression, type); + } else { + expression->base.type = orig_type; } - - expression->base.type = orig_type; } static void semantic_unexpr_plus(unary_expression_t *expression) @@ -7813,7 +7778,7 @@ static void semantic_unexpr_integer(unary_expression_t *expression) return; } - expression->base.type = orig_type; + promote_unary_int_expr(expression, type); } static void semantic_dereference(unary_expression_t *expression) @@ -7880,10 +7845,9 @@ static void semantic_take_addr(unary_expression_t *expression) if (!is_lvalue(value)) { errorf(&expression->base.source_position, "'&' requires an lvalue"); } - if (type->kind == TYPE_BITFIELD) { + if (is_bitfield(value)) { errorf(&expression->base.source_position, - "'&' not allowed on object with bitfield type '%T'", - type); + "'&' not allowed on bitfield"); } set_address_taken(value, false); @@ -7891,12 +7855,12 @@ static void semantic_take_addr(unary_expression_t *expression) expression->base.type = make_pointer_type(orig_type, TYPE_QUALIFIER_NONE); } -#define CREATE_UNARY_EXPRESSION_PARSER(token_type, unexpression_type, sfunc) \ +#define CREATE_UNARY_EXPRESSION_PARSER(token_kind, unexpression_type, sfunc) \ static expression_t *parse_##unexpression_type(void) \ { \ expression_t *unary_expression \ = allocate_expression_zero(unexpression_type); \ - eat(token_type); \ + eat(token_kind); \ unary_expression->unary.value = parse_subexpression(PREC_UNARY); \ \ sfunc(&unary_expression->unary); \ @@ -7921,13 +7885,13 @@ CREATE_UNARY_EXPRESSION_PARSER(T_PLUSPLUS, EXPR_UNARY_PREFIX_INCREMENT, CREATE_UNARY_EXPRESSION_PARSER(T_MINUSMINUS, EXPR_UNARY_PREFIX_DECREMENT, semantic_incdec) -#define CREATE_UNARY_POSTFIX_EXPRESSION_PARSER(token_type, unexpression_type, \ +#define CREATE_UNARY_POSTFIX_EXPRESSION_PARSER(token_kind, unexpression_type, \ sfunc) \ static expression_t *parse_##unexpression_type(expression_t *left) \ { \ expression_t *unary_expression \ = allocate_expression_zero(unexpression_type); \ - eat(token_type); \ + eat(token_kind); \ unary_expression->unary.value = left; \ \ sfunc(&unary_expression->unary); \ @@ -7964,45 +7928,44 @@ static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right) if (type_left == type_right) return type_left; - bool const signed_left = is_type_signed(type_left); - bool const signed_right = is_type_signed(type_right); - int const rank_left = get_rank(type_left); - int const rank_right = get_rank(type_right); + bool const signed_left = is_type_signed(type_left); + bool const signed_right = is_type_signed(type_right); + unsigned const rank_left = get_akind_rank(get_akind(type_left)); + unsigned const rank_right = get_akind_rank(get_akind(type_right)); if (signed_left == signed_right) return rank_left >= rank_right ? type_left : type_right; - int s_rank; - int u_rank; + unsigned s_rank; + unsigned u_rank; + atomic_type_kind_t s_akind; + atomic_type_kind_t u_akind; type_t *s_type; type_t *u_type; if (signed_left) { - s_rank = rank_left; s_type = type_left; - u_rank = rank_right; u_type = type_right; } else { - s_rank = rank_right; s_type = type_right; - u_rank = rank_left; u_type = type_left; } + s_akind = get_akind(s_type); + u_akind = get_akind(u_type); + s_rank = get_akind_rank(s_akind); + u_rank = get_akind_rank(u_akind); if (u_rank >= s_rank) return u_type; - /* casting rank to atomic_type_kind is a bit hacky, but makes things - * easier here... */ - if (get_atomic_type_size((atomic_type_kind_t) s_rank) - > get_atomic_type_size((atomic_type_kind_t) u_rank)) + if (get_atomic_type_size(s_akind) > get_atomic_type_size(u_akind)) return s_type; - switch (s_rank) { - case ATOMIC_TYPE_INT: return type_unsigned_int; - case ATOMIC_TYPE_LONG: return type_unsigned_long; - case ATOMIC_TYPE_LONGLONG: return type_unsigned_long_long; + switch (s_akind) { + case ATOMIC_TYPE_INT: return type_unsigned_int; + case ATOMIC_TYPE_LONG: return type_unsigned_long; + case ATOMIC_TYPE_LONGLONG: return type_unsigned_long_long; - default: panic("invalid atomic type"); + default: panic("invalid atomic type"); } } @@ -8245,7 +8208,7 @@ static bool maybe_negative(expression_t const *const expr) { switch (is_constant_expression(expr)) { case EXPR_CLASS_ERROR: return false; - case EXPR_CLASS_CONSTANT: return fold_constant_to_int(expr) < 0; + case EXPR_CLASS_CONSTANT: return constant_is_negative(expr); default: return true; } } @@ -8564,8 +8527,7 @@ static void semantic_binexpr_assign(binary_expression_t *expression) static bool expression_has_effect(const expression_t *const expr) { switch (expr->kind) { - case EXPR_UNKNOWN: break; - case EXPR_INVALID: return true; /* do NOT warn */ + case EXPR_ERROR: return true; /* do NOT warn */ case EXPR_REFERENCE: return false; case EXPR_REFERENCE_ENUM_VALUE: return false; case EXPR_LABEL_ADDRESS: return false; @@ -8638,7 +8600,6 @@ static bool expression_has_effect(const expression_t *const expr) return is_type_atomic(type, ATOMIC_TYPE_VOID); } - case EXPR_UNARY_CAST_IMPLICIT: return true; case EXPR_UNARY_ASSUME: return true; case EXPR_UNARY_DELETE: return true; case EXPR_UNARY_DELETE_ARRAY: return true; @@ -8706,12 +8667,12 @@ static void semantic_comma(binary_expression_t *expression) /** * @param prec_r precedence of the right operand */ -#define CREATE_BINEXPR_PARSER(token_type, binexpression_type, prec_r, sfunc) \ +#define CREATE_BINEXPR_PARSER(token_kind, binexpression_type, prec_r, sfunc) \ static expression_t *parse_##binexpression_type(expression_t *left) \ { \ expression_t *binexpr = allocate_expression_zero(binexpression_type); \ binexpr->binary.left = left; \ - eat(token_type); \ + eat(token_kind); \ \ expression_t *right = parse_subexpression(prec_r); \ \ @@ -8755,12 +8716,12 @@ CREATE_BINEXPR_PARSER(',', EXPR_BINARY_COMMA, PR static expression_t *parse_subexpression(precedence_t precedence) { - if (token.type < 0) { + if (token.kind < 0) { return expected_expression_error(); } expression_parser_function_t *parser - = &expression_parsers[token.type]; + = &expression_parsers[token.kind]; expression_t *left; if (parser->parser != NULL) { @@ -8771,11 +8732,11 @@ static expression_t *parse_subexpression(precedence_t precedence) assert(left != NULL); while (true) { - if (token.type < 0) { + if (token.kind < 0) { return expected_expression_error(); } - parser = &expression_parsers[token.type]; + parser = &expression_parsers[token.kind]; if (parser->infix_parser == NULL) break; if (parser->infix_precedence < precedence) @@ -8784,7 +8745,6 @@ static expression_t *parse_subexpression(precedence_t precedence) left = parser->infix_parser(left); assert(left != NULL); - assert(left->kind != EXPR_UNKNOWN); } return left; @@ -8802,15 +8762,15 @@ static expression_t *parse_expression(void) * Register a parser for a prefix-like operator. * * @param parser the parser function - * @param token_type the token type of the prefix token + * @param token_kind the token type of the prefix token */ static void register_expression_parser(parse_expression_function parser, - int token_type) + int token_kind) { - expression_parser_function_t *entry = &expression_parsers[token_type]; + expression_parser_function_t *entry = &expression_parsers[token_kind]; if (entry->parser != NULL) { - diagnosticf("for token '%k'\n", (token_type_t)token_type); + diagnosticf("for token '%k'\n", (token_kind_t)token_kind); panic("trying to register multiple expression parsers for a token"); } entry->parser = parser; @@ -8820,16 +8780,16 @@ static void register_expression_parser(parse_expression_function parser, * Register a parser for an infix operator with given precedence. * * @param parser the parser function - * @param token_type the token type of the infix operator + * @param token_kind the token type of the infix operator * @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_kind, precedence_t precedence) { - expression_parser_function_t *entry = &expression_parsers[token_type]; + expression_parser_function_t *entry = &expression_parsers[token_kind]; if (entry->infix_parser != NULL) { - diagnosticf("for token '%k'\n", (token_type_t)token_type); + diagnosticf("for token '%k'\n", (token_kind_t)token_kind); panic("trying to register multiple infix expression parsers for a " "token"); } @@ -8906,17 +8866,17 @@ static asm_argument_t *parse_asm_arguments(bool is_out) asm_argument_t *result = NULL; asm_argument_t **anchor = &result; - while (token.type == T_STRING_LITERAL || token.type == '[') { + while (token.kind == T_STRING_LITERAL || token.kind == '[') { asm_argument_t *argument = allocate_ast_zero(sizeof(argument[0])); memset(argument, 0, sizeof(argument[0])); if (next_if('[')) { - if (token.type != T_IDENTIFIER) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing asm argument", T_IDENTIFIER, NULL); return NULL; } - argument->symbol = token.symbol; + argument->symbol = token.identifier.symbol; expect(']', end_error); } @@ -8942,7 +8902,7 @@ static asm_argument_t *parse_asm_arguments(bool is_out) size = get_atomic_type_size(akind); } else { flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC; - size = get_atomic_type_size(get_intptr_kind()); + size = get_type_size(type_void_ptr); } do { @@ -8958,7 +8918,7 @@ static asm_argument_t *parse_asm_arguments(bool is_out) value_size = get_atomic_type_size(value_akind); } else if (value_kind == TYPE_POINTER) { value_flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC; - value_size = get_atomic_type_size(get_intptr_kind()); + value_size = get_type_size(type_void_ptr); } else { break; } @@ -9008,7 +8968,7 @@ static asm_clobber_t *parse_asm_clobbers(void) asm_clobber_t *result = NULL; asm_clobber_t **anchor = &result; - while (token.type == T_STRING_LITERAL) { + while (token.kind == T_STRING_LITERAL) { asm_clobber_t *clobber = allocate_ast_zero(sizeof(clobber[0])); clobber->clobber = parse_string_literals(); @@ -9037,7 +8997,7 @@ static statement_t *parse_asm_statement(void) expect('(', end_error); add_anchor_token(')'); - if (token.type != T_STRING_LITERAL) { + if (token.kind != T_STRING_LITERAL) { parse_error_expected("after asm(", T_STRING_LITERAL, NULL); goto end_of_asm; } @@ -9077,16 +9037,16 @@ end_of_asm: return statement; end_error: - return create_invalid_statement(); + return create_error_statement(); } static statement_t *parse_label_inner_statement(statement_t const *const label, char const *const label_kind) { statement_t *inner_stmt; - switch (token.type) { + switch (token.kind) { case '}': errorf(&label->base.source_position, "%s at end of compound statement", label_kind); - inner_stmt = create_invalid_statement(); + inner_stmt = create_error_statement(); break; case ';': @@ -9102,7 +9062,8 @@ static statement_t *parse_label_inner_statement(statement_t const *const label, default: inner_stmt = parse_statement(); - /* ISO/IEC 14882:1998(E) §6:1/§6.7 Declarations are statements */ + /* ISO/IEC 9899:1999(E) §6.8:1/6.8.2:1 Declarations are no statements */ + /* 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); } @@ -9259,6 +9220,10 @@ static statement_t *parse_label_statement(void) eat(':'); + if (token.kind == T___attribute__ && !(c_mode & _CXX)) { + parse_attributes(NULL); // TODO process attributes + } + statement->label.statement = parse_label_inner_statement(statement, "label"); /* remember the labels in a list for later checking */ @@ -9269,6 +9234,17 @@ static statement_t *parse_label_statement(void) return statement; } +static statement_t *parse_inner_statement(void) +{ + statement_t *const stmt = parse_statement(); + /* ISO/IEC 9899:1999(E) §6.8:1/6.8.2:1 Declarations are no statements */ + /* ISO/IEC 14882:1998(E) §6:1/§6.7 Declarations are statements */ + if (stmt->kind == STATEMENT_DECLARATION && !(c_mode & _CXX)) { + errorf(&stmt->base.source_position, "declaration as inner statement, use {}"); + } + return stmt; +} + /** * Parse an if statement. */ @@ -9297,12 +9273,22 @@ end_error: rem_anchor_token('{'); add_anchor_token(T_else); - statement_t *const true_stmt = parse_statement(); + statement_t *const true_stmt = parse_inner_statement(); statement->ifs.true_statement = true_stmt; rem_anchor_token(T_else); + if (true_stmt->kind == STATEMENT_EMPTY) { + warningf(WARN_EMPTY_BODY, HERE, + "suggest braces around empty body in an ‘if’ statement"); + } + if (next_if(T_else)) { - statement->ifs.false_statement = parse_statement(); + statement->ifs.false_statement = parse_inner_statement(); + + if (statement->ifs.false_statement->kind == STATEMENT_EMPTY) { + warningf(WARN_EMPTY_BODY, HERE, + "suggest braces around empty body in an ‘if’ statement"); + } } else if (true_stmt->kind == STATEMENT_IF && true_stmt->ifs.false_statement != NULL) { source_position_t const *const pos = &true_stmt->base.source_position; @@ -9374,7 +9360,7 @@ static statement_t *parse_switch(void) type_t * type = skip_typeref(expr->base.type); if (is_type_integer(type)) { type = promote_integer(type); - if (get_rank(type) >= get_akind_rank(ATOMIC_TYPE_LONG)) { + if (get_akind_rank(get_akind(type)) >= get_akind_rank(ATOMIC_TYPE_LONG)) { warningf(WARN_TRADITIONAL, &expr->base.source_position, "'%T' switch expression not converted to '%T' in ISO C", type, type_int); } } else if (is_type_valid(type)) { @@ -9388,7 +9374,7 @@ static statement_t *parse_switch(void) switch_statement_t *rem = current_switch; current_switch = &statement->switchs; - statement->switchs.body = parse_statement(); + statement->switchs.body = parse_inner_statement(); current_switch = rem; if (statement->switchs.default_label == NULL) { @@ -9400,7 +9386,7 @@ static statement_t *parse_switch(void) return statement; end_error: POP_PARENT(); - return create_invalid_statement(); + return create_error_statement(); } static statement_t *parse_loop_body(statement_t *const loop) @@ -9408,7 +9394,7 @@ static statement_t *parse_loop_body(statement_t *const loop) statement_t *const rem = current_loop; current_loop = loop; - statement_t *const body = parse_statement(); + statement_t *const body = parse_inner_statement(); current_loop = rem; return body; @@ -9442,7 +9428,7 @@ static statement_t *parse_while(void) return statement; end_error: POP_PARENT(); - return create_invalid_statement(); + return create_error_statement(); } /** @@ -9477,7 +9463,7 @@ static statement_t *parse_do(void) return statement; end_error: POP_PARENT(); - return create_invalid_statement(); + return create_error_statement(); } /** @@ -9493,14 +9479,9 @@ static statement_t *parse_for(void) add_anchor_token(')'); PUSH_PARENT(statement); + PUSH_SCOPE(&statement->fors.scope); - size_t const top = environment_top(); - scope_t *old_scope = scope_push(&statement->fors.scope); - - bool old_gcc_extension = in_gcc_extension; - while (next_if(T___extension__)) { - in_gcc_extension = true; - } + PUSH_EXTENSION(); if (next_if(';')) { } else if (is_declaration_specifier(&token)) { @@ -9516,9 +9497,10 @@ static statement_t *parse_for(void) rem_anchor_token(';'); expect(';', end_error2); } - in_gcc_extension = old_gcc_extension; - if (token.type != ';') { + POP_EXTENSION(); + + if (token.kind != ';') { add_anchor_token(';'); expression_t *const cond = parse_expression(); statement->fors.condition = cond; @@ -9529,7 +9511,7 @@ static statement_t *parse_for(void) rem_anchor_token(';'); } expect(';', end_error2); - if (token.type != ')') { + if (token.kind != ')') { expression_t *const step = parse_expression(); statement->fors.step = step; mark_vars_read(step, ENT_ANY); @@ -9541,23 +9523,18 @@ static statement_t *parse_for(void) rem_anchor_token(')'); statement->fors.body = parse_loop_body(statement); - assert(current_scope == &statement->fors.scope); - scope_pop(old_scope); - environment_pop_to(top); - + POP_SCOPE(); POP_PARENT(); return statement; end_error2: POP_PARENT(); rem_anchor_token(')'); - assert(current_scope == &statement->fors.scope); - scope_pop(old_scope); - environment_pop_to(top); + POP_SCOPE(); /* fallthrough */ end_error1: - return create_invalid_statement(); + return create_error_statement(); } /** @@ -9587,7 +9564,7 @@ static statement_t *parse_goto(void) } statement->gotos.expression = expression; - } else if (token.type == T_IDENTIFIER) { + } else if (token.kind == T_IDENTIFIER) { label_t *const label = get_label(); label->used = true; statement->gotos.label = label; @@ -9597,7 +9574,7 @@ static statement_t *parse_goto(void) else parse_error_expected("while parsing goto", T_IDENTIFIER, NULL); eat_until_anchor(); - return create_invalid_statement(); + return create_error_statement(); } /* remember the goto's in a list for later checking */ @@ -9724,7 +9701,7 @@ static statement_t *parse_return(void) eat(T_return); expression_t *return_value = NULL; - if (token.type != ';') { + if (token.kind != ';') { return_value = parse_expression(); mark_vars_read(return_value, NULL); } @@ -9865,11 +9842,11 @@ static statement_t *parse_ms_try_statment(void) statement->ms_try.final_statement = parse_compound_statement(false); } else { parse_error_expected("while parsing __try statement", T___except, T___finally, NULL); - return create_invalid_statement(); + return create_error_statement(); } return statement; end_error: - return create_invalid_statement(); + return create_error_statement(); } static statement_t *parse_empty_statement(void) @@ -9890,12 +9867,12 @@ static statement_t *parse_local_label_declaration(void) entity_t *end = NULL; entity_t **anchor = &begin; do { - if (token.type != T_IDENTIFIER) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing local label declaration", T_IDENTIFIER, NULL); goto end_error; } - symbol_t *symbol = token.symbol; + symbol_t *symbol = token.identifier.symbol; entity_t *entity = get_entity(symbol, NAMESPACE_LABEL); if (entity != NULL && entity->base.parent_scope == current_scope) { source_position_t const *const ppos = &entity->base.source_position; @@ -9903,7 +9880,7 @@ static statement_t *parse_local_label_declaration(void) } else { entity = allocate_entity_zero(ENTITY_LOCAL_LABEL, NAMESPACE_LABEL, symbol); entity->base.parent_scope = current_scope; - entity->base.source_position = token.source_position; + entity->base.source_position = token.base.source_position; *anchor = entity; anchor = &entity->base.next; @@ -9927,8 +9904,8 @@ static void parse_namespace_definition(void) entity_t *entity = NULL; symbol_t *symbol = NULL; - if (token.type == T_IDENTIFIER) { - symbol = token.symbol; + if (token.kind == T_IDENTIFIER) { + symbol = token.identifier.symbol; next_token(); entity = get_entity(symbol, NAMESPACE_NORMAL); @@ -9936,7 +9913,7 @@ static void parse_namespace_definition(void) && entity->kind != ENTITY_NAMESPACE && entity->base.parent_scope == current_scope) { if (is_entity_valid(entity)) { - error_redefined_as_different_kind(&token.source_position, + error_redefined_as_different_kind(&token.base.source_position, entity, ENTITY_NAMESPACE); } entity = NULL; @@ -9945,11 +9922,11 @@ static void parse_namespace_definition(void) if (entity == NULL) { entity = allocate_entity_zero(ENTITY_NAMESPACE, NAMESPACE_NORMAL, symbol); - entity->base.source_position = token.source_position; + entity->base.source_position = token.base.source_position; entity->base.parent_scope = current_scope; } - if (token.type == '=') { + if (token.kind == '=') { /* TODO: parse namespace alias */ panic("namespace alias definition not supported yet"); } @@ -9957,8 +9934,7 @@ static void parse_namespace_definition(void) environment_push(entity); append_entity(current_scope, entity); - size_t const top = environment_top(); - scope_t *old_scope = scope_push(&entity->namespacee.members); + PUSH_SCOPE(&entity->namespacee.members); entity_t *old_current_entity = current_entity; current_entity = entity; @@ -9968,11 +9944,9 @@ static void parse_namespace_definition(void) expect('}', end_error); end_error: - assert(current_scope == &entity->namespacee.members); assert(current_entity == entity); current_entity = old_current_entity; - scope_pop(old_scope); - environment_pop_to(top); + POP_SCOPE(); } /** @@ -9986,12 +9960,12 @@ static statement_t *intern_parse_statement(void) /* declaration or statement */ add_anchor_token(';'); - switch (token.type) { + switch (token.kind) { case T_IDENTIFIER: { - token_type_t la1_type = (token_type_t)look_ahead(1)->type; + token_kind_t la1_type = (token_kind_t)look_ahead(1)->kind; if (la1_type == ':') { statement = parse_label_statement(); - } else if (is_typedef_symbol(token.symbol)) { + } else if (is_typedef_symbol(token.identifier.symbol)) { statement = parse_declaration_statement(); } else { /* it's an identifier, the grammar says this must be an @@ -10001,7 +9975,7 @@ static statement_t *intern_parse_statement(void) switch (la1_type) { case '&': case '*': - if (get_entity(token.symbol, NAMESPACE_NORMAL) != NULL) { + if (get_entity(token.identifier.symbol, NAMESPACE_NORMAL) != NULL) { default: statement = parse_expression_statement(); } else { @@ -10015,15 +9989,14 @@ static statement_t *intern_parse_statement(void) break; } - case T___extension__: + case T___extension__: { /* This can be a prefix to a declaration or an expression statement. * We simply eat it now and parse the rest with tail recursion. */ - while (next_if(T___extension__)) {} - bool old_gcc_extension = in_gcc_extension; - in_gcc_extension = true; + PUSH_EXTENSION(); statement = intern_parse_statement(); - in_gcc_extension = old_gcc_extension; + POP_EXTENSION(); break; + } DECLARATION_START statement = parse_declaration_statement(); @@ -10056,7 +10029,7 @@ static statement_t *intern_parse_statement(void) default: errorf(HERE, "unexpected token %K while parsing statement", &token); - statement = create_invalid_statement(); + statement = create_error_statement(); if (!at_anchor()) next_token(); break; @@ -10097,6 +10070,7 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) statement_t *statement = allocate_statement_zero(STATEMENT_COMPOUND); PUSH_PARENT(statement); + PUSH_SCOPE(&statement->compound.scope); eat('{'); add_anchor_token('}'); @@ -10189,19 +10163,16 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) add_anchor_token(T_wchar_t); add_anchor_token(T_while); - size_t const top = environment_top(); - scope_t *old_scope = scope_push(&statement->compound.scope); - statement_t **anchor = &statement->compound.statements; bool only_decls_so_far = true; - while (token.type != '}') { - if (token.type == T_EOF) { + while (token.kind != '}') { + if (token.kind == T_EOF) { errorf(&statement->base.source_position, "EOF while parsing compound statement"); break; } statement_t *sub_statement = intern_parse_statement(); - if (is_invalid_statement(sub_statement)) { + if (sub_statement->kind == STATEMENT_ERROR) { /* an error occurred. if we are at an anchor, return */ if (at_anchor()) goto end_error; @@ -10330,10 +10301,8 @@ end_error: rem_anchor_token('&'); rem_anchor_token('!'); rem_anchor_token('}'); - assert(current_scope == &statement->compound.scope); - scope_pop(old_scope); - environment_pop_to(top); + POP_SCOPE(); POP_PARENT(); return statement; } @@ -10402,13 +10371,13 @@ static void parse_linkage_specification(void) linkage_kind_t old_linkage = current_linkage; linkage_kind_t new_linkage; - if (strcmp(linkage, "C") == 0) { + if (streq(linkage, "C")) { new_linkage = LINKAGE_C; - } else if (strcmp(linkage, "C++") == 0) { + } else if (streq(linkage, "C++")) { new_linkage = LINKAGE_CXX; } else { errorf(&pos, "linkage string \"%s\" not recognized", linkage); - new_linkage = LINKAGE_INVALID; + new_linkage = LINKAGE_C; } current_linkage = new_linkage; @@ -10426,23 +10395,22 @@ end_error: static void parse_external(void) { - switch (token.type) { + switch (token.kind) { + case T_extern: + if (look_ahead(1)->kind == T_STRING_LITERAL) { + parse_linkage_specification(); + } else { DECLARATION_START_NO_EXTERN case T_IDENTIFIER: case T___extension__: /* 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; - - case T_extern: - if (look_ahead(1)->type == T_STRING_LITERAL) { - parse_linkage_specification(); - } else { + case '&': /* & x; -> int& x; (and error later, because C++ has no + implicit int) */ + case '*': /* * x; -> int* x; */ + case '(': /* (x); -> int (x); */ + PUSH_EXTENSION(); parse_external_declaration(); + POP_EXTENSION(); } return; @@ -10456,7 +10424,7 @@ static void parse_external(void) case ';': if (!strict_mode) { - warningf(WARN_OTHER, HERE, "stray ';' outside of function"); + warningf(WARN_STRAY_SEMICOLON, HERE, "stray ';' outside of function"); next_token(); return; } @@ -10464,8 +10432,8 @@ static void parse_external(void) default: errorf(HERE, "stray %K outside of function", &token); - if (token.type == '(' || token.type == '{' || token.type == '[') - eat_until_matching_token(token.type); + if (token.kind == '(' || token.kind == '{' || token.kind == '[') + eat_until_matching_token(token.kind); next_token(); return; } @@ -10478,14 +10446,14 @@ static void parse_externals(void) #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]; + unsigned short token_anchor_copy[T_LAST_TOKEN]; memcpy(token_anchor_copy, token_anchor_set, sizeof(token_anchor_copy)); #endif - while (token.type != T_EOF && token.type != '}') { + while (token.kind != T_EOF && token.kind != '}') { #ifndef NDEBUG for (int i = 0; i < T_LAST_TOKEN; ++i) { - unsigned char count = token_anchor_set[i] - token_anchor_copy[i]; + unsigned short count = token_anchor_set[i] - token_anchor_copy[i]; if (count != 0) { /* the anchor set and its copy differs */ internal_errorf(HERE, "Leaked anchor token %k %d times", i, count); @@ -10514,12 +10482,12 @@ static void parse_translation_unit(void) while (true) { parse_externals(); - if (token.type == T_EOF) + if (token.kind == T_EOF) break; errorf(HERE, "stray %K outside of function", &token); - if (token.type == '(' || token.type == '{' || token.type == '[') - eat_until_matching_token(token.type); + if (token.kind == '(' || token.kind == '{' || token.kind == '[') + eat_until_matching_token(token.kind); next_token(); } }