X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=baa943af371f7d56b6deb85153433683575ebc11;hb=d4a27091c638acf4f67f8a4f1faf3aac911c7fce;hp=297dbd6dd283b76b80f9270ab34ad2dc4a9ff90c;hpb=047521e80856f0e884ef6e3c304f798d67b480f3;p=cparser diff --git a/parser.c b/parser.c index 297dbd6..baa943a 100644 --- a/parser.c +++ b/parser.c @@ -39,6 +39,14 @@ #include "adt/error.h" #include "adt/array.h" +/** if wchar_t is equal to unsigned short. */ +bool opt_short_wchar_t = +#ifdef _WIN32 + true; +#else + false; +#endif + //#define PRINT_TOKENS #define MAX_LOOKAHEAD 2 @@ -48,15 +56,24 @@ typedef struct { unsigned short namespc; } stack_entry_t; +typedef struct argument_list_t argument_list_t; +struct argument_list_t { + long argument; + argument_list_t *next; +}; + typedef struct gnu_attribute_t gnu_attribute_t; struct gnu_attribute_t { - gnu_attribute_kind_t kind; + gnu_attribute_kind_t kind; /**< The kind of the GNU attribute. */ gnu_attribute_t *next; - bool invalid; - bool have_arguments; + bool invalid; /**< Set if this attribute had argument errors, */ + bool have_arguments; /**< True, if this attribute has arguments. */ union { - size_t value; - string_t string; + size_t value; + string_t string; + atomic_type_kind_t akind; + long argument; /**< Single argument. */ + argument_list_t *arguments; /**< List of argument expressions. */ } u; }; @@ -99,6 +116,7 @@ static declaration_t *last_declaration = NULL; static declaration_t *current_function = NULL; static switch_statement_t *current_switch = NULL; static statement_t *current_loop = NULL; +static statement_t *current_parent = NULL; static ms_try_statement_t *current_try = NULL; static goto_statement_t *goto_first = NULL; static goto_statement_t *goto_last = NULL; @@ -107,6 +125,11 @@ static label_statement_t *label_last = NULL; static translation_unit_t *unit = NULL; static struct obstack temp_obst; +#define PUSH_PARENT(stmt) \ + statement_t *const prev_parent = current_parent; \ + current_parent = (stmt); +#define POP_PARENT ((void)(current_parent = prev_parent)) + static source_position_t null_position = { NULL, 0 }; /* symbols for Microsoft extended-decl-modifier */ @@ -156,7 +179,8 @@ static void semantic_comparison(binary_expression_t *expression); case T_extern: \ case T_static: \ case T_auto: \ - case T_register: + case T_register: \ + case T___thread: #define TYPE_QUALIFIERS \ case T_const: \ @@ -291,10 +315,10 @@ static size_t get_expression_struct_size(expression_kind_t kind) [EXPR_VA_ARG] = sizeof(va_arg_expression_t), [EXPR_STATEMENT] = sizeof(statement_expression_t), }; - if(kind >= EXPR_UNARY_FIRST && kind <= EXPR_UNARY_LAST) { + if (kind >= EXPR_UNARY_FIRST && kind <= EXPR_UNARY_LAST) { return sizes[EXPR_UNARY_FIRST]; } - if(kind >= EXPR_BINARY_FIRST && kind <= EXPR_BINARY_LAST) { + if (kind >= EXPR_BINARY_FIRST && kind <= EXPR_BINARY_LAST) { return sizes[EXPR_BINARY_FIRST]; } assert(kind <= sizeof(sizes) / sizeof(sizes[0])); @@ -311,7 +335,8 @@ static statement_t *allocate_statement_zero(statement_kind_t kind) size_t size = get_statement_struct_size(kind); statement_t *res = allocate_ast_zero(size); - res->base.kind = kind; + res->base.kind = kind; + res->base.parent = current_parent; return res; } @@ -390,6 +415,9 @@ static size_t get_type_struct_size(type_kind_t kind) /** * Allocate a type node of given kind and initialize all * fields with zero. + * + * @param kind type kind to allocate + * @param source_position the source position of the type definition */ static type_t *allocate_type_zero(type_kind_t kind, const source_position_t *source_position) { @@ -487,19 +515,22 @@ static inline const token_t *look_ahead(int num) /** * Adds a token to the token anchor set (a multi-set). */ -static void add_anchor_token(int token_type) { +static void add_anchor_token(int token_type) +{ assert(0 <= token_type && token_type < T_LAST_TOKEN); ++token_anchor_set[token_type]; } -static int save_and_reset_anchor_state(int token_type) { +static int save_and_reset_anchor_state(int token_type) +{ assert(0 <= token_type && token_type < T_LAST_TOKEN); int count = token_anchor_set[token_type]; token_anchor_set[token_type] = 0; return count; } -static void restore_anchor_state(int token_type, int count) { +static void restore_anchor_state(int token_type, int count) +{ assert(0 <= token_type && token_type < T_LAST_TOKEN); token_anchor_set[token_type] = count; } @@ -507,13 +538,15 @@ static void restore_anchor_state(int token_type, int count) { /** * Remove a token from the token anchor set (a multi-set). */ -static void rem_anchor_token(int token_type) { +static void rem_anchor_token(int token_type) +{ assert(0 <= token_type && token_type < T_LAST_TOKEN); --token_anchor_set[token_type]; } -static bool at_anchor(void) { - if(token.type < 0) +static bool at_anchor(void) +{ + if (token.type < 0) return false; return token_anchor_set[token.type]; } @@ -521,39 +554,50 @@ static bool at_anchor(void) { /** * Eat tokens until a matching token is found. */ -static void eat_until_matching_token(int type) { - unsigned parenthesis_count = 0; - unsigned brace_count = 0; - unsigned bracket_count = 0; - int end_token = type; - - if(type == '(') - end_token = ')'; - else if(type == '{') - end_token = '}'; - else if(type == '[') - end_token = ']'; - - while(token.type != end_token || - (parenthesis_count > 0 || brace_count > 0 || bracket_count > 0)) { +static void eat_until_matching_token(int type) +{ + int end_token; + switch (type) { + case '(': end_token = ')'; break; + case '{': end_token = '}'; break; + case '[': end_token = ']'; break; + default: end_token = type; break; + } - switch(token.type) { + unsigned parenthesis_count = 0; + unsigned brace_count = 0; + unsigned bracket_count = 0; + while (token.type != end_token || + parenthesis_count != 0 || + brace_count != 0 || + bracket_count != 0) { + switch (token.type) { case T_EOF: return; case '(': ++parenthesis_count; break; case '{': ++brace_count; break; case '[': ++bracket_count; break; + case ')': - if(parenthesis_count > 0) + if (parenthesis_count > 0) --parenthesis_count; - break; + goto check_stop; + case '}': - if(brace_count > 0) + if (brace_count > 0) --brace_count; - break; + goto check_stop; + case ']': - if(bracket_count > 0) + if (bracket_count > 0) --bracket_count; +check_stop: + if (token.type == end_token && + parenthesis_count == 0 && + brace_count == 0 && + bracket_count == 0) + return; break; + default: break; } @@ -564,34 +608,37 @@ static void eat_until_matching_token(int type) { /** * Eat input tokens until an anchor is found. */ -static void eat_until_anchor(void) { - if(token.type == T_EOF) +static void eat_until_anchor(void) +{ + if (token.type == T_EOF) return; - while(token_anchor_set[token.type] == 0) { - if(token.type == '(' || token.type == '{' || token.type == '[') + while (token_anchor_set[token.type] == 0) { + if (token.type == '(' || token.type == '{' || token.type == '[') eat_until_matching_token(token.type); - if(token.type == T_EOF) + if (token.type == T_EOF) break; next_token(); } } -static void eat_block(void) { +static void eat_block(void) +{ eat_until_matching_token('{'); - if(token.type == '}') + if (token.type == '}') next_token(); } /** * eat all token until a ';' is reached or a stop token is found. */ -static void eat_statement(void) { +static void eat_statement(void) +{ eat_until_matching_token(';'); - if(token.type == ';') + if (token.type == ';') next_token(); } -#define eat(token_type) do { assert(token.type == token_type); next_token(); } while(0) +#define eat(token_type) do { assert(token.type == token_type); next_token(); } while (0) /** * Report a parse error because an expected token was not found. @@ -602,7 +649,7 @@ __attribute__((sentinel)) #endif void parse_error_expected(const char *message, ...) { - if(message != NULL) { + if (message != NULL) { errorf(HERE, "%s", message); } va_list ap; @@ -637,7 +684,7 @@ static void type_error_incompatible(const char *msg, */ #define expect(expected) \ do { \ - if(UNLIKELY(token.type != (expected))) { \ + if (UNLIKELY(token.type != (expected))) { \ parse_error_expected(NULL, (expected), NULL); \ add_anchor_token(expected); \ eat_until_anchor(); \ @@ -647,11 +694,11 @@ static void type_error_incompatible(const char *msg, goto end_error; \ } \ next_token(); \ - } while(0) + } while (0) static void set_scope(scope_t *new_scope) { - if(scope != NULL) { + if (scope != NULL) { scope->last_declaration = last_declaration; } scope = new_scope; @@ -668,7 +715,7 @@ static declaration_t *get_declaration(const symbol_t *const symbol, { declaration_t *declaration = symbol->declaration; for( ; declaration != NULL; declaration = declaration->symbol_next) { - if(declaration->namespc == namespc) + if (declaration->namespc == namespc) return declaration; } @@ -692,8 +739,8 @@ static void stack_push(stack_entry_t **stack_ptr, declaration_t *declaration) declaration_t *iter_last = NULL; for( ; iter != NULL; iter_last = iter, iter = iter->symbol_next) { /* replace an entry? */ - if(iter->namespc == namespc) { - if(iter_last == NULL) { + if (iter->namespc == namespc) { + if (iter_last == NULL) { symbol->declaration = declaration; } else { iter_last->symbol_next = declaration; @@ -702,7 +749,7 @@ static void stack_push(stack_entry_t **stack_ptr, declaration_t *declaration) break; } } - if(iter == NULL) { + if (iter == NULL) { assert(iter_last->symbol_next == NULL); iter_last->symbol_next = declaration; } @@ -723,6 +770,11 @@ static void environment_push(declaration_t *declaration) stack_push(&environment_stack, declaration); } +/** + * Push a declaration of the label stack. + * + * @param declaration the declaration + */ static void label_push(declaration_t *declaration) { declaration->parent_scope = ¤t_function->scope; @@ -739,7 +791,7 @@ static void stack_pop_to(stack_entry_t **stack_ptr, size_t new_top) size_t i; assert(new_top <= top); - if(new_top == top) + if (new_top == top) return; for(i = top; i > new_top; --i) { @@ -752,8 +804,8 @@ static void stack_pop_to(stack_entry_t **stack_ptr, size_t new_top) /* replace/remove declaration */ declaration_t *declaration = symbol->declaration; assert(declaration != NULL); - if(declaration->namespc == namespc) { - if(old_declaration == NULL) { + if (declaration->namespc == namespc) { + if (old_declaration == NULL) { symbol->declaration = declaration->symbol_next; } else { symbol->declaration = old_declaration; @@ -763,10 +815,10 @@ static void stack_pop_to(stack_entry_t **stack_ptr, size_t new_top) declaration_t *iter = declaration->symbol_next; for( ; iter != NULL; iter_last = iter, iter = iter->symbol_next) { /* replace an entry? */ - if(iter->namespc == namespc) { + if (iter->namespc == namespc) { assert(iter_last != NULL); iter_last->symbol_next = old_declaration; - if(old_declaration != NULL) { + if (old_declaration != NULL) { old_declaration->symbol_next = iter->symbol_next; } break; @@ -784,13 +836,19 @@ static void environment_pop_to(size_t new_top) stack_pop_to(&environment_stack, new_top); } +/** + * Pop all entries on the label stack until the new_top + * is reached. + * + * @param new_top the new stack top + */ static void label_pop_to(size_t new_top) { stack_pop_to(&label_stack, new_top); } -static int get_rank(const type_t *type) +static atomic_type_kind_t get_rank(const type_t *type) { assert(!is_typeref(type)); /* The C-standard allows promoting enums to int or unsigned int (see § 7.2.2 @@ -798,7 +856,7 @@ static int get_rank(const type_t *type) * can't decide whether unsigned int is possible, while int always works. * (unsigned int would be preferable when possible... for stuff like * struct { enum { ... } bla : 4; } ) */ - if(type->kind == TYPE_ENUM) + if (type->kind == TYPE_ENUM) return ATOMIC_TYPE_INT; assert(type->kind == TYPE_ATOMIC); @@ -807,10 +865,10 @@ static int get_rank(const type_t *type) static type_t *promote_integer(type_t *type) { - if(type->kind == TYPE_BITFIELD) + if (type->kind == TYPE_BITFIELD) type = type->bitfield.base_type; - if(get_rank(type) < ATOMIC_TYPE_INT) + if (get_rank(type) < ATOMIC_TYPE_INT) type = type_int; return type; @@ -839,7 +897,7 @@ static expression_t *create_cast_expression(expression_t *expression, static bool is_null_pointer_constant(const expression_t *expression) { /* skip void* cast */ - if(expression->kind == EXPR_UNARY_CAST + if (expression->kind == EXPR_UNARY_CAST || expression->kind == EXPR_UNARY_CAST_IMPLICIT) { expression = expression->unary.value; } @@ -909,9 +967,9 @@ static void report_assign_error(assign_error_t error, type_t *orig_type_left, /* the left type has all qualifiers from the right type */ unsigned missing_qualifiers = points_to_right->base.qualifiers & ~points_to_left->base.qualifiers; - errorf(source_position, - "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointed-to type", - orig_type_left, context, orig_type_right, missing_qualifiers); + warningf(source_position, + "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointed-to type", + orig_type_left, context, orig_type_right, missing_qualifiers); return; } @@ -946,10 +1004,10 @@ static assign_error_t semantic_assign(type_t *orig_type_left, type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); - if(is_type_pointer(type_left)) { - if(is_null_pointer_constant(right)) { + if (is_type_pointer(type_left)) { + if (is_null_pointer_constant(right)) { return ASSIGN_SUCCESS; - } else if(is_type_pointer(type_right)) { + } else if (is_type_pointer(type_right)) { type_t *points_to_left = skip_typeref(type_left->pointer.points_to); type_t *points_to_right @@ -958,7 +1016,7 @@ static assign_error_t semantic_assign(type_t *orig_type_left, /* the left type has all qualifiers from the right type */ unsigned missing_qualifiers = points_to_right->base.qualifiers & ~points_to_left->base.qualifiers; - if(missing_qualifiers != 0) { + if (missing_qualifiers != 0) { return ASSIGN_ERROR_POINTER_QUALIFIER_MISSING; } @@ -975,7 +1033,7 @@ static assign_error_t semantic_assign(type_t *orig_type_left, } return ASSIGN_SUCCESS; - } else if(is_type_integer(type_right)) { + } else if (is_type_integer(type_right)) { return ASSIGN_WARNING_POINTER_FROM_INT; } } else if ((is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) || @@ -1004,7 +1062,7 @@ static expression_t *parse_constant_expression(void) /* start parsing at precedence 7 (conditional expression) */ expression_t *result = parse_sub_expression(7); - if(!is_constant_expression(result)) { + if (!is_constant_expression(result)) { errorf(&result->base.source_position, "expression '%E' is not constant\n", result); } @@ -1053,7 +1111,7 @@ static string_t parse_string_literals(void) return result; } -static const char *gnu_attribute_names[GNU_AK_LAST] = { +static const char *const gnu_attribute_names[GNU_AK_LAST] = { [GNU_AK_CONST] = "const", [GNU_AK_VOLATILE] = "volatile", [GNU_AK_CDECL] = "cdecl", @@ -1067,7 +1125,7 @@ static const char *gnu_attribute_names[GNU_AK_LAST] = { [GNU_AK_ALWAYS_INLINE] = "always_inline", [GNU_AK_MALLOC] = "malloc", [GNU_AK_WEAK] = "weak", - [GNU_AK_CONSTRUCTOR] = "constructor", + [GNU_AK_CONSTRUCTOR] = "constructor", [GNU_AK_DESTRUCTOR] = "destructor", [GNU_AK_NOTHROW] = "nothrow", [GNU_AK_TRANSPARENT_UNION] = "transparent_union", @@ -1081,15 +1139,15 @@ static const char *gnu_attribute_names[GNU_AK_LAST] = { [GNU_AK_NO_INSTRUMENT_FUNCTION] = "no_instrument_function", [GNU_AK_WARN_UNUSED_RESULT] = "warn_unused_result", [GNU_AK_LONGCALL] = "longcall", - [GNU_AK_SHORTCALL] = "shortcall", + [GNU_AK_SHORTCALL] = "shortcall", [GNU_AK_LONG_CALL] = "long_call", - [GNU_AK_SHORT_CALL] = "short_call", + [GNU_AK_SHORT_CALL] = "short_call", [GNU_AK_FUNCTION_VECTOR] = "function_vector", - [GNU_AK_INTERRUPT] = "interrupt", - [GNU_AK_INTERRUPT_HANDLER] = "interrupt_handler", - [GNU_AK_NMI_HANDLER] = "nmi_handler", - [GNU_AK_NESTING] = "nesting", - [GNU_AK_NEAR] = "near", + [GNU_AK_INTERRUPT] = "interrupt", + [GNU_AK_INTERRUPT_HANDLER] = "interrupt_handler", + [GNU_AK_NMI_HANDLER] = "nmi_handler", + [GNU_AK_NESTING] = "nesting", + [GNU_AK_NEAR] = "near", [GNU_AK_FAR] = "far", [GNU_AK_SIGNAL] = "signal", [GNU_AK_EIGTHBIT_DATA] = "eightbit_data", @@ -1124,11 +1182,12 @@ static const char *gnu_attribute_names[GNU_AK_LAST] = { /** * compare two string, ignoring double underscores on the second. */ -static int strcmp_underscore(const char *s1, const char *s2) { - if(s2[0] == '_' && s2[1] == '_') { +static int strcmp_underscore(const char *s1, const char *s2) +{ + if (s2[0] == '_' && s2[1] == '_') { size_t len2 = strlen(s2); size_t len1 = strlen(s1); - if(len1 == len2-4 && s2[len2-2] == '_' && s2[len2-1] == '_') { + if (len1 == len2-4 && s2[len2-2] == '_' && s2[len2-1] == '_') { return strncmp(s1, s2+2, len2-4); } } @@ -1139,7 +1198,8 @@ static int strcmp_underscore(const char *s1, const char *s2) { /** * Allocate a new gnu temporal attribute. */ -static gnu_attribute_t *allocate_gnu_attribute(gnu_attribute_kind_t kind) { +static gnu_attribute_t *allocate_gnu_attribute(gnu_attribute_kind_t kind) +{ gnu_attribute_t *attribute = obstack_alloc(&temp_obst, sizeof(*attribute)); attribute->kind = kind; attribute->next = NULL; @@ -1152,13 +1212,14 @@ static gnu_attribute_t *allocate_gnu_attribute(gnu_attribute_kind_t kind) { /** * parse one constant expression argument. */ -static void parse_gnu_attribute_const_arg(gnu_attribute_t *attribute) { +static void parse_gnu_attribute_const_arg(gnu_attribute_t *attribute) +{ expression_t *expression; add_anchor_token(')'); expression = parse_constant_expression(); rem_anchor_token(')'); expect(')'); - (void)expression; + attribute->u.argument = fold_constant(expression); return; end_error: attribute->invalid = true; @@ -1167,20 +1228,27 @@ end_error: /** * parse a list of constant expressions arguments. */ -static void parse_gnu_attribute_const_arg_list(gnu_attribute_t *attribute) { - expression_t *expression; +static void parse_gnu_attribute_const_arg_list(gnu_attribute_t *attribute) +{ + argument_list_t **list = &attribute->u.arguments; + argument_list_t *entry; + expression_t *expression; add_anchor_token(')'); add_anchor_token(','); - while(true){ + while (true) { expression = parse_constant_expression(); - if(token.type != ',') + entry = obstack_alloc(&temp_obst, sizeof(entry)); + entry->argument = fold_constant(expression); + entry->next = NULL; + *list = entry; + list = &entry->next; + if (token.type != ',') break; next_token(); } rem_anchor_token(','); rem_anchor_token(')'); expect(')'); - (void)expression; return; end_error: attribute->invalid = true; @@ -1193,7 +1261,7 @@ static void parse_gnu_attribute_string_arg(gnu_attribute_t *attribute, string_t *string) { add_anchor_token('('); - if(token.type != T_STRING_LITERAL) { + if (token.type != T_STRING_LITERAL) { parse_error_expected("while parsing attribute directive", T_STRING_LITERAL, NULL); goto end_error; @@ -1209,8 +1277,9 @@ end_error: /** * parse one tls model. */ -static void parse_gnu_attribute_tls_model_arg(gnu_attribute_t *attribute) { - static const char *tls_models[] = { +static void parse_gnu_attribute_tls_model_arg(gnu_attribute_t *attribute) +{ + static const char *const tls_models[] = { "global-dynamic", "local-dynamic", "initial-exec", @@ -1218,9 +1287,9 @@ static void parse_gnu_attribute_tls_model_arg(gnu_attribute_t *attribute) { }; string_t string = { NULL, 0 }; parse_gnu_attribute_string_arg(attribute, &string); - if(string.begin != NULL) { + if (string.begin != NULL) { for(size_t i = 0; i < 4; ++i) { - if(strcmp(tls_models[i], string.begin) == 0) { + if (strcmp(tls_models[i], string.begin) == 0) { attribute->u.value = i; return; } @@ -1233,8 +1302,9 @@ static void parse_gnu_attribute_tls_model_arg(gnu_attribute_t *attribute) { /** * parse one tls model. */ -static void parse_gnu_attribute_visibility_arg(gnu_attribute_t *attribute) { - static const char *visibilities[] = { +static void parse_gnu_attribute_visibility_arg(gnu_attribute_t *attribute) +{ + static const char *const visibilities[] = { "default", "protected", "hidden", @@ -1242,9 +1312,9 @@ static void parse_gnu_attribute_visibility_arg(gnu_attribute_t *attribute) { }; string_t string = { NULL, 0 }; parse_gnu_attribute_string_arg(attribute, &string); - if(string.begin != NULL) { + if (string.begin != NULL) { for(size_t i = 0; i < 4; ++i) { - if(strcmp(visibilities[i], string.begin) == 0) { + if (strcmp(visibilities[i], string.begin) == 0) { attribute->u.value = i; return; } @@ -1257,17 +1327,18 @@ static void parse_gnu_attribute_visibility_arg(gnu_attribute_t *attribute) { /** * parse one (code) model. */ -static void parse_gnu_attribute_model_arg(gnu_attribute_t *attribute) { - static const char *visibilities[] = { +static void parse_gnu_attribute_model_arg(gnu_attribute_t *attribute) +{ + static const char *const visibilities[] = { "small", "medium", "large" }; string_t string = { NULL, 0 }; parse_gnu_attribute_string_arg(attribute, &string); - if(string.begin != NULL) { + if (string.begin != NULL) { for(int i = 0; i < 3; ++i) { - if(strcmp(visibilities[i], string.begin) == 0) { + if (strcmp(visibilities[i], string.begin) == 0) { attribute->u.value = i; return; } @@ -1284,7 +1355,31 @@ static void parse_gnu_attribute_mode_arg(gnu_attribute_t *attribute) /* at least: byte, word, pointer, list of machine modes * __XXX___ is interpreted as XXX */ add_anchor_token(')'); - expect(T_IDENTIFIER); + + if (token.type != T_IDENTIFIER) { + expect(T_IDENTIFIER); + } + + /* This isn't really correct, the backend should provide a list of machine + * specific modes (according to gcc philosophy that is...) */ + const char *symbol_str = token.v.symbol->string; + if (strcmp_underscore("QI", symbol_str) == 0 || + strcmp_underscore("byte", symbol_str) == 0) { + attribute->u.akind = ATOMIC_TYPE_CHAR; + } else if (strcmp_underscore("HI", symbol_str) == 0) { + attribute->u.akind = ATOMIC_TYPE_SHORT; + } else if (strcmp_underscore("SI", symbol_str) == 0 + || strcmp_underscore("word", symbol_str) == 0 + || strcmp_underscore("pointer", symbol_str) == 0) { + attribute->u.akind = ATOMIC_TYPE_INT; + } else if (strcmp_underscore("DI", symbol_str) == 0) { + attribute->u.akind = ATOMIC_TYPE_LONGLONG; + } else { + warningf(HERE, "ignoring unknown mode '%s'", symbol_str); + attribute->invalid = true; + } + next_token(); + rem_anchor_token(')'); expect(')'); return; @@ -1295,8 +1390,9 @@ end_error: /** * parse one interrupt argument. */ -static void parse_gnu_attribute_interrupt_arg(gnu_attribute_t *attribute) { - static const char *interrupts[] = { +static void parse_gnu_attribute_interrupt_arg(gnu_attribute_t *attribute) +{ + static const char *const interrupts[] = { "IRQ", "FIQ", "SWI", @@ -1305,9 +1401,9 @@ static void parse_gnu_attribute_interrupt_arg(gnu_attribute_t *attribute) { }; string_t string = { NULL, 0 }; parse_gnu_attribute_string_arg(attribute, &string); - if(string.begin != NULL) { + if (string.begin != NULL) { for(size_t i = 0; i < 5; ++i) { - if(strcmp(interrupts[i], string.begin) == 0) { + if (strcmp(interrupts[i], string.begin) == 0) { attribute->u.value = i; return; } @@ -1320,8 +1416,9 @@ static void parse_gnu_attribute_interrupt_arg(gnu_attribute_t *attribute) { /** * parse ( identifier, const expression, const expression ) */ -static void parse_gnu_attribute_format_args(gnu_attribute_t *attribute) { - static const char *format_names[] = { +static void parse_gnu_attribute_format_args(gnu_attribute_t *attribute) +{ + static const char *const format_names[] = { "printf", "scanf", "strftime", @@ -1329,17 +1426,17 @@ static void parse_gnu_attribute_format_args(gnu_attribute_t *attribute) { }; int i; - if(token.type != T_IDENTIFIER) { + if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing format attribute directive", T_IDENTIFIER, NULL); goto end_error; } const char *name = token.v.symbol->string; for(i = 0; i < 4; ++i) { - if(strcmp_underscore(format_names[i], name) == 0) + if (strcmp_underscore(format_names[i], name) == 0) break; } - if(i >= 4) { - if(warning.attribute) + if (i >= 4) { + if (warning.attribute) warningf(HERE, "'%s' is an unrecognized format function type", name); } next_token(); @@ -1363,7 +1460,7 @@ end_error: static void check_no_argument(gnu_attribute_t *attribute, const char *name) { - if(!attribute->have_arguments) + if (!attribute->have_arguments) return; /* should have no arguments */ @@ -1461,21 +1558,21 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) expect('('); expect('('); - if(token.type != ')') { + if (token.type != ')') { /* find the end of the list */ - if(last != NULL) { - while(last->next != NULL) + if (last != NULL) { + while (last->next != NULL) last = last->next; } /* non-empty attribute list */ - while(true) { + while (true) { const char *name; if (token.type == T_const) { name = "const"; - } else if(token.type == T_volatile) { + } else if (token.type == T_volatile) { name = "volatile"; - } else if(token.type == T_cdecl) { + } else if (token.type == T_cdecl) { /* __attribute__((cdecl)), WITH ms mode */ name = "cdecl"; } else if (token.type == T_IDENTIFIER) { @@ -1490,26 +1587,26 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) int i; for(i = 0; i < GNU_AK_LAST; ++i) { - if(strcmp_underscore(gnu_attribute_names[i], name) == 0) + if (strcmp_underscore(gnu_attribute_names[i], name) == 0) break; } gnu_attribute_kind_t kind = (gnu_attribute_kind_t)i; attribute = NULL; - if(kind == GNU_AK_LAST) { - if(warning.attribute) + if (kind == GNU_AK_LAST) { + if (warning.attribute) warningf(HERE, "'%s' attribute directive ignored", name); /* skip possible arguments */ - if(token.type == '(') { + if (token.type == '(') { eat_until_matching_token(')'); } } else { /* check for arguments */ attribute = allocate_gnu_attribute(kind); - if(token.type == '(') { + if (token.type == '(') { next_token(); - if(token.type == ')') { + if (token.type == ')') { /* empty args are allowed */ next_token(); } else @@ -1519,10 +1616,6 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) switch(kind) { case GNU_AK_CONST: case GNU_AK_VOLATILE: - case GNU_AK_CDECL: - case GNU_AK_STDCALL: - case GNU_AK_FASTCALL: - case GNU_AK_DEPRECATED: case GNU_AK_NAKED: case GNU_AK_MALLOC: case GNU_AK_WEAK: @@ -1530,8 +1623,6 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) case GNU_AK_NOCOMMON: case GNU_AK_SHARED: case GNU_AK_NOTSHARED: - case GNU_AK_USED: - case GNU_AK_UNUSED: case GNU_AK_NO_INSTRUMENT_FUNCTION: case GNU_AK_WARN_UNUSED_RESULT: case GNU_AK_LONGCALL: @@ -1555,69 +1646,37 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) case GNU_AK_MAY_ALIAS: case GNU_AK_MS_STRUCT: case GNU_AK_GCC_STRUCT: - check_no_argument(attribute, name); - break; - - case GNU_AK_PURE: - check_no_argument(attribute, name); - modifiers |= DM_PURE; - break; - - case GNU_AK_ALWAYS_INLINE: - check_no_argument(attribute, name); - modifiers |= DM_FORCEINLINE; - break; - - case GNU_AK_DLLIMPORT: - check_no_argument(attribute, name); - modifiers |= DM_DLLIMPORT; - break; - - case GNU_AK_DLLEXPORT: - check_no_argument(attribute, name); - modifiers |= DM_DLLEXPORT; - break; - - case GNU_AK_PACKED: - check_no_argument(attribute, name); - modifiers |= DM_PACKED; - break; - - case GNU_AK_NOINLINE: - check_no_argument(attribute, name); - modifiers |= DM_NOINLINE; - break; + goto no_arg; + + case GNU_AK_CDECL: modifiers |= DM_CDECL; goto no_arg; + case GNU_AK_FASTCALL: modifiers |= DM_FASTCALL; goto no_arg; + case GNU_AK_STDCALL: modifiers |= DM_STDCALL; goto no_arg; + case GNU_AK_UNUSED: modifiers |= DM_UNUSED; goto no_arg; + case GNU_AK_USED: modifiers |= DM_USED; goto no_arg; + case GNU_AK_PURE: modifiers |= DM_PURE; goto no_arg; + case GNU_AK_ALWAYS_INLINE: modifiers |= DM_FORCEINLINE; goto no_arg; + case GNU_AK_DLLIMPORT: modifiers |= DM_DLLIMPORT; goto no_arg; + case GNU_AK_DLLEXPORT: modifiers |= DM_DLLEXPORT; goto no_arg; + case GNU_AK_PACKED: modifiers |= DM_PACKED; goto no_arg; + case GNU_AK_NOINLINE: modifiers |= DM_NOINLINE; goto no_arg; + case GNU_AK_NORETURN: modifiers |= DM_NORETURN; goto no_arg; + case GNU_AK_NOTHROW: modifiers |= DM_NOTHROW; goto no_arg; + case GNU_AK_TRANSPARENT_UNION: modifiers |= DM_TRANSPARENT_UNION; goto no_arg; + case GNU_AK_CONSTRUCTOR: modifiers |= DM_CONSTRUCTOR; goto no_arg; + case GNU_AK_DESTRUCTOR: modifiers |= DM_DESTRUCTOR; goto no_arg; + case GNU_AK_DEPRECATED: modifiers |= DM_DEPRECATED; goto no_arg; - case GNU_AK_NORETURN: - check_no_argument(attribute, name); - modifiers |= DM_NORETURN; - break; - - case GNU_AK_NOTHROW: - check_no_argument(attribute, name); - modifiers |= DM_NOTHROW; - break; - - case GNU_AK_TRANSPARENT_UNION: - check_no_argument(attribute, name); - modifiers |= DM_TRANSPARENT_UNION; - break; - - case GNU_AK_CONSTRUCTOR: - check_no_argument(attribute, name); - modifiers |= DM_CONSTRUCTOR; - break; - - case GNU_AK_DESTRUCTOR: - check_no_argument(attribute, name); - modifiers |= DM_DESTRUCTOR; + case GNU_AK_ALIGNED: + /* __align__ may be used without an argument */ + if (attribute->have_arguments) { + parse_gnu_attribute_const_arg(attribute); + } break; - case GNU_AK_ALIGNED: case GNU_AK_FORMAT_ARG: case GNU_AK_REGPARM: case GNU_AK_TRAP_EXIT: - if(!attribute->have_arguments) { + if (!attribute->have_arguments) { /* should have arguments */ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); attribute->invalid = true; @@ -1627,7 +1686,7 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) case GNU_AK_ALIAS: case GNU_AK_SECTION: case GNU_AK_SP_SWITCH: - if(!attribute->have_arguments) { + if (!attribute->have_arguments) { /* should have arguments */ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); attribute->invalid = true; @@ -1635,7 +1694,7 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) parse_gnu_attribute_string_arg(attribute, &attribute->u.string); break; case GNU_AK_FORMAT: - if(!attribute->have_arguments) { + if (!attribute->have_arguments) { /* should have arguments */ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); attribute->invalid = true; @@ -1644,29 +1703,29 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) break; case GNU_AK_WEAKREF: /* may have one string argument */ - if(attribute->have_arguments) + if (attribute->have_arguments) parse_gnu_attribute_string_arg(attribute, &attribute->u.string); break; case GNU_AK_NONNULL: - if(attribute->have_arguments) + if (attribute->have_arguments) parse_gnu_attribute_const_arg_list(attribute); break; case GNU_AK_TLS_MODEL: - if(!attribute->have_arguments) { + if (!attribute->have_arguments) { /* should have arguments */ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); } else parse_gnu_attribute_tls_model_arg(attribute); break; case GNU_AK_VISIBILITY: - if(!attribute->have_arguments) { + if (!attribute->have_arguments) { /* should have arguments */ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); } else parse_gnu_attribute_visibility_arg(attribute); break; case GNU_AK_MODEL: - if(!attribute->have_arguments) { + if (!attribute->have_arguments) { /* should have arguments */ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); } else { @@ -1674,7 +1733,7 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) } break; case GNU_AK_MODE: - if(!attribute->have_arguments) { + if (!attribute->have_arguments) { /* should have arguments */ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); } else { @@ -1683,21 +1742,24 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) break; case GNU_AK_INTERRUPT: /* may have one string argument */ - if(attribute->have_arguments) + if (attribute->have_arguments) parse_gnu_attribute_interrupt_arg(attribute); break; case GNU_AK_SENTINEL: /* may have one string argument */ - if(attribute->have_arguments) + if (attribute->have_arguments) parse_gnu_attribute_const_arg(attribute); break; case GNU_AK_LAST: /* already handled */ break; + +no_arg: + check_no_argument(attribute, name); } } - if(attribute != NULL) { - if(last != NULL) { + if (attribute != NULL) { + if (last != NULL) { last->next = attribute; last = attribute; } else { @@ -1705,7 +1767,7 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) } } - if(token.type != ',') + if (token.type != ',') break; next_token(); } @@ -1725,16 +1787,16 @@ static decl_modifiers_t parse_attributes(gnu_attribute_t **attributes) { decl_modifiers_t modifiers = 0; - while(true) { + while (true) { switch(token.type) { - case T___attribute__: { + case T___attribute__: modifiers |= parse_gnu_attribute(attributes); - break; - } + continue; + case T_asm: next_token(); expect('('); - if(token.type != T_STRING_LITERAL) { + if (token.type != T_STRING_LITERAL) { parse_error_expected("while parsing assembler attribute", T_STRING_LITERAL, NULL); eat_until_matching_token('('); @@ -1743,15 +1805,23 @@ static decl_modifiers_t parse_attributes(gnu_attribute_t **attributes) parse_string_literals(); } expect(')'); + continue; + + case T_cdecl: modifiers |= DM_CDECL; break; + case T__fastcall: modifiers |= DM_FASTCALL; break; + case T__stdcall: modifiers |= DM_STDCALL; break; + + case T___thiscall: + /* TODO record modifier */ + warningf(HERE, "Ignoring declaration modifier %K", &token); break; - default: - goto attributes_finished; - } - } -attributes_finished: end_error: - return modifiers; + default: return modifiers; + } + + next_token(); + } } static designator_t *parse_designation(void) @@ -1759,7 +1829,7 @@ static designator_t *parse_designation(void) designator_t *result = NULL; designator_t *last = NULL; - while(true) { + while (true) { designator_t *designator; switch(token.type) { case '[': @@ -1775,7 +1845,7 @@ static designator_t *parse_designation(void) designator = allocate_ast_zero(sizeof(designator[0])); designator->source_position = token.source_position; next_token(); - if(token.type != T_IDENTIFIER) { + if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing designator", T_IDENTIFIER, NULL); return NULL; @@ -1789,7 +1859,7 @@ static designator_t *parse_designation(void) } assert(designator != NULL); - if(last != NULL) { + if (last != NULL) { last->next = designator; } else { result = designator; @@ -1897,16 +1967,16 @@ static initializer_t *parse_scalar_initializer(type_t *type, { /* there might be extra {} hierarchies */ int braces = 0; - while(token.type == '{') { - next_token(); - if(braces == 0) { - warningf(HERE, "extra curly braces around scalar initializer"); - } - braces++; + if (token.type == '{') { + warningf(HERE, "extra curly braces around scalar initializer"); + do { + ++braces; + next_token(); + } while (token.type == '{'); } expression_t *expression = parse_assignment_expression(); - if(must_be_constant && !is_initializer_constant(expression)) { + if (must_be_constant && !is_initializer_constant(expression)) { errorf(&expression->base.source_position, "Initialisation expression '%E' is not constant\n", expression); @@ -1914,7 +1984,7 @@ static initializer_t *parse_scalar_initializer(type_t *type, initializer_t *initializer = initializer_from_expression(type, expression); - if(initializer == NULL) { + if (initializer == NULL) { errorf(&expression->base.source_position, "expression '%E' (type '%T') doesn't match expected type '%T'", expression, expression->base.type, type); @@ -1923,12 +1993,12 @@ static initializer_t *parse_scalar_initializer(type_t *type, } bool additional_warning_displayed = false; - while(braces > 0) { - if(token.type == ',') { + while (braces > 0) { + if (token.type == ',') { next_token(); } - if(token.type != '}') { - if(!additional_warning_displayed) { + if (token.type != '}') { + if (!additional_warning_displayed) { warningf(HERE, "additional elements in scalar initializer"); additional_warning_displayed = true; } @@ -1974,20 +2044,20 @@ static __attribute__((unused)) void debug_print_type_path( const type_path_entry_t *entry = & path->path[i]; type_t *type = skip_typeref(entry->type); - if(is_type_compound(type)) { + if (is_type_compound(type)) { /* in gcc mode structs can have no members */ - if(entry->v.compound_entry == NULL) { + if (entry->v.compound_entry == NULL) { assert(i == len-1); continue; } fprintf(stderr, ".%s", entry->v.compound_entry->symbol->string); - } else if(is_type_array(type)) { - fprintf(stderr, "[%zd]", entry->v.index); + } else if (is_type_array(type)) { + fprintf(stderr, "[%zu]", entry->v.index); } else { fprintf(stderr, "-INVALID-"); } } - if(path->top_type != NULL) { + if (path->top_type != NULL) { fprintf(stderr, " ("); print_type(path->top_type); fprintf(stderr, ")"); @@ -2032,12 +2102,12 @@ static void descend_into_subtype(type_path_t *path) type_path_entry_t *top = append_to_type_path(path); top->type = top_type; - if(is_type_compound(top_type)) { + if (is_type_compound(top_type)) { declaration_t *declaration = top_type->compound.declaration; declaration_t *entry = declaration->scope.declarations; top->v.compound_entry = entry; - if(entry != NULL) { + if (entry != NULL) { path->top_type = entry->type; } else { path->top_type = NULL; @@ -2072,7 +2142,7 @@ static void ascend_to(type_path_t *path, size_t top_path_level) { size_t len = ARR_LEN(path->path); - while(len > top_path_level) { + while (len > top_path_level) { ascend_from_subtype(path); len = ARR_LEN(path->path); } @@ -2087,10 +2157,10 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, type_t *type = skip_typeref(orig_type); - if(designator->symbol != NULL) { + if (designator->symbol != NULL) { symbol_t *symbol = designator->symbol; - if(!is_type_compound(type)) { - if(is_type_valid(type)) { + if (!is_type_compound(type)) { + if (is_type_valid(type)) { errorf(&designator->source_position, "'.%Y' designator used for non-compound type '%T'", symbol, orig_type); @@ -2101,18 +2171,18 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, declaration_t *declaration = type->compound.declaration; declaration_t *iter = declaration->scope.declarations; for( ; iter != NULL; iter = iter->next) { - if(iter->symbol == symbol) { + if (iter->symbol == symbol) { break; } } - if(iter == NULL) { + if (iter == NULL) { errorf(&designator->source_position, "'%T' has no member named '%Y'", orig_type, symbol); goto failed; } - if(used_in_offsetof) { + if (used_in_offsetof) { type_t *real_type = skip_typeref(iter->type); - if(real_type->kind == TYPE_BITFIELD) { + if (real_type->kind == TYPE_BITFIELD) { errorf(&designator->source_position, "offsetof designator '%Y' may not specify bitfield", symbol); @@ -2127,28 +2197,28 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, expression_t *array_index = designator->array_index; assert(designator->array_index != NULL); - if(!is_type_array(type)) { - if(is_type_valid(type)) { + if (!is_type_array(type)) { + if (is_type_valid(type)) { errorf(&designator->source_position, "[%E] designator used for non-array type '%T'", array_index, orig_type); } goto failed; } - if(!is_type_valid(array_index->base.type)) { + if (!is_type_valid(array_index->base.type)) { goto failed; } long index = fold_constant(array_index); - if(!used_in_offsetof) { - if(index < 0) { + if (!used_in_offsetof) { + if (index < 0) { errorf(&designator->source_position, "array index [%E] must be positive", array_index); goto failed; } - if(type->array.size_constant == true) { + if (type->array.size_constant == true) { long array_size = type->array.size; - if(index >= array_size) { + if (index >= array_size) { errorf(&designator->source_position, "designator [%E] (%d) exceeds array size %d", array_index, index, array_size); @@ -2163,7 +2233,7 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, } path->top_type = orig_type; - if(designator->next != NULL) { + if (designator->next != NULL) { descend_into_subtype(path); } } @@ -2178,15 +2248,15 @@ static void advance_current_object(type_path_t *path, size_t top_path_level) type_path_entry_t *top = get_type_path_top(path); type_t *type = skip_typeref(top->type); - if(is_type_union(type)) { + if (is_type_union(type)) { /* in unions only the first element is initialized */ top->v.compound_entry = NULL; - } else if(is_type_struct(type)) { + } else if (is_type_struct(type)) { declaration_t *entry = top->v.compound_entry; entry = entry->next; top->v.compound_entry = entry; - if(entry != NULL) { + if (entry != NULL) { path->top_type = entry->type; return; } @@ -2195,7 +2265,7 @@ static void advance_current_object(type_path_t *path, size_t top_path_level) top->v.index++; - if(!type->array.size_constant || top->v.index < type->array.size) { + if (!type->array.size_constant || top->v.index < type->array.size) { return; } } @@ -2204,7 +2274,7 @@ static void advance_current_object(type_path_t *path, size_t top_path_level) * can ascend in the type hierarchy and continue with another subobject */ size_t len = ARR_LEN(path->path); - if(len > top_path_level) { + if (len > top_path_level) { ascend_from_subtype(path); advance_current_object(path, top_path_level); } else { @@ -2215,9 +2285,10 @@ static void advance_current_object(type_path_t *path, size_t top_path_level) /** * skip until token is found. */ -static void skip_until(int type) { - while(token.type != type) { - if(token.type == T_EOF) +static void skip_until(int type) +{ + while (token.type != type) { + if (token.type == T_EOF) return; next_token(); } @@ -2228,13 +2299,13 @@ static void skip_until(int type) { */ static void skip_initializers(void) { - if(token.type == '{') + if (token.type == '{') next_token(); - while(token.type != '}') { - if(token.type == T_EOF) + while (token.type != '}') { + if (token.type == T_EOF) return; - if(token.type == '{') { + if (token.type == '{') { eat_block(); continue; } @@ -2256,7 +2327,7 @@ static initializer_t *parse_sub_initializer(type_path_t *path, type_t *outer_type, size_t top_path_level, parse_initializer_env_t *env) { - if(token.type == '}') { + if (token.type == '}') { /* empty initializer */ return create_empty_initializer(); } @@ -2271,7 +2342,7 @@ static initializer_t *parse_sub_initializer(type_path_t *path, /* we can't do usefull stuff if we didn't even parse the type. Skip the * initializers in this case. */ - if(!is_type_valid(type)) { + if (!is_type_valid(type)) { skip_initializers(); return create_empty_initializer(); } @@ -2279,14 +2350,23 @@ static initializer_t *parse_sub_initializer(type_path_t *path, initializer_t **initializers = NEW_ARR_F(initializer_t*, 0); - while(true) { + while (true) { designator_t *designator = NULL; - if(token.type == '.' || token.type == '[') { + if (token.type == '.' || token.type == '[') { designator = parse_designation(); + goto finish_designator; + } else if (token.type == T_IDENTIFIER && look_ahead(1)->type == ':') { + /* GNU-style designator ("identifier: value") */ + designator = allocate_ast_zero(sizeof(designator[0])); + designator->source_position = token.source_position; + designator->symbol = token.v.symbol; + eat(T_IDENTIFIER); + eat(':'); +finish_designator: /* reset path to toplevel, evaluate designator from there */ ascend_to(path, top_path_level); - if(!walk_designator(path, designator, false)) { + if (!walk_designator(path, designator, false)) { /* can't continue after designation error */ goto end_error; } @@ -2302,17 +2382,18 @@ static initializer_t *parse_sub_initializer(type_path_t *path, initializer_t *sub; - if(token.type == '{') { - if(type != NULL && is_type_scalar(type)) { + if (token.type == '{') { + if (type != NULL && is_type_scalar(type)) { sub = parse_scalar_initializer(type, env->must_be_constant); } else { eat('{'); - if(type == NULL) { - if (env->declaration != NULL) + if (type == NULL) { + if (env->declaration != NULL) { errorf(HERE, "extra brace group at end of initializer for '%Y'", - env->declaration->symbol); - else - errorf(HERE, "extra brace group at end of initializer"); + env->declaration->symbol); + } else { + errorf(HERE, "extra brace group at end of initializer"); + } } else descend_into_subtype(path); @@ -2321,7 +2402,7 @@ static initializer_t *parse_sub_initializer(type_path_t *path, env); rem_anchor_token('}'); - if(type != NULL) { + if (type != NULL) { ascend_from_subtype(path); expect('}'); } else { @@ -2333,27 +2414,27 @@ static initializer_t *parse_sub_initializer(type_path_t *path, /* must be an expression */ expression_t *expression = parse_assignment_expression(); - if(env->must_be_constant && !is_initializer_constant(expression)) { + if (env->must_be_constant && !is_initializer_constant(expression)) { errorf(&expression->base.source_position, "Initialisation expression '%E' is not constant\n", expression); } - if(type == NULL) { + if (type == NULL) { /* we are already outside, ... */ goto error_excess; } /* handle { "string" } special case */ - if((expression->kind == EXPR_STRING_LITERAL + if ((expression->kind == EXPR_STRING_LITERAL || expression->kind == EXPR_WIDE_STRING_LITERAL) && outer_type != NULL) { sub = initializer_from_expression(outer_type, expression); - if(sub != NULL) { - if(token.type == ',') { + if (sub != NULL) { + if (token.type == ',') { next_token(); } - if(token.type != '}') { + if (token.type != '}') { warningf(HERE, "excessive elements in initializer for type '%T'", orig_type); } @@ -2363,18 +2444,18 @@ static initializer_t *parse_sub_initializer(type_path_t *path, } /* descend into subtypes until expression matches type */ - while(true) { + while (true) { orig_type = path->top_type; type = skip_typeref(orig_type); sub = initializer_from_expression(orig_type, expression); - if(sub != NULL) { + if (sub != NULL) { break; } - if(!is_type_valid(type)) { + if (!is_type_valid(type)) { goto end_error; } - if(is_type_scalar(type)) { + if (is_type_scalar(type)) { errorf(&expression->base.source_position, "expression '%E' doesn't match expected type '%T'", expression, orig_type); @@ -2389,18 +2470,18 @@ static initializer_t *parse_sub_initializer(type_path_t *path, const type_path_entry_t *first = &path->path[0]; type_t *first_type = first->type; first_type = skip_typeref(first_type); - if(is_type_array(first_type)) { + if (is_type_array(first_type)) { size_t index = first->v.index; - if(index > path->max_index) + if (index > path->max_index) path->max_index = index; } - if(type != NULL) { + if (type != NULL) { /* append to initializers list */ ARR_APP1(initializer_t*, initializers, sub); } else { error_excess: - if(env->declaration != NULL) + if (env->declaration != NULL) warningf(HERE, "excess elements in struct initializer for '%Y'", env->declaration->symbol); else @@ -2408,19 +2489,19 @@ error_excess: } error_parse_next: - if(token.type == '}') { + if (token.type == '}') { break; } expect(','); - if(token.type == '}') { + if (token.type == '}') { break; } - if(type != NULL) { + if (type != NULL) { /* advance to the next declaration if we are not at the end */ advance_current_object(path, top_path_level); orig_type = path->top_type; - if(orig_type != NULL) + if (orig_type != NULL) type = skip_typeref(orig_type); else type = NULL; @@ -2457,9 +2538,9 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env) initializer_t *result = NULL; size_t max_index; - if(is_type_scalar(type)) { + if (is_type_scalar(type)) { result = parse_scalar_initializer(type, env->must_be_constant); - } else if(token.type == '{') { + } else if (token.type == '{') { eat('{'); type_path_t path; @@ -2485,7 +2566,7 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env) /* § 6.7.5 (22) array initializers for arrays with unknown size determine * the array type size */ - if(is_type_array(type) && type->array.size_expression == NULL + if (is_type_array(type) && type->array.size_expression == NULL && result != NULL) { size_t size; switch (result->kind) { @@ -2534,7 +2615,7 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) { gnu_attribute_t *attributes = NULL; decl_modifiers_t modifiers = 0; - if(is_struct) { + if (is_struct) { eat(T_struct); } else { eat(T_union); @@ -2547,17 +2628,28 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) modifiers |= parse_attributes(&attributes); } - if(token.type == T_IDENTIFIER) { + if (token.type == T_IDENTIFIER) { symbol = token.v.symbol; next_token(); - if(is_struct) { - declaration = get_declaration(symbol, NAMESPACE_STRUCT); - } else { - declaration = get_declaration(symbol, NAMESPACE_UNION); + namespace_t const namespc = + is_struct ? NAMESPACE_STRUCT : NAMESPACE_UNION; + declaration = get_declaration(symbol, namespc); + if (declaration != NULL) { + if (declaration->parent_scope != scope && + (token.type == '{' || token.type == ';')) { + declaration = NULL; + } else if (declaration->init.complete && + token.type == '{') { + assert(symbol != NULL); + errorf(HERE, "multiple definitions of '%s %Y' (previous definition at %P)", + is_struct ? "struct" : "union", symbol, + &declaration->source_position); + declaration->scope.declarations = NULL; + } } - } else if(token.type != '{') { - if(is_struct) { + } else if (token.type != '{') { + if (is_struct) { parse_error_expected("while parsing struct type specifier", T_IDENTIFIER, '{', NULL); } else { @@ -2568,7 +2660,7 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) return NULL; } - if(declaration == NULL) { + if (declaration == NULL) { declaration = allocate_declaration_zero(); declaration->namespc = (is_struct ? NAMESPACE_STRUCT : NAMESPACE_UNION); @@ -2581,14 +2673,7 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) append_declaration(declaration); } - if(token.type == '{') { - if (declaration->init.complete) { - assert(symbol != NULL); - errorf(HERE, "multiple definitions of '%s %Y' (previous definition at %P)", - is_struct ? "struct" : "union", symbol, - &declaration->source_position); - declaration->scope.declarations = NULL; - } + if (token.type == '{') { declaration->init.complete = true; parse_compound_type_entries(declaration); @@ -2603,7 +2688,7 @@ static void parse_enum_entries(type_t *const enum_type) { eat('{'); - if(token.type == '}') { + if (token.type == '}') { next_token(); errorf(HERE, "empty enum not allowed"); return; @@ -2611,7 +2696,7 @@ static void parse_enum_entries(type_t *const enum_type) add_anchor_token('}'); do { - if(token.type != T_IDENTIFIER) { + if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing enum entry", T_IDENTIFIER, NULL); eat_block(); rem_anchor_token('}'); @@ -2625,7 +2710,7 @@ static void parse_enum_entries(type_t *const enum_type) entry->source_position = token.source_position; next_token(); - if(token.type == '=') { + if (token.type == '=') { next_token(); expression_t *value = parse_constant_expression(); @@ -2637,10 +2722,10 @@ static void parse_enum_entries(type_t *const enum_type) record_declaration(entry); - if(token.type != ',') + if (token.type != ',') break; next_token(); - } while(token.type != '}'); + } while (token.type != '}'); rem_anchor_token('}'); expect('}'); @@ -2656,12 +2741,12 @@ static type_t *parse_enum_specifier(void) symbol_t *symbol; eat(T_enum); - if(token.type == T_IDENTIFIER) { + if (token.type == T_IDENTIFIER) { symbol = token.v.symbol; next_token(); declaration = get_declaration(symbol, NAMESPACE_ENUM); - } else if(token.type != '{') { + } else if (token.type != '{') { parse_error_expected("while parsing enum type specifier", T_IDENTIFIER, '{', NULL); return NULL; @@ -2670,7 +2755,7 @@ static type_t *parse_enum_specifier(void) symbol = NULL; } - if(declaration == NULL) { + if (declaration == NULL) { declaration = allocate_declaration_zero(); declaration->namespc = NAMESPACE_ENUM; declaration->source_position = token.source_position; @@ -2681,8 +2766,8 @@ static type_t *parse_enum_specifier(void) type_t *const type = allocate_type_zero(TYPE_ENUM, &declaration->source_position); type->enumt.declaration = declaration; - if(token.type == '{') { - if(declaration->init.complete) { + if (token.type == '{') { + if (declaration->init.complete) { errorf(HERE, "multiple definitions of enum %Y", symbol); } if (symbol != NULL) { @@ -2724,15 +2809,15 @@ static type_t *parse_typeof(void) restart: switch(token.type) { case T___extension__: - /* this can be a prefix to a typename or an expression */ - /* we simply eat it now. */ + /* This can be a prefix to a typename or an expression. We simply eat + * it now. */ do { next_token(); - } while(token.type == T___extension__); + } while (token.type == T___extension__); goto restart; case T_IDENTIFIER: - if(is_typedef_symbol(token.v.symbol)) { + if (is_typedef_symbol(token.v.symbol)) { type = parse_typename(); } else { expression = parse_expression(); @@ -2762,7 +2847,7 @@ end_error: return NULL; } -typedef enum { +typedef enum specifiers_t { SPECIFIER_SIGNED = 1 << 0, SPECIFIER_UNSIGNED = 1 << 1, SPECIFIER_LONG = 1 << 2, @@ -2791,7 +2876,7 @@ static type_t *create_builtin_type(symbol_t *const symbol, type->builtin.real_type = real_type; type_t *result = typehash_insert(type); - if(type != result) { + if (type != result) { free_type(type); } @@ -2801,7 +2886,7 @@ static type_t *create_builtin_type(symbol_t *const symbol, static type_t *get_typedef_type(symbol_t *symbol) { declaration_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL); - if(declaration == NULL || + if (declaration == NULL || declaration->storage_class != STORAGE_CLASS_TYPEDEF) return NULL; @@ -2814,8 +2899,9 @@ static type_t *get_typedef_type(symbol_t *symbol) /** * check for the allowed MS alignment values. */ -static bool check_elignment_value(long long intvalue) { - if(intvalue < 1 || intvalue > 8192) { +static bool check_alignment_value(long long intvalue) +{ + if (intvalue < 1 || intvalue > 8192) { errorf(HERE, "illegal alignment value"); return false; } @@ -2829,122 +2915,122 @@ static bool check_elignment_value(long long intvalue) { } #define DET_MOD(name, tag) do { \ - if(*modifiers & tag) warningf(HERE, #name " used more than once"); \ + if (*modifiers & tag) warningf(HERE, #name " used more than once"); \ *modifiers |= tag; \ -} while(0) +} while (0) static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *specifiers) { decl_modifiers_t *modifiers = &specifiers->modifiers; - while(true) { - if(token.type == T_restrict) { + while (true) { + if (token.type == T_restrict) { next_token(); DET_MOD(restrict, DM_RESTRICT); goto end_loop; - } else if(token.type != T_IDENTIFIER) + } else if (token.type != T_IDENTIFIER) break; symbol_t *symbol = token.v.symbol; - if(symbol == sym_align) { + if (symbol == sym_align) { next_token(); expect('('); - if(token.type != T_INTEGER) + if (token.type != T_INTEGER) goto end_error; - if(check_elignment_value(token.v.intvalue)) { - if(specifiers->alignment != 0) + if (check_alignment_value(token.v.intvalue)) { + if (specifiers->alignment != 0) warningf(HERE, "align used more than once"); specifiers->alignment = (unsigned char)token.v.intvalue; } next_token(); expect(')'); - } else if(symbol == sym_allocate) { + } else if (symbol == sym_allocate) { next_token(); expect('('); - if(token.type != T_IDENTIFIER) + if (token.type != T_IDENTIFIER) goto end_error; (void)token.v.symbol; expect(')'); - } else if(symbol == sym_dllimport) { + } else if (symbol == sym_dllimport) { next_token(); DET_MOD(dllimport, DM_DLLIMPORT); - } else if(symbol == sym_dllexport) { + } else if (symbol == sym_dllexport) { next_token(); DET_MOD(dllexport, DM_DLLEXPORT); - } else if(symbol == sym_thread) { + } else if (symbol == sym_thread) { next_token(); DET_MOD(thread, DM_THREAD); - } else if(symbol == sym_naked) { + } else if (symbol == sym_naked) { next_token(); DET_MOD(naked, DM_NAKED); - } else if(symbol == sym_noinline) { + } else if (symbol == sym_noinline) { next_token(); DET_MOD(noinline, DM_NOINLINE); - } else if(symbol == sym_noreturn) { + } else if (symbol == sym_noreturn) { next_token(); DET_MOD(noreturn, DM_NORETURN); - } else if(symbol == sym_nothrow) { + } else if (symbol == sym_nothrow) { next_token(); DET_MOD(nothrow, DM_NOTHROW); - } else if(symbol == sym_novtable) { + } else if (symbol == sym_novtable) { next_token(); DET_MOD(novtable, DM_NOVTABLE); - } else if(symbol == sym_property) { + } else if (symbol == sym_property) { next_token(); expect('('); for(;;) { bool is_get = false; - if(token.type != T_IDENTIFIER) + if (token.type != T_IDENTIFIER) goto end_error; - if(token.v.symbol == sym_get) { + if (token.v.symbol == sym_get) { is_get = true; - } else if(token.v.symbol == sym_put) { + } else if (token.v.symbol == sym_put) { } else { errorf(HERE, "Bad property name '%Y'", token.v.symbol); goto end_error; } next_token(); expect('='); - if(token.type != T_IDENTIFIER) + if (token.type != T_IDENTIFIER) goto end_error; - if(is_get) { - if(specifiers->get_property_sym != NULL) { + if (is_get) { + if (specifiers->get_property_sym != NULL) { errorf(HERE, "get property name already specified"); } else { specifiers->get_property_sym = token.v.symbol; } } else { - if(specifiers->put_property_sym != NULL) { + if (specifiers->put_property_sym != NULL) { errorf(HERE, "put property name already specified"); } else { specifiers->put_property_sym = token.v.symbol; } } next_token(); - if(token.type == ',') { + if (token.type == ',') { next_token(); continue; } break; } expect(')'); - } else if(symbol == sym_selectany) { + } else if (symbol == sym_selectany) { next_token(); DET_MOD(selectany, DM_SELECTANY); - } else if(symbol == sym_uuid) { + } else if (symbol == sym_uuid) { next_token(); expect('('); - if(token.type != T_STRING_LITERAL) + if (token.type != T_STRING_LITERAL) goto end_error; next_token(); expect(')'); - } else if(symbol == sym_deprecated) { + } else if (symbol == sym_deprecated) { next_token(); - if(specifiers->deprecated != 0) + if (specifiers->deprecated != 0) warningf(HERE, "deprecated used more than once"); specifiers->deprecated = 1; - if(token.type == '(') { + if (token.type == '(') { next_token(); - if(token.type == T_STRING_LITERAL) { + if (token.type == T_STRING_LITERAL) { specifiers->deprecated_string = token.v.string.begin; next_token(); } else { @@ -2952,13 +3038,13 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe } expect(')'); } - } else if(symbol == sym_noalias) { + } else if (symbol == sym_noalias) { next_token(); DET_MOD(noalias, DM_NOALIAS); } else { warningf(HERE, "Unknown modifier %Y ignored", token.v.symbol); next_token(); - if(token.type == '(') + if (token.type == '(') skip_until(')'); } end_loop: @@ -2975,17 +3061,23 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE; type_modifiers_t modifiers = TYPE_MODIFIER_NONE; unsigned type_specifiers = 0; - int newtype = 0; + bool newtype = false; + bool saw_error = false; specifiers->source_position = token.source_position; - while(true) { + while (true) { + specifiers->modifiers + |= parse_attributes(&specifiers->gnu_attributes); + if (specifiers->modifiers & DM_TRANSPARENT_UNION) + modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; + switch(token.type) { /* storage class */ #define MATCH_STORAGE_CLASS(token, class) \ case token: \ - if(specifiers->declared_storage_class != STORAGE_CLASS_NONE) { \ + if (specifiers->declared_storage_class != STORAGE_CLASS_NONE) { \ errorf(HERE, "multiple storage classes in declaration specifiers"); \ } \ specifiers->declared_storage_class = class; \ @@ -3033,7 +3125,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) case token: \ qualifiers |= qualifier; \ next_token(); \ - break; + break MATCH_TYPE_QUALIFIER(T_const, TYPE_QUALIFIER_CONST); MATCH_TYPE_QUALIFIER(T_restrict, TYPE_QUALIFIER_RESTRICT); @@ -3053,33 +3145,34 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) #define MATCH_SPECIFIER(token, specifier, name) \ case token: \ next_token(); \ - if(type_specifiers & specifier) { \ + if (type_specifiers & specifier) { \ errorf(HERE, "multiple " name " type specifiers given"); \ } else { \ type_specifiers |= specifier; \ } \ - break; - - MATCH_SPECIFIER(T_void, SPECIFIER_VOID, "void") - MATCH_SPECIFIER(T_char, SPECIFIER_CHAR, "char") - MATCH_SPECIFIER(T_short, SPECIFIER_SHORT, "short") - MATCH_SPECIFIER(T_int, SPECIFIER_INT, "int") - MATCH_SPECIFIER(T_float, SPECIFIER_FLOAT, "float") - MATCH_SPECIFIER(T_double, SPECIFIER_DOUBLE, "double") - MATCH_SPECIFIER(T_signed, SPECIFIER_SIGNED, "signed") - MATCH_SPECIFIER(T_unsigned, SPECIFIER_UNSIGNED, "unsigned") - MATCH_SPECIFIER(T__Bool, SPECIFIER_BOOL, "_Bool") - MATCH_SPECIFIER(T__int8, SPECIFIER_INT8, "_int8") - MATCH_SPECIFIER(T__int16, SPECIFIER_INT16, "_int16") - MATCH_SPECIFIER(T__int32, SPECIFIER_INT32, "_int32") - MATCH_SPECIFIER(T__int64, SPECIFIER_INT64, "_int64") - MATCH_SPECIFIER(T__int128, SPECIFIER_INT128, "_int128") - MATCH_SPECIFIER(T__Complex, SPECIFIER_COMPLEX, "_Complex") - MATCH_SPECIFIER(T__Imaginary, SPECIFIER_IMAGINARY, "_Imaginary") + break + + MATCH_SPECIFIER(T_void, SPECIFIER_VOID, "void"); + MATCH_SPECIFIER(T_char, SPECIFIER_CHAR, "char"); + MATCH_SPECIFIER(T_short, SPECIFIER_SHORT, "short"); + MATCH_SPECIFIER(T_int, SPECIFIER_INT, "int"); + MATCH_SPECIFIER(T_float, SPECIFIER_FLOAT, "float"); + MATCH_SPECIFIER(T_double, SPECIFIER_DOUBLE, "double"); + MATCH_SPECIFIER(T_signed, SPECIFIER_SIGNED, "signed"); + MATCH_SPECIFIER(T_unsigned, SPECIFIER_UNSIGNED, "unsigned"); + MATCH_SPECIFIER(T__Bool, SPECIFIER_BOOL, "_Bool"); + MATCH_SPECIFIER(T__int8, SPECIFIER_INT8, "_int8"); + MATCH_SPECIFIER(T__int16, SPECIFIER_INT16, "_int16"); + MATCH_SPECIFIER(T__int32, SPECIFIER_INT32, "_int32"); + MATCH_SPECIFIER(T__int64, SPECIFIER_INT64, "_int64"); + MATCH_SPECIFIER(T__int128, SPECIFIER_INT128, "_int128"); + MATCH_SPECIFIER(T__Complex, SPECIFIER_COMPLEX, "_Complex"); + MATCH_SPECIFIER(T__Imaginary, SPECIFIER_IMAGINARY, "_Imaginary"); case T__forceinline: /* only in microsoft mode */ specifiers->modifiers |= DM_FORCEINLINE; + /* FALLTHROUGH */ case T_inline: next_token(); @@ -3088,9 +3181,9 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) case T_long: next_token(); - if(type_specifiers & SPECIFIER_LONG_LONG) { + if (type_specifiers & SPECIFIER_LONG_LONG) { errorf(HERE, "multiple type specifiers given"); - } else if(type_specifiers & SPECIFIER_LONG) { + } else if (type_specifiers & SPECIFIER_LONG) { type_specifiers |= SPECIFIER_LONG_LONG; } else { type_specifiers |= SPECIFIER_LONG; @@ -3121,22 +3214,52 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) next_token(); break; - case T___attribute__: - specifiers->modifiers - |= parse_attributes(&specifiers->gnu_attributes); - if (specifiers->modifiers & DM_TRANSPARENT_UNION) - modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; - break; - case T_IDENTIFIER: { /* only parse identifier if we haven't found a type yet */ - if(type != NULL || type_specifiers != 0) - goto finish_specifiers; + if (type != NULL || type_specifiers != 0) { + /* Be somewhat resilient to typos like 'unsigned lng* f()' in a + * declaration, so it doesn't generate errors about expecting '(' or + * '{' later on. */ + switch (look_ahead(1)->type) { + STORAGE_CLASSES + TYPE_SPECIFIERS + case T_const: + case T_restrict: + case T_volatile: + case T_inline: + case T__forceinline: /* ^ DECLARATION_START except for __attribute__ */ + case T_IDENTIFIER: + case '*': + errorf(HERE, "discarding stray %K in declaration specifer", &token); + next_token(); + continue; + + default: + goto finish_specifiers; + } + } - type_t *typedef_type = get_typedef_type(token.v.symbol); + type_t *const typedef_type = get_typedef_type(token.v.symbol); + if (typedef_type == NULL) { + /* Be somewhat resilient to typos like 'vodi f()' at the beginning of a + * declaration, so it doesn't generate 'implicit int' followed by more + * errors later on. */ + token_type_t const la1_type = (token_type_t)look_ahead(1)->type; + switch (la1_type) { + DECLARATION_START + case T_IDENTIFIER: + case '*': + errorf(HERE, "%K does not name a type", &token); + next_token(); + saw_error = true; + if (la1_type == '*') + goto finish_specifiers; + continue; - if(typedef_type == NULL) - goto finish_specifiers; + default: + goto finish_specifiers; + } + } next_token(); type = typedef_type; @@ -3151,7 +3274,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) finish_specifiers: - if(type == NULL) { + if (type == NULL) { atomic_type_kind_t atomic_type; /* match valid basic types */ @@ -3197,17 +3320,24 @@ finish_specifiers: case SPECIFIER_UNSIGNED | SPECIFIER_LONG | SPECIFIER_INT: atomic_type = ATOMIC_TYPE_ULONG; break; + case SPECIFIER_LONG | SPECIFIER_LONG_LONG: case SPECIFIER_SIGNED | SPECIFIER_LONG | SPECIFIER_LONG_LONG: case SPECIFIER_LONG | SPECIFIER_LONG_LONG | SPECIFIER_INT: case SPECIFIER_SIGNED | SPECIFIER_LONG | SPECIFIER_LONG_LONG | SPECIFIER_INT: atomic_type = ATOMIC_TYPE_LONGLONG; - break; + goto warn_about_long_long; + case SPECIFIER_UNSIGNED | SPECIFIER_LONG | SPECIFIER_LONG_LONG: case SPECIFIER_UNSIGNED | SPECIFIER_LONG | SPECIFIER_LONG_LONG | SPECIFIER_INT: atomic_type = ATOMIC_TYPE_ULONGLONG; +warn_about_long_long: + if (warning.long_long) { + warningf(&specifiers->source_position, + "ISO C90 does not support 'long long'"); + } break; case SPECIFIER_UNSIGNED | SPECIFIER_INT8: @@ -3281,8 +3411,13 @@ finish_specifiers: break; default: /* invalid specifier combination, give an error message */ - if(type_specifiers == 0) { - if (! strict_mode) { + if (type_specifiers == 0) { + if (saw_error) { + specifiers->type = type_error_type; + return; + } + + if (!strict_mode) { if (warning.implicit_int) { warningf(HERE, "no type specifiers in declaration, using 'int'"); } @@ -3291,10 +3426,10 @@ finish_specifiers: } else { errorf(HERE, "no type specifiers given in declaration"); } - } else if((type_specifiers & SPECIFIER_SIGNED) && + } else if ((type_specifiers & SPECIFIER_SIGNED) && (type_specifiers & SPECIFIER_UNSIGNED)) { - errorf(HERE, "signed and unsigned specifiers gives"); - } else if(type_specifiers & (SPECIFIER_SIGNED | SPECIFIER_UNSIGNED)) { + errorf(HERE, "signed and unsigned specifiers given"); + } else if (type_specifiers & (SPECIFIER_SIGNED | SPECIFIER_UNSIGNED)) { errorf(HERE, "only integer types can be signed or unsigned"); } else { errorf(HERE, "multiple datatypes in declaration"); @@ -3302,11 +3437,11 @@ finish_specifiers: atomic_type = ATOMIC_TYPE_INVALID; } - if(type_specifiers & SPECIFIER_COMPLEX && + if (type_specifiers & SPECIFIER_COMPLEX && atomic_type != ATOMIC_TYPE_INVALID) { type = allocate_type_zero(TYPE_COMPLEX, &builtin_source_position); type->complex.akind = atomic_type; - } else if(type_specifiers & SPECIFIER_IMAGINARY && + } else if (type_specifiers & SPECIFIER_IMAGINARY && atomic_type != ATOMIC_TYPE_INVALID) { type = allocate_type_zero(TYPE_IMAGINARY, &builtin_source_position); type->imaginary.akind = atomic_type; @@ -3314,11 +3449,9 @@ finish_specifiers: type = allocate_type_zero(TYPE_ATOMIC, &builtin_source_position); type->atomic.akind = atomic_type; } - newtype = 1; - } else { - if(type_specifiers != 0) { - errorf(HERE, "multiple datatypes in declaration"); - } + newtype = true; + } else if (type_specifiers != 0) { + errorf(HERE, "multiple datatypes in declaration"); } /* FIXME: check type qualifiers here */ @@ -3327,7 +3460,7 @@ finish_specifiers: type->base.modifiers = modifiers; type_t *result = typehash_insert(type); - if(newtype && result != type) { + if (newtype && result != type) { free_type(type); } @@ -3340,7 +3473,7 @@ static type_qualifiers_t parse_type_qualifiers(void) { type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE; - while(true) { + while (true) { switch(token.type) { /* type qualifiers */ MATCH_TYPE_QUALIFIER(T_const, TYPE_QUALIFIER_CONST); @@ -3370,7 +3503,7 @@ static declaration_t *parse_identifier_list(void) declaration->symbol = token.v.symbol; next_token(); - if(last_declaration != NULL) { + if (last_declaration != NULL) { last_declaration->next = declaration; } else { declarations = declaration; @@ -3381,37 +3514,44 @@ static declaration_t *parse_identifier_list(void) break; } next_token(); - } while(token.type == T_IDENTIFIER); + } while (token.type == T_IDENTIFIER); return declarations; } +static type_t *automatic_type_conversion(type_t *orig_type); + static void semantic_parameter(declaration_t *declaration) { /* TODO: improve error messages */ + source_position_t const* const pos = &declaration->source_position; - if(declaration->declared_storage_class == STORAGE_CLASS_TYPEDEF) { - errorf(HERE, "typedef not allowed in parameter list"); - } else if(declaration->declared_storage_class != STORAGE_CLASS_NONE - && declaration->declared_storage_class != STORAGE_CLASS_REGISTER) { - errorf(HERE, "parameter may only have none or register storage class"); - } - - type_t *const orig_type = declaration->type; - type_t * type = skip_typeref(orig_type); - - /* Array as last part of a parameter type is just syntactic sugar. Turn it - * into a pointer. § 6.7.5.3 (7) */ - if (is_type_array(type)) { - type_t *const element_type = type->array.element_type; + switch (declaration->declared_storage_class) { + case STORAGE_CLASS_TYPEDEF: + errorf(pos, "typedef not allowed in parameter list"); + break; - type = make_pointer_type(element_type, type->base.qualifiers); + /* Allowed storage classes */ + case STORAGE_CLASS_NONE: + case STORAGE_CLASS_REGISTER: + break; - declaration->type = type; + default: + errorf(pos, "parameter may only have none or register storage class"); + break; } - if(is_type_incomplete(type)) { - errorf(HERE, "incomplete type '%T' not allowed for parameter '%Y'", + type_t *const orig_type = declaration->type; + /* §6.7.5.3(7): Array as last part of a parameter type is just syntactic + * sugar. Turn it into a pointer. + * §6.7.5.3(8): A declaration of a parameter as ``function returning type'' + * shall be adjusted to ``pointer to function returning type'', as in 6.3.2.1. + */ + type_t *const type = automatic_type_conversion(orig_type); + declaration->type = type; + + if (is_type_incomplete(skip_typeref(type))) { + errorf(pos, "incomplete type '%T' not allowed for parameter '%Y'", orig_type, declaration->symbol); } } @@ -3425,8 +3565,6 @@ static declaration_t *parse_parameter(void) declaration_t *declaration = parse_declarator(&specifiers, /*may_be_abstract=*/true); - semantic_parameter(declaration); - return declaration; } @@ -3438,30 +3576,26 @@ static declaration_t *parse_parameters(function_type_t *type) add_anchor_token(')'); int saved_comma_state = save_and_reset_anchor_state(','); - if(token.type == T_IDENTIFIER) { + if (token.type == T_IDENTIFIER) { symbol_t *symbol = token.v.symbol; - if(!is_typedef_symbol(symbol)) { + if (!is_typedef_symbol(symbol)) { type->kr_style_parameters = true; declarations = parse_identifier_list(); goto parameters_finished; } } - if(token.type == ')') { + if (token.type == ')') { type->unspecified_parameters = 1; goto parameters_finished; } - if(token.type == T_void && look_ahead(1)->type == ')') { - next_token(); - goto parameters_finished; - } declaration_t *declaration; declaration_t *last_declaration = NULL; function_parameter_t *parameter; function_parameter_t *last_parameter = NULL; - while(true) { + while (true) { switch(token.type) { case T_DOTDOTDOT: next_token(); @@ -3473,11 +3607,20 @@ static declaration_t *parse_parameters(function_type_t *type) DECLARATION_START declaration = parse_parameter(); + /* func(void) is not a parameter */ + if (last_parameter == NULL + && token.type == ')' + && declaration->symbol == NULL + && skip_typeref(declaration->type) == type_void) { + goto parameters_finished; + } + semantic_parameter(declaration); + parameter = obstack_alloc(type_obst, sizeof(parameter[0])); memset(parameter, 0, sizeof(parameter[0])); parameter->type = declaration->type; - if(last_parameter != NULL) { + if (last_parameter != NULL) { last_declaration->next = declaration; last_parameter->next = parameter; } else { @@ -3510,7 +3653,7 @@ end_error: return NULL; } -typedef enum { +typedef enum construct_type_kind_t { CONSTRUCT_INVALID, CONSTRUCT_POINTER, CONSTRUCT_FUNCTION, @@ -3571,24 +3714,24 @@ static construct_type_t *parse_array_declarator(void) memset(array, 0, sizeof(array[0])); array->construct_type.kind = CONSTRUCT_ARRAY; - if(token.type == T_static) { + if (token.type == T_static) { array->is_static = true; next_token(); } type_qualifiers_t type_qualifiers = parse_type_qualifiers(); - if(type_qualifiers != 0) { - if(token.type == T_static) { + if (type_qualifiers != 0) { + if (token.type == T_static) { array->is_static = true; next_token(); } } array->type_qualifiers = type_qualifiers; - if(token.type == '*' && look_ahead(1)->type == ']') { + if (token.type == '*' && look_ahead(1)->type == ']') { array->is_variable = true; next_token(); - } else if(token.type != ']') { + } else if (token.type != ']') { array->size = parse_assignment_expression(); } @@ -3603,14 +3746,48 @@ end_error: static construct_type_t *parse_function_declarator(declaration_t *declaration) { type_t *type; - if(declaration != NULL) { + if (declaration != NULL) { type = allocate_type_zero(TYPE_FUNCTION, &declaration->source_position); + + unsigned mask = declaration->modifiers & (DM_CDECL|DM_STDCALL|DM_FASTCALL|DM_THISCALL); + + if (mask & (mask-1)) { + const char *first = NULL, *second = NULL; + + /* more than one calling convention set */ + if (declaration->modifiers & DM_CDECL) { + if (first == NULL) first = "cdecl"; + else if (second == NULL) second = "cdecl"; + } + if (declaration->modifiers & DM_STDCALL) { + if (first == NULL) first = "stdcall"; + else if (second == NULL) second = "stdcall"; + } + if (declaration->modifiers & DM_FASTCALL) { + if (first == NULL) first = "fastcall"; + else if (second == NULL) second = "fastcall"; + } + if (declaration->modifiers & DM_THISCALL) { + if (first == NULL) first = "thiscall"; + else if (second == NULL) second = "thiscall"; + } + errorf(&declaration->source_position, "%s and %s attributes are not compatible", first, second); + } + + if (declaration->modifiers & DM_CDECL) + type->function.calling_convention = CC_CDECL; + else if (declaration->modifiers & DM_STDCALL) + type->function.calling_convention = CC_STDCALL; + else if (declaration->modifiers & DM_FASTCALL) + type->function.calling_convention = CC_FASTCALL; + else if (declaration->modifiers & DM_THISCALL) + type->function.calling_convention = CC_THISCALL; } else { type = allocate_type_zero(TYPE_FUNCTION, HERE); } declaration_t *parameters = parse_parameters(&type->function); - if(declaration != NULL) { + if (declaration != NULL) { declaration->scope.declarations = parameters; } @@ -3620,7 +3797,7 @@ static construct_type_t *parse_function_declarator(declaration_t *declaration) construct_function_type->construct_type.kind = CONSTRUCT_FUNCTION; construct_function_type->function_type = type; - return (construct_type_t*) construct_function_type; + return &construct_function_type->construct_type; } static void fix_declaration_type(declaration_t *declaration) @@ -3654,27 +3831,32 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration, construct_type_t *last = NULL; gnu_attribute_t *attributes = NULL; + decl_modifiers_t modifiers = parse_attributes(&attributes); + /* pointers */ - while(token.type == '*') { + while (token.type == '*') { construct_type_t *type = parse_pointer_declarator(); - if(last == NULL) { + if (last == NULL) { first = type; last = type; } else { last->next = type; last = type; } + + /* TODO: find out if this is correct */ + modifiers |= parse_attributes(&attributes); } - /* TODO: find out if this is correct */ - decl_modifiers_t modifiers = parse_attributes(&attributes); + if (declaration != NULL) + declaration->modifiers |= modifiers; construct_type_t *inner_types = NULL; switch(token.type) { case T_IDENTIFIER: - if(declaration == NULL) { + if (declaration == NULL) { errorf(HERE, "no identifier expected in typename"); } else { declaration->symbol = token.v.symbol; @@ -3686,16 +3868,18 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration, next_token(); add_anchor_token(')'); inner_types = parse_inner_declarator(declaration, may_be_abstract); + /* All later declarators only modify the return type, not declaration */ + declaration = NULL; rem_anchor_token(')'); expect(')'); break; default: - if(may_be_abstract) + if (may_be_abstract) break; parse_error_expected("while parsing declarator", T_IDENTIFIER, '(', NULL); /* avoid a loop in the outermost scope, because eat_statement doesn't * eat '}' */ - if(token.type == '}' && current_function == NULL) { + if (token.type == '}' && current_function == NULL) { next_token(); } else { eat_statement(); @@ -3719,27 +3903,22 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration, } /* insert in the middle of the list (behind p) */ - if(p != NULL) { + if (p != NULL) { type->next = p->next; p->next = type; } else { type->next = first; first = type; } - if(last == p) { + if (last == p) { last = type; } } declarator_finished: - modifiers = parse_attributes(&attributes); - if (declaration != NULL) { - declaration->modifiers |= modifiers; - } - /* append inner_types at the end of the list, we don't to set last anymore * as it's not needed anymore */ - if(last == NULL) { + if (last == NULL) { assert(first == NULL); first = inner_types; } else { @@ -3751,6 +3930,41 @@ end_error: return NULL; } +static void parse_declaration_attributes(declaration_t *declaration) +{ + gnu_attribute_t *attributes = NULL; + decl_modifiers_t modifiers = parse_attributes(&attributes); + + if (declaration == NULL) + return; + + declaration->modifiers |= modifiers; + /* check if we have these stupid mode attributes... */ + type_t *old_type = declaration->type; + if (old_type == NULL) + return; + + gnu_attribute_t *attribute = attributes; + for ( ; attribute != NULL; attribute = attribute->next) { + if (attribute->kind != GNU_AK_MODE || attribute->invalid) + continue; + + atomic_type_kind_t akind = attribute->u.akind; + if (!is_type_signed(old_type)) { + switch(akind) { + case ATOMIC_TYPE_CHAR: akind = ATOMIC_TYPE_UCHAR; break; + case ATOMIC_TYPE_SHORT: akind = ATOMIC_TYPE_USHORT; break; + case ATOMIC_TYPE_INT: akind = ATOMIC_TYPE_UINT; break; + case ATOMIC_TYPE_LONGLONG: akind = ATOMIC_TYPE_ULONGLONG; break; + default: + panic("invalid akind in mode attribute"); + } + } + declaration->type + = make_atomic_type(akind, old_type->base.qualifiers); + } +} + static type_t *construct_declarator_type(construct_type_t *construct_list, type_t *type) { @@ -3795,7 +4009,7 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, type_t *array_type = allocate_type_zero(TYPE_ARRAY, &null_position); expression_t *size_expression = parsed_array->size; - if(size_expression != NULL) { + if (size_expression != NULL) { size_expression = create_implicit_cast(size_expression, type_size_t); } @@ -3806,8 +4020,8 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, array_type->array.is_variable = parsed_array->is_variable; array_type->array.size_expression = size_expression; - if(size_expression != NULL) { - if(is_constant_expression(size_expression)) { + if (size_expression != NULL) { + if (is_constant_expression(size_expression)) { array_type->array.size_constant = true; array_type->array.size = fold_constant(size_expression); @@ -3828,10 +4042,10 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, } type_t *hashed_type = typehash_insert(type); - if(hashed_type != type) { + if (hashed_type != type) { /* the function type was constructed earlier freeing it here will * destroy other types... */ - if(iter->kind != CONSTRUCT_FUNCTION) { + if (iter->kind != CONSTRUCT_FUNCTION) { free_type(type); } type = hashed_type; @@ -3845,21 +4059,21 @@ static declaration_t *parse_declarator( const declaration_specifiers_t *specifiers, bool may_be_abstract) { declaration_t *const declaration = allocate_declaration_zero(); + declaration->source_position = specifiers->source_position; declaration->declared_storage_class = specifiers->declared_storage_class; declaration->modifiers = specifiers->modifiers; - declaration->deprecated = specifiers->deprecated; declaration->deprecated_string = specifiers->deprecated_string; declaration->get_property_sym = specifiers->get_property_sym; declaration->put_property_sym = specifiers->put_property_sym; declaration->is_inline = specifiers->is_inline; declaration->storage_class = specifiers->declared_storage_class; - if(declaration->storage_class == STORAGE_CLASS_NONE + if (declaration->storage_class == STORAGE_CLASS_NONE && scope != global_scope) { declaration->storage_class = STORAGE_CLASS_AUTO; } - if(specifiers->alignment != 0) { + if (specifiers->alignment != 0) { /* TODO: add checks here */ declaration->alignment = specifiers->alignment; } @@ -3869,9 +4083,11 @@ static declaration_t *parse_declarator( type_t *const type = specifiers->type; declaration->type = construct_declarator_type(construct_type, type); + parse_declaration_attributes(declaration); + fix_declaration_type(declaration); - if(construct_type != NULL) { + if (construct_type != NULL) { obstack_free(&temp_obst, construct_type); } @@ -3883,7 +4099,7 @@ static type_t *parse_abstract_declarator(type_t *base_type) construct_type_t *construct_type = parse_inner_declarator(NULL, 1); type_t *result = construct_declarator_type(construct_type, base_type); - if(construct_type != NULL) { + if (construct_type != NULL) { obstack_free(&temp_obst, construct_type); } @@ -3944,11 +4160,11 @@ static void check_type_of_main(const declaration_t *const decl, const function_t "third argument of 'main' should be 'char**', but is '%T'", third_type); } parm = parm->next; - if (parm != NULL) { - warningf(&decl->source_position, "'main' takes only zero, two or three arguments"); - } + if (parm != NULL) + goto warn_arg_count; } } else { +warn_arg_count: warningf(&decl->source_position, "'main' takes only zero, two or three arguments"); } } @@ -3964,12 +4180,12 @@ static bool is_sym_main(const symbol_t *const sym) static declaration_t *internal_record_declaration( declaration_t *const declaration, - const bool is_function_definition) + const bool is_definition) { const symbol_t *const symbol = declaration->symbol; const namespace_t namespc = (namespace_t)declaration->namespc; - assert(declaration->symbol != NULL); + assert(symbol != NULL); declaration_t *previous_declaration = get_declaration(symbol, namespc); type_t *const orig_type = declaration->type; @@ -3983,10 +4199,17 @@ static declaration_t *internal_record_declaration( orig_type, declaration->symbol); } - if (is_function_definition && warning.main && is_sym_main(symbol)) { + if (warning.main && is_type_function(type) && is_sym_main(symbol)) { check_type_of_main(declaration, &type->function); } + if (warning.nested_externs && + declaration->storage_class == STORAGE_CLASS_EXTERN && + scope != global_scope) { + warningf(&declaration->source_position, + "nested extern declaration of '%#T'", declaration->type, symbol); + } + assert(declaration != previous_declaration); if (previous_declaration != NULL && previous_declaration->parent_scope == scope) { @@ -4010,6 +4233,16 @@ static declaration_t *internal_record_declaration( return previous_declaration; } + if (warning.redundant_decls && + is_definition && + previous_declaration->storage_class == STORAGE_CLASS_STATIC && + !(previous_declaration->modifiers & DM_USED) && + !previous_declaration->used) { + warningf(&previous_declaration->source_position, + "unnecessary static forward declaration for '%#T'", + previous_declaration->type, symbol); + } + unsigned new_storage_class = declaration->storage_class; if (is_type_incomplete(prev_type)) { @@ -4029,12 +4262,13 @@ static declaration_t *internal_record_declaration( switch (old_storage_class) { case STORAGE_CLASS_NONE: old_storage_class = STORAGE_CLASS_EXTERN; + /* FALLTHROUGH */ case STORAGE_CLASS_EXTERN: - if (is_function_definition) { + if (is_definition) { if (warning.missing_prototypes && - prev_type->function.unspecified_parameters && - !is_sym_main(symbol)) { + prev_type->function.unspecified_parameters && + !is_sym_main(symbol)) { warningf(&declaration->source_position, "no previous prototype for '%#T'", orig_type, symbol); @@ -4052,40 +4286,42 @@ static declaration_t *internal_record_declaration( if (old_storage_class == STORAGE_CLASS_EXTERN && new_storage_class == STORAGE_CLASS_EXTERN) { warn_redundant_declaration: - if (warning.redundant_decls && strcmp(previous_declaration->source_position.input_name, "") != 0) { + if (!is_definition && + warning.redundant_decls && + strcmp(previous_declaration->source_position.input_name, "") != 0) { warningf(&declaration->source_position, - "redundant declaration for '%Y' (declared %P)", - symbol, &previous_declaration->source_position); + "redundant declaration for '%Y' (declared %P)", + symbol, &previous_declaration->source_position); } } else if (current_function == NULL) { if (old_storage_class != STORAGE_CLASS_STATIC && - new_storage_class == STORAGE_CLASS_STATIC) { + new_storage_class == STORAGE_CLASS_STATIC) { errorf(&declaration->source_position, - "static declaration of '%Y' follows non-static declaration (declared %P)", - symbol, &previous_declaration->source_position); - } else if (old_storage_class != STORAGE_CLASS_EXTERN - && !is_function_definition) { + "static declaration of '%Y' follows non-static declaration (declared %P)", + symbol, &previous_declaration->source_position); + } else if (old_storage_class == STORAGE_CLASS_EXTERN) { + previous_declaration->storage_class = STORAGE_CLASS_NONE; + previous_declaration->declared_storage_class = STORAGE_CLASS_NONE; + } else { goto warn_redundant_declaration; - } else if (new_storage_class == STORAGE_CLASS_NONE) { - previous_declaration->storage_class = STORAGE_CLASS_NONE; - previous_declaration->declared_storage_class = STORAGE_CLASS_NONE; } } else if (old_storage_class == new_storage_class) { errorf(&declaration->source_position, - "redeclaration of '%Y' (declared %P)", - symbol, &previous_declaration->source_position); + "redeclaration of '%Y' (declared %P)", + symbol, &previous_declaration->source_position); } else { errorf(&declaration->source_position, - "redeclaration of '%Y' with different linkage (declared %P)", - symbol, &previous_declaration->source_position); + "redeclaration of '%Y' with different linkage (declared %P)", + symbol, &previous_declaration->source_position); } } - if (declaration->is_inline) - previous_declaration->is_inline = true; + previous_declaration->modifiers |= declaration->modifiers; + previous_declaration->is_inline |= declaration->is_inline; return previous_declaration; - } else if (is_function_definition) { - if (declaration->storage_class != STORAGE_CLASS_STATIC) { + } else if (is_type_function(type)) { + if (is_definition && + declaration->storage_class != STORAGE_CLASS_STATIC) { if (warning.missing_prototypes && !is_sym_main(symbol)) { warningf(&declaration->source_position, "no previous prototype for '%#T'", orig_type, symbol); @@ -4095,14 +4331,15 @@ warn_redundant_declaration: symbol); } } - } else if (warning.missing_declarations && - scope == global_scope && - !is_type_function(type) && ( - declaration->storage_class == STORAGE_CLASS_NONE || - declaration->storage_class == STORAGE_CLASS_THREAD - )) { - warningf(&declaration->source_position, - "no previous declaration for '%#T'", orig_type, symbol); + } else { + if (warning.missing_declarations && + scope == global_scope && ( + declaration->storage_class == STORAGE_CLASS_NONE || + declaration->storage_class == STORAGE_CLASS_THREAD + )) { + warningf(&declaration->source_position, + "no previous declaration for '%#T'", orig_type, symbol); + } } assert(declaration->parent_scope == NULL); @@ -4119,7 +4356,7 @@ static declaration_t *record_declaration(declaration_t *declaration) return internal_record_declaration(declaration, false); } -static declaration_t *record_function_definition(declaration_t *declaration) +static declaration_t *record_definition(declaration_t *declaration) { return internal_record_declaration(declaration, true); } @@ -4157,12 +4394,12 @@ static void parse_init_declarator_rest(declaration_t *declaration) type_t *orig_type = declaration->type; type_t *type = skip_typeref(orig_type); - if(declaration->init.initializer != NULL) { + if (declaration->init.initializer != NULL) { parser_error_multiple_definition(declaration, HERE); } bool must_be_constant = false; - if(declaration->storage_class == STORAGE_CLASS_STATIC + if (declaration->storage_class == STORAGE_CLASS_STATIC || declaration->storage_class == STORAGE_CLASS_THREAD_STATIC || declaration->parent_scope == global_scope) { must_be_constant = true; @@ -4175,13 +4412,13 @@ static void parse_init_declarator_rest(declaration_t *declaration) initializer_t *initializer = parse_initializer(&env); - if(env.type != orig_type) { + if (env.type != orig_type) { orig_type = env.type; type = skip_typeref(orig_type); declaration->type = env.type; } - if(is_type_function(type)) { + if (is_type_function(type)) { errorf(&declaration->source_position, "initializers not allowed for function types at declator '%Y' (type '%T')", declaration->symbol, orig_type); @@ -4251,11 +4488,11 @@ static void parse_declaration_rest(declaration_t *ndeclaration, "variable '%Y' declared 'inline'\n", declaration->symbol); } - if(token.type == '=') { + if (token.type == '=') { parse_init_declarator_rest(declaration); } - if(token.type != ',') + if (token.type != ',') break; eat(','); @@ -4272,24 +4509,24 @@ end_error: static declaration_t *finished_kr_declaration(declaration_t *declaration) { symbol_t *symbol = declaration->symbol; - if(symbol == NULL) { + if (symbol == NULL) { errorf(HERE, "anonymous declaration not valid as function parameter"); return declaration; } namespace_t namespc = (namespace_t) declaration->namespc; - if(namespc != NAMESPACE_NORMAL) { + if (namespc != NAMESPACE_NORMAL) { return record_declaration(declaration); } declaration_t *previous_declaration = get_declaration(symbol, namespc); - if(previous_declaration == NULL || + if (previous_declaration == NULL || previous_declaration->parent_scope != scope) { errorf(HERE, "expected declaration of a function parameter, found '%Y'", symbol); return declaration; } - if(previous_declaration->type == NULL) { + if (previous_declaration->type == NULL) { previous_declaration->type = declaration->type; previous_declaration->declared_storage_class = declaration->declared_storage_class; previous_declaration->storage_class = declaration->storage_class; @@ -4306,7 +4543,7 @@ static void parse_declaration(parsed_declaration_func finished_declaration) memset(&specifiers, 0, sizeof(specifiers)); parse_declaration_specifiers(&specifiers); - if(token.type == ';') { + if (token.type == ';') { parse_anonymous_declaration_rest(&specifiers, append_declaration); } else { declaration_t *declaration = parse_declarator(&specifiers, /*may_be_abstract=*/false); @@ -4319,9 +4556,9 @@ static type_t *get_default_promoted_type(type_t *orig_type) type_t *result = orig_type; type_t *type = skip_typeref(orig_type); - if(is_type_integer(type)) { + if (is_type_integer(type)) { result = promote_integer(type); - } else if(type == type_float) { + } else if (type == type_float) { result = type_double; } @@ -4369,7 +4606,7 @@ static void parse_kr_declaration_list(declaration_t *declaration) for( ; parameter_declaration != NULL; parameter_declaration = parameter_declaration->next) { type_t *parameter_type = parameter_declaration->type; - if(parameter_type == NULL) { + if (parameter_type == NULL) { if (strict_mode) { errorf(HERE, "no type specified for function parameter '%Y'", parameter_declaration->symbol); @@ -4396,7 +4633,7 @@ static void parse_kr_declaration_list(declaration_t *declaration) memset(function_parameter, 0, sizeof(function_parameter[0])); function_parameter->type = parameter_type; - if(last_parameter != NULL) { + if (last_parameter != NULL) { last_parameter->next = function_parameter; } else { parameters = function_parameter; @@ -4410,7 +4647,7 @@ static void parse_kr_declaration_list(declaration_t *declaration) new_type->function.unspecified_parameters = true; type = typehash_insert(new_type); - if(type != new_type) { + if (type != new_type) { obstack_free(type_obst, new_type); } @@ -4423,7 +4660,8 @@ static bool first_err = true; * When called with first_err set, prints the name of the current function, * else does noting. */ -static void print_in_function(void) { +static void print_in_function(void) +{ if (first_err) { first_err = false; diagnosticf("%s: In function '%Y':\n", @@ -4476,6 +4714,10 @@ static void check_declarations(void) if (warning.unused_parameter) { const scope_t *scope = ¤t_function->scope; + if (is_sym_main(current_function->symbol)) { + /* do not issue unused warnings for main */ + return; + } const declaration_t *parameter = scope->declarations; for (; parameter != NULL; parameter = parameter->next) { if (! parameter->used) { @@ -4489,22 +4731,448 @@ static void check_declarations(void) } } -static void parse_external_declaration(void) +static int determine_truth(expression_t const* const cond) { - /* function-definitions and declarations both start with declaration - * specifiers */ - declaration_specifiers_t specifiers; - memset(&specifiers, 0, sizeof(specifiers)); + return + !is_constant_expression(cond) ? 0 : + fold_constant(cond) != 0 ? 1 : + -1; +} - add_anchor_token(';'); - parse_declaration_specifiers(&specifiers); - rem_anchor_token(';'); +static bool noreturn_candidate; - /* must be a declaration */ - if(token.type == ';') { - parse_anonymous_declaration_rest(&specifiers, append_declaration); +static void check_reachable(statement_t *const stmt) +{ + if (stmt->base.reachable) return; - } + if (stmt->kind != STATEMENT_DO_WHILE) + stmt->base.reachable = true; + + statement_t *last = stmt; + statement_t *next; + switch (stmt->kind) { + case STATEMENT_INVALID: + case STATEMENT_EMPTY: + case STATEMENT_DECLARATION: + case STATEMENT_ASM: + next = stmt->base.next; + break; + + case STATEMENT_COMPOUND: + next = stmt->compound.statements; + break; + + case STATEMENT_RETURN: + noreturn_candidate = false; + return; + + case STATEMENT_IF: { + if_statement_t const* const ifs = &stmt->ifs; + int const val = determine_truth(ifs->condition); + + if (val >= 0) + check_reachable(ifs->true_statement); + + if (val > 0) + return; + + if (ifs->false_statement != NULL) { + check_reachable(ifs->false_statement); + return; + } + + next = stmt->base.next; + break; + } + + case STATEMENT_SWITCH: { + switch_statement_t const *const switchs = &stmt->switchs; + expression_t const *const expr = switchs->expression; + + if (is_constant_expression(expr)) { + long const val = fold_constant(expr); + case_label_statement_t * defaults = NULL; + for (case_label_statement_t *i = switchs->first_case; i != NULL; i = i->next) { + if (i->expression == NULL) { + defaults = i; + continue; + } + + if (i->first_case <= val && val <= i->last_case) { + check_reachable((statement_t*)i); + return; + } + } + + if (defaults != NULL) { + check_reachable((statement_t*)defaults); + return; + } + } else { + bool has_default = false; + for (case_label_statement_t *i = switchs->first_case; i != NULL; i = i->next) { + if (i->expression == NULL) + has_default = true; + + check_reachable((statement_t*)i); + } + + if (has_default) + return; + } + + next = stmt->base.next; + break; + } + + case STATEMENT_EXPRESSION: { + /* Check for noreturn function call */ + expression_t const *const expr = stmt->expression.expression; + if (expr->kind == EXPR_CALL) { + expression_t const *const func = expr->call.function; + if (func->kind == EXPR_REFERENCE) { + declaration_t const *const decl = func->reference.declaration; + if (decl != NULL && decl->modifiers & DM_NORETURN) { + return; + } + } + } + + next = stmt->base.next; + break; + } + + case STATEMENT_CONTINUE: { + statement_t *parent = stmt; + for (;;) { + parent = parent->base.parent; + if (parent == NULL) /* continue not within loop */ + return; + + next = parent; + switch (parent->kind) { + case STATEMENT_WHILE: goto continue_while; + case STATEMENT_DO_WHILE: goto continue_do_while; + case STATEMENT_FOR: goto continue_for; + + default: break; + } + } + } + + case STATEMENT_BREAK: { + statement_t *parent = stmt; + for (;;) { + parent = parent->base.parent; + if (parent == NULL) /* break not within loop/switch */ + return; + + switch (parent->kind) { + case STATEMENT_SWITCH: + case STATEMENT_WHILE: + case STATEMENT_DO_WHILE: + case STATEMENT_FOR: + last = parent; + next = parent->base.next; + goto found_break_parent; + + default: break; + } + } +found_break_parent: + break; + } + + case STATEMENT_GOTO: + next = stmt->gotos.label->init.statement; + if (next == NULL) /* missing label */ + return; + break; + + case STATEMENT_LABEL: + next = stmt->label.statement; + break; + + case STATEMENT_CASE_LABEL: + next = stmt->case_label.statement; + break; + + case STATEMENT_WHILE: { + while_statement_t const *const whiles = &stmt->whiles; + int const val = determine_truth(whiles->condition); + + if (val >= 0) + check_reachable(whiles->body); + + if (val > 0) + return; + + next = stmt->base.next; + break; + } + + case STATEMENT_DO_WHILE: + next = stmt->do_while.body; + break; + + case STATEMENT_FOR: { + for_statement_t *const fors = &stmt->fors; + + if (fors->condition_reachable) + return; + fors->condition_reachable = true; + + expression_t const *const cond = fors->condition; + int const val = + cond == NULL ? 1 : determine_truth(cond); + + if (val >= 0) + check_reachable(fors->body); + + if (val > 0) + return; + + next = stmt->base.next; + break; + } + + case STATEMENT_MS_TRY: + case STATEMENT_LEAVE: + panic("unimplemented"); + } + + while (next == NULL) { + next = last->base.parent; + if (next == NULL) { + noreturn_candidate = false; + + type_t *const type = current_function->type; + assert(is_type_function(type)); + type_t *const ret = skip_typeref(type->function.return_type); + if (warning.return_type && + !is_type_atomic(ret, ATOMIC_TYPE_VOID) && + is_type_valid(ret) && + !is_sym_main(current_function->symbol)) { + warningf(&stmt->base.source_position, + "control reaches end of non-void function"); + } + return; + } + + switch (next->kind) { + case STATEMENT_INVALID: + case STATEMENT_EMPTY: + case STATEMENT_DECLARATION: + case STATEMENT_EXPRESSION: + case STATEMENT_ASM: + case STATEMENT_RETURN: + case STATEMENT_CONTINUE: + case STATEMENT_BREAK: + case STATEMENT_GOTO: + case STATEMENT_LEAVE: + panic("invalid control flow in function"); + + case STATEMENT_COMPOUND: + case STATEMENT_IF: + case STATEMENT_SWITCH: + case STATEMENT_LABEL: + case STATEMENT_CASE_LABEL: + last = next; + next = next->base.next; + break; + + case STATEMENT_WHILE: { +continue_while: + if (next->base.reachable) + return; + next->base.reachable = true; + + while_statement_t const *const whiles = &next->whiles; + int const val = determine_truth(whiles->condition); + + if (val >= 0) + check_reachable(whiles->body); + + if (val > 0) + return; + + last = next; + next = next->base.next; + break; + } + + case STATEMENT_DO_WHILE: { +continue_do_while: + if (next->base.reachable) + return; + next->base.reachable = true; + + do_while_statement_t const *const dw = &next->do_while; + int const val = determine_truth(dw->condition); + + if (val >= 0) + check_reachable(dw->body); + + if (val > 0) + return; + + last = next; + next = next->base.next; + break; + } + + case STATEMENT_FOR: { +continue_for:; + for_statement_t *const fors = &next->fors; + + fors->step_reachable = true; + + if (fors->condition_reachable) + return; + fors->condition_reachable = true; + + expression_t const *const cond = fors->condition; + int const val = + cond == NULL ? 1 : determine_truth(cond); + + if (val >= 0) + check_reachable(fors->body); + + if (val > 0) + return; + + last = next; + next = next->base.next; + break; + } + + case STATEMENT_MS_TRY: + panic("unimplemented"); + } + } + + if (next == NULL) { + next = stmt->base.parent; + if (next == NULL) { + warningf(&stmt->base.source_position, + "control reaches end of non-void function"); + } + } + + check_reachable(next); +} + +static void check_unreachable(statement_t const* const stmt) +{ + if (!stmt->base.reachable && + stmt->kind != STATEMENT_COMPOUND && + stmt->kind != STATEMENT_DO_WHILE && + stmt->kind != STATEMENT_FOR) { + warningf(&stmt->base.source_position, "statement is unreachable"); + } + + switch (stmt->kind) { + case STATEMENT_INVALID: + case STATEMENT_EMPTY: + case STATEMENT_RETURN: + case STATEMENT_DECLARATION: + case STATEMENT_EXPRESSION: + case STATEMENT_CONTINUE: + case STATEMENT_BREAK: + case STATEMENT_GOTO: + case STATEMENT_ASM: + case STATEMENT_LEAVE: + break; + + case STATEMENT_COMPOUND: + if (stmt->compound.statements) + check_unreachable(stmt->compound.statements); + break; + + case STATEMENT_IF: + check_unreachable(stmt->ifs.true_statement); + if (stmt->ifs.false_statement != NULL) + check_unreachable(stmt->ifs.false_statement); + break; + + case STATEMENT_SWITCH: + check_unreachable(stmt->switchs.body); + break; + + case STATEMENT_LABEL: + check_unreachable(stmt->label.statement); + break; + + case STATEMENT_CASE_LABEL: + check_unreachable(stmt->case_label.statement); + break; + + case STATEMENT_WHILE: + check_unreachable(stmt->whiles.body); + break; + + case STATEMENT_DO_WHILE: + check_unreachable(stmt->do_while.body); + if (!stmt->base.reachable) { + expression_t const *const cond = stmt->do_while.condition; + if (determine_truth(cond) >= 0) { + warningf(&cond->base.source_position, + "condition of do-while-loop is unreachable"); + } + } + break; + + case STATEMENT_FOR: { + for_statement_t const* const fors = &stmt->fors; + + // if init and step are unreachable, cond is unreachable, too + if (!stmt->base.reachable && !fors->step_reachable) { + warningf(&stmt->base.source_position, "statement is unreachable"); + } else { + if (!stmt->base.reachable && fors->initialisation != NULL) { + warningf(&fors->initialisation->base.source_position, + "initialisation of for-statement is unreachable"); + } + + if (!fors->condition_reachable && fors->condition != NULL) { + warningf(&fors->condition->base.source_position, + "condition of for-statement is unreachable"); + } + + if (!fors->step_reachable && fors->step != NULL) { + warningf(&fors->step->base.source_position, + "step of for-statement is unreachable"); + } + } + + check_unreachable(stmt->fors.body); + break; + } + + case STATEMENT_MS_TRY: + panic("unimplemented"); + } + + if (stmt->base.next) + check_unreachable(stmt->base.next); +} + +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(';'); + parse_declaration_specifiers(&specifiers); + rem_anchor_token(';'); + + /* must be a declaration */ + if (token.type == ';') { + parse_anonymous_declaration_rest(&specifiers, append_declaration); + return; + } add_anchor_token(','); add_anchor_token('='); @@ -4518,15 +5186,21 @@ static void parse_external_declaration(void) rem_anchor_token(';'); /* must be a declaration */ - if(token.type == ',' || token.type == '=' || token.type == ';') { - parse_declaration_rest(ndeclaration, &specifiers, record_declaration); - return; + switch (token.type) { + case ',': + case ';': + parse_declaration_rest(ndeclaration, &specifiers, record_declaration); + return; + + case '=': + parse_declaration_rest(ndeclaration, &specifiers, record_definition); + return; } /* must be a function definition */ parse_kr_declaration_list(ndeclaration); - if(token.type != '{') { + if (token.type != '{') { parse_error_expected("while parsing function definition", '{', NULL); eat_until_matching_token(';'); return; @@ -4536,7 +5210,7 @@ static void parse_external_declaration(void) /* note that we don't skip typerefs: the standard doesn't allow them here * (so we can't use is_type_function here) */ - if(type->kind != TYPE_FUNCTION) { + if (type->kind != TYPE_FUNCTION) { if (is_type_valid(type)) { errorf(HERE, "declarator '%#T' has a body but is not a function type", type, ndeclaration->symbol); @@ -4547,21 +5221,21 @@ static void parse_external_declaration(void) /* § 6.7.5.3 (14) a function definition with () means no * parameters (and not unspecified parameters) */ - if(type->function.unspecified_parameters + if (type->function.unspecified_parameters && type->function.parameters == NULL && !type->function.kr_style_parameters) { type_t *duplicate = duplicate_type(type); duplicate->function.unspecified_parameters = false; type = typehash_insert(duplicate); - if(type != duplicate) { + if (type != duplicate) { obstack_free(type_obst, duplicate); } ndeclaration->type = type; } - declaration_t *const declaration = record_function_definition(ndeclaration); - if(ndeclaration != declaration) { + declaration_t *const declaration = record_definition(ndeclaration); + if (ndeclaration != declaration) { declaration->scope = ndeclaration->scope; } type = skip_typeref(declaration->type); @@ -4573,40 +5247,56 @@ static void parse_external_declaration(void) declaration_t *parameter = declaration->scope.declarations; for( ; parameter != NULL; parameter = parameter->next) { - if(parameter->parent_scope == &ndeclaration->scope) { + if (parameter->parent_scope == &ndeclaration->scope) { parameter->parent_scope = scope; } assert(parameter->parent_scope == NULL || parameter->parent_scope == scope); parameter->parent_scope = scope; if (parameter->symbol == NULL) { - errorf(&ndeclaration->source_position, "parameter name omitted"); + errorf(¶meter->source_position, "parameter name omitted"); continue; } environment_push(parameter); } - if(declaration->init.statement != NULL) { + if (declaration->init.statement != NULL) { parser_error_multiple_definition(declaration, HERE); eat_block(); - goto end_of_parse_external_declaration; } else { /* parse function body */ int label_stack_top = label_top(); declaration_t *old_current_function = current_function; current_function = declaration; + current_parent = NULL; - declaration->init.statement = parse_compound_statement(false); + statement_t *const body = parse_compound_statement(false); + declaration->init.statement = body; first_err = true; check_labels(); check_declarations(); + if (warning.return_type || + warning.unreachable_code || + (warning.missing_noreturn && !(declaration->modifiers & DM_NORETURN))) { + noreturn_candidate = true; + check_reachable(body); + if (warning.unreachable_code) + check_unreachable(body); + if (warning.missing_noreturn && + noreturn_candidate && + !(declaration->modifiers & DM_NORETURN)) { + warningf(&body->base.source_position, + "function '%#T' is candidate for attribute 'noreturn'", + type, declaration->symbol); + } + } + assert(current_parent == NULL); assert(current_function == declaration); current_function = old_current_function; label_pop_to(label_stack_top); } -end_of_parse_external_declaration: assert(scope == &declaration->scope); set_scope(last_scope); environment_pop_to(top); @@ -4628,21 +5318,21 @@ static declaration_t *find_compound_entry(declaration_t *compound_declaration, { declaration_t *iter = compound_declaration->scope.declarations; for( ; iter != NULL; iter = iter->next) { - if(iter->namespc != NAMESPACE_NORMAL) + if (iter->namespc != NAMESPACE_NORMAL) continue; - if(iter->symbol == NULL) { + if (iter->symbol == NULL) { type_t *type = skip_typeref(iter->type); - if(is_type_compound(type)) { + if (is_type_compound(type)) { declaration_t *result = find_compound_entry(type->compound.declaration, symbol); - if(result != NULL) + if (result != NULL) return result; } continue; } - if(iter->symbol == symbol) { + if (iter->symbol == symbol) { return iter; } } @@ -4654,7 +5344,7 @@ static void parse_compound_declarators(declaration_t *struct_declaration, const declaration_specifiers_t *specifiers) { declaration_t *last_declaration = struct_declaration->scope.declarations; - if(last_declaration != NULL) { + if (last_declaration != NULL) { while(last_declaration->next != NULL) { last_declaration = last_declaration->next; } @@ -4663,14 +5353,14 @@ static void parse_compound_declarators(declaration_t *struct_declaration, while(1) { declaration_t *declaration; - if(token.type == ':') { + if (token.type == ':') { source_position_t source_position = *HERE; next_token(); type_t *base_type = specifiers->type; expression_t *size = parse_constant_expression(); - if(!is_type_integer(skip_typeref(base_type))) { + if (!is_type_integer(skip_typeref(base_type))) { errorf(HERE, "bitfield base type '%T' is not an integer type", base_type); } @@ -4690,12 +5380,12 @@ static void parse_compound_declarators(declaration_t *struct_declaration, type_t *orig_type = declaration->type; type_t *type = skip_typeref(orig_type); - if(token.type == ':') { + if (token.type == ':') { source_position_t source_position = *HERE; next_token(); expression_t *size = parse_constant_expression(); - if(!is_type_integer(type)) { + if (!is_type_integer(type)) { errorf(HERE, "bitfield base type '%T' is not an " "integer type", orig_type); } @@ -4705,11 +5395,11 @@ static void parse_compound_declarators(declaration_t *struct_declaration, } else { /* TODO we ignore arrays for now... what is missing is a check * that they're at the end of the struct */ - if(is_type_incomplete(type) && !is_type_array(type)) { + if (is_type_incomplete(type) && !is_type_array(type)) { errorf(HERE, "compound member '%Y' has incomplete type '%T'", declaration->symbol, orig_type); - } else if(is_type_function(type)) { + } else if (is_type_function(type)) { errorf(HERE, "compound member '%Y' must not have function " "type '%T'", declaration->symbol, orig_type); } @@ -4718,11 +5408,11 @@ static void parse_compound_declarators(declaration_t *struct_declaration, /* make sure we don't define a symbol multiple times */ symbol_t *symbol = declaration->symbol; - if(symbol != NULL) { + if (symbol != NULL) { declaration_t *prev_decl = find_compound_entry(struct_declaration, symbol); - if(prev_decl != NULL) { + if (prev_decl != NULL) { assert(prev_decl->symbol == symbol); errorf(&declaration->source_position, "multiple declarations of symbol '%Y' (declared %P)", @@ -4731,14 +5421,14 @@ static void parse_compound_declarators(declaration_t *struct_declaration, } /* append declaration */ - if(last_declaration != NULL) { + if (last_declaration != NULL) { last_declaration->next = declaration; } else { struct_declaration->scope.declarations = declaration; } last_declaration = declaration; - if(token.type != ',') + if (token.type != ',') break; next_token(); } @@ -4762,7 +5452,7 @@ static void parse_compound_type_entries(declaration_t *compound_declaration) } rem_anchor_token('}'); - if(token.type == T_EOF) { + if (token.type == T_EOF) { errorf(HERE, "EOF while parsing struct"); } next_token(); @@ -4773,7 +5463,7 @@ static type_t *parse_typename(void) declaration_specifiers_t specifiers; memset(&specifiers, 0, sizeof(specifiers)); parse_declaration_specifiers(&specifiers); - if(specifiers.declared_storage_class != STORAGE_CLASS_NONE) { + if (specifiers.declared_storage_class != STORAGE_CLASS_NONE) { /* TODO: improve error message, user does probably not know what a * storage class is... */ @@ -4834,7 +5524,7 @@ static expression_t *parse_string_const(void) /* 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 = type_char_ptr; + cnst->base.type = warning.write_strings ? type_const_char_ptr : type_char_ptr; cnst->string.value = res; return cnst; } @@ -4857,7 +5547,7 @@ static expression_t *parse_string_const(void) default: { expression_t *const cnst = allocate_expression_zero(EXPR_WIDE_STRING_LITERAL); - cnst->base.type = type_wchar_t_ptr; + cnst->base.type = warning.write_strings ? type_const_wchar_t_ptr : type_wchar_t_ptr; cnst->wide_string.value = wres; return cnst; } @@ -4951,7 +5641,7 @@ static declaration_t *create_implicit_function(symbol_t *symbol, ntype->function.unspecified_parameters = true; type_t *type = typehash_insert(ntype); - if(type != ntype) { + if (type != ntype) { free_type(ntype); } @@ -4993,7 +5683,7 @@ static type_t *make_function_2_type(type_t *return_type, type_t *argument_type1, type->function.parameters = parameter1; type_t *result = typehash_insert(type); - if(result != type) { + if (result != type) { free_type(type); } @@ -5019,7 +5709,7 @@ static type_t *make_function_1_type(type_t *return_type, type_t *argument_type) type->function.parameters = parameter; type_t *result = typehash_insert(type); - if(result != type) { + if (result != type) { free_type(type); } @@ -5033,7 +5723,7 @@ static type_t *make_function_0_type(type_t *return_type) type->function.parameters = NULL; type_t *result = typehash_insert(type); - if(result != type) { + if (result != type) { free_type(type); } @@ -5075,7 +5765,7 @@ static type_t *get_builtin_symbol_type(symbol_t *symbol) static type_t *automatic_type_conversion(type_t *orig_type) { type_t *type = skip_typeref(orig_type); - if(is_type_array(type)) { + if (is_type_array(type)) { array_type_t *array_type = &type->array; type_t *element_type = array_type->element_type; unsigned qualifiers = array_type->base.qualifiers; @@ -5083,7 +5773,7 @@ static type_t *automatic_type_conversion(type_t *orig_type) return make_pointer_type(element_type, qualifiers); } - if(is_type_function(type)) { + if (is_type_function(type)) { return make_pointer_type(orig_type, TYPE_QUALIFIER_NONE); } @@ -5150,7 +5840,7 @@ static expression_t *parse_reference(void) source_position_t source_position = token.source_position; next_token(); - if(declaration == NULL) { + if (declaration == NULL) { if (! strict_mode && token.type == '(') { /* an implicitly defined function */ if (warning.implicit_function_declaration) { @@ -5179,18 +5869,20 @@ static expression_t *parse_reference(void) declaration->used = true; /* check for deprecated functions */ - if(declaration->deprecated != 0) { - const char *prefix = ""; - if (is_type_function(declaration->type)) - prefix = "function "; + if (warning.deprecated_declarations && + declaration->modifiers & DM_DEPRECATED) { + char const *const prefix = is_type_function(declaration->type) ? + "function" : "variable"; if (declaration->deprecated_string != NULL) { warningf(&source_position, - "%s'%Y' was declared 'deprecated(\"%s\")'", prefix, declaration->symbol, + "%s '%Y' is deprecated (declared %P): \"%s\"", prefix, + declaration->symbol, &declaration->source_position, declaration->deprecated_string); } else { warningf(&source_position, - "%s'%Y' was declared 'deprecated'", prefix, declaration->symbol); + "%s '%Y' is deprecated (declared %P)", prefix, + declaration->symbol, &declaration->source_position); } } @@ -5235,7 +5927,7 @@ static expression_t *parse_cast(void) rem_anchor_token(')'); expect(')'); - if(token.type == '{') { + if (token.type == '{') { return parse_compound_literal(type); } @@ -5288,9 +5980,9 @@ end_error: } /** - * Parse a braced expression. + * Parse a parenthesized expression. */ -static expression_t *parse_brace_expression(void) +static expression_t *parse_parenthesized_expression(void) { eat('('); add_anchor_token(')'); @@ -5304,7 +5996,7 @@ static expression_t *parse_brace_expression(void) TYPE_SPECIFIERS return parse_cast(); case T_IDENTIFIER: - if(is_typedef_symbol(token.v.symbol)) { + if (is_typedef_symbol(token.v.symbol)) { return parse_cast(); } } @@ -5384,7 +6076,7 @@ static designator_t *parse_designator(void) designator_t *result = allocate_ast_zero(sizeof(result[0])); result->source_position = *HERE; - if(token.type != T_IDENTIFIER) { + if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing member designator", T_IDENTIFIER, NULL); return NULL; @@ -5394,9 +6086,9 @@ static designator_t *parse_designator(void) designator_t *last_designator = result; while(true) { - if(token.type == '.') { + if (token.type == '.') { next_token(); - if(token.type != T_IDENTIFIER) { + if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing member designator", T_IDENTIFIER, NULL); return NULL; @@ -5410,7 +6102,7 @@ static designator_t *parse_designator(void) last_designator = designator; continue; } - if(token.type == '[') { + if (token.type == '[') { next_token(); add_anchor_token(']'); designator_t *designator = allocate_ast_zero(sizeof(result[0])); @@ -5418,7 +6110,7 @@ static designator_t *parse_designator(void) designator->array_index = parse_expression(); rem_anchor_token(']'); expect(']'); - if(designator->array_index == NULL) { + if (designator->array_index == NULL) { return NULL; } @@ -5464,7 +6156,7 @@ static expression_t *parse_offsetof(void) descend_into_subtype(&path); - if(!walk_designator(&path, designator, true)) { + if (!walk_designator(&path, designator, true)) { return create_invalid_expression(); } @@ -5637,7 +6329,7 @@ static expression_t *parse_compare_builtin(void) type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); - if(!is_type_float(type_left) && !is_type_float(type_right)) { + if (!is_type_float(type_left) && !is_type_float(type_right)) { if (is_type_valid(type_left) && is_type_valid(type_right)) { type_error_incompatible("invalid operands in comparison", &expression->base.source_position, orig_type_left, orig_type_right); @@ -5679,7 +6371,8 @@ end_error: /** * Parses a MS assume() expression. */ -static expression_t *parse_assume(void) { +static expression_t *parse_assume(void) +{ eat(T__assume); expression_t *expression @@ -5700,7 +6393,8 @@ end_error: /** * Parse a microsoft __noop expression. */ -static expression_t *parse_noop_expression(void) { +static expression_t *parse_noop_expression(void) +{ source_position_t source_position = *HERE; eat(T___noop); @@ -5710,10 +6404,10 @@ static expression_t *parse_noop_expression(void) { add_anchor_token(')'); add_anchor_token(','); - if(token.type != ')') { + if (token.type != ')') { while(true) { (void)parse_assignment_expression(); - if(token.type != ',') + if (token.type != ',') break; next_token(); } @@ -5774,7 +6468,7 @@ static expression_t *parse_primary_expression(void) case T___builtin_prefetch: return parse_builtin_prefetch(); case T__assume: return parse_assume(); - case '(': return parse_brace_expression(); + case '(': return parse_parenthesized_expression(); case T___noop: return parse_noop_expression(); } @@ -5785,7 +6479,8 @@ static expression_t *parse_primary_expression(void) /** * Check if the expression has the character type and issue a warning then. */ -static void check_for_char_index_type(const expression_t *expression) { +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); @@ -5839,7 +6534,7 @@ static expression_t *parse_array_expression(unsigned precedence, } rem_anchor_token(']'); - if(token.type != ']') { + if (token.type != ']') { parse_error_expected("Problem while parsing array access", ']', NULL); return expression; } @@ -6073,21 +6768,21 @@ static expression_t *parse_call_expression(unsigned precedence, add_anchor_token(')'); add_anchor_token(','); - if(token.type != ')') { + if (token.type != ')') { call_argument_t *last_argument = NULL; while(true) { call_argument_t *argument = allocate_ast_zero(sizeof(argument[0])); argument->expression = parse_assignment_expression(); - if(last_argument == NULL) { + if (last_argument == NULL) { call->arguments = argument; } else { last_argument->next = argument; } last_argument = argument; - if(token.type != ',') + if (token.type != ',') break; next_token(); } @@ -6096,7 +6791,7 @@ static expression_t *parse_call_expression(unsigned precedence, rem_anchor_token(')'); expect(')'); - if(function_type == NULL) + if (function_type == NULL) return result; function_parameter_t *parameter = function_type->parameters; @@ -6149,13 +6844,14 @@ static bool same_compound_type(const type_t *type1, const type_t *type2) static expression_t *parse_conditional_expression(unsigned precedence, expression_t *expression) { - eat('?'); - add_anchor_token(':'); - expression_t *result = allocate_expression_zero(EXPR_CONDITIONAL); conditional_expression_t *conditional = &result->conditional; - conditional->condition = expression; + conditional->base.source_position = *HERE; + conditional->condition = expression; + + eat('?'); + add_anchor_token(':'); /* 6.5.15.2 */ type_t *const condition_type_orig = expression->base.type; @@ -6177,11 +6873,11 @@ static expression_t *parse_conditional_expression(unsigned precedence, /* 6.5.15.3 */ type_t *result_type; - if(is_type_atomic(true_type, ATOMIC_TYPE_VOID) || + if (is_type_atomic(true_type, ATOMIC_TYPE_VOID) || is_type_atomic(false_type, ATOMIC_TYPE_VOID)) { if (!is_type_atomic(true_type, ATOMIC_TYPE_VOID) || !is_type_atomic(false_type, ATOMIC_TYPE_VOID)) { - warningf(&expression->base.source_position, + warningf(&conditional->base.source_position, "ISO C forbids conditional expression with only one void side"); } result_type = type_void; @@ -6202,7 +6898,8 @@ static expression_t *parse_conditional_expression(unsigned precedence, type_t *pointer_type; type_t *other_type; expression_t *other_expression; - if (is_type_pointer(true_type)) { + if (is_type_pointer(true_type) && + (!is_type_pointer(false_type) || is_null_pointer_constant(false_expression))) { pointer_type = true_type; other_type = false_type; other_expression = false_expression; @@ -6212,10 +6909,11 @@ static expression_t *parse_conditional_expression(unsigned precedence, other_expression = true_expression; } - /* TODO Treat (void*)0 as null pointer constant */ - if (is_type_pointer(other_type)) { - type_t *to1 = pointer_type->pointer.points_to; - type_t *to2 = other_type->pointer.points_to; + if (is_null_pointer_constant(other_expression)) { + result_type = pointer_type; + } else if (is_type_pointer(other_type)) { + type_t *to1 = skip_typeref(pointer_type->pointer.points_to); + type_t *to2 = skip_typeref(other_type->pointer.points_to); type_t *to; if (is_type_atomic(to1, ATOMIC_TYPE_VOID) || @@ -6225,7 +6923,7 @@ static expression_t *parse_conditional_expression(unsigned precedence, get_unqualified_type(to2))) { to = to1; } else { - warningf(&expression->base.source_position, + warningf(&conditional->base.source_position, "pointer types '%T' and '%T' in conditional expression are incompatible", true_type, false_type); to = type_void; @@ -6239,10 +6937,8 @@ static expression_t *parse_conditional_expression(unsigned precedence, free_type(copy); result_type = make_pointer_type(type, TYPE_QUALIFIER_NONE); - } else if(is_null_pointer_constant(other_expression)) { - result_type = pointer_type; - } else if(is_type_integer(other_type)) { - warningf(&expression->base.source_position, + } else if (is_type_integer(other_type)) { + warningf(&conditional->base.source_position, "pointer/integer type mismatch in conditional expression ('%T' and '%T')", true_type, false_type); result_type = pointer_type; } else { @@ -6255,7 +6951,7 @@ static expression_t *parse_conditional_expression(unsigned precedence, if (is_type_valid(true_type) && is_type_valid(false_type)) { type_error_incompatible("while parsing conditional", - &expression->base.source_position, true_type, + &conditional->base.source_position, true_type, false_type); } result_type = type_error_type; @@ -6306,24 +7002,37 @@ end_error: return create_invalid_expression(); } -static void check_pointer_arithmetic(const source_position_t *source_position, +static bool check_pointer_arithmetic(const source_position_t *source_position, type_t *pointer_type, type_t *orig_pointer_type) { type_t *points_to = pointer_type->pointer.points_to; points_to = skip_typeref(points_to); - if (is_type_incomplete(points_to) && - (! (c_mode & _GNUC) - || !is_type_atomic(points_to, ATOMIC_TYPE_VOID))) { - errorf(source_position, - "arithmetic with pointer to incomplete type '%T' not allowed", - orig_pointer_type); + if (is_type_incomplete(points_to)) { + if (!(c_mode & _GNUC) || !is_type_atomic(points_to, ATOMIC_TYPE_VOID)) { + errorf(source_position, + "arithmetic with pointer to incomplete type '%T' not allowed", + orig_pointer_type); + return false; + } else if (warning.pointer_arith) { + warningf(source_position, + "pointer of type '%T' used in arithmetic", + orig_pointer_type); + } } else if (is_type_function(points_to)) { - errorf(source_position, - "arithmetic with pointer to function type '%T' not allowed", - orig_pointer_type); + if (!(c_mode && _GNUC)) { + errorf(source_position, + "arithmetic with pointer to function type '%T' not allowed", + orig_pointer_type); + return false; + } else if (warning.pointer_arith) { + warningf(source_position, + "pointer to a function '%T' used in arithmetic", + orig_pointer_type); + } } + return true; } static void semantic_incdec(unary_expression_t *expression) @@ -6331,11 +7040,15 @@ static void semantic_incdec(unary_expression_t *expression) type_t *const orig_type = expression->value->base.type; type_t *const type = skip_typeref(orig_type); if (is_type_pointer(type)) { - check_pointer_arithmetic(&expression->base.source_position, - type, orig_type); + if (!check_pointer_arithmetic(&expression->base.source_position, + type, orig_type)) { + return; + } } else if (!is_type_real(type) && is_type_valid(type)) { /* TODO: improve error message */ - errorf(HERE, "operation needs an arithmetic or pointer type"); + errorf(&expression->base.source_position, + "operation needs an arithmetic or pointer type"); + return; } expression->base.type = orig_type; } @@ -6344,10 +7057,11 @@ static void semantic_unexpr_arithmetic(unary_expression_t *expression) { type_t *const orig_type = expression->value->base.type; type_t *const type = skip_typeref(orig_type); - if(!is_type_arithmetic(type)) { + if (!is_type_arithmetic(type)) { if (is_type_valid(type)) { /* TODO: improve error message */ - errorf(HERE, "operation needs an arithmetic type"); + errorf(&expression->base.source_position, + "operation needs an arithmetic type"); } return; } @@ -6355,18 +7069,16 @@ static void semantic_unexpr_arithmetic(unary_expression_t *expression) expression->base.type = orig_type; } -static void semantic_unexpr_scalar(unary_expression_t *expression) +static void semantic_not(unary_expression_t *expression) { type_t *const orig_type = expression->value->base.type; type_t *const type = skip_typeref(orig_type); - if (!is_type_scalar(type)) { - if (is_type_valid(type)) { - errorf(HERE, "operand of ! must be of scalar type"); - } - return; + if (!is_type_scalar(type) && is_type_valid(type)) { + errorf(&expression->base.source_position, + "operand of ! must be of scalar type"); } - expression->base.type = orig_type; + expression->base.type = type_int; } static void semantic_unexpr_integer(unary_expression_t *expression) @@ -6375,7 +7087,8 @@ static void semantic_unexpr_integer(unary_expression_t *expression) type_t *const type = skip_typeref(orig_type); if (!is_type_integer(type)) { if (is_type_valid(type)) { - errorf(HERE, "operand of ~ must be of integer type"); + errorf(&expression->base.source_position, + "operand of ~ must be of integer type"); } return; } @@ -6387,9 +7100,10 @@ static void semantic_dereference(unary_expression_t *expression) { type_t *const orig_type = expression->value->base.type; type_t *const type = skip_typeref(orig_type); - if(!is_type_pointer(type)) { + if (!is_type_pointer(type)) { if (is_type_valid(type)) { - errorf(HERE, "Unary '*' needs pointer or arrray type, but type '%T' given", orig_type); + errorf(&expression->base.source_position, + "Unary '*' needs pointer or arrray type, but type '%T' given", orig_type); } return; } @@ -6399,17 +7113,17 @@ static void semantic_dereference(unary_expression_t *expression) expression->base.type = result_type; } -static void set_address_taken(expression_t *expression) +static void set_address_taken(expression_t *expression, bool may_be_register) { - if(expression->kind != EXPR_REFERENCE) + if (expression->kind != EXPR_REFERENCE) return; declaration_t *const declaration = expression->reference.declaration; /* happens for parse errors */ - if(declaration == NULL) + if (declaration == NULL) return; - if (declaration->storage_class == STORAGE_CLASS_REGISTER) { + if (declaration->storage_class == STORAGE_CLASS_REGISTER && !may_be_register) { errorf(&expression->base.source_position, "address of register variable '%Y' requested", declaration->symbol); @@ -6427,10 +7141,10 @@ static void semantic_take_addr(unary_expression_t *expression) value->base.type = revert_automatic_type_conversion(value); type_t *orig_type = value->base.type; - if(!is_type_valid(orig_type)) + if (!is_type_valid(orig_type)) return; - set_address_taken(value); + set_address_taken(value, false); expression->base.type = make_pointer_type(orig_type, TYPE_QUALIFIER_NONE); } @@ -6438,11 +7152,10 @@ static void semantic_take_addr(unary_expression_t *expression) #define CREATE_UNARY_EXPRESSION_PARSER(token_type, unexpression_type, sfunc) \ static expression_t *parse_##unexpression_type(unsigned precedence) \ { \ - eat(token_type); \ - \ expression_t *unary_expression \ = allocate_expression_zero(unexpression_type); \ unary_expression->base.source_position = *HERE; \ + eat(token_type); \ unary_expression->unary.value = parse_sub_expression(precedence); \ \ sfunc(&unary_expression->unary); \ @@ -6455,7 +7168,7 @@ CREATE_UNARY_EXPRESSION_PARSER('-', EXPR_UNARY_NEGATE, CREATE_UNARY_EXPRESSION_PARSER('+', EXPR_UNARY_PLUS, semantic_unexpr_arithmetic) CREATE_UNARY_EXPRESSION_PARSER('!', EXPR_UNARY_NOT, - semantic_unexpr_scalar) + semantic_not) CREATE_UNARY_EXPRESSION_PARSER('*', EXPR_UNARY_DEREFERENCE, semantic_dereference) CREATE_UNARY_EXPRESSION_PARSER('&', EXPR_UNARY_TAKE_ADDRESS, @@ -6473,11 +7186,12 @@ static expression_t *parse_##unexpression_type(unsigned precedence, \ expression_t *left) \ { \ (void) precedence; \ - eat(token_type); \ \ expression_t *unary_expression \ = allocate_expression_zero(unexpression_type); \ - unary_expression->unary.value = left; \ + unary_expression->base.source_position = *HERE; \ + eat(token_type); \ + unary_expression->unary.value = left; \ \ sfunc(&unary_expression->unary); \ \ @@ -6496,36 +7210,56 @@ static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right) /* TODO: handle complex + imaginary types */ /* § 6.3.1.8 Usual arithmetic conversions */ - if(type_left == type_long_double || type_right == type_long_double) { + if (type_left == type_long_double || type_right == type_long_double) { return type_long_double; - } else if(type_left == type_double || type_right == type_double) { + } else if (type_left == type_double || type_right == type_double) { return type_double; - } else if(type_left == type_float || type_right == type_float) { + } else if (type_left == type_float || type_right == type_float) { return type_float; } - type_right = promote_integer(type_right); type_left = promote_integer(type_left); + type_right = promote_integer(type_right); - if(type_left == type_right) + if (type_left == type_right) return type_left; - bool signed_left = is_type_signed(type_left); - bool signed_right = is_type_signed(type_right); - int rank_left = get_rank(type_left); - int rank_right = get_rank(type_right); - if(rank_left < rank_right) { - if(signed_left == signed_right || !signed_right) { - return type_right; - } else { - return type_left; - } + bool const signed_left = is_type_signed(type_left); + bool const signed_right = is_type_signed(type_right); + atomic_type_kind_t const rank_left = get_rank(type_left); + atomic_type_kind_t const rank_right = get_rank(type_right); + + if (signed_left == signed_right) + return rank_left >= rank_right ? type_left : type_right; + + atomic_type_kind_t s_rank; + atomic_type_kind_t u_rank; + type_t *s_type; + type_t *u_type; + if (signed_left) { + s_rank = rank_left; + s_type = type_left; + u_rank = rank_right; + u_type = type_right; } else { - if(signed_left == signed_right || !signed_left) { - return type_left; - } else { - return type_right; - } + s_rank = rank_right; + s_type = type_right; + u_rank = rank_left; + u_type = type_left; + } + + if (u_rank >= s_rank) + return u_type; + + if (get_atomic_type_size(s_rank) > get_atomic_type_size(u_rank)) + return s_type; + + switch (s_rank) { + case ATOMIC_TYPE_INT: return type_int; + case ATOMIC_TYPE_LONG: return type_long; + case ATOMIC_TYPE_LONGLONG: return type_long_long; + + default: panic("invalid atomic type"); } } @@ -6541,10 +7275,11 @@ static void semantic_binexpr_arithmetic(binary_expression_t *expression) type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); - if(!is_type_arithmetic(type_left) || !is_type_arithmetic(type_right)) { + if (!is_type_arithmetic(type_left) || !is_type_arithmetic(type_right)) { /* TODO: improve error message */ if (is_type_valid(type_left) && is_type_valid(type_right)) { - errorf(HERE, "operation needs arithmetic types"); + errorf(&expression->base.source_position, + "operation needs arithmetic types"); } return; } @@ -6564,10 +7299,11 @@ static void semantic_shift_op(binary_expression_t *expression) type_t * type_left = skip_typeref(orig_type_left); type_t * type_right = skip_typeref(orig_type_right); - if(!is_type_integer(type_left) || !is_type_integer(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(HERE, "operation needs integer types"); + errorf(&expression->base.source_position, + "operands of shift operation must have integer types"); } return; } @@ -6613,44 +7349,43 @@ static void semantic_add(binary_expression_t *expression) static void semantic_sub(binary_expression_t *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); + 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); + source_position_t const *const pos = &expression->base.source_position; /* § 5.6.5 */ - if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { + if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); expression->left = create_implicit_cast(left, arithmetic_type); expression->right = create_implicit_cast(right, arithmetic_type); expression->base.type = arithmetic_type; return; - } else if(is_type_pointer(type_left) && is_type_integer(type_right)) { + } else if (is_type_pointer(type_left) && is_type_integer(type_right)) { check_pointer_arithmetic(&expression->base.source_position, type_left, orig_type_left); expression->base.type = type_left; - } else if(is_type_pointer(type_left) && is_type_pointer(type_right)) { + } else if (is_type_pointer(type_left) && is_type_pointer(type_right)) { type_t *const unqual_left = get_unqualified_type(skip_typeref(type_left->pointer.points_to)); type_t *const unqual_right = get_unqualified_type(skip_typeref(type_right->pointer.points_to)); if (!types_compatible(unqual_left, unqual_right)) { - errorf(&expression->base.source_position, + errorf(pos, "subtracting pointers to incompatible types '%T' and '%T'", orig_type_left, orig_type_right); } else if (!is_type_object(unqual_left)) { if (is_type_atomic(unqual_left, ATOMIC_TYPE_VOID)) { - warningf(&expression->base.source_position, - "subtracting pointers to void"); + warningf(pos, "subtracting pointers to void"); } else { - errorf(&expression->base.source_position, - "subtracting pointers to non-object types '%T'", + errorf(pos, "subtracting pointers to non-object types '%T'", orig_type_left); } } expression->base.type = type_ptrdiff_t; } else if (is_type_valid(type_left) && is_type_valid(type_right)) { - errorf(HERE, "invalid operands of types '%T' and '%T' to binary '-'", + errorf(pos, "invalid operands of types '%T' and '%T' to binary '-'", orig_type_left, orig_type_right); } } @@ -6671,7 +7406,7 @@ static void semantic_comparison(binary_expression_t *expression) type_t *type_right = skip_typeref(orig_type_right); /* TODO non-arithmetic types */ - if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { + if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { /* test for signed vs unsigned compares */ if (warning.sign_compare && (expression->base.kind != EXPR_BINARY_EQUAL && @@ -6684,15 +7419,15 @@ static void semantic_comparison(binary_expression_t *expression) expression_t *const_expr = NULL; expression_t *other_expr = NULL; - if(is_constant_expression(left)) { + if (is_constant_expression(left)) { const_expr = left; other_expr = right; - } else if(is_constant_expression(right)) { + } else if (is_constant_expression(right)) { const_expr = right; other_expr = left; } - if(const_expr != NULL) { + if (const_expr != NULL) { type_t *other_type = skip_typeref(other_expr->base.type); long val = fold_constant(const_expr); /* TODO: check if val can be represented by other_type */ @@ -6808,10 +7543,11 @@ static void semantic_arithmetic_assign(binary_expression_t *expression) type_t *type_left = skip_typeref(orig_type_left); type_t *type_right = skip_typeref(orig_type_right); - if(!is_type_arithmetic(type_left) || !is_type_arithmetic(type_right)) { + if (!is_type_arithmetic(type_left) || !is_type_arithmetic(type_right)) { /* TODO: improve error message */ if (is_type_valid(type_left) && is_type_valid(type_right)) { - errorf(HERE, "operation needs arithmetic types"); + errorf(&expression->base.source_position, + "operation needs arithmetic types"); } return; } @@ -6850,7 +7586,9 @@ static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression) type_left, orig_type_left); expression->base.type = type_left; } else if (is_type_valid(type_left) && is_type_valid(type_right)) { - errorf(HERE, "incompatible types '%T' and '%T' in assignment", orig_type_left, orig_type_right); + errorf(&expression->base.source_position, + "incompatible types '%T' and '%T' in assignment", + orig_type_left, orig_type_right); } } @@ -6869,7 +7607,8 @@ static void semantic_logical_op(binary_expression_t *expression) if (!is_type_scalar(type_left) || !is_type_scalar(type_right)) { /* TODO: improve error message */ if (is_type_valid(type_left) && is_type_valid(type_right)) { - errorf(HERE, "operation needs scalar types"); + errorf(&expression->base.source_position, + "operation needs scalar types"); } return; } @@ -7046,14 +7785,13 @@ static void semantic_comma(binary_expression_t *expression) static expression_t *parse_##binexpression_type(unsigned precedence, \ expression_t *left) \ { \ + expression_t *binexpr = allocate_expression_zero(binexpression_type); \ + binexpr->base.source_position = *HERE; \ + binexpr->binary.left = left; \ eat(token_type); \ - source_position_t pos = *HERE; \ \ expression_t *right = parse_sub_expression(precedence + lr); \ \ - expression_t *binexpr = allocate_expression_zero(binexpression_type); \ - binexpr->base.source_position = pos; \ - binexpr->binary.left = left; \ binexpr->binary.right = right; \ sfunc(&binexpr->binary); \ \ @@ -7116,7 +7854,7 @@ CREATE_BINEXPR_PARSER(T_CARETEQUAL, EXPR_BINARY_BITWISE_XOR_ASSIGN, static expression_t *parse_sub_expression(unsigned precedence) { - if(token.type < 0) { + if (token.type < 0) { return expected_expression_error(); } @@ -7125,7 +7863,7 @@ static expression_t *parse_sub_expression(unsigned precedence) source_position_t source_position = token.source_position; expression_t *left; - if(parser->parser != NULL) { + if (parser->parser != NULL) { left = parser->parser(parser->precedence); } else { left = parse_primary_expression(); @@ -7134,14 +7872,14 @@ static expression_t *parse_sub_expression(unsigned precedence) left->base.source_position = source_position; while(true) { - if(token.type < 0) { + if (token.type < 0) { return expected_expression_error(); } parser = &expression_parsers[token.type]; - if(parser->infix_parser == NULL) + if (parser->infix_parser == NULL) break; - if(parser->infix_precedence < precedence) + if (parser->infix_precedence < precedence) break; left = parser->infix_parser(parser->infix_precedence, left); @@ -7174,7 +7912,7 @@ static void register_expression_parser(parse_expression_function parser, { expression_parser_function_t *entry = &expression_parsers[token_type]; - if(entry->parser != NULL) { + if (entry->parser != NULL) { diagnosticf("for token '%k'\n", (token_type_t)token_type); panic("trying to register multiple expression parsers for a token"); } @@ -7194,7 +7932,7 @@ static void register_infix_parser(parse_expression_infix_function parser, { expression_parser_function_t *entry = &expression_parsers[token_type]; - if(entry->infix_parser != NULL) { + if (entry->infix_parser != NULL) { diagnosticf("for token '%k'\n", (token_type_t)token_type); panic("trying to register multiple infix expression parsers for a " "token"); @@ -7301,15 +8039,63 @@ static asm_argument_t *parse_asm_arguments(bool is_out) argument->constraints = parse_string_literals(); expect('('); + add_anchor_token(')'); expression_t *expression = parse_expression(); - argument->expression = expression; - if (is_out && !is_lvalue(expression)) { - errorf(&expression->base.source_position, - "asm output argument is not an lvalue"); + rem_anchor_token(')'); + if (is_out) { + /* Ugly GCC stuff: Allow lvalue casts. Skip casts, when they do not + * change size or type representation (e.g. int -> long is ok, but + * int -> float is not) */ + if (expression->kind == EXPR_UNARY_CAST) { + type_t *const type = expression->base.type; + type_kind_t const kind = type->kind; + if (kind == TYPE_ATOMIC || kind == TYPE_POINTER) { + unsigned flags; + unsigned size; + if (kind == TYPE_ATOMIC) { + atomic_type_kind_t const akind = type->atomic.akind; + flags = get_atomic_type_flags(akind) & ~ATOMIC_TYPE_FLAG_SIGNED; + size = get_atomic_type_size(akind); + } else { + flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC; + size = get_atomic_type_size(get_intptr_kind()); + } + + do { + expression_t *const value = expression->unary.value; + type_t *const value_type = value->base.type; + type_kind_t const value_kind = value_type->kind; + + unsigned value_flags; + unsigned value_size; + if (value_kind == TYPE_ATOMIC) { + atomic_type_kind_t const value_akind = value_type->atomic.akind; + value_flags = get_atomic_type_flags(value_akind) & ~ATOMIC_TYPE_FLAG_SIGNED; + value_size = get_atomic_type_size(value_akind); + } else if (value_kind == TYPE_POINTER) { + value_flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC; + value_size = get_atomic_type_size(get_intptr_kind()); + } else { + break; + } + + if (value_flags != flags || value_size != size) + break; + + expression = value; + } while (expression->kind == EXPR_UNARY_CAST); + } + } + + if (!is_lvalue(expression)) { + errorf(&expression->base.source_position, + "asm output argument is not an lvalue"); + } } + argument->expression = expression; expect(')'); - set_address_taken(expression); + set_address_taken(expression, true); if (last != NULL) { last->next = argument; @@ -7340,14 +8126,14 @@ static asm_clobber_t *parse_asm_clobbers(void) asm_clobber_t *clobber = allocate_ast_zero(sizeof(clobber[0])); clobber->clobber = parse_string_literals(); - if(last != NULL) { + if (last != NULL) { last->next = clobber; } else { result = clobber; } last = clobber; - if(token.type != ',') + if (token.type != ',') break; eat(','); } @@ -7367,7 +8153,7 @@ static statement_t *parse_asm_statement(void) asm_statement_t *asm_statement = &statement->asms; - if(token.type == T_volatile) { + if (token.type == T_volatile) { next_token(); asm_statement->is_volatile = true; } @@ -7377,21 +8163,21 @@ static statement_t *parse_asm_statement(void) add_anchor_token(':'); asm_statement->asm_text = parse_string_literals(); - if(token.type != ':') { + if (token.type != ':') { rem_anchor_token(':'); goto end_of_asm; } eat(':'); asm_statement->outputs = parse_asm_arguments(true); - if(token.type != ':') { + if (token.type != ':') { rem_anchor_token(':'); goto end_of_asm; } eat(':'); asm_statement->inputs = parse_asm_arguments(false); - if(token.type != ':') { + if (token.type != ':') { rem_anchor_token(':'); goto end_of_asm; } @@ -7404,6 +8190,13 @@ end_of_asm: rem_anchor_token(')'); expect(')'); expect(';'); + + if (asm_statement->outputs == NULL) { + /* GCC: An 'asm' instruction without any output operands will be treated + * identically to a volatile 'asm' instruction. */ + asm_statement->is_volatile = true; + } + return statement; end_error: return create_invalid_statement(); @@ -7416,59 +8209,83 @@ static statement_t *parse_case_statement(void) { eat(T_case); - statement_t *statement = allocate_statement_zero(STATEMENT_CASE_LABEL); + statement_t *const statement = allocate_statement_zero(STATEMENT_CASE_LABEL); + source_position_t *const pos = &statement->base.source_position; - statement->base.source_position = token.source_position; + *pos = token.source_position; statement->case_label.expression = parse_expression(); + if (! is_constant_expression(statement->case_label.expression)) { + errorf(pos, "case label does not reduce to an integer constant"); + statement->case_label.is_bad = true; + } else { + long const val = fold_constant(statement->case_label.expression); + statement->case_label.first_case = val; + statement->case_label.last_case = val; + } if (c_mode & _GNUC) { if (token.type == T_DOTDOTDOT) { next_token(); statement->case_label.end_range = parse_expression(); + if (! is_constant_expression(statement->case_label.end_range)) { + errorf(pos, "case range does not reduce to an integer constant"); + statement->case_label.is_bad = true; + } else { + long const val = fold_constant(statement->case_label.end_range); + statement->case_label.last_case = val; + + if (val < statement->case_label.first_case) { + statement->case_label.is_empty = true; + warningf(pos, "empty range specified"); + } + } } } + PUSH_PARENT(statement); + expect(':'); - if (! is_constant_expression(statement->case_label.expression)) { - errorf(&statement->base.source_position, - "case label does not reduce to an integer constant"); - } else { - /* TODO: check if the case label is already known */ - if (current_switch != NULL) { - /* link all cases into the switch statement */ - if (current_switch->last_case == NULL) { - current_switch->first_case = - current_switch->last_case = &statement->case_label; - } else { - current_switch->last_case->next = &statement->case_label; + if (current_switch != NULL) { + if (! statement->case_label.is_bad) { + /* Check for duplicate case values */ + case_label_statement_t *c = &statement->case_label; + for (case_label_statement_t *l = current_switch->first_case; l != NULL; l = l->next) { + if (l->is_bad || l->is_empty) + continue; + + if (c->last_case < l->first_case || c->first_case > l->last_case) + continue; + + errorf(pos, "duplicate case value (previously used %P)", + &l->base.source_position); + break; } + } + /* link all cases into the switch statement */ + if (current_switch->last_case == NULL) { + current_switch->first_case = &statement->case_label; } else { - errorf(&statement->base.source_position, - "case label not within a switch statement"); + current_switch->last_case->next = &statement->case_label; } + current_switch->last_case = &statement->case_label; + } else { + errorf(pos, "case label not within a switch statement"); } - statement->case_label.statement = parse_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"); + } + + POP_PARENT; return statement; end_error: + POP_PARENT; return create_invalid_statement(); } -/** - * Finds an existing default label of a switch statement. - */ -static case_label_statement_t * -find_default_label(const switch_statement_t *statement) -{ - case_label_statement_t *label = statement->first_case; - for ( ; label != NULL; label = label->next) { - if (label->expression == NULL) - return label; - } - return NULL; -} - /** * Parse a default statement. */ @@ -7477,37 +8294,49 @@ static statement_t *parse_default_statement(void) eat(T_default); statement_t *statement = allocate_statement_zero(STATEMENT_CASE_LABEL); - statement->base.source_position = token.source_position; + PUSH_PARENT(statement); + expect(':'); if (current_switch != NULL) { - const case_label_statement_t *def_label = find_default_label(current_switch); + 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); } else { + current_switch->default_label = &statement->case_label; + /* link all cases into the switch statement */ if (current_switch->last_case == NULL) { - current_switch->first_case = - current_switch->last_case = &statement->case_label; + current_switch->first_case = &statement->case_label; } else { current_switch->last_case->next = &statement->case_label; } + current_switch->last_case = &statement->case_label; } } else { errorf(&statement->base.source_position, "'default' label not within a switch statement"); } - statement->case_label.statement = parse_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"); + } + + POP_PARENT; return statement; end_error: + POP_PARENT; return create_invalid_statement(); } /** * Return the declaration for a given label symbol or create a new one. + * + * @param symbol the symbol of the label */ static declaration_t *get_label(symbol_t *symbol) { @@ -7515,7 +8344,7 @@ static declaration_t *get_label(symbol_t *symbol) assert(current_function != NULL); /* if we found a label in the same function, then we already created the * declaration */ - if(candidate != NULL + if (candidate != NULL && candidate->parent_scope == ¤t_function->scope) { return candidate; } @@ -7541,45 +8370,48 @@ static statement_t *parse_label_statement(void) declaration_t *label = get_label(symbol); + statement_t *const statement = allocate_statement_zero(STATEMENT_LABEL); + statement->base.source_position = token.source_position; + statement->label.label = label; + + PUSH_PARENT(statement); + /* if source position is already set then the label is defined twice, * otherwise it was just mentioned in a goto so far */ - if(label->source_position.input_name != NULL) { + if (label->source_position.input_name != NULL) { errorf(HERE, "duplicate label '%Y' (declared %P)", symbol, &label->source_position); } else { label->source_position = token.source_position; + label->init.statement = statement; } - statement_t *statement = allocate_statement_zero(STATEMENT_LABEL); - - statement->base.source_position = token.source_position; - statement->label.label = label; - eat(':'); - if(token.type == '}') { + if (token.type == '}') { /* TODO only warn? */ - if(false) { + if (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(); } - return 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 { - if (token.type == ';') { - /* eat an empty statement here, to avoid the warning about an empty - * after a label. label:; is commonly used to have a label before - * a }. */ - statement->label.statement = create_empty_statement(); - next_token(); - } else { - statement->label.statement = parse_statement(); + 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"); } } - /* remember the labels's in a list for later checking */ + /* remember the labels in a list for later checking */ if (label_last == NULL) { label_first = &statement->label; } else { @@ -7587,6 +8419,7 @@ static statement_t *parse_label_statement(void) } label_last = &statement->label; + POP_PARENT; return statement; } @@ -7600,6 +8433,8 @@ static statement_t *parse_if(void) statement_t *statement = allocate_statement_zero(STATEMENT_IF); statement->base.source_position = token.source_position; + PUSH_PARENT(statement); + expect('('); add_anchor_token(')'); statement->ifs.condition = parse_expression(); @@ -7610,16 +8445,58 @@ static statement_t *parse_if(void) statement->ifs.true_statement = parse_statement(); rem_anchor_token(T_else); - if(token.type == T_else) { + if (token.type == T_else) { next_token(); statement->ifs.false_statement = parse_statement(); } + POP_PARENT; return statement; end_error: + POP_PARENT; return create_invalid_statement(); } +/** + * Check that all enums are handled in a switch. + * + * @param statement the switch statement to check + */ +static void check_enum_cases(const switch_statement_t *statement) { + const type_t *type = skip_typeref(statement->expression->base.type); + if (! is_type_enum(type)) + return; + const enum_type_t *enumt = &type->enumt; + + /* if we have a default, no warnings */ + if (statement->default_label != NULL) + return; + + /* FIXME: calculation of value should be done while parsing */ + const declaration_t *declaration; + long last_value = -1; + for (declaration = enumt->declaration->next; + declaration != NULL && declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY; + declaration = declaration->next) { + const expression_t *expression = declaration->init.enum_value; + long value = expression != NULL ? fold_constant(expression) : last_value + 1; + bool found = false; + for (const case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) { + if (l->expression == NULL) + continue; + if (l->first_case <= value && value <= l->last_case) { + found = true; + break; + } + } + if (! found) { + warningf(&statement->base.source_position, + "enumeration value '%Y' not handled in switch", declaration->symbol); + } + last_value = value; + } +} + /** * Parse a switch statement. */ @@ -7630,7 +8507,10 @@ static statement_t *parse_switch(void) statement_t *statement = allocate_statement_zero(STATEMENT_SWITCH); statement->base.source_position = token.source_position; + PUSH_PARENT(statement); + expect('('); + add_anchor_token(')'); expression_t *const expr = parse_expression(); type_t * type = skip_typeref(expr->base.type); if (is_type_integer(type)) { @@ -7642,19 +8522,24 @@ static statement_t *parse_switch(void) } statement->switchs.expression = create_implicit_cast(expr, type); expect(')'); + rem_anchor_token(')'); switch_statement_t *rem = current_switch; current_switch = &statement->switchs; statement->switchs.body = parse_statement(); current_switch = rem; - if(warning.switch_default && - find_default_label(&statement->switchs) == NULL) { + if (warning.switch_default && + statement->switchs.default_label == NULL) { warningf(&statement->base.source_position, "switch has no default case"); } + if (warning.switch_enum) + check_enum_cases(&statement->switchs); + POP_PARENT; return statement; end_error: + POP_PARENT; return create_invalid_statement(); } @@ -7679,6 +8564,8 @@ static statement_t *parse_while(void) statement_t *statement = allocate_statement_zero(STATEMENT_WHILE); statement->base.source_position = token.source_position; + PUSH_PARENT(statement); + expect('('); add_anchor_token(')'); statement->whiles.condition = parse_expression(); @@ -7687,8 +8574,10 @@ static statement_t *parse_while(void) statement->whiles.body = parse_loop_body(statement); + POP_PARENT; return statement; end_error: + POP_PARENT; return create_invalid_statement(); } @@ -7700,9 +8589,10 @@ static statement_t *parse_do(void) eat(T_do); statement_t *statement = allocate_statement_zero(STATEMENT_DO_WHILE); - statement->base.source_position = token.source_position; + PUSH_PARENT(statement) + add_anchor_token(T_while); statement->do_while.body = parse_loop_body(statement); rem_anchor_token(T_while); @@ -7715,8 +8605,10 @@ static statement_t *parse_do(void) expect(')'); expect(';'); + POP_PARENT; return statement; end_error: + POP_PARENT; return create_invalid_statement(); } @@ -7730,6 +8622,8 @@ static statement_t *parse_for(void) statement_t *statement = allocate_statement_zero(STATEMENT_FOR); statement->base.source_position = token.source_position; + PUSH_PARENT(statement); + int top = environment_top(); scope_t *last_scope = scope; set_scope(&statement->fors.scope); @@ -7737,8 +8631,8 @@ static statement_t *parse_for(void) expect('('); add_anchor_token(')'); - if(token.type != ';') { - if(is_declaration_specifier(&token, false)) { + if (token.type != ';') { + if (is_declaration_specifier(&token, false)) { parse_declaration(record_declaration); } else { add_anchor_token(';'); @@ -7755,13 +8649,13 @@ static statement_t *parse_for(void) expect(';'); } - if(token.type != ';') { + if (token.type != ';') { add_anchor_token(';'); statement->fors.condition = parse_expression(); rem_anchor_token(';'); } expect(';'); - if(token.type != ')') { + if (token.type != ')') { expression_t *const step = parse_expression(); statement->fors.step = step; if (warning.unused_value && !expression_has_effect(step)) { @@ -7777,9 +8671,11 @@ static statement_t *parse_for(void) set_scope(last_scope); environment_pop_to(top); + POP_PARENT; return statement; end_error: + POP_PARENT; rem_anchor_token(')'); assert(scope == &statement->fors.scope); set_scope(last_scope); @@ -7795,7 +8691,7 @@ static statement_t *parse_goto(void) { eat(T_goto); - if(token.type != T_IDENTIFIER) { + if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing goto", T_IDENTIFIER, NULL); eat_statement(); goto end_error; @@ -7897,12 +8793,13 @@ end_error: /** * Check if a given declaration represents a local variable. */ -static bool is_local_var_declaration(const declaration_t *declaration) { +static bool is_local_var_declaration(const declaration_t *declaration) +{ switch ((storage_class_tag_t) declaration->storage_class) { case STORAGE_CLASS_AUTO: case STORAGE_CLASS_REGISTER: { const type_t *type = skip_typeref(declaration->type); - if(is_type_function(type)) { + if (is_type_function(type)) { return false; } else { return true; @@ -7916,8 +8813,9 @@ static bool is_local_var_declaration(const declaration_t *declaration) { /** * Check if a given declaration represents a variable. */ -static bool is_var_declaration(const declaration_t *declaration) { - if(declaration->storage_class == STORAGE_CLASS_TYPEDEF) +static bool is_var_declaration(const declaration_t *declaration) +{ + if (declaration->storage_class == STORAGE_CLASS_TYPEDEF) return false; const type_t *type = skip_typeref(declaration->type); @@ -7962,7 +8860,7 @@ static statement_t *parse_return(void) eat(T_return); expression_t *return_value = NULL; - if(token.type != ';') { + if (token.type != ';') { return_value = parse_expression(); } expect(';'); @@ -7971,10 +8869,10 @@ static statement_t *parse_return(void) assert(is_type_function(func_type)); type_t *const return_type = skip_typeref(func_type->function.return_type); - if(return_value != NULL) { + if (return_value != NULL) { type_t *return_value_type = skip_typeref(return_value->base.type); - if(is_type_atomic(return_type, ATOMIC_TYPE_VOID) + if (is_type_atomic(return_type, ATOMIC_TYPE_VOID) && !is_type_atomic(return_value_type, ATOMIC_TYPE_VOID)) { warningf(&statement->base.source_position, "'return' with a value, in function returning void"); @@ -7995,7 +8893,7 @@ static statement_t *parse_return(void) } } } else { - if(!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { + if (!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { warningf(&statement->base.source_position, "'return' without value, in function returning non-void"); } @@ -8019,7 +8917,7 @@ static statement_t *parse_declaration_statement(void) declaration_t *before = last_declaration; parse_declaration(record_declaration); - if(before == NULL) { + if (before == NULL) { statement->declaration.declarations_begin = scope->declarations; } else { statement->declaration.declarations_begin = before->next; @@ -8051,7 +8949,8 @@ end_error: * Parse a microsoft __try { } __finally { } or * __try{ } __except() { } */ -static statement_t *parse_ms_try_statment(void) { +static statement_t *parse_ms_try_statment(void) +{ statement_t *statement = allocate_statement_zero(STATEMENT_MS_TRY); statement->base.source_position = token.source_position; @@ -8062,7 +8961,7 @@ static statement_t *parse_ms_try_statment(void) { statement->ms_try.try_statement = parse_compound_statement(false); current_try = rem; - if(token.type == T___except) { + if (token.type == T___except) { eat(T___except); expect('('); add_anchor_token(')'); @@ -8079,7 +8978,7 @@ static statement_t *parse_ms_try_statment(void) { rem_anchor_token(')'); expect(')'); statement->ms_try.final_statement = parse_compound_statement(false); - } else if(token.type == T__finally) { + } else if (token.type == T__finally) { eat(T___finally); statement->ms_try.final_statement = parse_compound_statement(false); } else { @@ -8091,6 +8990,16 @@ end_error: return create_invalid_statement(); } +static statement_t *parse_empty_statement(void) +{ + if (warning.empty_statement) { + warningf(HERE, "statement is empty"); + } + statement_t *const statement = create_empty_statement(); + eat(';'); + return statement; +} + /** * Parse a statement. * There's also parse_statement() which additionally checks for @@ -8102,91 +9011,23 @@ static statement_t *intern_parse_statement(void) /* declaration or statement */ add_anchor_token(';'); - switch(token.type) { - case T_asm: - statement = parse_asm_statement(); - break; - - case T_case: - statement = parse_case_statement(); - break; - - case T_default: - statement = parse_default_statement(); - break; - - case '{': - statement = parse_compound_statement(false); - break; - - case T_if: - statement = parse_if(); - break; - - case T_switch: - statement = parse_switch(); - break; - - case T_while: - statement = parse_while(); - break; - - case T_do: - statement = parse_do(); - break; - - case T_for: - statement = parse_for(); - break; - - case T_goto: - statement = parse_goto(); - break; - - case T_continue: - statement = parse_continue(); - break; - - case T_break: - statement = parse_break(); - break; - - case T___leave: - statement = parse_leave(); - break; - - case T_return: - statement = parse_return(); - break; - - case ';': - if(warning.empty_statement) { - warningf(HERE, "statement is empty"); - } - statement = create_empty_statement(); - next_token(); - break; - + switch (token.type) { case T_IDENTIFIER: - if(look_ahead(1)->type == ':') { + if (look_ahead(1)->type == ':') { statement = parse_label_statement(); - break; - } - - if(is_typedef_symbol(token.v.symbol)) { + } else if (is_typedef_symbol(token.v.symbol)) { statement = parse_declaration_statement(); - break; + } else { + statement = parse_expression_statement(); } - - statement = parse_expression_statement(); break; 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 */ + /* 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 (token.type == T___extension__); statement = parse_statement(); break; @@ -8194,13 +9035,23 @@ static statement_t *intern_parse_statement(void) statement = parse_declaration_statement(); break; - case T___try: - statement = parse_ms_try_statment(); - break; - - default: - statement = parse_expression_statement(); - break; + case ';': statement = parse_empty_statement(); break; + case '{': statement = parse_compound_statement(false); break; + case T___leave: statement = parse_leave(); break; + case T___try: statement = parse_ms_try_statment(); break; + case T_asm: statement = parse_asm_statement(); break; + case T_break: statement = parse_break(); break; + case T_case: statement = parse_case_statement(); break; + case T_continue: statement = parse_continue(); break; + case T_default: statement = parse_default_statement(); break; + case T_do: statement = parse_do(); break; + case T_for: statement = parse_for(); break; + case T_goto: statement = parse_goto(); break; + case T_if: statement = parse_if (); break; + case T_return: statement = parse_return(); break; + case T_switch: statement = parse_switch(); break; + case T_while: statement = parse_while(); break; + default: statement = parse_expression_statement(); break; } rem_anchor_token(';'); @@ -8220,9 +9071,9 @@ static statement_t *parse_statement(void) { statement_t *statement = intern_parse_statement(); - if(statement->kind == STATEMENT_EXPRESSION && warning.unused_value) { + if (statement->kind == STATEMENT_EXPRESSION && warning.unused_value) { expression_t *expression = statement->expression.expression; - if(!expression_has_effect(expression)) { + if (!expression_has_effect(expression)) { warningf(&expression->base.source_position, "statement has no effect"); } @@ -8237,9 +9088,10 @@ static statement_t *parse_statement(void) static statement_t *parse_compound_statement(bool inside_expression_statement) { statement_t *statement = allocate_statement_zero(STATEMENT_COMPOUND); - statement->base.source_position = token.source_position; + PUSH_PARENT(statement); + eat('{'); add_anchor_token('}'); @@ -8247,30 +9099,35 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) scope_t *last_scope = scope; set_scope(&statement->compound.scope); - statement_t *last_statement = NULL; - - while(token.type != '}' && token.type != T_EOF) { + statement_t **anchor = &statement->compound.statements; + bool only_decls_so_far = true; + while (token.type != '}' && token.type != T_EOF) { statement_t *sub_statement = intern_parse_statement(); - if(is_invalid_statement(sub_statement)) { + if (is_invalid_statement(sub_statement)) { /* an error occurred. if we are at an anchor, return */ - if(at_anchor()) + if (at_anchor()) goto end_error; continue; } - if(last_statement != NULL) { - last_statement->base.next = sub_statement; - } else { - statement->compound.statements = sub_statement; + if (warning.declaration_after_statement) { + if (sub_statement->kind != STATEMENT_DECLARATION) { + only_decls_so_far = false; + } else if (!only_decls_so_far) { + warningf(&sub_statement->base.source_position, + "ISO C90 forbids mixed declarations and code"); + } } - while(sub_statement->base.next != NULL) + *anchor = sub_statement; + + while (sub_statement->base.next != NULL) sub_statement = sub_statement->base.next; - last_statement = sub_statement; + anchor = &sub_statement->base.next; } - if(token.type == '}') { + if (token.type == '}') { next_token(); } else { errorf(&statement->base.source_position, @@ -8278,18 +9135,18 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) } /* look over all statements again to produce no effect warnings */ - if(warning.unused_value) { + if (warning.unused_value) { statement_t *sub_statement = statement->compound.statements; for( ; sub_statement != NULL; sub_statement = sub_statement->base.next) { - if(sub_statement->kind != STATEMENT_EXPRESSION) + if (sub_statement->kind != STATEMENT_EXPRESSION) continue; /* don't emit a warning for the last expression in an expression * statement as it has always an effect */ - if(inside_expression_statement && sub_statement->base.next == NULL) + if (inside_expression_statement && sub_statement->base.next == NULL) continue; expression_t *expression = sub_statement->expression.expression; - if(!expression_has_effect(expression)) { + if (!expression_has_effect(expression)) { warningf(&expression->base.source_position, "statement has no effect"); } @@ -8302,6 +9159,7 @@ end_error: set_scope(last_scope); environment_pop_to(top); + POP_PARENT; return statement; } @@ -8316,13 +9174,20 @@ static void initialize_builtin_types(void) type_ptrdiff_t = make_global_typedef("__PTRDIFF_TYPE__", type_long); type_uintmax_t = make_global_typedef("__uintmax_t__", type_unsigned_long_long); type_uptrdiff_t = make_global_typedef("__UPTRDIFF_TYPE__", type_unsigned_long); - type_wchar_t = make_global_typedef("__WCHAR_TYPE__", type_int); + type_wchar_t = make_global_typedef("__WCHAR_TYPE__", opt_short_wchar_t ? type_unsigned_short : type_int); type_wint_t = make_global_typedef("__WINT_TYPE__", type_int); type_intmax_t_ptr = make_pointer_type(type_intmax_t, TYPE_QUALIFIER_NONE); type_ptrdiff_t_ptr = make_pointer_type(type_ptrdiff_t, TYPE_QUALIFIER_NONE); type_ssize_t_ptr = make_pointer_type(type_ssize_t, TYPE_QUALIFIER_NONE); type_wchar_t_ptr = make_pointer_type(type_wchar_t, TYPE_QUALIFIER_NONE); + + /* const version of wchar_t */ + type_const_wchar_t = allocate_type_zero(TYPE_TYPEDEF, &builtin_source_position); + type_const_wchar_t->typedeft.declaration = type_wchar_t->typedeft.declaration; + type_const_wchar_t->base.qualifiers |= TYPE_QUALIFIER_CONST; + + type_const_wchar_t_ptr = make_pointer_type(type_const_wchar_t, TYPE_QUALIFIER_NONE); } /** @@ -8334,7 +9199,10 @@ static void check_unused_globals(void) return; for (const declaration_t *decl = global_scope->declarations; decl != NULL; decl = decl->next) { - if (decl->used || decl->storage_class != STORAGE_CLASS_STATIC) + if (decl->used || + decl->modifiers & DM_UNUSED || + decl->modifiers & DM_USED || + decl->storage_class != STORAGE_CLASS_STATIC) continue; type_t *const type = decl->type; @@ -8356,19 +9224,54 @@ static void check_unused_globals(void) } } +static void parse_global_asm(void) +{ + eat(T_asm); + expect('('); + + statement_t *statement = allocate_statement_zero(STATEMENT_ASM); + statement->base.source_position = token.source_position; + statement->asms.asm_text = parse_string_literals(); + statement->base.next = unit->global_asm; + unit->global_asm = statement; + + expect(')'); + expect(';'); + +end_error:; +} + /** * Parse a translation unit. */ static void parse_translation_unit(void) { - while(token.type != T_EOF) { - if (token.type == ';') { + for (;;) switch (token.type) { + DECLARATION_START + case T_IDENTIFIER: + case T___extension__: + parse_external_declaration(); + break; + + case T_asm: + parse_global_asm(); + break; + + case T_EOF: + return; + + case ';': /* TODO error in strict mode */ warningf(HERE, "stray ';' outside of function"); next_token(); - } else { - parse_external_declaration(); - } + break; + + default: + errorf(HERE, "stray %K outside of function", &token); + if (token.type == '(' || token.type == '{' || token.type == '[') + eat_until_matching_token(token.type); + next_token(); + break; } } @@ -8432,7 +9335,7 @@ void parse(void) */ void init_parser(void) { - if(c_mode & _MS) { + if (c_mode & _MS) { /* add predefined symbols for extended-decl-modifier */ sym_align = symbol_table_insert("align"); sym_allocate = symbol_table_insert("allocate");