X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=d05f5c252a7cd22f7461e7c2d7b2e03875183122;hb=569c3410e7b645ac34e0a9a08ef5f0b068ecf606;hp=8378e7eeaa21b07d65f5280cfa5818b757ad53a3;hpb=7b8ed26efd05e59a7af0e7a56aa4b79b2d1b9051;p=cparser diff --git a/parser.c b/parser.c index 8378e7e..d05f5c2 100644 --- a/parser.c +++ b/parser.c @@ -38,6 +38,7 @@ #include "lang_features.h" #include "walk_statements.h" #include "warning.h" +#include "printer.h" #include "adt/bitfiddle.h" #include "adt/error.h" #include "adt/array.h" @@ -87,6 +88,7 @@ static scope_t *file_scope = NULL; 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; @@ -99,13 +101,14 @@ 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. */ +/** true if we are in a type property context (evaluation only for type) */ static bool in_type_prop = false; -/** true in we are in a __extension__ context. */ +/** true if we are in an __extension__ context. */ static bool in_gcc_extension = false; static struct obstack temp_obst; static entity_t *anonymous_entity; static declaration_t **incomplete_arrays; +static elf_visibility_tag_t default_visibility = ELF_VISIBILITY_DEFAULT; #define PUSH_PARENT(stmt) \ @@ -128,7 +131,7 @@ static unsigned char token_anchor_set[T_LAST_TOKEN]; static statement_t *parse_compound_statement(bool inside_expression_statement); static statement_t *parse_statement(void); -static expression_t *parse_sub_expression(precedence_t); +static expression_t *parse_subexpression(precedence_t); static expression_t *parse_expression(void); static type_t *parse_typename(void); static void parse_externals(void); @@ -149,13 +152,8 @@ typedef enum declarator_flags_t { static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, declarator_flags_t flags); -static entity_t *record_entity(entity_t *entity, bool is_definition); - static void semantic_comparison(binary_expression_t *expression); -static void create_gnu_builtins(void); -static void create_microsoft_intrinsics(void); - #define STORAGE_CLASSES \ STORAGE_CLASSES_NO_EXTERN \ case T_extern: @@ -221,100 +219,52 @@ static void create_microsoft_intrinsics(void); TYPE_QUALIFIERS \ TYPE_SPECIFIERS -#define EXPRESSION_START \ - case '!': \ - case '&': \ - case '(': \ - case '*': \ - case '+': \ - case '-': \ - case '~': \ - case T_ANDAND: \ - case T_CHARACTER_CONSTANT: \ - case T_FLOATINGPOINT: \ - case T_INTEGER: \ - case T_MINUSMINUS: \ - case T_PLUSPLUS: \ - case T_STRING_LITERAL: \ - case T_WIDE_CHARACTER_CONSTANT: \ - case T_WIDE_STRING_LITERAL: \ - case T___FUNCDNAME__: \ - case T___FUNCSIG__: \ - case T___FUNCTION__: \ - case T___PRETTY_FUNCTION__: \ - case T___alignof__: \ - case T___builtin_classify_type: \ - case T___builtin_constant_p: \ - case T___builtin_isgreater: \ - case T___builtin_isgreaterequal: \ - case T___builtin_isless: \ - case T___builtin_islessequal: \ - case T___builtin_islessgreater: \ - case T___builtin_isunordered: \ - case T___builtin_offsetof: \ - case T___builtin_va_arg: \ - case T___builtin_va_start: \ - case T___builtin_va_copy: \ - case T___func__: \ - case T___noop: \ - case T__assume: \ - case T_delete: \ - case T_false: \ - case T_sizeof: \ - case T_throw: \ +#define EXPRESSION_START \ + case '!': \ + case '&': \ + case '(': \ + case '*': \ + case '+': \ + case '-': \ + case '~': \ + case T_ANDAND: \ + case T_CHARACTER_CONSTANT: \ + case T_FLOATINGPOINT: \ + case T_FLOATINGPOINT_HEXADECIMAL: \ + case T_INTEGER: \ + case T_INTEGER_HEXADECIMAL: \ + case T_INTEGER_OCTAL: \ + case T_MINUSMINUS: \ + case T_PLUSPLUS: \ + case T_STRING_LITERAL: \ + case T_WIDE_CHARACTER_CONSTANT: \ + case T_WIDE_STRING_LITERAL: \ + case T___FUNCDNAME__: \ + case T___FUNCSIG__: \ + case T___FUNCTION__: \ + case T___PRETTY_FUNCTION__: \ + case T___alignof__: \ + case T___builtin_classify_type: \ + case T___builtin_constant_p: \ + case T___builtin_isgreater: \ + case T___builtin_isgreaterequal: \ + case T___builtin_isless: \ + case T___builtin_islessequal: \ + case T___builtin_islessgreater: \ + case T___builtin_isunordered: \ + case T___builtin_offsetof: \ + case T___builtin_va_arg: \ + case T___builtin_va_copy: \ + case T___builtin_va_start: \ + case T___func__: \ + case T___noop: \ + case T__assume: \ + case T_delete: \ + case T_false: \ + case T_sizeof: \ + case T_throw: \ case T_true: -/** - * Allocate an AST node with given size and - * initialize all fields with zero. - */ -static void *allocate_ast_zero(size_t size) -{ - void *res = allocate_ast(size); - memset(res, 0, size); - return res; -} - -/** - * Returns the size of an entity node. - * - * @param kind the entity kind - */ -static size_t get_entity_struct_size(entity_kind_t kind) -{ - static const size_t sizes[] = { - [ENTITY_VARIABLE] = sizeof(variable_t), - [ENTITY_PARAMETER] = sizeof(parameter_t), - [ENTITY_COMPOUND_MEMBER] = sizeof(compound_member_t), - [ENTITY_FUNCTION] = sizeof(function_t), - [ENTITY_TYPEDEF] = sizeof(typedef_t), - [ENTITY_STRUCT] = sizeof(compound_t), - [ENTITY_UNION] = sizeof(compound_t), - [ENTITY_ENUM] = sizeof(enum_t), - [ENTITY_ENUM_VALUE] = sizeof(enum_value_t), - [ENTITY_LABEL] = sizeof(label_t), - [ENTITY_LOCAL_LABEL] = sizeof(label_t), - [ENTITY_NAMESPACE] = sizeof(namespace_t) - }; - assert(kind < lengthof(sizes)); - assert(sizes[kind] != 0); - return sizes[kind]; -} - -/** - * Allocate an entity of given kind and initialize all - * fields with zero. - * - * @param kind the kind of the entity to allocate - */ -static entity_t *allocate_entity_zero(entity_kind_t kind) -{ - size_t size = get_entity_struct_size(kind); - entity_t *entity = allocate_ast_zero(size); - entity->kind = kind; - return entity; -} - /** * Returns the size of a statement node. * @@ -359,11 +309,16 @@ static size_t get_expression_struct_size(expression_kind_t kind) [EXPR_INVALID] = sizeof(expression_base_t), [EXPR_REFERENCE] = sizeof(reference_expression_t), [EXPR_REFERENCE_ENUM_VALUE] = sizeof(reference_expression_t), - [EXPR_CONST] = sizeof(const_expression_t), - [EXPR_CHARACTER_CONSTANT] = sizeof(const_expression_t), - [EXPR_WIDE_CHARACTER_CONSTANT] = sizeof(const_expression_t), + [EXPR_LITERAL_BOOLEAN] = sizeof(literal_expression_t), + [EXPR_LITERAL_INTEGER] = sizeof(literal_expression_t), + [EXPR_LITERAL_INTEGER_OCTAL] = sizeof(literal_expression_t), + [EXPR_LITERAL_INTEGER_HEXADECIMAL]= sizeof(literal_expression_t), + [EXPR_LITERAL_FLOATINGPOINT] = sizeof(literal_expression_t), + [EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL] = sizeof(literal_expression_t), + [EXPR_LITERAL_CHARACTER] = sizeof(literal_expression_t), + [EXPR_LITERAL_WIDE_CHARACTER] = sizeof(literal_expression_t), [EXPR_STRING_LITERAL] = sizeof(string_literal_expression_t), - [EXPR_WIDE_STRING_LITERAL] = sizeof(wide_string_literal_expression_t), + [EXPR_WIDE_STRING_LITERAL] = sizeof(string_literal_expression_t), [EXPR_COMPOUND_LITERAL] = sizeof(compound_literal_expression_t), [EXPR_CALL] = sizeof(call_expression_t), [EXPR_UNARY_FIRST] = sizeof(unary_expression_t), @@ -453,53 +408,10 @@ static statement_t *create_empty_statement(void) return allocate_statement_zero(STATEMENT_EMPTY); } -/** - * Returns the size of a type node. - * - * @param kind the type kind - */ -static size_t get_type_struct_size(type_kind_t kind) -{ - static const size_t sizes[] = { - [TYPE_ATOMIC] = sizeof(atomic_type_t), - [TYPE_COMPLEX] = sizeof(complex_type_t), - [TYPE_IMAGINARY] = sizeof(imaginary_type_t), - [TYPE_BITFIELD] = sizeof(bitfield_type_t), - [TYPE_COMPOUND_STRUCT] = sizeof(compound_type_t), - [TYPE_COMPOUND_UNION] = sizeof(compound_type_t), - [TYPE_ENUM] = sizeof(enum_type_t), - [TYPE_FUNCTION] = sizeof(function_type_t), - [TYPE_POINTER] = sizeof(pointer_type_t), - [TYPE_ARRAY] = sizeof(array_type_t), - [TYPE_BUILTIN] = sizeof(builtin_type_t), - [TYPE_TYPEDEF] = sizeof(typedef_type_t), - [TYPE_TYPEOF] = sizeof(typeof_type_t), - }; - assert(lengthof(sizes) == (int)TYPE_TYPEOF + 1); - assert(kind <= TYPE_TYPEOF); - assert(sizes[kind] != 0); - return sizes[kind]; -} - -/** - * Allocate a type node of given kind and initialize all - * fields with zero. - * - * @param kind type kind to allocate - */ -static type_t *allocate_type_zero(type_kind_t kind) -{ - size_t size = get_type_struct_size(kind); - type_t *res = obstack_alloc(type_obst, size); - memset(res, 0, size); - res->base.kind = kind; - - return res; -} - static function_parameter_t *allocate_parameter(type_t *const type) { - function_parameter_t *const param = obstack_alloc(type_obst, sizeof(*param)); + function_parameter_t *const param + = obstack_alloc(type_obst, sizeof(*param)); memset(param, 0, sizeof(*param)); param->type = type; return param; @@ -569,6 +481,16 @@ static inline void next_token(void) #endif } +static inline bool next_if(int const type) +{ + if (token.type == type) { + next_token(); + return true; + } else { + return false; + } +} + /** * Return the next token with a given lookahead. */ @@ -702,8 +624,7 @@ static void eat_until_anchor(void) static void eat_block(void) { eat_until_matching_token('{'); - if (token.type == '}') - next_token(); + next_if('}'); } #define eat(token_type) (assert(token.type == (token_type)), next_token()) @@ -739,7 +660,7 @@ static void type_error_incompatible(const char *msg, /** * Expect the current token is the expected token. * If not, generate an error, eat the current statement, - * and goto the end_error label. + * and goto the error_label label. */ #define expect(expected, error_label) \ do { \ @@ -747,8 +668,7 @@ static void type_error_incompatible(const char *msg, parse_error_expected(NULL, (expected), NULL); \ add_anchor_token(expected); \ eat_until_anchor(); \ - if (token.type == expected) \ - next_token(); \ + next_if((expected)); \ rem_anchor_token(expected); \ goto error_label; \ } \ @@ -784,6 +704,7 @@ static void scope_pop(scope_t *old_scope) static entity_t *get_entity(const symbol_t *const symbol, namespace_tag_t namespc) { + assert(namespc != NAMESPACE_INVALID); entity_t *entity = symbol->entity; for (; entity != NULL; entity = entity->base.symbol_next) { if (entity->base.namespc == namespc) @@ -905,7 +826,7 @@ static void stack_pop_to(stack_entry_t **stack_ptr, size_t new_top) } } - ARR_SHRINKLEN(*stack_ptr, (int) new_top); + ARR_SHRINKLEN(*stack_ptr, new_top); } /** @@ -998,10 +919,13 @@ static bool is_null_pointer_constant(const expression_t *expression) } type_t *const type = skip_typeref(expression->base.type); - return - is_type_integer(type) && - is_constant_expression(expression) && - !fold_constant_to_bool(expression); + if (!is_type_integer(type)) + return false; + switch (is_constant_expression(expression)) { + case EXPR_CLASS_ERROR: return true; + case EXPR_CLASS_CONSTANT: return !fold_constant_to_bool(expression); + default: return false; + } } /** @@ -1137,11 +1061,10 @@ static assign_error_t semantic_assign(type_t *orig_type_left, return ASSIGN_WARNING_POINTER_FROM_INT; } } else if ((is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) || - (is_type_atomic(type_left, ATOMIC_TYPE_BOOL) - && is_type_pointer(type_right))) { + (is_type_atomic(type_left, ATOMIC_TYPE_BOOL) + && is_type_pointer(type_right))) { return ASSIGN_SUCCESS; - } else if ((is_type_compound(type_left) && is_type_compound(type_right)) - || (is_type_builtin(type_left) && is_type_builtin(type_right))) { + } else if (is_type_compound(type_left) && is_type_compound(type_right)) { type_t *const unqual_type_left = get_unqualified_type(type_left); type_t *const unqual_type_right = get_unqualified_type(type_right); if (types_compatible(unqual_type_left, unqual_type_right)) { @@ -1159,9 +1082,9 @@ static assign_error_t semantic_assign(type_t *orig_type_left, static expression_t *parse_constant_expression(void) { - expression_t *result = parse_sub_expression(PREC_CONDITIONAL); + expression_t *result = parse_subexpression(PREC_CONDITIONAL); - if (!is_constant_expression(result)) { + if (is_constant_expression(result) == EXPR_CLASS_VARIABLE) { errorf(&result->base.source_position, "expression '%E' is not constant", result); } @@ -1171,18 +1094,26 @@ static expression_t *parse_constant_expression(void) static expression_t *parse_assignment_expression(void) { - return parse_sub_expression(PREC_ASSIGNMENT); + return parse_subexpression(PREC_ASSIGNMENT); +} + +static void warn_string_concat(const source_position_t *pos) +{ + if (warning.traditional) { + warningf(pos, "traditional C rejects string constant concatenation"); + } } static string_t parse_string_literals(void) { assert(token.type == T_STRING_LITERAL); - string_t result = token.v.string; + string_t result = token.literal; next_token(); while (token.type == T_STRING_LITERAL) { - result = concat_strings(&result, &token.v.string); + warn_string_concat(&token.source_position); + result = concat_strings(&result, &token.literal); next_token(); } @@ -1242,18 +1173,15 @@ static attribute_t *allocate_attribute_zero(attribute_kind_t kind) */ static attribute_argument_t *parse_attribute_arguments(void) { - if (token.type == ')') - return NULL; - - attribute_argument_t *first = NULL; - attribute_argument_t *last = NULL; - while (true) { + attribute_argument_t *first = NULL; + attribute_argument_t **anchor = &first; + if (token.type != ')') 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.v.symbol; + symbol_t *symbol = token.symbol; argument->kind = ATTRIBUTE_ARGUMENT_SYMBOL; argument->v.symbol = symbol; next_token(); @@ -1266,20 +1194,10 @@ static attribute_argument_t *parse_attribute_arguments(void) } /* append argument */ - if (last == NULL) { - first = argument; - } else { - last->next = argument; - } - last = argument; - - if (token.type == ',') { - next_token(); - continue; - } - expect(')', end_error); - break; - } + *anchor = argument; + anchor = &argument->next; + } while (next_if(',')); + expect(')', end_error); return first; @@ -1306,7 +1224,7 @@ static symbol_t *get_symbol_from_token(void) { switch(token.type) { case T_IDENTIFIER: - return token.v.symbol; + return token.symbol; case T_auto: case T_char: case T_double: @@ -1348,75 +1266,56 @@ static attribute_t *parse_attribute_gnu_single(void) symbol_t *symbol = get_symbol_from_token(); if (symbol == NULL) { parse_error_expected("while parsing attribute((", T_IDENTIFIER, NULL); - goto end_error; + return NULL; } - const char *name = symbol->string; - next_token(); + attribute_kind_t kind; + char const *const name = symbol->string; + for (kind = ATTRIBUTE_GNU_FIRST;; ++kind) { + if (kind > ATTRIBUTE_GNU_LAST) { + if (warning.attribute) { + warningf(HERE, "unknown attribute '%s' ignored", name); + } + /* TODO: we should still save the attribute in the list... */ + kind = ATTRIBUTE_UNKNOWN; + break; + } - attribute_kind_t kind; - for (kind = ATTRIBUTE_GNU_FIRST; kind <= ATTRIBUTE_GNU_LAST; ++kind) { const char *attribute_name = get_attribute_name(kind); if (attribute_name != NULL && strcmp_underscore(attribute_name, name) == 0) break; } - if (kind >= ATTRIBUTE_GNU_LAST) { - if (warning.attribute) { - warningf(HERE, "unknown attribute '%s' ignored", name); - } - /* TODO: we should still save the attribute in the list... */ - kind = ATTRIBUTE_UNKNOWN; - } + next_token(); attribute_t *attribute = allocate_attribute_zero(kind); /* parse arguments */ - if (token.type == '(') { - next_token(); + if (next_if('(')) attribute->a.arguments = parse_attribute_arguments(); - } return attribute; - -end_error: - return NULL; } static attribute_t *parse_attribute_gnu(void) { - attribute_t *first = NULL; - attribute_t *last = NULL; + attribute_t *first = NULL; + attribute_t **anchor = &first; eat(T___attribute__); expect('(', end_error); expect('(', end_error); - if (token.type == ')') { - next_token(); - expect(')', end_error); - return first; - } - - while (true) { + if (token.type != ')') do { attribute_t *attribute = parse_attribute_gnu_single(); if (attribute == NULL) goto end_error; - if (last == NULL) { - first = attribute; - } else { - last->next = attribute; - } - last = attribute; - - if (token.type == ')') { - next_token(); - break; - } - expect(',', end_error); - } + *anchor = attribute; + anchor = &attribute->next; + } while (next_if(',')); + expect(')', end_error); expect(')', end_error); end_error: @@ -1426,17 +1325,17 @@ end_error: /** Parse attributes. */ static attribute_t *parse_attributes(attribute_t *first) { - attribute_t *last = first; - while (true) { - if (last != NULL) { - while (last->next != NULL) - last = last->next; - } + attribute_t **anchor = &first; + for (;;) { + while (*anchor != NULL) + anchor = &(*anchor)->next; attribute_t *attribute; switch (token.type) { case T___attribute__: attribute = parse_attribute_gnu(); + if (attribute == NULL) + continue; break; case T_asm: @@ -1464,10 +1363,10 @@ static attribute_t *parse_attributes(attribute_t *first) break; case T___thiscall: - next_token(); /* TODO record modifier */ if (warning.other) warningf(HERE, "Ignoring declaration modifier %K", &token); + eat(T___thiscall); attribute = allocate_attribute_zero(ATTRIBUTE_MS_THISCALL); break; @@ -1475,12 +1374,8 @@ static attribute_t *parse_attributes(attribute_t *first) return first; } - if (last == NULL) { - first = attribute; - } else { - last->next = attribute; - } - last = attribute; + *anchor = attribute; + anchor = &attribute->next; } } @@ -1695,11 +1590,9 @@ unary: determine_lhs_ent(expr->va_starte.ap, lhs_ent); return; + EXPR_LITERAL_CASES case EXPR_UNKNOWN: case EXPR_INVALID: - case EXPR_CONST: - case EXPR_CHARACTER_CONSTANT: - case EXPR_WIDE_CHARACTER_CONSTANT: case EXPR_STRING_LITERAL: case EXPR_WIDE_STRING_LITERAL: case EXPR_COMPOUND_LITERAL: // TODO init? @@ -1721,10 +1614,10 @@ unary: static designator_t *parse_designation(void) { - designator_t *result = NULL; - designator_t *last = NULL; + designator_t *result = NULL; + designator_t **anchor = &result; - while (true) { + for (;;) { designator_t *designator; switch (token.type) { case '[': @@ -1745,7 +1638,7 @@ static designator_t *parse_designation(void) T_IDENTIFIER, NULL); return NULL; } - designator->symbol = token.v.symbol; + designator->symbol = token.symbol; next_token(); break; default: @@ -1754,18 +1647,14 @@ static designator_t *parse_designation(void) } assert(designator != NULL); - if (last != NULL) { - last->next = designator; - } else { - result = designator; - } - last = designator; + *anchor = designator; + anchor = &designator->next; } end_error: return NULL; } -static initializer_t *initializer_from_string(array_type_t *type, +static initializer_t *initializer_from_string(array_type_t *const type, const string_t *const string) { /* TODO: check len vs. size of array type */ @@ -1778,7 +1667,7 @@ static initializer_t *initializer_from_string(array_type_t *type, } static initializer_t *initializer_from_wide_string(array_type_t *const type, - wide_string_t *const string) + const string_t *const string) { /* TODO: check len vs. size of array type */ (void) type; @@ -1802,6 +1691,7 @@ static initializer_t *initializer_from_expression(type_t *orig_type, type_t *type = skip_typeref(orig_type); type_t *expr_type_orig = expression->base.type; type_t *expr_type = skip_typeref(expr_type_orig); + if (is_type_array(type) && expr_type->kind == TYPE_POINTER) { array_type_t *const array_type = &type->array; type_t *const element_type = skip_typeref(array_type->element_type); @@ -1809,26 +1699,26 @@ static initializer_t *initializer_from_expression(type_t *orig_type, if (element_type->kind == TYPE_ATOMIC) { atomic_type_kind_t akind = element_type->atomic.akind; switch (expression->kind) { - case EXPR_STRING_LITERAL: - if (akind == ATOMIC_TYPE_CHAR - || akind == ATOMIC_TYPE_SCHAR - || akind == ATOMIC_TYPE_UCHAR) { - return initializer_from_string(array_type, - &expression->string.value); - } - break; + case EXPR_STRING_LITERAL: + if (akind == ATOMIC_TYPE_CHAR + || akind == ATOMIC_TYPE_SCHAR + || akind == ATOMIC_TYPE_UCHAR) { + return initializer_from_string(array_type, + &expression->string_literal.value); + } + break; - case EXPR_WIDE_STRING_LITERAL: { - type_t *bare_wchar_type = skip_typeref(type_wchar_t); - if (get_unqualified_type(element_type) == bare_wchar_type) { - return initializer_from_wide_string(array_type, - &expression->wide_string.value); - } - break; + case EXPR_WIDE_STRING_LITERAL: { + type_t *bare_wchar_type = skip_typeref(type_wchar_t); + if (get_unqualified_type(element_type) == bare_wchar_type) { + return initializer_from_wide_string(array_type, + &expression->string_literal.value); } + break; + } - default: - break; + default: + break; } } } @@ -1850,8 +1740,9 @@ static initializer_t *initializer_from_expression(type_t *orig_type, */ static bool is_initializer_constant(const expression_t *expression) { - return is_constant_expression(expression) - || is_address_constant(expression); + return + is_constant_expression(expression) != EXPR_CLASS_VARIABLE || + is_address_constant(expression) != EXPR_CLASS_VARIABLE; } /** @@ -1868,8 +1759,8 @@ static initializer_t *parse_scalar_initializer(type_t *type, if (warning.other) warningf(HERE, "extra curly braces around scalar initializer"); do { + eat('{'); ++braces; - next_token(); } while (token.type == '{'); } @@ -1893,9 +1784,7 @@ static initializer_t *parse_scalar_initializer(type_t *type, bool additional_warning_displayed = false; while (braces > 0) { - if (token.type == ',') { - next_token(); - } + next_if(','); if (token.type != '}') { if (!additional_warning_displayed && warning.other) { warningf(HERE, "additional elements in scalar initializer"); @@ -2078,16 +1967,16 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, if (iter == NULL) { errorf(&designator->source_position, "'%T' has no member named '%Y'", orig_type, symbol); - goto failed; + return false; } assert(iter->kind == ENTITY_COMPOUND_MEMBER); if (used_in_offsetof) { type_t *real_type = skip_typeref(iter->declaration.type); if (real_type->kind == TYPE_BITFIELD) { errorf(&designator->source_position, - "offsetof designator '%Y' may not specify bitfield", + "offsetof designator '%Y' must not specify bitfield", symbol); - goto failed; + return false; } } @@ -2105,7 +1994,7 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, "[%E] designator used for non-array type '%T'", array_index, orig_type); } - goto failed; + return false; } long index = fold_constant_to_int(array_index); @@ -2117,8 +2006,8 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, long array_size = type->array.size; if (index >= array_size) { errorf(&designator->source_position, - "designator [%E] (%d) exceeds array size %d", - array_index, index, array_size); + "designator [%E] (%d) exceeds array size %d", + array_index, index, array_size); } } } @@ -2134,9 +2023,6 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, } } return true; - -failed: - return false; } static void advance_current_object(type_path_t *path, size_t top_path_level) @@ -2193,8 +2079,7 @@ static void advance_current_object(type_path_t *path, size_t top_path_level) */ static void skip_initializers(void) { - if (token.type == '{') - next_token(); + next_if('{'); while (token.type != '}') { if (token.type == T_EOF) @@ -2246,7 +2131,7 @@ static initializer_t *parse_sub_initializer(type_path_t *path, /* GNU-style designator ("identifier: value") */ designator = allocate_ast_zero(sizeof(designator[0])); designator->source_position = token.source_position; - designator->symbol = token.v.symbol; + designator->symbol = token.symbol; eat(T_IDENTIFIER); eat(':'); @@ -2273,7 +2158,6 @@ finish_designator: if (type != NULL && is_type_scalar(type)) { sub = parse_scalar_initializer(type, env->must_be_constant); } else { - eat('{'); if (type == NULL) { if (env->entity != NULL) { errorf(HERE, @@ -2282,8 +2166,11 @@ finish_designator: } else { errorf(HERE, "extra brace group at end of initializer"); } - } else + eat('{'); + } else { + eat('{'); descend_into_subtype(path); + } add_anchor_token('}'); sub = parse_sub_initializer(path, orig_type, top_path_level+1, @@ -2311,12 +2198,23 @@ finish_designator: if (type == NULL) { /* we are already outside, ... */ + if (outer_type == NULL) + goto error_parse_next; type_t *const outer_type_skip = skip_typeref(outer_type); if (is_type_compound(outer_type_skip) && - !outer_type_skip->compound.compound->complete) { + !outer_type_skip->compound.compound->complete) { goto error_parse_next; } - goto error_excess; + + if (warning.other) { + source_position_t const* const pos = &expression->base.source_position; + if (env->entity != NULL) { + warningf(pos, "excess elements in initializer for '%Y'", env->entity->base.symbol); + } else { + warningf(pos, "excess elements in initializer"); + } + } + goto error_parse_next; } /* handle { "string" } special case */ @@ -2325,9 +2223,7 @@ finish_designator: && outer_type != NULL) { sub = initializer_from_expression(outer_type, expression); if (sub != NULL) { - if (token.type == ',') { - next_token(); - } + next_if(','); if (token.type != '}' && warning.other) { warningf(HERE, "excessive elements in initializer for type '%T'", orig_type); @@ -2370,20 +2266,8 @@ finish_designator: path->max_index = index; } - if (type != NULL) { - /* append to initializers list */ - ARR_APP1(initializer_t*, initializers, sub); - } else { -error_excess: - if (warning.other) { - if (env->entity != NULL) { - warningf(HERE, "excess elements in initializer for '%Y'", - env->entity->base.symbol); - } else { - warningf(HERE, "excess elements in initializer"); - } - } - } + /* append to initializers list */ + ARR_APP1(initializer_t*, initializers, sub); error_parse_next: if (token.type == '}') { @@ -2425,6 +2309,18 @@ end_error: return NULL; } +static expression_t *make_size_literal(size_t value) +{ + expression_t *literal = allocate_expression_zero(EXPR_LITERAL_INTEGER); + literal->base.type = type_size_t; + + char buf[128]; + snprintf(buf, sizeof(buf), "%u", (unsigned) value); + literal->literal.value = make_string(buf); + + return literal; +} + /** * Parses an initializer. Parsers either a compound literal * (env->declaration == NULL) or an initializer of a declaration. @@ -2432,7 +2328,7 @@ end_error: static initializer_t *parse_initializer(parse_initializer_env_t *env) { type_t *type = skip_typeref(env->type); - size_t max_index = 0xdeadbeaf; // TODO: Resolve this uninitialized variable problem + size_t max_index = 0; initializer_t *result; if (is_type_scalar(type)) { @@ -2455,6 +2351,7 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env) DEL_ARR_F(path.path); expect('}', end_error); +end_error:; } else { /* parse_scalar_initializer() also works in this case: we simply * have an expression without {} around it */ @@ -2490,13 +2387,9 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env) internal_errorf(HERE, "invalid initializer type"); } - expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->base.type = type_size_t; - cnst->conste.v.int_value = size; - type_t *new_type = duplicate_type(type); - new_type->array.size_expression = cnst; + new_type->array.size_expression = make_size_literal(size); new_type->array.size_constant = true; new_type->array.has_implicit_size = true; new_type->array.size = size; @@ -2504,8 +2397,6 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env) } return result; -end_error: - return NULL; } static void append_entity(scope_t *scope, entity_t *entity) @@ -2515,16 +2406,18 @@ static void append_entity(scope_t *scope, entity_t *entity) } else { scope->entities = entity; } - scope->last_entity = entity; + entity->base.parent_entity = current_entity; + scope->last_entity = entity; } static compound_t *parse_compound_type_specifier(bool is_struct) { + source_position_t const pos = *HERE; eat(is_struct ? T_struct : T_union); - symbol_t *symbol = NULL; - compound_t *compound = NULL; + symbol_t *symbol = NULL; + entity_t *entity = NULL; attribute_t *attributes = NULL; if (token.type == T___attribute__) { @@ -2534,47 +2427,38 @@ static compound_t *parse_compound_type_specifier(bool is_struct) entity_kind_tag_t const kind = is_struct ? ENTITY_STRUCT : ENTITY_UNION; if (token.type == T_IDENTIFIER) { /* the compound has a name, check if we have seen it already */ - symbol = token.v.symbol; + symbol = token.symbol; + entity = get_tag(symbol, kind); next_token(); - entity_t *entity = get_tag(symbol, kind); if (entity != NULL) { - compound = &entity->compound; - if (compound->base.parent_scope != current_scope && + if (entity->base.parent_scope != current_scope && (token.type == '{' || token.type == ';')) { /* we're in an inner scope and have a definition. Shadow * existing definition in outer scope */ - compound = NULL; - } else if (compound->complete && token.type == '{') { - assert(symbol != NULL); - errorf(HERE, "multiple definitions of '%s %Y' (previous definition %P)", + entity = NULL; + } else if (entity->compound.complete && token.type == '{') { + errorf(&pos, "multiple definitions of '%s %Y' (previous definition %P)", is_struct ? "struct" : "union", symbol, - &compound->base.source_position); + &entity->base.source_position); /* clear members in the hope to avoid further errors */ - compound->members.entities = NULL; + entity->compound.members.entities = NULL; } } } else if (token.type != '{') { - if (is_struct) { - parse_error_expected("while parsing struct type specifier", - T_IDENTIFIER, '{', NULL); - } else { - parse_error_expected("while parsing union type specifier", - T_IDENTIFIER, '{', NULL); - } + char const *const msg = + is_struct ? "while parsing struct type specifier" : + "while parsing union type specifier"; + parse_error_expected(msg, T_IDENTIFIER, '{', NULL); return NULL; } - if (compound == NULL) { - entity_t *entity = allocate_entity_zero(kind); - compound = &entity->compound; - - compound->alignment = 1; - compound->base.namespc = NAMESPACE_TAG; - compound->base.source_position = token.source_position; - compound->base.symbol = symbol; - compound->base.parent_scope = current_scope; + if (entity == NULL) { + entity = allocate_entity_zero(kind, NAMESPACE_TAG, symbol); + entity->compound.alignment = 1; + entity->base.source_position = pos; + entity->base.parent_scope = current_scope; if (symbol != NULL) { environment_push(entity); } @@ -2582,20 +2466,20 @@ static compound_t *parse_compound_type_specifier(bool is_struct) } if (token.type == '{') { - parse_compound_type_entries(compound); + parse_compound_type_entries(&entity->compound); /* ISO/IEC 14882:1998(E) §7.1.3:5 */ if (symbol == NULL) { assert(anonymous_entity == NULL); - anonymous_entity = (entity_t*)compound; + anonymous_entity = entity; } } if (attributes != NULL) { - handle_entity_attributes(attributes, (entity_t*) compound); + handle_entity_attributes(attributes, entity); } - return compound; + return &entity->compound; } static void parse_enum_entries(type_t *const enum_type) @@ -2617,14 +2501,12 @@ static void parse_enum_entries(type_t *const enum_type) return; } - entity_t *entity = allocate_entity_zero(ENTITY_ENUM_VALUE); + entity_t *const entity = allocate_entity_zero(ENTITY_ENUM_VALUE, NAMESPACE_NORMAL, token.symbol); entity->enum_value.enum_type = enum_type; - entity->base.symbol = token.v.symbol; entity->base.source_position = token.source_position; next_token(); - if (token.type == '=') { - next_token(); + if (next_if('=')) { expression_t *value = parse_constant_expression(); value = create_implicit_cast(value, enum_type); @@ -2634,11 +2516,7 @@ static void parse_enum_entries(type_t *const enum_type) } record_entity(entity, false); - - if (token.type != ',') - break; - next_token(); - } while (token.type != '}'); + } while (next_if(',') && token.type != '}'); rem_anchor_token('}'); expect('}', end_error); @@ -2649,40 +2527,44 @@ end_error: static type_t *parse_enum_specifier(void) { - entity_t *entity; - symbol_t *symbol; + source_position_t const pos = *HERE; + entity_t *entity; + symbol_t *symbol; eat(T_enum); - if (token.type == T_IDENTIFIER) { - symbol = token.v.symbol; - next_token(); + switch (token.type) { + case T_IDENTIFIER: + symbol = token.symbol; + entity = get_tag(symbol, ENTITY_ENUM); + next_token(); - entity = get_tag(symbol, ENTITY_ENUM); - if (entity != NULL) { - if (entity->base.parent_scope != current_scope && - (token.type == '{' || token.type == ';')) { - /* 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 == '{') { - errorf(HERE, "multiple definitions of 'enum %Y' (previous definition %P)", - symbol, &entity->base.source_position); + if (entity != NULL) { + if (entity->base.parent_scope != current_scope && + (token.type == '{' || token.type == ';')) { + /* we're in an inner scope and have a definition. Shadow + * existing definition in outer scope */ + entity = NULL; + } else if (entity->enume.complete && token.type == '{') { + errorf(&pos, "multiple definitions of 'enum %Y' (previous definition %P)", + symbol, &entity->base.source_position); + } } - } - } else if (token.type != '{') { - parse_error_expected("while parsing enum type specifier", - T_IDENTIFIER, '{', NULL); - return NULL; - } else { - entity = NULL; - symbol = NULL; + break; + + case '{': + entity = NULL; + symbol = NULL; + break; + + default: + parse_error_expected("while parsing enum type specifier", + T_IDENTIFIER, '{', NULL); + return NULL; } if (entity == NULL) { - entity = allocate_entity_zero(ENTITY_ENUM); - entity->base.namespc = NAMESPACE_TAG; - entity->base.source_position = token.source_position; - entity->base.symbol = symbol; + entity = allocate_entity_zero(ENTITY_ENUM, NAMESPACE_TAG, symbol); + entity->base.source_position = pos; entity->base.parent_scope = current_scope; } @@ -2706,8 +2588,7 @@ static type_t *parse_enum_specifier(void) anonymous_entity = entity; } } else if (!entity->enume.complete && !(c_mode & _GNUC)) { - errorf(HERE, "'enum %Y' used before definition (incomplete enums are a GNU extension)", - symbol); + errorf(HERE, "'%T' used before definition (incomplete enums are a GNU extension)", type); } return type; @@ -2737,29 +2618,21 @@ static type_t *parse_typeof(void) bool old_gcc_extension = in_gcc_extension; in_type_prop = true; - while (token.type == T___extension__) { + while (next_if(T___extension__)) { /* This can be a prefix to a typename or an expression. */ - next_token(); in_gcc_extension = true; } switch (token.type) { case T_IDENTIFIER: - if (is_typedef_symbol(token.v.symbol)) { + if (is_typedef_symbol(token.symbol)) { + TYPENAME_START type = parse_typename(); } else { + default: expression = parse_expression(); type = revert_automatic_type_conversion(expression); } break; - - TYPENAME_START - type = parse_typename(); - break; - - default: - expression = parse_expression(); - type = expression->base.type; - break; } in_type_prop = old_type_prop; in_gcc_extension = old_gcc_extension; @@ -2798,15 +2671,6 @@ typedef enum specifiers_t { SPECIFIER_IMAGINARY = 1 << 18, } specifiers_t; -static type_t *create_builtin_type(symbol_t *const symbol, - type_t *const real_type) -{ - type_t *type = allocate_type_zero(TYPE_BUILTIN); - type->builtin.symbol = symbol; - type->builtin.real_type = real_type; - return identify_new_type(type); -} - static type_t *get_typedef_type(symbol_t *symbol) { entity_t *entity = get_entity(symbol, NAMESPACE_NORMAL); @@ -2826,40 +2690,34 @@ static attribute_t *parse_attribute_ms_property(attribute_t *attribute) attribute_property_argument_t *property = allocate_ast_zero(sizeof(*property)); - while (true) { + do { if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing property declspec", T_IDENTIFIER, NULL); goto end_error; } - bool is_put; - symbol_t *symbol = token.v.symbol; - next_token(); + symbol_t **prop; + symbol_t *symbol = token.symbol; if (strcmp(symbol->string, "put") == 0) { - is_put = true; + prop = &property->put_symbol; } else if (strcmp(symbol->string, "get") == 0) { - is_put = false; + prop = &property->get_symbol; } else { errorf(HERE, "expected put or get in property declspec"); - goto end_error; + prop = NULL; } + eat(T_IDENTIFIER); expect('=', end_error); if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing property declspec", T_IDENTIFIER, NULL); goto end_error; } - if (is_put) { - property->put_symbol = token.v.symbol; - } else { - property->get_symbol = token.v.symbol; - } + if (prop != NULL) + *prop = token.symbol; next_token(); - if (token.type == ')') - break; - expect(',', end_error); - } + } while (next_if(',')); attribute->a.property = property; @@ -2872,12 +2730,10 @@ end_error: static attribute_t *parse_microsoft_extended_decl_modifier_single(void) { attribute_kind_t kind = ATTRIBUTE_UNKNOWN; - if (token.type == T_restrict) { + if (next_if(T_restrict)) { kind = ATTRIBUTE_MS_RESTRICT; - next_token(); } else if (token.type == T_IDENTIFIER) { - const char *name = token.v.symbol->string; - next_token(); + const char *name = token.symbol->string; for (attribute_kind_t k = ATTRIBUTE_MS_FIRST; k <= ATTRIBUTE_MS_LAST; ++k) { const char *attribute_name = get_attribute_name(k); @@ -2890,6 +2746,7 @@ static attribute_t *parse_microsoft_extended_decl_modifier_single(void) if (kind == ATTRIBUTE_UNKNOWN && warning.attribute) { warningf(HERE, "unknown __declspec '%s' ignored", name); } + eat(T_IDENTIFIER); } else { parse_error_expected("while parsing __declspec", T_IDENTIFIER, NULL); return NULL; @@ -2902,10 +2759,8 @@ static attribute_t *parse_microsoft_extended_decl_modifier_single(void) } /* parse arguments */ - if (token.type == '(') { - next_token(); + if (next_if('(')) attribute->a.arguments = parse_attribute_arguments(); - } return attribute; } @@ -2916,37 +2771,24 @@ static attribute_t *parse_microsoft_extended_decl_modifier(attribute_t *first) expect('(', end_error); - if (token.type == ')') { - next_token(); + if (next_if(')')) return NULL; - } add_anchor_token(')'); - attribute_t *last = first; - while (true) { - if (last != NULL) { - while (last->next != NULL) - last = last->next; - } + attribute_t **anchor = &first; + do { + while (*anchor != NULL) + anchor = &(*anchor)->next; attribute_t *attribute = parse_microsoft_extended_decl_modifier_single(); if (attribute == NULL) goto end_error; - if (last == NULL) { - first = attribute; - } else { - last->next = attribute; - } - last = attribute; - - if (token.type == ')') { - break; - } - expect(',', end_error); - } + *anchor = attribute; + anchor = &attribute->next; + } while (next_if(',')); rem_anchor_token(')'); expect(')', end_error); @@ -2959,9 +2801,8 @@ end_error: static entity_t *create_error_entity(symbol_t *symbol, entity_kind_tag_t kind) { - entity_t *entity = allocate_entity_zero(kind); + entity_t *const entity = allocate_entity_zero(kind, NAMESPACE_NORMAL, symbol); entity->base.source_position = *HERE; - entity->base.symbol = symbol; if (is_declaration(entity)) { entity->declaration.type = type_error_type; entity->declaration.implicit = true; @@ -2983,6 +2824,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) bool saw_error = false; bool old_gcc_extension = in_gcc_extension; + memset(specifiers, 0, sizeof(*specifiers)); specifiers->source_position = token.source_position; while (true) { @@ -3025,10 +2867,10 @@ check_thread_storage_class: break; char const* wrong; - case STORAGE_CLASS_AUTO: wrong = "auto"; goto wrong_thread_stoarge_class; - case STORAGE_CLASS_REGISTER: wrong = "register"; goto wrong_thread_stoarge_class; - case STORAGE_CLASS_TYPEDEF: wrong = "typedef"; goto wrong_thread_stoarge_class; -wrong_thread_stoarge_class: + case STORAGE_CLASS_AUTO: wrong = "auto"; goto wrong_thread_storage_class; + case STORAGE_CLASS_REGISTER: wrong = "register"; goto wrong_thread_storage_class; + case STORAGE_CLASS_TYPEDEF: wrong = "typedef"; goto wrong_thread_storage_class; +wrong_thread_storage_class: errorf(HERE, "'__thread' used with '%s'", wrong); break; } @@ -3101,7 +2943,7 @@ wrong_thread_stoarge_class: case T_long: if (type_specifiers & SPECIFIER_LONG_LONG) { - errorf(HERE, "multiple type specifiers given"); + errorf(HERE, "too many long type specifiers given"); } else if (type_specifiers & SPECIFIER_LONG) { type_specifiers |= SPECIFIER_LONG_LONG; } else { @@ -3165,7 +3007,7 @@ wrong_thread_stoarge_class: } } - type_t *const typedef_type = get_typedef_type(token.v.symbol); + type_t *const typedef_type = get_typedef_type(token.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 @@ -3179,15 +3021,13 @@ wrong_thread_stoarge_class: errorf(HERE, "%K does not name a type", &token); entity_t *entity = - create_error_entity(token.v.symbol, ENTITY_TYPEDEF); + create_error_entity(token.symbol, ENTITY_TYPEDEF); type = allocate_type_zero(TYPE_TYPEDEF); type->typedeft.typedefe = &entity->typedefe; next_token(); saw_error = true; - if (la1_type == '&' || la1_type == '*') - goto finish_specifiers; continue; } @@ -3350,32 +3190,33 @@ warn_about_long_long: case SPECIFIER_LONG | SPECIFIER_DOUBLE | SPECIFIER_IMAGINARY: atomic_type = ATOMIC_TYPE_LONG_DOUBLE; break; - default: + default: { /* invalid specifier combination, give an error message */ + source_position_t const* const pos = &specifiers->source_position; if (type_specifiers == 0) { - if (saw_error) - goto end_error; - - /* ISO/IEC 14882:1998(E) §C.1.5:4 */ - if (!(c_mode & _CXX) && !strict_mode) { - if (warning.implicit_int) { - warningf(HERE, "no type specifiers in declaration, using 'int'"); + if (!saw_error) { + /* ISO/IEC 14882:1998(E) §C.1.5:4 */ + if (!(c_mode & _CXX) && !strict_mode) { + if (warning.implicit_int) { + warningf(pos, "no type specifiers in declaration, using 'int'"); + } + atomic_type = ATOMIC_TYPE_INT; + break; + } else { + errorf(pos, "no type specifiers given in declaration"); } - atomic_type = ATOMIC_TYPE_INT; - break; - } else { - errorf(HERE, "no type specifiers given in declaration"); } } else if ((type_specifiers & SPECIFIER_SIGNED) && (type_specifiers & SPECIFIER_UNSIGNED)) { - errorf(HERE, "signed and unsigned specifiers given"); + errorf(pos, "signed and unsigned specifiers given"); } else if (type_specifiers & (SPECIFIER_SIGNED | SPECIFIER_UNSIGNED)) { - errorf(HERE, "only integer types can be signed or unsigned"); + errorf(pos, "only integer types can be signed or unsigned"); } else { - errorf(HERE, "multiple datatypes in declaration"); + errorf(pos, "multiple datatypes in declaration"); } goto end_error; } + } if (type_specifiers & SPECIFIER_COMPLEX) { type = allocate_type_zero(TYPE_COMPLEX); @@ -3389,7 +3230,7 @@ warn_about_long_long: } newtype = true; } else if (type_specifiers != 0) { - errorf(HERE, "multiple datatypes in declaration"); + errorf(&specifiers->source_position, "multiple datatypes in declaration"); } /* FIXME: check type qualifiers here */ @@ -3439,28 +3280,19 @@ static type_qualifiers_t parse_type_qualifiers(void) static void parse_identifier_list(scope_t *scope) { do { - entity_t *entity = allocate_entity_zero(ENTITY_PARAMETER); + entity_t *const entity = allocate_entity_zero(ENTITY_PARAMETER, NAMESPACE_NORMAL, token.symbol); entity->base.source_position = token.source_position; - entity->base.namespc = NAMESPACE_NORMAL; - entity->base.symbol = token.v.symbol; /* a K&R parameter has no type, yet */ next_token(); if (scope != NULL) append_entity(scope, entity); - - if (token.type != ',') { - break; - } - next_token(); - } while (token.type == T_IDENTIFIER); + } while (next_if(',') && token.type == T_IDENTIFIER); } static entity_t *parse_parameter(void) { declaration_specifiers_t specifiers; - memset(&specifiers, 0, sizeof(specifiers)); - parse_declaration_specifiers(&specifiers); entity_t *entity = parse_declarator(&specifiers, @@ -3489,7 +3321,7 @@ static bool has_parameters(void) { /* func(void) is not a parameter */ if (token.type == T_IDENTIFIER) { - entity_t const *const entity = get_entity(token.v.symbol, NAMESPACE_NORMAL); + entity_t const *const entity = get_entity(token.symbol, NAMESPACE_NORMAL); if (entity == NULL) return true; if (entity->kind != ENTITY_TYPEDEF) @@ -3516,7 +3348,7 @@ static void parse_parameters(function_type_t *type, scope_t *scope) int saved_comma_state = save_and_reset_anchor_state(','); if (token.type == T_IDENTIFIER && - !is_typedef_symbol(token.v.symbol)) { + !is_typedef_symbol(token.symbol)) { token_type_t la1_type = (token_type_t)look_ahead(1)->type; if (la1_type == ',' || la1_type == ')') { type->kr_style_parameters = true; @@ -3529,12 +3361,9 @@ static void parse_parameters(function_type_t *type, scope_t *scope) /* ISO/IEC 14882:1998(E) §C.1.6:1 */ if (!(c_mode & _CXX)) type->unspecified_parameters = true; - goto parameters_finished; - } - - if (has_parameters()) { + } else if (has_parameters()) { function_parameter_t **anchor = &type->parameters; - for (;;) { + do { switch (token.type) { case T_DOTDOTDOT: next_token(); @@ -3570,14 +3399,9 @@ static void parse_parameters(function_type_t *type, scope_t *scope) default: goto parameters_finished; } - if (token.type != ',') { - goto parameters_finished; - } - next_token(); - } + } while (next_if(',')); } - parameters_finished: rem_anchor_token(')'); expect(')', end_error); @@ -3598,6 +3422,7 @@ typedef union construct_type_t construct_type_t; typedef struct construct_type_base_t { construct_type_kind_t kind; + source_position_t pos; construct_type_t *next; } construct_type_base_t; @@ -3633,60 +3458,63 @@ union construct_type_t { parsed_array_t array; }; +static construct_type_t *allocate_declarator_zero(construct_type_kind_t const kind, size_t const size) +{ + construct_type_t *const cons = obstack_alloc(&temp_obst, size); + memset(cons, 0, size); + cons->kind = kind; + cons->base.pos = *HERE; + return cons; +} + +/* §6.7.5.1 */ static construct_type_t *parse_pointer_declarator(void) { + construct_type_t *const cons = allocate_declarator_zero(CONSTRUCT_POINTER, sizeof(parsed_pointer_t)); eat('*'); + cons->pointer.type_qualifiers = parse_type_qualifiers(); + //cons->pointer.base_variable = base_variable; - parsed_pointer_t *pointer = obstack_alloc(&temp_obst, sizeof(pointer[0])); - memset(pointer, 0, sizeof(pointer[0])); - pointer->base.kind = CONSTRUCT_POINTER; - pointer->type_qualifiers = parse_type_qualifiers(); - //pointer->base_variable = base_variable; - - return (construct_type_t*) pointer; + return cons; } +/* ISO/IEC 14882:1998(E) §8.3.2 */ static construct_type_t *parse_reference_declarator(void) { - eat('&'); + if (!(c_mode & _CXX)) + errorf(HERE, "references are only available for C++"); - construct_type_t *cons = obstack_alloc(&temp_obst, sizeof(cons->reference)); - parsed_reference_t *reference = &cons->reference; - memset(reference, 0, sizeof(*reference)); - cons->kind = CONSTRUCT_REFERENCE; + construct_type_t *const cons = allocate_declarator_zero(CONSTRUCT_REFERENCE, sizeof(parsed_reference_t)); + eat('&'); return cons; } +/* §6.7.5.2 */ static construct_type_t *parse_array_declarator(void) { + construct_type_t *const cons = allocate_declarator_zero(CONSTRUCT_ARRAY, sizeof(parsed_array_t)); + parsed_array_t *const array = &cons->array; + eat('['); add_anchor_token(']'); - construct_type_t *cons = obstack_alloc(&temp_obst, sizeof(cons->array)); - parsed_array_t *array = &cons->array; - memset(array, 0, sizeof(*array)); - cons->kind = CONSTRUCT_ARRAY; - - if (token.type == T_static) { - array->is_static = true; - next_token(); - } + bool is_static = next_if(T_static); type_qualifiers_t type_qualifiers = parse_type_qualifiers(); - if (type_qualifiers != 0) { - if (token.type == T_static) { - array->is_static = true; - next_token(); - } - } + + if (!is_static) + is_static = next_if(T_static); + array->type_qualifiers = type_qualifiers; + array->is_static = is_static; + expression_t *size = NULL; if (token.type == '*' && look_ahead(1)->type == ']') { array->is_variable = true; next_token(); } else if (token.type != ']') { - expression_t *const size = parse_assignment_expression(); + size = parse_assignment_expression(); /* §6.7.5.2:1 Array size must have integer type */ type_t *const orig_type = size->base.type; @@ -3701,6 +3529,9 @@ static construct_type_t *parse_array_declarator(void) mark_vars_read(size, NULL); } + if (is_static && size == NULL) + errorf(&array->base.pos, "static array parameters require a size"); + rem_anchor_token(']'); expect(']', end_error); @@ -3708,8 +3539,11 @@ end_error: return cons; } +/* §6.7.5.3 */ static construct_type_t *parse_function_declarator(scope_t *scope) { + construct_type_t *const cons = allocate_declarator_zero(CONSTRUCT_FUNCTION, sizeof(construct_function_type_t)); + type_t *type = allocate_type_zero(TYPE_FUNCTION); function_type_t *ftype = &type->function; @@ -3718,11 +3552,7 @@ static construct_type_t *parse_function_declarator(scope_t *scope) parse_parameters(ftype, scope); - construct_type_t *cons = obstack_alloc(&temp_obst, sizeof(cons->function)); - construct_function_type_t *function = &cons->function; - memset(function, 0, sizeof(*function)); - cons->kind = CONSTRUCT_FUNCTION; - function->function_type = type; + cons->function.function_type = type; return cons; } @@ -3737,6 +3567,7 @@ typedef struct parse_declarator_env_t { attribute_t *attributes; } parse_declarator_env_t; +/* §6.7.5 */ static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env) { /* construct a single linked list of construct_type_t's which describe @@ -3751,32 +3582,11 @@ static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env) //variable_t *based = NULL; /* MS __based extension */ switch (token.type) { case '&': - if (!(c_mode & _CXX)) - errorf(HERE, "references are only available for C++"); type = parse_reference_declarator(); break; case T__based: { -#if 0 - source_position_t const pos = *HERE; - next_token(); - expect('(', end_error); - add_anchor_token(')'); - based = parse_microsoft_based(); - rem_anchor_token(')'); - expect(')', end_error); - if (token.type != '*') { - if (token.type == T__based) { - errorf(&pos, "__based type modifier specified more than once"); - } else if (warning.other) { - warningf(&pos, - "__based does not precede a pointer declarator, ignored"); - } - continue; - } -#else - panic("based currently disabled"); -#endif + panic("based not supported anymore"); /* FALLTHROUGH */ } @@ -3796,11 +3606,6 @@ static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env) } ptr_operator_end: ; -#if 0 - modifiers |= env->modifiers; - env->modifiers = modifiers; -#endif - construct_type_t *inner_types = NULL; switch (token.type) { @@ -3808,27 +3613,49 @@ ptr_operator_end: ; if (env->must_be_abstract) { errorf(HERE, "no identifier expected in typename"); } else { - env->symbol = token.v.symbol; + env->symbol = token.symbol; env->source_position = token.source_position; } next_token(); break; - case '(': - /* §6.7.6:2 footnote 126: Empty parentheses in a type name are - * interpreted as ``function with no parameter specification'', rather - * than redundant parentheses around the omitted identifier. */ - if (look_ahead(1)->type != ')') { - next_token(); - add_anchor_token(')'); - inner_types = parse_inner_declarator(env); - if (inner_types != NULL) { - /* All later declarators only modify the return type */ - env->must_be_abstract = true; - } - rem_anchor_token(')'); - expect(')', end_error); + + case '(': { + /* Parenthesized declarator or function declarator? */ + token_t const *const la1 = look_ahead(1); + switch (la1->type) { + case T_IDENTIFIER: + if (is_typedef_symbol(la1->symbol)) { + case ')': + /* §6.7.6:2 footnote 126: Empty parentheses in a type name are + * interpreted as ``function with no parameter specification'', rather + * than redundant parentheses around the omitted identifier. */ + default: + /* Function declarator. */ + if (!env->may_be_abstract) { + errorf(HERE, "function declarator must have a name"); + } + } else { + case '&': + case '(': + case '*': + case '[': + case T___attribute__: /* FIXME __attribute__ might also introduce a parameter of a function declarator. */ + /* Paranthesized declarator. */ + next_token(); + add_anchor_token(')'); + inner_types = parse_inner_declarator(env); + if (inner_types != NULL) { + /* All later declarators only modify the return type */ + env->must_be_abstract = true; + } + rem_anchor_token(')'); + expect(')', end_error); + } + break; } break; + } + default: if (env->may_be_abstract) break; @@ -3875,10 +3702,12 @@ end_error: return NULL; } -static type_t *construct_declarator_type(construct_type_t *construct_list, type_t *type) +static type_t *construct_declarator_type(construct_type_t *construct_list, + type_t *type) { construct_type_t *iter = construct_list; for (; iter != NULL; iter = iter->base.next) { + source_position_t const* const pos = &iter->base.pos; switch (iter->kind) { case CONSTRUCT_INVALID: break; @@ -3891,13 +3720,12 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, type_ type_t *skipped_return_type = skip_typeref(type); /* §6.7.5.3:1 */ if (is_type_function(skipped_return_type)) { - errorf(HERE, "function returning function is not allowed"); + errorf(pos, "function returning function is not allowed"); } else if (is_type_array(skipped_return_type)) { - errorf(HERE, "function returning array is not allowed"); + errorf(pos, "function returning array is not allowed"); } else { if (skipped_return_type->base.qualifiers != 0 && warning.other) { - warningf(HERE, - "type qualifiers in return type of function type are meaningless"); + warningf(pos, "type qualifiers in return type of function type are meaningless"); } } @@ -3909,7 +3737,7 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, type_ case CONSTRUCT_POINTER: { if (is_type_reference(skip_typeref(type))) - errorf(HERE, "cannot declare a pointer to reference"); + errorf(pos, "cannot declare a pointer to reference"); parsed_pointer_t *pointer = &iter->pointer; type = make_based_pointer_type(type, pointer->type_qualifiers, pointer->base_variable); @@ -3918,14 +3746,14 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, type_ case CONSTRUCT_REFERENCE: if (is_type_reference(skip_typeref(type))) - errorf(HERE, "cannot declare a reference to reference"); + errorf(pos, "cannot declare a reference to reference"); type = make_reference_type(type); continue; case CONSTRUCT_ARRAY: { if (is_type_reference(skip_typeref(type))) - errorf(HERE, "cannot declare an array of references"); + errorf(pos, "cannot declare an array of references"); parsed_array_t *array = &iter->array; type_t *array_type = allocate_type_zero(TYPE_ARRAY); @@ -3943,39 +3771,46 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, type_ array_type->array.size_expression = size_expression; if (size_expression != NULL) { - if (is_constant_expression(size_expression)) { - long const size - = fold_constant_to_int(size_expression); - array_type->array.size = size; - array_type->array.size_constant = true; - /* §6.7.5.2:1 If the expression is a constant expression, it shall - * have a value greater than zero. */ - if (size <= 0) { - if (size < 0 || !GNU_MODE) { - errorf(&size_expression->base.source_position, - "size of array must be greater than zero"); - } else if (warning.other) { - warningf(&size_expression->base.source_position, - "zero length arrays are a GCC extension"); + switch (is_constant_expression(size_expression)) { + case EXPR_CLASS_CONSTANT: { + long const size = fold_constant_to_int(size_expression); + array_type->array.size = size; + array_type->array.size_constant = true; + /* §6.7.5.2:1 If the expression is a constant expression, it shall + * have a value greater than zero. */ + if (size <= 0) { + if (size < 0 || !GNU_MODE) { + errorf(&size_expression->base.source_position, + "size of array must be greater than zero"); + } else if (warning.other) { + warningf(&size_expression->base.source_position, + "zero length arrays are a GCC extension"); + } } + break; } - } else { - array_type->array.is_vla = true; + + case EXPR_CLASS_VARIABLE: + array_type->array.is_vla = true; + break; + + case EXPR_CLASS_ERROR: + break; } } type_t *skipped_type = skip_typeref(type); /* §6.7.5.2:1 */ if (is_type_incomplete(skipped_type)) { - errorf(HERE, "array of incomplete type '%T' is not allowed", type); + errorf(pos, "array of incomplete type '%T' is not allowed", type); } else if (is_type_function(skipped_type)) { - errorf(HERE, "array of functions is not allowed"); + errorf(pos, "array of functions is not allowed"); } type = identify_new_type(array_type); continue; } } - internal_errorf(HERE, "invalid type construction found"); + internal_errorf(pos, "invalid type construction found"); } return type; @@ -4034,20 +3869,15 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, attribute_t *attributes = parse_attributes(env.attributes); /* append (shared) specifier attribute behind attributes of this - declarator */ - if (attributes != NULL) { - attribute_t *last = attributes; - while (last->next != NULL) - last = last->next; - last->next = specifiers->attributes; - } else { - attributes = specifiers->attributes; - } + * declarator */ + attribute_t **anchor = &attributes; + while (*anchor != NULL) + anchor = &(*anchor)->next; + *anchor = specifiers->attributes; entity_t *entity; if (specifiers->storage_class == STORAGE_CLASS_TYPEDEF) { - entity = allocate_entity_zero(ENTITY_TYPEDEF); - entity->base.symbol = env.symbol; + entity = allocate_entity_zero(ENTITY_TYPEDEF, NAMESPACE_NORMAL, env.symbol); entity->base.source_position = env.source_position; entity->typedefe.type = orig_type; @@ -4068,7 +3898,7 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, } else { /* create a declaration type entity */ if (flags & DECL_CREATE_COMPOUND_MEMBER) { - entity = allocate_entity_zero(ENTITY_COMPOUND_MEMBER); + entity = allocate_entity_zero(ENTITY_COMPOUND_MEMBER, NAMESPACE_NORMAL, env.symbol); if (env.symbol != NULL) { if (specifiers->is_inline && is_type_valid(type)) { @@ -4087,30 +3917,30 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, orig_type = semantic_parameter(&env.source_position, orig_type, specifiers, env.symbol); - entity = allocate_entity_zero(ENTITY_PARAMETER); + entity = allocate_entity_zero(ENTITY_PARAMETER, NAMESPACE_NORMAL, env.symbol); } else if (is_type_function(type)) { - entity = allocate_entity_zero(ENTITY_FUNCTION); - - entity->function.is_inline = specifiers->is_inline; - entity->function.parameters = env.parameters; + entity = allocate_entity_zero(ENTITY_FUNCTION, NAMESPACE_NORMAL, env.symbol); + entity->function.is_inline = specifiers->is_inline; + entity->function.elf_visibility = default_visibility; + entity->function.parameters = env.parameters; if (env.symbol != NULL) { /* this needs fixes for C++ */ bool in_function_scope = current_function != NULL; if (specifiers->thread_local || ( - specifiers->storage_class != STORAGE_CLASS_EXTERN && - specifiers->storage_class != STORAGE_CLASS_NONE && - (in_function_scope || specifiers->storage_class != STORAGE_CLASS_STATIC) - )) { + specifiers->storage_class != STORAGE_CLASS_EXTERN && + specifiers->storage_class != STORAGE_CLASS_NONE && + (in_function_scope || specifiers->storage_class != STORAGE_CLASS_STATIC) + )) { errorf(&env.source_position, "invalid storage class for function '%Y'", env.symbol); } } } else { - entity = allocate_entity_zero(ENTITY_VARIABLE); - - entity->variable.thread_local = specifiers->thread_local; + entity = allocate_entity_zero(ENTITY_VARIABLE, NAMESPACE_NORMAL, env.symbol); + entity->variable.elf_visibility = default_visibility; + entity->variable.thread_local = specifiers->thread_local; if (env.symbol != NULL) { if (specifiers->is_inline && is_type_valid(type)) { @@ -4138,13 +3968,7 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, } } - if (env.symbol != NULL) { - entity->base.symbol = env.symbol; - entity->base.source_position = env.source_position; - } else { - entity->base.source_position = specifiers->source_position; - } - entity->base.namespc = NAMESPACE_NORMAL; + entity->base.source_position = env.symbol != NULL ? env.source_position : specifiers->source_position; entity->declaration.type = orig_type; entity->declaration.alignment = get_type_alignment(orig_type); entity->declaration.modifiers = env.modifiers; @@ -4153,7 +3977,7 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, storage_class_t storage_class = specifiers->storage_class; entity->declaration.declared_storage_class = storage_class; - if (storage_class == STORAGE_CLASS_NONE && current_function != NULL) + if (storage_class == STORAGE_CLASS_NONE && current_function != NULL) storage_class = STORAGE_CLASS_AUTO; entity->declaration.storage_class = storage_class; } @@ -4215,23 +4039,30 @@ static void check_main(const entity_t *entity) } const function_parameter_t *parm = func_type->parameters; if (parm != NULL) { - type_t *const first_type = parm->type; - if (!types_compatible(skip_typeref(first_type), type_int)) { + type_t *const first_type = skip_typeref(parm->type); + type_t *const first_type_unqual = get_unqualified_type(first_type); + if (!types_compatible(first_type_unqual, type_int)) { warningf(pos, "first argument of 'main' should be 'int', but is '%T'", - first_type); + parm->type); } parm = parm->next; if (parm != NULL) { - type_t *const second_type = parm->type; - if (!types_compatible(skip_typeref(second_type), type_char_ptr_ptr)) { - warningf(pos, "second argument of 'main' should be 'char**', but is '%T'", second_type); + type_t *const second_type = skip_typeref(parm->type); + type_t *const second_type_unqual + = get_unqualified_type(second_type); + if (!types_compatible(second_type_unqual, type_char_ptr_ptr)) { + warningf(pos, "second argument of 'main' should be 'char**', but is '%T'", + parm->type); } parm = parm->next; if (parm != NULL) { - type_t *const third_type = parm->type; - if (!types_compatible(skip_typeref(third_type), type_char_ptr_ptr)) { - warningf(pos, "third argument of 'main' should be 'char**', but is '%T'", third_type); + type_t *const third_type = skip_typeref(parm->type); + type_t *const third_type_unqual + = get_unqualified_type(third_type); + if (!types_compatible(third_type_unqual, type_char_ptr_ptr)) { + warningf(pos, "third argument of 'main' should be 'char**', but is '%T'", + parm->type); } parm = parm->next; if (parm != NULL) @@ -4260,14 +4091,14 @@ static void error_redefined_as_different_kind(const source_position_t *pos, get_entity_kind_name(new_kind), &old->base.source_position); } -static bool is_error_entity(entity_t *const ent) +static bool is_entity_valid(entity_t *const ent) { if (is_declaration(ent)) { return is_type_valid(skip_typeref(ent->declaration.type)); } else if (ent->kind == ENTITY_TYPEDEF) { return is_type_valid(skip_typeref(ent->typedefe.type)); } - return false; + return true; } static bool contains_attribute(const attribute_t *list, const attribute_t *attr) @@ -4315,7 +4146,7 @@ static void merge_in_attributes(declaration_t *decl, attribute_t *attributes) * record entities for the NAMESPACE_NORMAL, and produce error messages/warnings * for various problems that occur for multiple definitions */ -static entity_t *record_entity(entity_t *entity, const bool is_definition) +entity_t *record_entity(entity_t *entity, const bool is_definition) { const symbol_t *const symbol = entity->base.symbol; const namespace_tag_t namespc = (namespace_tag_t)entity->base.namespc; @@ -4369,7 +4200,7 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition) if (previous_entity->base.parent_scope == current_scope) { if (previous_entity->kind != entity->kind) { - if (!is_error_entity(previous_entity) && !is_error_entity(entity)) { + if (is_entity_valid(previous_entity) && is_entity_valid(entity)) { error_redefined_as_different_kind(pos, previous_entity, entity->kind); } @@ -4417,7 +4248,7 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition) } else { unsigned old_storage_class = prev_decl->storage_class; - if (warning.redundant_decls && + if (warning.redundant_decls && is_definition && !prev_decl->used && !(prev_decl->modifiers & DM_USED) && @@ -4478,15 +4309,15 @@ warn_redundant_declaration: ; strcmp(previous_entity->base.source_position.input_name, "") != 0) { warningf(pos, - "redundant declaration for '%Y' (declared %P)", - symbol, &previous_entity->base.source_position); + "redundant declaration for '%Y' (declared %P)", + symbol, &previous_entity->base.source_position); } } else if (current_function == NULL) { if (old_storage_class != STORAGE_CLASS_STATIC && new_storage_class == STORAGE_CLASS_STATIC) { errorf(pos, - "static declaration of '%Y' follows non-static declaration (declared %P)", - symbol, &previous_entity->base.source_position); + "static declaration of '%Y' follows non-static declaration (declared %P)", + symbol, &previous_entity->base.source_position); } else if (old_storage_class == STORAGE_CLASS_EXTERN) { prev_decl->storage_class = STORAGE_CLASS_NONE; prev_decl->declared_storage_class = STORAGE_CLASS_NONE; @@ -4516,7 +4347,8 @@ error_redeclaration: return previous_entity; } - if (warning.shadow) { + if (warning.shadow || + (warning.shadow_local && previous_entity->base.parent_scope != file_scope)) { warningf(pos, "%s '%Y' shadows %s (declared %P)", get_entity_kind_name(entity->kind), symbol, get_entity_kind_name(previous_entity->kind), @@ -4550,7 +4382,6 @@ finish: assert(current_scope != NULL); entity->base.parent_scope = current_scope; - entity->base.namespc = NAMESPACE_NORMAL; environment_push(entity); append_entity(current_scope, entity); @@ -4572,7 +4403,7 @@ static bool is_declaration_specifier(const token_t *token, TYPE_QUALIFIERS return true; case T_IDENTIFIER: - return is_typedef_symbol(token->v.symbol); + return is_typedef_symbol(token->symbol); case T___extension__: STORAGE_CLASSES @@ -4585,19 +4416,26 @@ static bool is_declaration_specifier(const token_t *token, static void parse_init_declarator_rest(entity_t *entity) { - assert(is_declaration(entity)); - declaration_t *const declaration = &entity->declaration; + type_t *orig_type = type_error_type; - eat('='); + if (entity->base.kind == ENTITY_TYPEDEF) { + errorf(&entity->base.source_position, + "typedef '%Y' is initialized (use __typeof__ instead)", + entity->base.symbol); + } else { + assert(is_declaration(entity)); + orig_type = entity->declaration.type; + } - type_t *orig_type = declaration->type; - type_t *type = skip_typeref(orig_type); + type_t *type = skip_typeref(orig_type); if (entity->kind == ENTITY_VARIABLE && entity->variable.initializer != NULL) { parser_error_multiple_definition(entity, HERE); } + eat('='); + declaration_t *const declaration = &entity->declaration; bool must_be_constant = false; if (declaration->storage_class == STORAGE_CLASS_STATIC || entity->base.parent_scope == file_scope) { @@ -4720,9 +4558,8 @@ static void parse_declaration_rest(entity_t *ndeclaration, check_variable_type_complete(entity); - if (token.type != ',') + if (!next_if(',')) break; - eat(','); add_anchor_token('='); ndeclaration = parse_declarator(specifiers, flags); @@ -4739,16 +4576,14 @@ end_error: static entity_t *finished_kr_declaration(entity_t *entity, bool is_definition) { symbol_t *symbol = entity->base.symbol; - if (symbol == NULL) { - errorf(HERE, "anonymous declaration not valid as function parameter"); + if (symbol == NULL) return entity; - } assert(entity->base.namespc == NAMESPACE_NORMAL); entity_t *previous_entity = get_entity(symbol, NAMESPACE_NORMAL); if (previous_entity == NULL || previous_entity->base.parent_scope != current_scope) { - errorf(HERE, "expected declaration of a function parameter, found '%Y'", + errorf(&entity->base.source_position, "expected declaration of a function parameter, found '%Y'", symbol); return entity; } @@ -4763,10 +4598,8 @@ static entity_t *finished_kr_declaration(entity_t *entity, bool is_definition) static void parse_declaration(parsed_declaration_func finished_declaration, declarator_flags_t flags) { - declaration_specifiers_t specifiers; - memset(&specifiers, 0, sizeof(specifiers)); - add_anchor_token(';'); + declaration_specifiers_t specifiers; parse_declaration_specifiers(&specifiers); rem_anchor_token(';'); @@ -4873,14 +4706,13 @@ decl_list_end: type_t *parameter_type = parameter->declaration.type; if (parameter_type == NULL) { + source_position_t const* const pos = ¶meter->base.source_position; if (strict_mode) { - errorf(HERE, "no type specified for function parameter '%Y'", - parameter->base.symbol); + errorf(pos, "no type specified for function parameter '%Y'", parameter->base.symbol); parameter_type = type_error_type; } else { if (warning.implicit_int) { - warningf(HERE, "no type specified for function parameter '%Y', using 'int'", - parameter->base.symbol); + warningf(pos, "no type specified for function parameter '%Y', using 'int'", parameter->base.symbol); } parameter_type = type_int; } @@ -4918,7 +4750,7 @@ decl_list_end: if (warning.other && need_incompatible_warning) { type_t *proto_type_type = proto_type->declaration.type; - warningf(HERE, + warningf(&entity->base.source_position, "declaration '%#T' is incompatible with '%#T' (declared %P)", proto_type_type, proto_type->base.symbol, new_type, entity->base.symbol, @@ -4960,8 +4792,6 @@ static void check_labels(void) continue; label_t *label = goto_statement->label; - - label->used = true; if (label->base.source_position.input_name == NULL) { print_in_function(); errorf(&goto_statement->base.source_position, @@ -5052,8 +4882,8 @@ static void check_declarations(void) static int determine_truth(expression_t const* const cond) { return - !is_constant_expression(cond) ? 0 : - fold_constant_to_bool(cond) ? 1 : + is_constant_expression(cond) != EXPR_CLASS_CONSTANT ? 0 : + fold_constant_to_bool(cond) ? 1 : -1; } @@ -5085,9 +4915,7 @@ static bool expression_returns(expression_t const *const expr) case EXPR_REFERENCE: case EXPR_REFERENCE_ENUM_VALUE: - case EXPR_CONST: - case EXPR_CHARACTER_CONSTANT: - case EXPR_WIDE_CHARACTER_CONSTANT: + EXPR_LITERAL_CASES case EXPR_STRING_LITERAL: case EXPR_WIDE_STRING_LITERAL: case EXPR_COMPOUND_LITERAL: // TODO descend into initialisers @@ -5265,7 +5093,7 @@ static void check_reachable(statement_t *const stmt) if (!expression_returns(expr)) return; - if (is_constant_expression(expr)) { + if (is_constant_expression(expr) == EXPR_CLASS_CONSTANT) { long const val = fold_constant_to_int(expr); case_label_statement_t * defaults = NULL; for (case_label_statement_t *i = switchs->first_case; i != NULL; i = i->next) { @@ -5311,9 +5139,8 @@ static void check_reachable(statement_t *const stmt) break; } - case STATEMENT_CONTINUE: { - statement_t *parent = stmt; - for (;;) { + case STATEMENT_CONTINUE: + for (statement_t *parent = stmt;;) { parent = parent->base.parent; if (parent == NULL) /* continue not within loop */ return; @@ -5327,11 +5154,9 @@ static void check_reachable(statement_t *const stmt) default: break; } } - } - case STATEMENT_BREAK: { - statement_t *parent = stmt; - for (;;) { + case STATEMENT_BREAK: + for (statement_t *parent = stmt;;) { parent = parent->base.parent; if (parent == NULL) /* break not within loop/switch */ return; @@ -5350,7 +5175,6 @@ static void check_reachable(statement_t *const stmt) } found_break_parent: break; - } case STATEMENT_GOTO: if (stmt->gotos.expression) { @@ -5666,10 +5490,8 @@ static void parse_external_declaration(void) { /* function-definitions and declarations both start with declaration * specifiers */ - declaration_specifiers_t specifiers; - memset(&specifiers, 0, sizeof(specifiers)); - add_anchor_token(';'); + declaration_specifiers_t specifiers; parse_declaration_specifiers(&specifiers); rem_anchor_token(';'); @@ -5731,15 +5553,15 @@ static void parse_external_declaration(void) if (warning.aggregate_return && is_type_compound(skip_typeref(type->function.return_type))) { - warningf(HERE, "function '%Y' returns an aggregate", + warningf(&ndeclaration->base.source_position, "function '%Y' returns an aggregate", ndeclaration->base.symbol); } if (warning.traditional && !type->function.unspecified_parameters) { - warningf(HERE, "traditional C rejects ISO C style function definition of function '%Y'", + warningf(&ndeclaration->base.source_position, "traditional C rejects ISO C style function definition of function '%Y'", ndeclaration->base.symbol); } if (warning.old_style_definition && type->function.unspecified_parameters) { - warningf(HERE, "old-style function definition '%Y'", + warningf(&ndeclaration->base.source_position, "old-style function definition '%Y'", ndeclaration->base.symbol); } @@ -5758,7 +5580,7 @@ static void parse_external_declaration(void) assert(entity->kind == ENTITY_FUNCTION); assert(ndeclaration->kind == ENTITY_FUNCTION); - function_t *function = &entity->function; + function_t *const function = &entity->function; if (ndeclaration != entity) { function->parameters = ndeclaration->function.parameters; } @@ -5791,7 +5613,9 @@ static void parse_external_declaration(void) /* parse function body */ int label_stack_top = label_top(); function_t *old_current_function = current_function; + entity_t *old_current_entity = current_entity; current_function = function; + current_entity = entity; current_parent = NULL; goto_first = NULL; @@ -5823,6 +5647,8 @@ static void parse_external_declaration(void) assert(current_parent == NULL); assert(current_function == function); + assert(current_entity == entity); + current_entity = old_current_entity; current_function = old_current_function; label_pop_to(label_stack_top); } @@ -5844,14 +5670,13 @@ static type_t *make_bitfield_type(type_t *base_type, expression_t *size, il_size_t bit_size; type_t *skipped_type = skip_typeref(base_type); if (!is_type_integer(skipped_type)) { - errorf(HERE, "bitfield base type '%T' is not an integer type", - base_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)) { + 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; @@ -5991,7 +5816,7 @@ static expression_t *find_create_select(const source_position_t *pos, static void parse_compound_declarators(compound_t *compound, const declaration_specifiers_t *specifiers) { - while (true) { + do { entity_t *entity; if (token.type == ':') { @@ -6004,18 +5829,13 @@ static void parse_compound_declarators(compound_t *compound, type_t *type = make_bitfield_type(base_type, size, &source_position, NULL); - attribute_t *attributes = parse_attributes(NULL); - if (attributes != NULL) { - attribute_t *last = attributes; - while (last->next != NULL) - last = last->next; - last->next = specifiers->attributes; - } else { - attributes = specifiers->attributes; - } + 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); - entity->base.namespc = NAMESPACE_NORMAL; + 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; @@ -6063,7 +5883,7 @@ static void parse_compound_declarators(compound_t *compound, type_t *type = skip_typeref(orig_type); if (is_type_function(type)) { errorf(&entity->base.source_position, - "compound member '%Y' must not have function type '%T'", + "compound member '%Y' must not have function type '%T'", entity->base.symbol, orig_type); } else if (is_type_incomplete(type)) { /* §6.7.2.1:16 flexible array member */ @@ -6071,7 +5891,7 @@ static void parse_compound_declarators(compound_t *compound, token.type != ';' || look_ahead(1)->type != '}') { errorf(&entity->base.source_position, - "compound member '%Y' has incomplete type '%T'", + "compound member '%Y' has incomplete type '%T'", entity->base.symbol, orig_type); } } @@ -6080,11 +5900,7 @@ static void parse_compound_declarators(compound_t *compound, append_entity(&compound->members, entity); } } - - if (token.type != ',') - break; - next_token(); - } + } while (next_if(',')); expect(';', end_error); end_error: @@ -6102,9 +5918,7 @@ static void parse_compound_type_entries(compound_t *compound) break; } declaration_specifiers_t specifiers; - memset(&specifiers, 0, sizeof(specifiers)); parse_declaration_specifiers(&specifiers); - parse_compound_declarators(compound, &specifiers); } rem_anchor_token('}'); @@ -6117,14 +5931,13 @@ static void parse_compound_type_entries(compound_t *compound) static type_t *parse_typename(void) { declaration_specifiers_t specifiers; - memset(&specifiers, 0, sizeof(specifiers)); parse_declaration_specifiers(&specifiers); - if (specifiers.storage_class != STORAGE_CLASS_NONE || - specifiers.thread_local) { + if (specifiers.storage_class != STORAGE_CLASS_NONE + || specifiers.thread_local) { /* TODO: improve error message, user does probably not know what a * storage class is... */ - errorf(HERE, "typename may not have a storage class"); + errorf(&specifiers.source_position, "typename must not have a storage class"); } type_t *result = parse_abstract_declarator(specifiers.type); @@ -6161,82 +5974,184 @@ static expression_t *expected_expression_error(void) return create_invalid_expression(); } +static type_t *get_string_type(void) +{ + return warning.write_strings ? type_const_char_ptr : type_char_ptr; +} + +static type_t *get_wide_string_type(void) +{ + return warning.write_strings ? type_const_wchar_t_ptr : type_wchar_t_ptr; +} + /** * Parse a string constant. */ -static expression_t *parse_string_const(void) +static expression_t *parse_string_literal(void) { - wide_string_t wres; - if (token.type == T_STRING_LITERAL) { - string_t res = token.v.string; + source_position_t begin = token.source_position; + string_t res = token.literal; + bool is_wide = (token.type == 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); next_token(); - while (token.type == T_STRING_LITERAL) { - res = concat_strings(&res, &token.v.string); - next_token(); - } - if (token.type != T_WIDE_STRING_LITERAL) { - expression_t *const cnst = allocate_expression_zero(EXPR_STRING_LITERAL); - /* note: that we use type_char_ptr here, which is already the - * automatic converted type. revert_automatic_type_conversion - * will construct the array type */ - cnst->base.type = warning.write_strings ? type_const_char_ptr : type_char_ptr; - cnst->string.value = res; - return cnst; - } + is_wide |= token.type == T_WIDE_STRING_LITERAL; + } - wres = concat_string_wide_string(&res, &token.v.wide_string); + expression_t *literal; + if (is_wide) { + literal = allocate_expression_zero(EXPR_WIDE_STRING_LITERAL); + literal->base.type = get_wide_string_type(); } else { - wres = token.v.wide_string; + literal = allocate_expression_zero(EXPR_STRING_LITERAL); + literal->base.type = get_string_type(); } + literal->base.source_position = begin; + literal->literal.value = res; + + return literal; +} + +/** + * Parse a boolean constant. + */ +static expression_t *parse_boolean_literal(bool value) +{ + expression_t *literal = allocate_expression_zero(EXPR_LITERAL_BOOLEAN); + literal->base.source_position = token.source_position; + literal->base.type = type_bool; + literal->literal.value.begin = value ? "true" : "false"; + literal->literal.value.size = value ? 4 : 5; + next_token(); + return literal; +} - for (;;) { - switch (token.type) { - case T_WIDE_STRING_LITERAL: - wres = concat_wide_strings(&wres, &token.v.wide_string); - break; +static void warn_traditional_suffix(void) +{ + if (!warning.traditional) + return; + warningf(&token.source_position, "traditional C rejects the '%Y' suffix", + token.symbol); +} - case T_STRING_LITERAL: - wres = concat_wide_string_string(&wres, &token.v.string); - break; +static void check_integer_suffix(void) +{ + symbol_t *suffix = token.symbol; + if (suffix == NULL) + return; - default: { - expression_t *const cnst = allocate_expression_zero(EXPR_WIDE_STRING_LITERAL); - cnst->base.type = warning.write_strings ? type_const_wchar_t_ptr : type_wchar_t_ptr; - cnst->wide_string.value = wres; - return cnst; + bool not_traditional = false; + const char *c = suffix->string; + if (*c == 'l' || *c == 'L') { + ++c; + if (*c == *(c-1)) { + not_traditional = true; + ++c; + if (*c == 'u' || *c == 'U') { + ++c; + } + } else if (*c == 'u' || *c == 'U') { + not_traditional = true; + ++c; + } + } else if (*c == 'u' || *c == 'U') { + not_traditional = true; + ++c; + if (*c == 'l' || *c == 'L') { + ++c; + if (*c == *(c-1)) { + ++c; } } - next_token(); + } + if (*c != '\0') { + errorf(&token.source_position, + "invalid suffix '%s' on integer constant", suffix->string); + } else if (not_traditional) { + warn_traditional_suffix(); } } -/** - * Parse a boolean constant. - */ -static expression_t *parse_bool_const(bool value) +static type_t *check_floatingpoint_suffix(void) { - expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->base.type = type_bool; - cnst->conste.v.int_value = value; + symbol_t *suffix = token.symbol; + type_t *type = type_double; + if (suffix == NULL) + return type; - next_token(); + bool not_traditional = false; + const char *c = suffix->string; + if (*c == 'f' || *c == 'F') { + ++c; + type = type_float; + } else if (*c == 'l' || *c == 'L') { + ++c; + type = type_long_double; + } + if (*c != '\0') { + errorf(&token.source_position, + "invalid suffix '%s' on floatingpoint constant", suffix->string); + } else if (not_traditional) { + warn_traditional_suffix(); + } - return cnst; + return type; } /** * Parse an integer constant. */ -static expression_t *parse_int_const(void) +static expression_t *parse_number_literal(void) { - expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->base.type = token.datatype; - cnst->conste.v.int_value = token.v.intvalue; + expression_kind_t kind; + type_t *type; + + switch (token.type) { + case T_INTEGER: + kind = EXPR_LITERAL_INTEGER; + check_integer_suffix(); + type = type_int; + break; + case T_INTEGER_OCTAL: + kind = EXPR_LITERAL_INTEGER_OCTAL; + check_integer_suffix(); + type = type_int; + break; + case T_INTEGER_HEXADECIMAL: + kind = EXPR_LITERAL_INTEGER_HEXADECIMAL; + check_integer_suffix(); + type = type_int; + break; + case T_FLOATINGPOINT: + kind = EXPR_LITERAL_FLOATINGPOINT; + type = check_floatingpoint_suffix(); + break; + case T_FLOATINGPOINT_HEXADECIMAL: + kind = EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL; + type = check_floatingpoint_suffix(); + break; + default: + panic("unexpected token type in parse_number_literal"); + } + expression_t *literal = allocate_expression_zero(kind); + literal->base.source_position = token.source_position; + literal->base.type = type; + literal->literal.value = token.literal; + literal->literal.suffix = token.symbol; next_token(); - return cnst; + /* integer type depends on the size of the number and the size + * representable by the types. The backend/codegeneration has to determine + * that + */ + determine_literal_type(&literal->literal); + return literal; } /** @@ -6244,20 +6159,23 @@ static expression_t *parse_int_const(void) */ static expression_t *parse_character_constant(void) { - expression_t *cnst = allocate_expression_zero(EXPR_CHARACTER_CONSTANT); - cnst->base.type = token.datatype; - cnst->conste.v.character = token.v.string; + expression_t *literal = allocate_expression_zero(EXPR_LITERAL_CHARACTER); + literal->base.source_position = token.source_position; + literal->base.type = c_mode & _CXX ? type_char : type_int; + literal->literal.value = token.literal; - if (cnst->conste.v.character.size != 1) { - if (!GNU_MODE) { + size_t len = literal->literal.value.size; + if (len > 1) { + if (!GNU_MODE && !(c_mode & _C99)) { errorf(HERE, "more than 1 character in character constant"); } else if (warning.multichar) { + literal->base.type = type_int; warningf(HERE, "multi-character character constant"); } } - next_token(); - return cnst; + next_token(); + return literal; } /** @@ -6265,34 +6183,18 @@ static expression_t *parse_character_constant(void) */ static expression_t *parse_wide_character_constant(void) { - expression_t *cnst = allocate_expression_zero(EXPR_WIDE_CHARACTER_CONSTANT); - cnst->base.type = token.datatype; - cnst->conste.v.wide_character = token.v.wide_string; + expression_t *literal = allocate_expression_zero(EXPR_LITERAL_WIDE_CHARACTER); + literal->base.source_position = token.source_position; + literal->base.type = type_int; + literal->literal.value = token.literal; - if (cnst->conste.v.wide_character.size != 1) { - if (!GNU_MODE) { - errorf(HERE, "more than 1 character in character constant"); - } else if (warning.multichar) { - warningf(HERE, "multi-character character constant"); - } + size_t len = wstrlen(&literal->literal.value); + if (len > 1) { + warningf(HERE, "multi-character character constant"); } - next_token(); - - return cnst; -} - -/** - * Parse a float constant. - */ -static expression_t *parse_float_const(void) -{ - expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->base.type = token.datatype; - cnst->conste.v.float_value = token.v.floatvalue; next_token(); - - return cnst; + return literal; } static entity_t *create_implicit_function(symbol_t *symbol, @@ -6304,107 +6206,21 @@ static entity_t *create_implicit_function(symbol_t *symbol, ntype->function.linkage = LINKAGE_C; type_t *type = identify_new_type(ntype); - entity_t *entity = allocate_entity_zero(ENTITY_FUNCTION); + entity_t *const entity = allocate_entity_zero(ENTITY_FUNCTION, NAMESPACE_NORMAL, symbol); entity->declaration.storage_class = STORAGE_CLASS_EXTERN; entity->declaration.declared_storage_class = STORAGE_CLASS_EXTERN; entity->declaration.type = type; entity->declaration.implicit = true; - entity->base.symbol = symbol; - entity->base.source_position = *source_position; - - if (current_scope != NULL) { - bool strict_prototypes_old = warning.strict_prototypes; - warning.strict_prototypes = false; - record_entity(entity, false); - warning.strict_prototypes = strict_prototypes_old; - } - - return entity; -} - -/** - * Creates a return_type (func)(argument_type) function type if not - * already exists. - */ -static type_t *make_function_2_type(type_t *return_type, type_t *argument_type1, - type_t *argument_type2) -{ - function_parameter_t *const parameter2 = allocate_parameter(argument_type2); - function_parameter_t *const parameter1 = allocate_parameter(argument_type1); - parameter1->next = parameter2; - - type_t *type = allocate_type_zero(TYPE_FUNCTION); - type->function.return_type = return_type; - type->function.parameters = parameter1; - - return identify_new_type(type); -} - -/** - * Creates a return_type (func)(argument_type) function type if not - * already exists. - * - * @param return_type the return type - * @param argument_type the argument type - */ -static type_t *make_function_1_type(type_t *return_type, type_t *argument_type) -{ - function_parameter_t *const parameter = allocate_parameter(argument_type); - - type_t *type = allocate_type_zero(TYPE_FUNCTION); - type->function.return_type = return_type; - type->function.parameters = parameter; - - return identify_new_type(type); -} - -/** - * Creates a return_type (func)(argument_type, ...) function type if not - * already exists. - * - * @param return_type the return type - * @param argument_type the argument type - */ -static type_t *make_function_1_type_variadic(type_t *return_type, type_t *argument_type) -{ - function_parameter_t *const parameter = allocate_parameter(argument_type); - - type_t *type = allocate_type_zero(TYPE_FUNCTION); - type->function.return_type = return_type; - type->function.parameters = parameter; - type->function.variadic = true; - - return identify_new_type(type); -} - -/** - * Creates a return_type (func)(void) function type if not - * already exists. - * - * @param return_type the return type - */ -static type_t *make_function_0_type(type_t *return_type) -{ - type_t *type = allocate_type_zero(TYPE_FUNCTION); - type->function.return_type = return_type; - type->function.parameters = NULL; + entity->base.source_position = *source_position; - return identify_new_type(type); -} + if (current_scope != NULL) { + bool strict_prototypes_old = warning.strict_prototypes; + warning.strict_prototypes = false; + record_entity(entity, false); + warning.strict_prototypes = strict_prototypes_old; + } -/** - * Creates a NO_RETURN return_type (func)(void) function type if not - * already exists. - * - * @param return_type the return type - */ -static type_t *make_function_0_type_noreturn(type_t *return_type) -{ - type_t *type = allocate_type_zero(TYPE_FUNCTION); - type->function.return_type = return_type; - type->function.parameters = NULL; - type->function.modifiers |= DM_NORETURN; - return identify_new_type(type); + return entity; } /** @@ -6437,57 +6253,58 @@ static type_t *automatic_type_conversion(type_t *orig_type) type_t *revert_automatic_type_conversion(const expression_t *expression) { switch (expression->kind) { - case EXPR_REFERENCE: { - entity_t *entity = expression->reference.entity; - if (is_declaration(entity)) { - return entity->declaration.type; - } else if (entity->kind == ENTITY_ENUM_VALUE) { - return entity->enum_value.enum_type; - } else { - panic("no declaration or enum in reference"); - } + case EXPR_REFERENCE: { + entity_t *entity = expression->reference.entity; + if (is_declaration(entity)) { + return entity->declaration.type; + } else if (entity->kind == ENTITY_ENUM_VALUE) { + return entity->enum_value.enum_type; + } else { + panic("no declaration or enum in reference"); } + } - case EXPR_SELECT: { - 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); - } + case EXPR_SELECT: { + 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); + } - case EXPR_UNARY_DEREFERENCE: { - const expression_t *const value = expression->unary.value; - type_t *const type = skip_typeref(value->base.type); - if (!is_type_pointer(type)) - return type_error_type; - return type->pointer.points_to; - } + case EXPR_UNARY_DEREFERENCE: { + const expression_t *const value = expression->unary.value; + type_t *const type = skip_typeref(value->base.type); + if (!is_type_pointer(type)) + return type_error_type; + return type->pointer.points_to; + } - case EXPR_ARRAY_ACCESS: { - const expression_t *array_ref = expression->array_access.array_ref; - type_t *type_left = skip_typeref(array_ref->base.type); - if (!is_type_pointer(type_left)) - return type_error_type; - return type_left->pointer.points_to; - } + case EXPR_ARRAY_ACCESS: { + const expression_t *array_ref = expression->array_access.array_ref; + type_t *type_left = skip_typeref(array_ref->base.type); + if (!is_type_pointer(type_left)) + return type_error_type; + return type_left->pointer.points_to; + } - case EXPR_STRING_LITERAL: { - size_t size = expression->string.value.size; - return make_array_type(type_char, size, TYPE_QUALIFIER_NONE); - } + case EXPR_STRING_LITERAL: { + size_t size = expression->string_literal.value.size; + return make_array_type(type_char, size, TYPE_QUALIFIER_NONE); + } - case EXPR_WIDE_STRING_LITERAL: { - size_t size = expression->wide_string.value.size; - return make_array_type(type_wchar_t, size, TYPE_QUALIFIER_NONE); - } + case EXPR_WIDE_STRING_LITERAL: { + size_t size = wstrlen(&expression->string_literal.value); + return make_array_type(type_wchar_t, size, TYPE_QUALIFIER_NONE); + } - case EXPR_COMPOUND_LITERAL: - return expression->compound_literal.type; + case EXPR_COMPOUND_LITERAL: + return expression->compound_literal.type; - default: - return expression->base.type; + default: + break; } + return expression->base.type; } /** @@ -6515,13 +6332,12 @@ static entity_t *lookup_entity(const scope_t *scope, symbol_t *symbol, static entity_t *parse_qualified_identifier(void) { /* namespace containing the symbol */ - symbol_t *symbol; - const scope_t *lookup_scope = NULL; + symbol_t *symbol; + source_position_t pos; + const scope_t *lookup_scope = NULL; - if (token.type == T_COLONCOLON) { - next_token(); + if (next_if(T_COLONCOLON)) lookup_scope = &unit->scope; - } entity_t *entity; while (true) { @@ -6529,15 +6345,15 @@ static entity_t *parse_qualified_identifier(void) parse_error_expected("while parsing identifier", T_IDENTIFIER, NULL); return create_error_entity(sym_anonymous, ENTITY_VARIABLE); } - symbol = token.v.symbol; + symbol = token.symbol; + pos = *HERE; next_token(); /* lookup entity */ entity = lookup_entity(lookup_scope, symbol, NAMESPACE_NORMAL); - if (token.type != T_COLONCOLON) + if (!next_if(T_COLONCOLON)) break; - next_token(); switch (entity->kind) { case ENTITY_NAMESPACE: @@ -6549,7 +6365,7 @@ static entity_t *parse_qualified_identifier(void) lookup_scope = &entity->compound.members; break; default: - errorf(HERE, "'%Y' must be a namespace, class, struct or union (but is a %s)", + errorf(&pos, "'%Y' must be a namespace, class, struct or union (but is a %s)", symbol, get_entity_kind_name(entity->kind)); goto end_error; } @@ -6559,14 +6375,14 @@ static entity_t *parse_qualified_identifier(void) if (!strict_mode && token.type == '(') { /* an implicitly declared function */ if (warning.error_implicit_function_declaration) { - errorf(HERE, "implicit declaration of function '%Y'", symbol); + errorf(&pos, "implicit declaration of function '%Y'", symbol); } else if (warning.implicit_function_declaration) { - warningf(HERE, "implicit declaration of function '%Y'", symbol); + warningf(&pos, "implicit declaration of function '%Y'", symbol); } - entity = create_implicit_function(symbol, HERE); + entity = create_implicit_function(symbol, &pos); } else { - errorf(HERE, "unknown identifier '%Y' found.", symbol); + errorf(&pos, "unknown identifier '%Y' found.", symbol); entity = create_error_entity(symbol, ENTITY_VARIABLE); } } @@ -6575,19 +6391,15 @@ static entity_t *parse_qualified_identifier(void) end_error: /* skip further qualifications */ - while (token.type == T_IDENTIFIER) { - next_token(); - if (token.type != T_COLONCOLON) - break; - next_token(); - } + while (next_if(T_IDENTIFIER) && next_if(T_COLONCOLON)) {} return create_error_entity(sym_anonymous, ENTITY_VARIABLE); } static expression_t *parse_reference(void) { - entity_t *entity = parse_qualified_identifier(); + source_position_t const pos = token.source_position; + entity_t *const entity = parse_qualified_identifier(); type_t *orig_type; if (is_declaration(entity)) { @@ -6606,9 +6418,10 @@ static expression_t *parse_reference(void) if (entity->kind == ENTITY_ENUM_VALUE) kind = EXPR_REFERENCE_ENUM_VALUE; - expression_t *expression = allocate_expression_zero(kind); - expression->reference.entity = entity; - expression->base.type = type; + expression_t *expression = allocate_expression_zero(kind); + expression->base.source_position = pos; + expression->base.type = type; + expression->reference.entity = entity; /* this declaration is used */ if (is_declaration(entity)) { @@ -6628,12 +6441,12 @@ static expression_t *parse_reference(void) current_function->need_closure = true; } - check_deprecated(HERE, entity); + check_deprecated(&pos, entity); if (warning.init_self && entity == current_init_decl && !in_type_prop && entity->kind == ENTITY_VARIABLE) { current_init_decl = NULL; - warningf(HERE, "variable '%#T' is initialized by itself", + warningf(&pos, "variable '%#T' is initialized by itself", entity->declaration.type, entity->base.symbol); } @@ -6711,10 +6524,11 @@ static expression_t *parse_compound_literal(type_t *type) */ static expression_t *parse_cast(void) { - add_anchor_token(')'); - source_position_t source_position = token.source_position; + eat('('); + add_anchor_token(')'); + type_t *type = parse_typename(); rem_anchor_token(')'); @@ -6727,7 +6541,7 @@ static expression_t *parse_cast(void) expression_t *cast = allocate_expression_zero(EXPR_UNARY_CAST); cast->base.source_position = source_position; - expression_t *value = parse_sub_expression(PREC_CAST); + expression_t *value = parse_subexpression(PREC_CAST); cast->base.type = type; cast->unary.value = value; @@ -6745,10 +6559,11 @@ end_error: */ static expression_t *parse_statement_expression(void) { - add_anchor_token(')'); - expression_t *expression = allocate_expression_zero(EXPR_STATEMENT); + eat('('); + add_anchor_token(')'); + statement_t *statement = parse_compound_statement(true); statement->compound.stmt_expr = true; expression->statement.statement = statement; @@ -6780,22 +6595,21 @@ end_error: */ static expression_t *parse_parenthesized_expression(void) { - eat('('); - - switch (token.type) { + token_t const* const la1 = look_ahead(1); + switch (la1->type) { case '{': /* gcc extension: a statement expression */ return parse_statement_expression(); + case T_IDENTIFIER: + if (is_typedef_symbol(la1->symbol)) { TYPE_QUALIFIERS TYPE_SPECIFIERS - return parse_cast(); - case T_IDENTIFIER: - if (is_typedef_symbol(token.v.symbol)) { return parse_cast(); } } + eat('('); add_anchor_token(')'); expression_t *result = parse_expression(); result->base.parenthesized = true; @@ -6878,13 +6692,12 @@ static designator_t *parse_designator(void) T_IDENTIFIER, NULL); return NULL; } - result->symbol = token.v.symbol; + result->symbol = token.symbol; next_token(); designator_t *last_designator = result; while (true) { - if (token.type == '.') { - next_token(); + if (next_if('.')) { if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing member designator", T_IDENTIFIER, NULL); @@ -6892,15 +6705,14 @@ static designator_t *parse_designator(void) } designator_t *designator = allocate_ast_zero(sizeof(result[0])); designator->source_position = *HERE; - designator->symbol = token.v.symbol; + designator->symbol = token.symbol; next_token(); last_designator->next = designator; last_designator = designator; continue; } - if (token.type == '[') { - next_token(); + if (next_if('[')) { add_anchor_token(']'); designator_t *designator = allocate_ast_zero(sizeof(result[0])); designator->source_position = *HERE; @@ -7178,40 +6990,27 @@ end_error: } /** - * Return the declaration for a given label symbol or create a new one. - * - * @param symbol the symbol of the label + * Return the label for the current symbol or create a new one. */ -static label_t *get_label(symbol_t *symbol) +static label_t *get_label(void) { - entity_t *label; + assert(token.type == T_IDENTIFIER); assert(current_function != NULL); - label = get_entity(symbol, NAMESPACE_LABEL); - /* if we found a local label, we already created the declaration */ + entity_t *label = get_entity(token.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) { assert(label->base.parent_scope->depth < current_scope->depth); current_function->goto_to_outer = true; } - return &label->label; - } - - label = get_entity(symbol, NAMESPACE_LABEL); - /* if we found a label in the same function, then we already created the - * declaration */ - if (label != NULL - && label->base.parent_scope == ¤t_function->parameters) { - return &label->label; + } 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_push(label); } - /* otherwise we need to create a new one */ - label = allocate_entity_zero(ENTITY_LABEL); - label->base.namespc = NAMESPACE_LABEL; - label->base.symbol = symbol; - - label_push(label); - + eat(T_IDENTIFIER); return &label->label; } @@ -7224,24 +7023,20 @@ static expression_t *parse_label_address(void) eat(T_ANDAND); if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing label address", T_IDENTIFIER, NULL); - goto end_error; + return create_invalid_expression(); } - symbol_t *symbol = token.v.symbol; - next_token(); - label_t *label = get_label(symbol); + label_t *const label = get_label(); label->used = true; label->address_taken = true; expression_t *expression = allocate_expression_zero(EXPR_LABEL_ADDRESS); expression->base.source_position = source_position; - /* label address is threaten as a void pointer */ + /* label address is treated as a void pointer */ expression->base.type = type_void_ptr; expression->label_address.label = label; return expression; -end_error: - return create_invalid_expression(); } /** @@ -7250,10 +7045,11 @@ end_error: static expression_t *parse_noop_expression(void) { /* the result is a (int)0 */ - expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->base.type = type_int; - cnst->conste.v.int_value = 0; - cnst->conste.is_ms_noop = true; + expression_t *literal = allocate_expression_zero(EXPR_LITERAL_MS_NOOP); + literal->base.type = type_int; + literal->base.source_position = token.source_position; + literal->literal.value.begin = "__noop"; + literal->literal.value.size = 6; eat(T___noop); @@ -7263,21 +7059,16 @@ static expression_t *parse_noop_expression(void) add_anchor_token(')'); add_anchor_token(','); - if (token.type != ')') { - while (true) { - (void)parse_assignment_expression(); - if (token.type != ',') - break; - next_token(); - } - } + if (token.type != ')') do { + (void)parse_assignment_expression(); + } while (next_if(',')); } rem_anchor_token(','); rem_anchor_token(')'); expect(')', end_error); end_error: - return cnst; + return literal; } /** @@ -7286,83 +7077,73 @@ end_error: static expression_t *parse_primary_expression(void) { switch (token.type) { - case T_false: return parse_bool_const(false); - case T_true: return parse_bool_const(true); - case T_INTEGER: return parse_int_const(); - case T_CHARACTER_CONSTANT: return parse_character_constant(); - case T_WIDE_CHARACTER_CONSTANT: return parse_wide_character_constant(); - case T_FLOATINGPOINT: return parse_float_const(); - case T_STRING_LITERAL: - case T_WIDE_STRING_LITERAL: return parse_string_const(); - case T___FUNCTION__: - case T___func__: return parse_function_keyword(); - case T___PRETTY_FUNCTION__: return parse_pretty_function_keyword(); - case T___FUNCSIG__: return parse_funcsig_keyword(); - case T___FUNCDNAME__: return parse_funcdname_keyword(); - case T___builtin_offsetof: return parse_offsetof(); - case T___builtin_va_start: return parse_va_start(); - case T___builtin_va_arg: return parse_va_arg(); - case T___builtin_va_copy: return parse_va_copy(); - case T___builtin_isgreater: - case T___builtin_isgreaterequal: - case T___builtin_isless: - case T___builtin_islessequal: - case T___builtin_islessgreater: - case T___builtin_isunordered: return parse_compare_builtin(); - case T___builtin_constant_p: return parse_builtin_constant(); - case T___builtin_types_compatible_p: return parse_builtin_types_compatible(); - case T__assume: return parse_assume(); - case T_ANDAND: - if (GNU_MODE) - return parse_label_address(); - break; + case T_false: return parse_boolean_literal(false); + case T_true: return parse_boolean_literal(true); + case T_INTEGER: + case T_INTEGER_OCTAL: + case T_INTEGER_HEXADECIMAL: + case T_FLOATINGPOINT: + case T_FLOATINGPOINT_HEXADECIMAL: return parse_number_literal(); + case T_CHARACTER_CONSTANT: return parse_character_constant(); + case T_WIDE_CHARACTER_CONSTANT: return parse_wide_character_constant(); + case T_STRING_LITERAL: + case T_WIDE_STRING_LITERAL: return parse_string_literal(); + case T___FUNCTION__: + case T___func__: return parse_function_keyword(); + case T___PRETTY_FUNCTION__: return parse_pretty_function_keyword(); + case T___FUNCSIG__: return parse_funcsig_keyword(); + case T___FUNCDNAME__: return parse_funcdname_keyword(); + case T___builtin_offsetof: return parse_offsetof(); + case T___builtin_va_start: return parse_va_start(); + case T___builtin_va_arg: return parse_va_arg(); + case T___builtin_va_copy: return parse_va_copy(); + case T___builtin_isgreater: + case T___builtin_isgreaterequal: + case T___builtin_isless: + case T___builtin_islessequal: + case T___builtin_islessgreater: + case T___builtin_isunordered: return parse_compare_builtin(); + case T___builtin_constant_p: return parse_builtin_constant(); + case T___builtin_types_compatible_p: return parse_builtin_types_compatible(); + case T__assume: return parse_assume(); + case T_ANDAND: + if (GNU_MODE) + return parse_label_address(); + break; - case '(': return parse_parenthesized_expression(); - case T___noop: return parse_noop_expression(); + case '(': return parse_parenthesized_expression(); + case T___noop: return parse_noop_expression(); - /* Gracefully handle type names while parsing expressions. */ - case T_COLONCOLON: + /* Gracefully handle type names while parsing expressions. */ + case T_COLONCOLON: + return parse_reference(); + case T_IDENTIFIER: + if (!is_typedef_symbol(token.symbol)) { return parse_reference(); - case T_IDENTIFIER: - if (!is_typedef_symbol(token.v.symbol)) { - return parse_reference(); - } - /* FALLTHROUGH */ - TYPENAME_START { - source_position_t const pos = *HERE; - type_t const *const type = parse_typename(); - errorf(&pos, "encountered type '%T' while parsing expression", type); - return create_invalid_expression(); } + /* FALLTHROUGH */ + TYPENAME_START { + source_position_t const pos = *HERE; + type_t const *const type = parse_typename(); + errorf(&pos, "encountered type '%T' while parsing expression", type); + return create_invalid_expression(); + } } errorf(HERE, "unexpected token %K, expected an expression", &token); + eat_until_anchor(); return create_invalid_expression(); } -/** - * Check if the expression has the character type and issue a warning then. - */ -static void check_for_char_index_type(const expression_t *expression) -{ - type_t *const type = expression->base.type; - const type_t *const base_type = skip_typeref(type); - - if (is_type_atomic(base_type, ATOMIC_TYPE_CHAR) && - warning.char_subscripts) { - warningf(&expression->base.source_position, - "array subscript has type '%T'", type); - } -} - static expression_t *parse_array_expression(expression_t *left) { - expression_t *expression = allocate_expression_zero(EXPR_ARRAY_ACCESS); + expression_t *const expr = allocate_expression_zero(EXPR_ARRAY_ACCESS); + array_access_expression_t *const arr = &expr->array_access; eat('['); add_anchor_token(']'); - expression_t *inside = parse_expression(); + expression_t *const inside = parse_expression(); type_t *const orig_type_left = left->base.type; type_t *const orig_type_inside = inside->base.type; @@ -7370,36 +7151,48 @@ static expression_t *parse_array_expression(expression_t *left) type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_inside = skip_typeref(orig_type_inside); - type_t *return_type; - array_access_expression_t *array_access = &expression->array_access; + expression_t *ref; + expression_t *idx; + type_t *idx_type; + type_t *res_type; if (is_type_pointer(type_left)) { - return_type = type_left->pointer.points_to; - array_access->array_ref = left; - array_access->index = inside; - check_for_char_index_type(inside); + ref = left; + idx = inside; + idx_type = type_inside; + res_type = type_left->pointer.points_to; + goto check_idx; } else if (is_type_pointer(type_inside)) { - return_type = type_inside->pointer.points_to; - array_access->array_ref = inside; - array_access->index = left; - array_access->flipped = true; - check_for_char_index_type(left); + arr->flipped = true; + ref = inside; + idx = left; + idx_type = type_left; + res_type = type_inside->pointer.points_to; +check_idx: + res_type = automatic_type_conversion(res_type); + if (!is_type_integer(idx_type)) { + errorf(&idx->base.source_position, "array subscript must have integer type"); + } else if (is_type_atomic(idx_type, ATOMIC_TYPE_CHAR) && warning.char_subscripts) { + warningf(&idx->base.source_position, "array subscript has char type"); + } } else { if (is_type_valid(type_left) && is_type_valid(type_inside)) { - errorf(HERE, + errorf(&expr->base.source_position, "array access on object with non-pointer types '%T', '%T'", orig_type_left, orig_type_inside); } - return_type = type_error_type; - array_access->array_ref = left; - array_access->index = inside; + res_type = type_error_type; + ref = left; + idx = inside; } - expression->base.type = automatic_type_conversion(return_type); + arr->array_ref = ref; + arr->index = idx; + arr->base.type = res_type; rem_anchor_token(']'); expect(']', end_error); end_error: - return expression; + return expr; } static expression_t *parse_typeprop(expression_kind_t const kind) @@ -7429,7 +7222,7 @@ static expression_t *parse_typeprop(expression_kind_t const kind) goto typeprop_expression; } } else { - expression = parse_sub_expression(PREC_UNARY); + expression = parse_subexpression(PREC_UNARY); typeprop_expression: tp_expression->typeprop.tp_expression = expression; @@ -7440,12 +7233,28 @@ typeprop_expression: tp_expression->typeprop.type = orig_type; type_t const* const type = skip_typeref(orig_type); - char const* const wrong_type = - GNU_MODE && is_type_atomic(type, ATOMIC_TYPE_VOID) ? NULL : - is_type_incomplete(type) ? "incomplete" : - type->kind == TYPE_FUNCTION ? "function designator" : - type->kind == TYPE_BITFIELD ? "bitfield" : - NULL; + char const* wrong_type = NULL; + if (is_type_incomplete(type)) { + if (!is_type_atomic(type, ATOMIC_TYPE_VOID) || !GNU_MODE) + wrong_type = "incomplete"; + } else if (type->kind == TYPE_FUNCTION) { + if (GNU_MODE) { + /* function types are allowed (and return 1) */ + if (warning.other) { + char const* const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof"; + warningf(&tp_expression->base.source_position, + "%s expression with function argument returns invalid result", what); + } + } else { + wrong_type = "function"; + } + } else { + if (is_type_incomplete(type)) + wrong_type = "incomplete"; + } + if (type->kind == TYPE_BITFIELD) + wrong_type = "bitfield"; + if (wrong_type != NULL) { char const* const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof"; errorf(&tp_expression->base.source_position, @@ -7472,13 +7281,14 @@ static expression_t *parse_select_expression(expression_t *addr) { assert(token.type == '.' || token.type == T_MINUSGREATER); bool select_left_arrow = (token.type == T_MINUSGREATER); + source_position_t const pos = *HERE; next_token(); if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing select", T_IDENTIFIER, NULL); return create_invalid_expression(); } - symbol_t *symbol = token.v.symbol; + symbol_t *symbol = token.symbol; next_token(); type_t *const orig_type = addr->base.type; @@ -7488,7 +7298,7 @@ static expression_t *parse_select_expression(expression_t *addr) bool saw_error = false; if (is_type_pointer(type)) { if (!select_left_arrow) { - errorf(HERE, + errorf(&pos, "request for member '%Y' in something not a struct or union, but '%T'", symbol, orig_type); saw_error = true; @@ -7496,7 +7306,7 @@ static expression_t *parse_select_expression(expression_t *addr) type_left = skip_typeref(type->pointer.points_to); } else { if (select_left_arrow && is_type_valid(type)) { - errorf(HERE, "left hand side of '->' is not a pointer, but '%T'", orig_type); + errorf(&pos, "left hand side of '->' is not a pointer, but '%T'", orig_type); saw_error = true; } type_left = type; @@ -7506,7 +7316,7 @@ static expression_t *parse_select_expression(expression_t *addr) type_left->kind != TYPE_COMPOUND_UNION) { if (is_type_valid(type_left) && !saw_error) { - errorf(HERE, + errorf(&pos, "request for member '%Y' in something not a struct or union, but '%T'", symbol, type_left); } @@ -7515,17 +7325,17 @@ static expression_t *parse_select_expression(expression_t *addr) compound_t *compound = type_left->compound.compound; if (!compound->complete) { - errorf(HERE, "request for member '%Y' in incomplete type '%T'", + errorf(&pos, "request for member '%Y' in incomplete type '%T'", symbol, type_left); return create_invalid_expression(); } type_qualifiers_t qualifiers = type_left->base.qualifiers; - expression_t *result - = find_create_select(HERE, addr, qualifiers, compound, symbol); + expression_t *result = + find_create_select(&pos, addr, qualifiers, compound, symbol); if (result == NULL) { - errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol); + errorf(&pos, "'%T' has no member named '%Y'", orig_type, symbol); return create_invalid_expression(); } @@ -7573,8 +7383,8 @@ static void check_call_argument(type_t *expected_type, /* report exact scope in error messages (like "in argument 3") */ char buf[64]; snprintf(buf, sizeof(buf), "call argument %u", pos); - report_assign_error(error, expected_type, arg_expr, buf, - &arg_expr->base.source_position); + report_assign_error(error, expected_type, arg_expr, buf, + &arg_expr->base.source_position); } else if (warning.traditional || warning.conversion) { type_t *const promoted_type = get_default_promoted_type(arg_type); if (!types_compatible(expected_type_skip, promoted_type) && @@ -7598,20 +7408,33 @@ static void handle_builtin_argument_restrictions(call_expression_t *call) { /* argument must be constant */ call_argument_t *argument = call->arguments; - if (! is_constant_expression(argument->expression)) { + if (is_constant_expression(argument->expression) == EXPR_CLASS_VARIABLE) { errorf(&call->base.source_position, "argument of '%Y' must be a constant expression", call->function->reference.entity->base.symbol); } break; } - case bk_gnu_builtin_prefetch: { + 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", + call->function->reference.entity->base.symbol); + } + break; + case bk_gnu_builtin_prefetch: /* second and third argument must be constant if existent */ + if (call->arguments == NULL) + break; call_argument_t *rw = call->arguments->next; call_argument_t *locality = NULL; if (rw != NULL) { - if (! is_constant_expression(rw->expression)) { + if (is_constant_expression(rw->expression) == EXPR_CLASS_VARIABLE) { errorf(&call->base.source_position, "second argument of '%Y' must be a constant expression", call->function->reference.entity->base.symbol); @@ -7619,7 +7442,7 @@ static void handle_builtin_argument_restrictions(call_expression_t *call) { locality = rw->next; } if (locality != NULL) { - if (! is_constant_expression(locality->expression)) { + if (is_constant_expression(locality->expression) == EXPR_CLASS_VARIABLE) { errorf(&call->base.source_position, "third argument of '%Y' must be a constant expression", call->function->reference.entity->base.symbol); @@ -7627,7 +7450,6 @@ static void handle_builtin_argument_restrictions(call_expression_t *call) { locality = rw->next; } break; - } default: break; } @@ -7670,17 +7492,13 @@ static expression_t *parse_call_expression(expression_t *expression) if (token.type != ')') { call_argument_t **anchor = &call->arguments; - for (;;) { + do { call_argument_t *argument = allocate_ast_zero(sizeof(*argument)); argument->expression = parse_assignment_expression(); *anchor = argument; anchor = &argument->next; - - if (token.type != ',') - break; - next_token(); - } + } while (next_if(',')); } rem_anchor_token(','); rem_anchor_token(')'); @@ -7699,15 +7517,19 @@ static expression_t *parse_call_expression(expression_t *expression) } if (parameter != NULL) { - errorf(HERE, "too few arguments to function '%E'", expression); + errorf(&expression->base.source_position, "too few arguments to function '%E'", expression); } else if (argument != NULL && !function_type->variadic) { - errorf(HERE, "too many arguments to function '%E'", expression); + errorf(&argument->expression->base.source_position, "too many arguments to function '%E'", expression); } } /* do default promotion for other arguments */ for (; argument != NULL; argument = argument->next) { type_t *type = argument->expression->base.type; + if (!is_type_object(skip_typeref(type))) { + errorf(&argument->expression->base.source_position, + "call argument '%E' must not be void", argument->expression); + } type = get_default_promoted_type(type); @@ -7715,16 +7537,16 @@ static expression_t *parse_call_expression(expression_t *expression) = create_implicit_cast(argument->expression, type); } - check_format(&result->call); + check_format(call); if (warning.aggregate_return && is_type_compound(skip_typeref(function_type->return_type))) { - warningf(&result->base.source_position, + warningf(&expression->base.source_position, "function call has aggregate value"); } - if (call->function->kind == EXPR_REFERENCE) { - reference_expression_t *reference = &call->function->reference; + if (expression->kind == EXPR_REFERENCE) { + reference_expression_t *reference = &expression->reference; if (reference->entity->kind == ENTITY_FUNCTION && reference->entity->function.btk != bk_none) handle_builtin_argument_restrictions(call); @@ -7840,7 +7662,7 @@ static expression_t *parse_conditional_expression(expression_t *expression) expect(':', end_error); end_error:; expression_t *false_expression = - parse_sub_expression(c_mode & _CXX ? PREC_ASSIGNMENT : PREC_CONDITIONAL); + parse_subexpression(c_mode & _CXX ? PREC_ASSIGNMENT : PREC_CONDITIONAL); type_t *const orig_true_type = true_expression->base.type; type_t *const orig_false_type = false_expression->base.type; @@ -7869,13 +7691,6 @@ end_error:; } else if (is_type_arithmetic(true_type) && is_type_arithmetic(false_type)) { result_type = semantic_arithmetic(true_type, false_type); - - true_expression = create_implicit_cast(true_expression, result_type); - false_expression = create_implicit_cast(false_expression, result_type); - - conditional->true_expression = true_expression; - conditional->false_expression = false_expression; - conditional->base.type = result_type; } else if (same_compound_type(true_type, false_type)) { /* just take 1 of the 2 types */ result_type = true_type; @@ -7927,7 +7742,7 @@ end_error:; result_type = pointer_type; } else { if (is_type_valid(other_type)) { - type_error_incompatible("while parsing conditional", + type_error_incompatible("while parsing conditional", &expression->base.source_position, true_type, false_type); } result_type = type_error_type; @@ -7958,7 +7773,7 @@ static expression_t *parse_extension(void) bool old_gcc_extension = in_gcc_extension; in_gcc_extension = true; - expression_t *expression = parse_sub_expression(PREC_UNARY); + expression_t *expression = parse_subexpression(PREC_UNARY); in_gcc_extension = old_gcc_extension; return expression; } @@ -7996,14 +7811,13 @@ static expression_t *parse_delete(void) eat(T_delete); - if (token.type == '[') { - next_token(); + if (next_if('[')) { result->kind = EXPR_UNARY_DELETE_ARRAY; expect(']', end_error); end_error:; } - expression_t *const value = parse_sub_expression(PREC_CAST); + expression_t *const value = parse_subexpression(PREC_CAST); result->unary.value = value; type_t *const type = skip_typeref(value->base.type); @@ -8105,14 +7919,14 @@ static bool is_lvalue(const expression_t *expression) return true; default: { - type_t *type = skip_typeref(expression->base.type); - return - /* ISO/IEC 14882:1998(E) §3.10:3 */ - is_type_reference(type) || - /* Claim it is an lvalue, if the type is invalid. There was a parse - * error before, which maybe prevented properly recognizing it as - * lvalue. */ - !is_type_valid(type); + type_t *type = skip_typeref(expression->base.type); + return + /* ISO/IEC 14882:1998(E) §3.10:3 */ + is_type_reference(type) || + /* Claim it is an lvalue, if the type is invalid. There was a parse + * error before, which maybe prevented properly recognizing it as + * lvalue. */ + !is_type_valid(type); } } } @@ -8221,8 +8035,8 @@ static void set_address_taken(expression_t *expression, bool may_be_register) if (entity->declaration.storage_class == STORAGE_CLASS_REGISTER && !may_be_register) { errorf(&expression->base.source_position, - "address of register %s '%Y' requested", - get_entity_kind_name(entity->kind), entity->base.symbol); + "address of register %s '%Y' requested", + get_entity_kind_name(entity->kind), entity->base.symbol); } if (entity->kind == ENTITY_VARIABLE) { @@ -8267,7 +8081,7 @@ static expression_t *parse_##unexpression_type(void) \ expression_t *unary_expression \ = allocate_expression_zero(unexpression_type); \ eat(token_type); \ - unary_expression->unary.value = parse_sub_expression(PREC_UNARY); \ + unary_expression->unary.value = parse_subexpression(PREC_UNARY); \ \ sfunc(&unary_expression->unary); \ \ @@ -8403,6 +8217,30 @@ static void semantic_binexpr_arithmetic(binary_expression_t *expression) expression->base.type = arithmetic_type; } +static void semantic_binexpr_integer(binary_expression_t *const expression) +{ + expression_t *const left = expression->left; + expression_t *const right = expression->right; + type_t *const orig_type_left = left->base.type; + type_t *const orig_type_right = right->base.type; + type_t *const type_left = skip_typeref(orig_type_left); + type_t *const type_right = skip_typeref(orig_type_right); + + if (!is_type_integer(type_left) || !is_type_integer(type_right)) { + /* TODO: improve error message */ + if (is_type_valid(type_left) && is_type_valid(type_right)) { + errorf(&expression->base.source_position, + "operation needs integer types"); + } + return; + } + + type_t *const result_type = semantic_arithmetic(type_left, type_right); + expression->left = create_implicit_cast(left, result_type); + expression->right = create_implicit_cast(right, result_type); + expression->base.type = result_type; +} + static void warn_div_by_zero(binary_expression_t const *const expression) { if (!warning.div_by_zero || @@ -8411,8 +8249,8 @@ static void warn_div_by_zero(binary_expression_t const *const expression) expression_t const *const right = expression->right; /* The type of the right operand can be different for /= */ - if (is_type_integer(right->base.type) && - is_constant_expression(right) && + if (is_type_integer(right->base.type) && + is_constant_expression(right) == EXPR_CLASS_CONSTANT && !fold_constant_to_bool(right)) { warningf(&expression->base.source_position, "division by zero"); } @@ -8463,7 +8301,7 @@ static bool semantic_shift(binary_expression_t *expression) type_left = promote_integer(type_left); - if (is_constant_expression(right)) { + if (is_constant_expression(right) == EXPR_CLASS_CONSTANT) { long count = fold_constant_to_int(right); if (count < 0) { warningf(&right->base.source_position, @@ -8583,8 +8421,8 @@ static void warn_string_literal_address(expression_t const* expr) expr = expr->unary.value; } - if (expr->kind == EXPR_STRING_LITERAL || - expr->kind == EXPR_WIDE_STRING_LITERAL) { + if (expr->kind == EXPR_STRING_LITERAL + || expr->kind == EXPR_WIDE_STRING_LITERAL) { warningf(&expr->base.source_position, "comparison with string literal results in unspecified behaviour"); } @@ -8611,9 +8449,11 @@ static void warn_comparison_in_comparison(const expression_t *const expr) static bool maybe_negative(expression_t const *const expr) { - return - !is_constant_expression(expr) || - fold_constant_to_int(expr) < 0; + switch (is_constant_expression(expr)) { + case EXPR_CLASS_ERROR: return false; + case EXPR_CLASS_CONSTANT: return fold_constant_to_int(expr) < 0; + default: return true; + } } /** @@ -8724,33 +8564,33 @@ static bool is_valid_assignment_lhs(expression_t const* const left) type_t *const type_left = skip_typeref(orig_type_left); if (!is_lvalue(left)) { - errorf(HERE, "left hand side '%E' of assignment is not an lvalue", + errorf(&left->base.source_position, "left hand side '%E' of assignment is not an lvalue", left); return false; } if (left->kind == EXPR_REFERENCE && left->reference.entity->kind == ENTITY_FUNCTION) { - errorf(HERE, "cannot assign to function '%E'", left); + errorf(&left->base.source_position, "cannot assign to function '%E'", left); return false; } if (is_type_array(type_left)) { - errorf(HERE, "cannot assign to array '%E'", left); + errorf(&left->base.source_position, "cannot assign to array '%E'", left); return false; } if (type_left->base.qualifiers & TYPE_QUALIFIER_CONST) { - errorf(HERE, "assignment to readonly location '%E' (type '%T')", left, + errorf(&left->base.source_position, "assignment to read-only location '%E' (type '%T')", left, orig_type_left); return false; } if (is_type_incomplete(type_left)) { - errorf(HERE, "left-hand side '%E' of assignment has incomplete type '%T'", + errorf(&left->base.source_position, "left-hand side '%E' of assignment has incomplete type '%T'", left, orig_type_left); return false; } if (is_type_compound(type_left) && has_const_fields(&type_left->compound)) { - errorf(HERE, "cannot assign to '%E' because compound type '%T' has readonly fields", + errorf(&left->base.source_position, "cannot assign to '%E' because compound type '%T' has read-only fields", left, orig_type_left); return false; } @@ -8934,13 +8774,20 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_INVALID: return true; /* do NOT warn */ case EXPR_REFERENCE: return false; case EXPR_REFERENCE_ENUM_VALUE: return false; + case EXPR_LABEL_ADDRESS: return false; + /* suppress the warning for microsoft __noop operations */ - case EXPR_CONST: return expr->conste.is_ms_noop; - case EXPR_CHARACTER_CONSTANT: return false; - case EXPR_WIDE_CHARACTER_CONSTANT: return false; + case EXPR_LITERAL_MS_NOOP: return true; + case EXPR_LITERAL_BOOLEAN: + case EXPR_LITERAL_CHARACTER: + case EXPR_LITERAL_WIDE_CHARACTER: + case EXPR_LITERAL_INTEGER: + case EXPR_LITERAL_INTEGER_OCTAL: + case EXPR_LITERAL_INTEGER_HEXADECIMAL: + case EXPR_LITERAL_FLOATINGPOINT: + case EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL: return false; case EXPR_STRING_LITERAL: return false; case EXPR_WIDE_STRING_LITERAL: return false; - case EXPR_LABEL_ADDRESS: return false; case EXPR_CALL: { const call_expression_t *const call = &expr->call; @@ -9074,7 +8921,7 @@ static expression_t *parse_##binexpression_type(expression_t *left) \ binexpr->binary.left = left; \ eat(token_type); \ \ - expression_t *right = parse_sub_expression(prec_r); \ + expression_t *right = parse_subexpression(prec_r); \ \ binexpr->binary.right = right; \ sfunc(&binexpr->binary); \ @@ -9095,9 +8942,9 @@ CREATE_BINEXPR_PARSER(T_LESSEQUAL, EXPR_BINARY_LESSEQUAL, PR CREATE_BINEXPR_PARSER(T_GREATEREQUAL, EXPR_BINARY_GREATEREQUAL, PREC_SHIFT, semantic_comparison) CREATE_BINEXPR_PARSER(T_EXCLAMATIONMARKEQUAL, EXPR_BINARY_NOTEQUAL, PREC_RELATIONAL, semantic_comparison) CREATE_BINEXPR_PARSER(T_EQUALEQUAL, EXPR_BINARY_EQUAL, PREC_RELATIONAL, semantic_comparison) -CREATE_BINEXPR_PARSER('&', EXPR_BINARY_BITWISE_AND, PREC_EQUALITY, semantic_binexpr_arithmetic) -CREATE_BINEXPR_PARSER('^', EXPR_BINARY_BITWISE_XOR, PREC_AND, semantic_binexpr_arithmetic) -CREATE_BINEXPR_PARSER('|', EXPR_BINARY_BITWISE_OR, PREC_XOR, semantic_binexpr_arithmetic) +CREATE_BINEXPR_PARSER('&', EXPR_BINARY_BITWISE_AND, PREC_EQUALITY, semantic_binexpr_integer) +CREATE_BINEXPR_PARSER('^', EXPR_BINARY_BITWISE_XOR, PREC_AND, semantic_binexpr_integer) +CREATE_BINEXPR_PARSER('|', EXPR_BINARY_BITWISE_OR, PREC_XOR, semantic_binexpr_integer) CREATE_BINEXPR_PARSER(T_ANDAND, EXPR_BINARY_LOGICAL_AND, PREC_OR, semantic_logical_op) CREATE_BINEXPR_PARSER(T_PIPEPIPE, EXPR_BINARY_LOGICAL_OR, PREC_LOGICAL_AND, semantic_logical_op) CREATE_BINEXPR_PARSER('=', EXPR_BINARY_ASSIGN, PREC_ASSIGNMENT, semantic_binexpr_assign) @@ -9114,7 +8961,7 @@ CREATE_BINEXPR_PARSER(T_CARETEQUAL, EXPR_BINARY_BITWISE_XOR_ASSIGN, PR CREATE_BINEXPR_PARSER(',', EXPR_BINARY_COMMA, PREC_ASSIGNMENT, semantic_comma) -static expression_t *parse_sub_expression(precedence_t precedence) +static expression_t *parse_subexpression(precedence_t precedence) { if (token.type < 0) { return expected_expression_error(); @@ -9159,7 +9006,7 @@ static expression_t *parse_sub_expression(precedence_t precedence) */ static expression_t *parse_expression(void) { - return parse_sub_expression(PREC_EXPRESSION); + return parse_subexpression(PREC_EXPRESSION); } /** @@ -9188,7 +9035,7 @@ static void register_expression_parser(parse_expression_function parser, * @param precedence the precedence of the operator */ static void register_infix_parser(parse_expression_infix_function parser, - int token_type, precedence_t precedence) + int token_type, precedence_t precedence) { expression_parser_function_t *entry = &expression_parsers[token_type]; @@ -9274,14 +9121,13 @@ static asm_argument_t *parse_asm_arguments(bool is_out) asm_argument_t *argument = allocate_ast_zero(sizeof(argument[0])); memset(argument, 0, sizeof(argument[0])); - if (token.type == '[') { - eat('['); + if (next_if('[')) { if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing asm argument", T_IDENTIFIER, NULL); return NULL; } - argument->symbol = token.v.symbol; + argument->symbol = token.symbol; expect(']', end_error); } @@ -9341,7 +9187,9 @@ static asm_argument_t *parse_asm_arguments(bool is_out) "asm output argument is not an lvalue"); } - if (argument->constraints.begin[0] == '+') + if (argument->constraints.begin[0] == '=') + determine_lhs_ent(expression, NULL); + else mark_vars_read(expression, NULL); } else { mark_vars_read(expression, NULL); @@ -9354,9 +9202,8 @@ static asm_argument_t *parse_asm_arguments(bool is_out) *anchor = argument; anchor = &argument->next; - if (token.type != ',') + if (!next_if(',')) break; - eat(','); } return result; @@ -9369,23 +9216,18 @@ end_error: */ static asm_clobber_t *parse_asm_clobbers(void) { - asm_clobber_t *result = NULL; - asm_clobber_t *last = NULL; + asm_clobber_t *result = NULL; + asm_clobber_t **anchor = &result; while (token.type == T_STRING_LITERAL) { asm_clobber_t *clobber = allocate_ast_zero(sizeof(clobber[0])); clobber->clobber = parse_string_literals(); - if (last != NULL) { - last->next = clobber; - } else { - result = clobber; - } - last = clobber; + *anchor = clobber; + anchor = &clobber->next; - if (token.type != ',') + if (!next_if(',')) break; - eat(','); } return result; @@ -9401,36 +9243,35 @@ static statement_t *parse_asm_statement(void) eat(T_asm); - if (token.type == T_volatile) { - next_token(); + if (next_if(T_volatile)) asm_statement->is_volatile = true; - } expect('(', end_error); add_anchor_token(')'); - add_anchor_token(':'); + if (token.type != T_STRING_LITERAL) { + parse_error_expected("after asm(", T_STRING_LITERAL, NULL); + goto end_of_asm; + } asm_statement->asm_text = parse_string_literals(); - if (token.type != ':') { + add_anchor_token(':'); + if (!next_if(':')) { rem_anchor_token(':'); goto end_of_asm; } - eat(':'); asm_statement->outputs = parse_asm_arguments(true); - if (token.type != ':') { + if (!next_if(':')) { rem_anchor_token(':'); goto end_of_asm; } - eat(':'); asm_statement->inputs = parse_asm_arguments(false); - if (token.type != ':') { + if (!next_if(':')) { rem_anchor_token(':'); goto end_of_asm; } rem_anchor_token(':'); - eat(':'); asm_statement->clobbers = parse_asm_clobbers(); @@ -9450,6 +9291,37 @@ end_error: return create_invalid_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) { + case '}': + errorf(&label->base.source_position, "%s at end of compound statement", label_kind); + inner_stmt = create_invalid_statement(); + break; + + case ';': + if (label->kind == STATEMENT_LABEL) { + /* Eat an empty statement here, to avoid the warning about an empty + * statement after a label. label:; is commonly used to have a label + * before a closing brace. */ + inner_stmt = create_empty_statement(); + next_token(); + break; + } + /* FALLTHROUGH */ + + default: + inner_stmt = parse_statement(); + /* ISO/IEC 14882:1998(E) §6:1/§6.7 Declarations are statements */ + if (inner_stmt->kind == STATEMENT_DECLARATION && !(c_mode & _CXX)) { + errorf(&inner_stmt->base.source_position, "declaration after %s", label_kind); + } + break; + } + return inner_stmt; +} + /** * Parse a case statement. */ @@ -9462,11 +9334,9 @@ static statement_t *parse_case_statement(void) expression_t *const expression = parse_expression(); statement->case_label.expression = expression; - if (!is_constant_expression(expression)) { - /* This check does not prevent the error message in all cases of an - * prior error while parsing the expression. At least it catches the - * common case of a mistyped enum entry. */ - if (is_type_valid(skip_typeref(expression->base.type))) { + expression_classification_t const expr_class = is_constant_expression(expression); + if (expr_class != EXPR_CLASS_CONSTANT) { + if (expr_class != EXPR_CLASS_ERROR) { errorf(pos, "case label does not reduce to an integer constant"); } statement->case_label.is_bad = true; @@ -9477,15 +9347,12 @@ static statement_t *parse_case_statement(void) } if (GNU_MODE) { - if (token.type == T_DOTDOTDOT) { - next_token(); + if (next_if(T_DOTDOTDOT)) { expression_t *const end_range = parse_expression(); statement->case_label.end_range = end_range; - if (!is_constant_expression(end_range)) { - /* This check does not prevent the error message in all cases of an - * prior error while parsing the expression. At least it catches the - * common case of a mistyped enum entry. */ - if (is_type_valid(skip_typeref(end_range->base.type))) { + expression_classification_t const end_class = is_constant_expression(end_range); + if (end_class != EXPR_CLASS_CONSTANT) { + if (end_class != EXPR_CLASS_ERROR) { errorf(pos, "case range does not reduce to an integer constant"); } statement->case_label.is_bad = true; @@ -9533,11 +9400,7 @@ end_error: errorf(pos, "case label not within a switch statement"); } - statement_t *const inner_stmt = parse_statement(); - statement->case_label.statement = inner_stmt; - if (inner_stmt->kind == STATEMENT_DECLARATION) { - errorf(&inner_stmt->base.source_position, "declaration after case label"); - } + statement->case_label.statement = parse_label_inner_statement(statement, "case label"); POP_PARENT; return statement; @@ -9555,11 +9418,12 @@ static statement_t *parse_default_statement(void) PUSH_PARENT(statement); expect(':', end_error); +end_error: + if (current_switch != NULL) { const case_label_statement_t *def_label = current_switch->default_label; if (def_label != NULL) { - errorf(HERE, "multiple default labels in one switch (previous declared %P)", - &def_label->base.source_position); + errorf(&statement->base.source_position, "multiple default labels in one switch (previous declared %P)", &def_label->base.source_position); } else { current_switch->default_label = &statement->case_label; @@ -9576,17 +9440,10 @@ static statement_t *parse_default_statement(void) "'default' label not within a switch statement"); } - statement_t *const inner_stmt = parse_statement(); - statement->case_label.statement = inner_stmt; - if (inner_stmt->kind == STATEMENT_DECLARATION) { - errorf(&inner_stmt->base.source_position, "declaration after default label"); - } + statement->case_label.statement = parse_label_inner_statement(statement, "default label"); POP_PARENT; return statement; -end_error: - POP_PARENT; - return create_invalid_statement(); } /** @@ -9594,52 +9451,26 @@ end_error: */ static statement_t *parse_label_statement(void) { - assert(token.type == T_IDENTIFIER); - symbol_t *symbol = token.v.symbol; - label_t *label = get_label(symbol); - statement_t *const statement = allocate_statement_zero(STATEMENT_LABEL); - statement->label.label = label; - - next_token(); + label_t *const label = get_label(); + statement->label.label = label; PUSH_PARENT(statement); /* if statement is already set then the label is defined twice, * otherwise it was just mentioned in a goto/local label declaration so far */ + source_position_t const* const pos = &statement->base.source_position; if (label->statement != NULL) { - errorf(HERE, "duplicate label '%Y' (declared %P)", - symbol, &label->base.source_position); + errorf(pos, "duplicate label '%Y' (declared %P)", label->base.symbol, &label->base.source_position); } else { - label->base.source_position = token.source_position; + label->base.source_position = *pos; label->statement = statement; } eat(':'); - if (token.type == '}') { - /* TODO only warn? */ - if (warning.other && false) { - warningf(HERE, "label at end of compound statement"); - statement->label.statement = create_empty_statement(); - } else { - errorf(HERE, "label at end of compound statement"); - statement->label.statement = create_invalid_statement(); - } - } else if (token.type == ';') { - /* Eat an empty statement here, to avoid the warning about an empty - * statement after a label. label:; is commonly used to have a label - * before a closing brace. */ - statement->label.statement = create_empty_statement(); - next_token(); - } else { - statement_t *const inner_stmt = parse_statement(); - statement->label.statement = inner_stmt; - if (inner_stmt->kind == STATEMENT_DECLARATION) { - errorf(&inner_stmt->base.source_position, "declaration after label"); - } - } + statement->label.statement = parse_label_inner_statement(statement, "label"); /* remember the labels in a list for later checking */ *label_anchor = &statement->label; @@ -9681,8 +9512,7 @@ end_error: statement->ifs.true_statement = true_stmt; rem_anchor_token(T_else); - if (token.type == T_else) { - next_token(); + if (next_if(T_else)) { statement->ifs.false_statement = parse_statement(); } else if (warning.parentheses && true_stmt->kind == STATEMENT_IF && @@ -9885,13 +9715,11 @@ static statement_t *parse_for(void) scope_t *old_scope = scope_push(&statement->fors.scope); bool old_gcc_extension = in_gcc_extension; - while (token.type == T___extension__) { - next_token(); + while (next_if(T___extension__)) { in_gcc_extension = true; } - if (token.type == ';') { - next_token(); + if (next_if(';')) { } else if (is_declaration_specifier(&token, false)) { parse_declaration(record_entity, DECL_FLAGS_NONE); } else { @@ -9959,8 +9787,7 @@ static statement_t *parse_goto(void) statement_t *statement = allocate_statement_zero(STATEMENT_GOTO); eat(T_goto); - if (GNU_MODE && token.type == '*') { - next_token(); + if (GNU_MODE && next_if('*')) { expression_t *expression = parse_expression(); mark_vars_read(expression, NULL); @@ -9981,16 +9808,16 @@ static statement_t *parse_goto(void) statement->gotos.expression = expression; } else if (token.type == T_IDENTIFIER) { - symbol_t *symbol = token.v.symbol; - next_token(); - statement->gotos.label = get_label(symbol); + label_t *const label = get_label(); + label->used = true; + statement->gotos.label = label; } else { if (GNU_MODE) parse_error_expected("while parsing goto", T_IDENTIFIER, '*', NULL); else parse_error_expected("while parsing goto", T_IDENTIFIER, NULL); eat_until_anchor(); - goto end_error; + return create_invalid_statement(); } /* remember the goto's in a list for later checking */ @@ -9999,9 +9826,8 @@ static statement_t *parse_goto(void) expect(';', end_error); - return statement; end_error: - return create_invalid_statement(); + return statement; } /** @@ -10155,13 +9981,13 @@ static statement_t *parse_return(void) } } else { assign_error_t error = semantic_assign(return_type, return_value); - report_assign_error(error, return_type, return_value, "'return'", - pos); + report_assign_error(error, return_type, return_value, "'return'", + pos); } return_value = create_implicit_cast(return_value, return_type); /* check for returning address of a local var */ if (warning.other && return_value != NULL - && return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) { + && return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) { const expression_t *expression = return_value->unary.value; if (expression_is_local_variable(expression)) { warningf(pos, "function returns address of local variable"); @@ -10171,10 +9997,10 @@ static statement_t *parse_return(void) /* ISO/IEC 14882:1998(E) §6.6.3:3 */ if (c_mode & _CXX || strict_mode) { errorf(pos, - "'return' without value, in function returning non-void"); + "'return' without value, in function returning non-void"); } else { warningf(pos, - "'return' without value, in function returning non-void"); + "'return' without value, in function returning non-void"); } } statement->returns.value = return_value; @@ -10243,8 +10069,7 @@ static statement_t *parse_ms_try_statment(void) POP_PARENT; - if (token.type == T___except) { - eat(T___except); + if (next_if(T___except)) { expect('(', end_error); add_anchor_token(')'); expression_t *const expr = parse_expression(); @@ -10261,8 +10086,7 @@ static statement_t *parse_ms_try_statment(void) rem_anchor_token(')'); expect(')', end_error); statement->ms_try.final_statement = parse_compound_statement(false); - } else if (token.type == T__finally) { - eat(T___finally); + } else if (next_if(T__finally)) { statement->ms_try.final_statement = parse_compound_statement(false); } else { parse_error_expected("while parsing __try statement", T___except, T___finally, NULL); @@ -10289,42 +10113,34 @@ static statement_t *parse_local_label_declaration(void) eat(T___label__); - entity_t *begin = NULL, *end = NULL; - - while (true) { + entity_t *begin = NULL; + entity_t *end = NULL; + entity_t **anchor = &begin; + do { if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing local label declaration", T_IDENTIFIER, NULL); goto end_error; } - symbol_t *symbol = token.v.symbol; + symbol_t *symbol = token.symbol; entity_t *entity = get_entity(symbol, NAMESPACE_LABEL); if (entity != NULL && entity->base.parent_scope == current_scope) { errorf(HERE, "multiple definitions of '__label__ %Y' (previous definition %P)", symbol, &entity->base.source_position); } else { - entity = allocate_entity_zero(ENTITY_LOCAL_LABEL); - + entity = allocate_entity_zero(ENTITY_LOCAL_LABEL, NAMESPACE_LABEL, symbol); entity->base.parent_scope = current_scope; - entity->base.namespc = NAMESPACE_LABEL; entity->base.source_position = token.source_position; - entity->base.symbol = symbol; - if (end != NULL) - end->base.next = entity; - end = entity; - if (begin == NULL) - begin = entity; + *anchor = entity; + anchor = &entity->base.next; + end = entity; environment_push(entity); } next_token(); - - if (token.type != ',') - break; - next_token(); - } - eat(';'); + } while (next_if(',')); + expect(';', end_error); end_error: statement->declaration.declarations_begin = begin; statement->declaration.declarations_end = end; @@ -10339,14 +10155,14 @@ static void parse_namespace_definition(void) symbol_t *symbol = NULL; if (token.type == T_IDENTIFIER) { - symbol = token.v.symbol; + symbol = token.symbol; next_token(); entity = get_entity(symbol, NAMESPACE_NORMAL); - if (entity != NULL && - entity->kind != ENTITY_NAMESPACE && - entity->base.parent_scope == current_scope) { - if (!is_error_entity(entity)) { + if (entity != NULL + && entity->kind != ENTITY_NAMESPACE + && entity->base.parent_scope == current_scope) { + if (is_entity_valid(entity)) { error_redefined_as_different_kind(&token.source_position, entity, ENTITY_NAMESPACE); } @@ -10355,10 +10171,8 @@ static void parse_namespace_definition(void) } if (entity == NULL) { - entity = allocate_entity_zero(ENTITY_NAMESPACE); - entity->base.symbol = symbol; + entity = allocate_entity_zero(ENTITY_NAMESPACE, NAMESPACE_NORMAL, symbol); entity->base.source_position = token.source_position; - entity->base.namespc = NAMESPACE_NORMAL; entity->base.parent_scope = current_scope; } @@ -10373,12 +10187,17 @@ static void parse_namespace_definition(void) size_t const top = environment_top(); scope_t *old_scope = scope_push(&entity->namespacee.members); + entity_t *old_current_entity = current_entity; + current_entity = entity; + expect('{', end_error); parse_externals(); 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); } @@ -10399,7 +10218,7 @@ static statement_t *intern_parse_statement(void) token_type_t la1_type = (token_type_t)look_ahead(1)->type; if (la1_type == ':') { statement = parse_label_statement(); - } else if (is_typedef_symbol(token.v.symbol)) { + } else if (is_typedef_symbol(token.symbol)) { statement = parse_declaration_statement(); } else { /* it's an identifier, the grammar says this must be an @@ -10409,18 +10228,14 @@ static statement_t *intern_parse_statement(void) switch (la1_type) { case '&': case '*': - if (get_entity(token.v.symbol, NAMESPACE_NORMAL) != NULL) - goto expression_statment; - /* FALLTHROUGH */ - + if (get_entity(token.symbol, NAMESPACE_NORMAL) != NULL) { + default: + statement = parse_expression_statement(); + } else { DECLARATION_START case T_IDENTIFIER: - statement = parse_declaration_statement(); - break; - - default: -expression_statment: - statement = parse_expression_statement(); + statement = parse_declaration_statement(); + } break; } } @@ -10430,9 +10245,7 @@ expression_statment: 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. */ - do { - next_token(); - } while (token.type == T___extension__); + while (next_if(T___extension__)) {} bool old_gcc_extension = in_gcc_extension; in_gcc_extension = true; statement = intern_parse_statement(); @@ -10813,9 +10626,9 @@ end_error:; static void parse_linkage_specification(void) { eat(T_extern); - assert(token.type == T_STRING_LITERAL); - const char *linkage = parse_string_literals().begin; + source_position_t const pos = *HERE; + char const *const linkage = parse_string_literals().begin; linkage_kind_t old_linkage = current_linkage; linkage_kind_t new_linkage; @@ -10824,13 +10637,12 @@ static void parse_linkage_specification(void) } else if (strcmp(linkage, "C++") == 0) { new_linkage = LINKAGE_CXX; } else { - errorf(HERE, "linkage string \"%s\" not recognized", linkage); + errorf(&pos, "linkage string \"%s\" not recognized", linkage); new_linkage = LINKAGE_INVALID; } current_linkage = new_linkage; - if (token.type == '{') { - next_token(); + if (next_if('{')) { parse_externals(); expect('}', end_error); } else { @@ -10896,6 +10708,7 @@ static void parse_externals(void) add_anchor_token(T_EOF); #ifndef NDEBUG + /* make a copy of the anchor set, so we can check if it is restored after parsing */ unsigned char token_anchor_copy[T_LAST_TOKEN]; memcpy(token_anchor_copy, token_anchor_set, sizeof(token_anchor_copy)); #endif @@ -10903,15 +10716,17 @@ static void parse_externals(void) while (token.type != T_EOF && token.type != '}') { #ifndef NDEBUG bool anchor_leak = false; - for (int i = 0; i != T_LAST_TOKEN; ++i) { + for (int i = 0; i < T_LAST_TOKEN; ++i) { unsigned char count = token_anchor_set[i] - token_anchor_copy[i]; if (count != 0) { - errorf(HERE, "Leaked anchor token %k %d times", i, count); + /* the anchor set and its copy differs */ + internal_errorf(HERE, "Leaked anchor token %k %d times", i, count); anchor_leak = true; } } if (in_gcc_extension) { - errorf(HERE, "Leaked __extension__"); + /* an gcc extension scope was not closed */ + internal_errorf(HERE, "Leaked __extension__"); anchor_leak = true; } @@ -10946,6 +10761,11 @@ static void parse_translation_unit(void) } } +void set_default_visibility(elf_visibility_tag_t visibility) +{ + default_visibility = visibility; +} + /** * Parse the input. * @@ -10959,8 +10779,7 @@ void start_parsing(void) error_count = 0; warning_count = 0; - type_set_output(stderr); - ast_set_output(stderr); + print_to_file(stderr); assert(unit == NULL); unit = allocate_ast_zero(sizeof(unit[0])); @@ -11067,104 +10886,6 @@ void parse(void) incomplete_arrays = NULL; } -/** - * create a builtin function. - */ -static entity_t *create_builtin_function(builtin_kind_t kind, const char *name, type_t *function_type) -{ - symbol_t *symbol = symbol_table_insert(name); - entity_t *entity = allocate_entity_zero(ENTITY_FUNCTION); - entity->declaration.storage_class = STORAGE_CLASS_EXTERN; - entity->declaration.declared_storage_class = STORAGE_CLASS_EXTERN; - entity->declaration.type = function_type; - entity->declaration.implicit = true; - entity->base.symbol = symbol; - entity->base.source_position = builtin_source_position; - - entity->function.btk = kind; - - record_entity(entity, /*is_definition=*/false); - return entity; -} - - -/** - * Create predefined gnu builtins. - */ -static void create_gnu_builtins(void) -{ -#define GNU_BUILTIN(a, b) create_builtin_function(bk_gnu_builtin_##a, "__builtin_" #a, b) - - GNU_BUILTIN(alloca, make_function_1_type(type_void_ptr, type_size_t)); - GNU_BUILTIN(huge_val, make_function_0_type(type_double)); - GNU_BUILTIN(inf, make_function_0_type(type_double)); - GNU_BUILTIN(inff, make_function_0_type(type_float)); - GNU_BUILTIN(infl, make_function_0_type(type_long_double)); - GNU_BUILTIN(nan, make_function_1_type(type_double, type_char_ptr)); - GNU_BUILTIN(nanf, make_function_1_type(type_float, type_char_ptr)); - GNU_BUILTIN(nanl, make_function_1_type(type_long_double, type_char_ptr)); - GNU_BUILTIN(va_end, make_function_1_type(type_void, type_valist)); - GNU_BUILTIN(expect, make_function_2_type(type_long, type_long, type_long)); - GNU_BUILTIN(return_address, make_function_1_type(type_void_ptr, type_unsigned_int)); - GNU_BUILTIN(frame_address, make_function_1_type(type_void_ptr, type_unsigned_int)); - GNU_BUILTIN(ffs, make_function_1_type(type_int, type_unsigned_int)); - GNU_BUILTIN(clz, make_function_1_type(type_int, type_unsigned_int)); - GNU_BUILTIN(ctz, make_function_1_type(type_int, type_unsigned_int)); - GNU_BUILTIN(popcount, make_function_1_type(type_int, type_unsigned_int)); - GNU_BUILTIN(parity, make_function_1_type(type_int, type_unsigned_int)); - GNU_BUILTIN(prefetch, make_function_1_type_variadic(type_float, type_void_ptr)); - GNU_BUILTIN(trap, make_function_0_type_noreturn(type_void)); - -#undef GNU_BUILTIN -} - -/** - * Create predefined MS intrinsics. - */ -static void create_microsoft_intrinsics(void) -{ -#define MS_BUILTIN(a, b) create_builtin_function(bk_ms##a, #a, b) - - /* intrinsics for all architectures */ - MS_BUILTIN(_rotl, make_function_2_type(type_unsigned_int, type_unsigned_int, type_int)); - MS_BUILTIN(_rotr, make_function_2_type(type_unsigned_int, type_unsigned_int, type_int)); - MS_BUILTIN(_rotl64, make_function_2_type(type_unsigned_int64, type_unsigned_int64, type_int)); - MS_BUILTIN(_rotr64, make_function_2_type(type_unsigned_int64, type_unsigned_int64, type_int)); - MS_BUILTIN(_byteswap_ushort, make_function_1_type(type_unsigned_short, type_unsigned_short)); - MS_BUILTIN(_byteswap_ulong, make_function_1_type(type_unsigned_long, type_unsigned_long)); - MS_BUILTIN(_byteswap_uint64, make_function_1_type(type_unsigned_int64, type_unsigned_int64)); - - MS_BUILTIN(__debugbreak, make_function_0_type(type_void)); - MS_BUILTIN(_ReturnAddress, make_function_0_type(type_void_ptr)); - MS_BUILTIN(_AddressOfReturnAddress, make_function_0_type(type_void_ptr)); - MS_BUILTIN(__popcount, make_function_1_type(type_unsigned_int, type_unsigned_int)); - - /* x86/x64 only */ - MS_BUILTIN(_enable, make_function_0_type(type_void)); - MS_BUILTIN(_disable, make_function_0_type(type_void)); - MS_BUILTIN(__inbyte, make_function_1_type(type_unsigned_char, type_unsigned_short)); - MS_BUILTIN(__inword, make_function_1_type(type_unsigned_short, type_unsigned_short)); - MS_BUILTIN(__indword, make_function_1_type(type_unsigned_long, type_unsigned_short)); - MS_BUILTIN(__outbyte, make_function_2_type(type_void, type_unsigned_short, type_unsigned_char)); - MS_BUILTIN(__outword, make_function_2_type(type_void, type_unsigned_short, type_unsigned_short)); - MS_BUILTIN(__outdword, make_function_2_type(type_void, type_unsigned_short, type_unsigned_long)); - MS_BUILTIN(__ud2, make_function_0_type_noreturn(type_void)); - MS_BUILTIN(_BitScanForward, make_function_2_type(type_unsigned_char, type_unsigned_long_ptr, type_unsigned_long)); - MS_BUILTIN(_BitScanReverse, make_function_2_type(type_unsigned_char, type_unsigned_long_ptr, type_unsigned_long)); - MS_BUILTIN(_InterlockedExchange, make_function_2_type(type_long, type_long_ptr, type_long)); - MS_BUILTIN(_InterlockedExchange64, make_function_2_type(type_int64, type_int64_ptr, type_int64)); - - if (machine_size <= 32) { - MS_BUILTIN(__readeflags, make_function_0_type(type_unsigned_int)); - MS_BUILTIN(__writeeflags, make_function_1_type(type_void, type_unsigned_int)); - } else { - MS_BUILTIN(__readeflags, make_function_0_type(type_unsigned_int64)); - MS_BUILTIN(__writeeflags, make_function_1_type(type_void, type_unsigned_int64)); - } - -#undef MS_BUILTIN -} - /** * Initialize the parser. */ @@ -11176,9 +10897,6 @@ void init_parser(void) init_expression_parsers(); obstack_init(&temp_obst); - - symbol_t *const va_list_sym = symbol_table_insert("__builtin_va_list"); - type_valist = create_builtin_type(va_list_sym, type_void_ptr); } /**