X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=4925adf0259ff39d0f2fb74831165a9a11bd5d41;hb=2788e437530378ada31a28484ec49a9eeb05faf2;hp=d83c2618089610725c76d33ceb26411ecb04b3dd;hpb=dc80433e9208fb190af9b5a466b484036cfb8335;p=cparser diff --git a/parser.c b/parser.c index d83c261..4925adf 100644 --- a/parser.c +++ b/parser.c @@ -48,15 +48,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; }; @@ -67,7 +76,7 @@ struct declaration_specifiers_t { unsigned char alignment; /**< Alignment, 0 if not set. */ unsigned int is_inline : 1; unsigned int deprecated : 1; - decl_modifiers_t decl_modifiers; /**< MS __declspec extended modifier mask */ + decl_modifiers_t modifiers; /**< declaration modifiers */ gnu_attribute_t *gnu_attributes; /**< list of GNU attributes */ const char *deprecated_string; /**< can be set if declaration was marked deprecated. */ symbol_t *get_property_sym; /**< the name of the get property if set. */ @@ -99,13 +108,20 @@ 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; static label_statement_t *label_first = NULL; 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 */ @@ -132,7 +148,7 @@ static const symbol_t *sym_noalias = NULL; static unsigned char token_anchor_set[T_LAST_TOKEN]; /** The current source position. */ -#define HERE &token.source_position +#define HERE (&token.source_position) static type_t *type_valist; @@ -155,14 +171,16 @@ 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: \ case T_restrict: \ case T_volatile: \ case T_inline: \ - case T__forceinline: + case T__forceinline: \ + case T___attribute__: #ifdef PROVIDE_COMPLEX #define COMPLEX_SPECIFIERS \ @@ -289,10 +307,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])); @@ -309,7 +327,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; } @@ -366,6 +385,8 @@ static size_t get_type_struct_size(type_kind_t kind) { static const size_t sizes[] = { [TYPE_ATOMIC] = sizeof(atomic_type_t), + [TYPE_COMPLEX] = sizeof(complex_type_t), + [TYPE_IMAGINARY] = sizeof(imaginary_type_t), [TYPE_BITFIELD] = sizeof(bitfield_type_t), [TYPE_COMPOUND_STRUCT] = sizeof(compound_type_t), [TYPE_COMPOUND_UNION] = sizeof(compound_type_t), @@ -386,6 +407,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) { @@ -483,21 +507,38 @@ 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) +{ + 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) +{ + assert(0 <= token_type && token_type < T_LAST_TOKEN); + token_anchor_set[token_type] = 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]; } @@ -505,39 +546,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; } @@ -548,42 +600,48 @@ 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. */ -static __attribute__((sentinel)) +static +#if defined __GNUC__ && __GNUC__ >= 4 +__attribute__((sentinel)) +#endif void parse_error_expected(const char *message, ...) { - if(message != NULL) { + if (message != NULL) { errorf(HERE, "%s", message); } va_list ap; @@ -618,19 +676,21 @@ 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(); \ + if (token.type == expected) \ + next_token(); \ rem_anchor_token(expected); \ 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; @@ -647,7 +707,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; } @@ -671,8 +731,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; @@ -681,7 +741,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; } @@ -702,6 +762,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; @@ -718,7 +783,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) { @@ -731,8 +796,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; @@ -742,10 +807,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; @@ -763,6 +828,12 @@ 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); @@ -777,7 +848,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); @@ -786,10 +857,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; @@ -818,7 +889,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; } @@ -852,20 +923,83 @@ static expression_t *create_implicit_cast(expression_t *expression, return create_cast_expression(expression, dest_type); } +typedef enum assign_error_t { + ASSIGN_SUCCESS, + ASSIGN_ERROR_INCOMPATIBLE, + ASSIGN_ERROR_POINTER_QUALIFIER_MISSING, + ASSIGN_WARNING_POINTER_INCOMPATIBLE, + ASSIGN_WARNING_POINTER_FROM_INT, + ASSIGN_WARNING_INT_FROM_POINTER +} assign_error_t; + +static void report_assign_error(assign_error_t error, type_t *orig_type_left, + const expression_t *const right, + const char *context, + const source_position_t *source_position) +{ + 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); + + switch (error) { + case ASSIGN_SUCCESS: + return; + case ASSIGN_ERROR_INCOMPATIBLE: + errorf(source_position, + "destination type '%T' in %s is incompatible with type '%T'", + orig_type_left, context, orig_type_right); + return; + + case ASSIGN_ERROR_POINTER_QUALIFIER_MISSING: { + type_t *points_to_left + = skip_typeref(type_left->pointer.points_to); + type_t *points_to_right + = skip_typeref(type_right->pointer.points_to); + + /* 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); + return; + } + + case ASSIGN_WARNING_POINTER_INCOMPATIBLE: + warningf(source_position, + "destination type '%T' in %s is incompatible with '%E' of type '%T'", + orig_type_left, context, right, orig_type_right); + return; + + case ASSIGN_WARNING_POINTER_FROM_INT: + warningf(source_position, + "%s makes integer '%T' from pointer '%T' without a cast", + context, orig_type_left, orig_type_right); + return; + + case ASSIGN_WARNING_INT_FROM_POINTER: + warningf(source_position, + "%s makes integer '%T' from pointer '%T' without a cast", + context, orig_type_left, orig_type_right); + return; + + default: + panic("invalid error value"); + } +} + /** Implements the rules from § 6.5.16.1 */ -static type_t *semantic_assign(type_t *orig_type_left, - const expression_t *const right, - const char *context, - const source_position_t *source_position) +static assign_error_t semantic_assign(type_t *orig_type_left, + const expression_t *const right) { type_t *const orig_type_right = right->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); - if(is_type_pointer(type_left)) { - if(is_null_pointer_constant(right)) { - return orig_type_left; - } else if(is_type_pointer(type_right)) { + if (is_type_pointer(type_left)) { + if (is_null_pointer_constant(right)) { + return ASSIGN_SUCCESS; + } else if (is_type_pointer(type_right)) { type_t *points_to_left = skip_typeref(type_left->pointer.points_to); type_t *points_to_right @@ -874,10 +1008,8 @@ static type_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) { - errorf(source_position, - "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointed-to type", type_left, context, type_right, missing_qualifiers); - return orig_type_left; + if (missing_qualifiers != 0) { + return ASSIGN_ERROR_POINTER_QUALIFIER_MISSING; } points_to_left = get_unqualified_type(points_to_left); @@ -885,47 +1017,36 @@ static type_t *semantic_assign(type_t *orig_type_left, if (is_type_atomic(points_to_left, ATOMIC_TYPE_VOID) || is_type_atomic(points_to_right, ATOMIC_TYPE_VOID)) { - return orig_type_left; + return ASSIGN_SUCCESS; } if (!types_compatible(points_to_left, points_to_right)) { - warningf(source_position, - "destination type '%T' in %s is incompatible with '%E' of type '%T'", - orig_type_left, context, right, orig_type_right); + return ASSIGN_WARNING_POINTER_INCOMPATIBLE; } - return orig_type_left; - } else if(is_type_integer(type_right)) { - warningf(source_position, - "%s makes pointer '%T' from integer '%T' without a cast", - context, orig_type_left, orig_type_right); - return orig_type_left; + return ASSIGN_SUCCESS; + } 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)) || (is_type_atomic(type_left, ATOMIC_TYPE_BOOL) && is_type_pointer(type_right))) { - return orig_type_left; + return ASSIGN_SUCCESS; } else if ((is_type_compound(type_left) && is_type_compound(type_right)) || (is_type_builtin(type_left) && is_type_builtin(type_right))) { type_t *const unqual_type_left = get_unqualified_type(type_left); type_t *const unqual_type_right = get_unqualified_type(type_right); if (types_compatible(unqual_type_left, unqual_type_right)) { - return orig_type_left; + return ASSIGN_SUCCESS; } } else if (is_type_integer(type_left) && is_type_pointer(type_right)) { - warningf(source_position, - "%s makes integer '%T' from pointer '%T' without a cast", - context, orig_type_left, orig_type_right); - return orig_type_left; + return ASSIGN_WARNING_INT_FROM_POINTER; } - if (!is_type_valid(type_left)) - return type_left; - - if (!is_type_valid(type_right)) - return orig_type_right; + if (!is_type_valid(type_left) || !is_type_valid(type_right)) + return ASSIGN_SUCCESS; - return NULL; + return ASSIGN_ERROR_INCOMPATIBLE; } static expression_t *parse_constant_expression(void) @@ -933,7 +1054,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); } @@ -982,7 +1103,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", @@ -996,11 +1117,11 @@ 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", - [GNU_AK_COMMON] = "coommon", + [GNU_AK_COMMON] = "common", [GNU_AK_NOCOMMON] = "nocommon", [GNU_AK_PACKED] = "packed", [GNU_AK_SHARED] = "shared", @@ -1010,15 +1131,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", @@ -1043,6 +1164,7 @@ static const char *gnu_attribute_names[GNU_AK_LAST] = { [GNU_AK_TLS_MODEL] = "tls_model", [GNU_AK_VISIBILITY] = "visibility", [GNU_AK_REGPARM] = "regparm", + [GNU_AK_MODE] = "mode", [GNU_AK_MODEL] = "model", [GNU_AK_TRAP_EXIT] = "trap_exit", [GNU_AK_SP_SWITCH] = "sp_switch", @@ -1052,23 +1174,24 @@ 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] == '_') { - s2 += 2; - size_t l1 = strlen(s1); - if(l1 + 2 != strlen(s2)) { - /* not equal */ - return 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] == '_') { + return strncmp(s1, s2+2, len2-4); } - return strncmp(s1, s2, l1); } + return strcmp(s1, 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; @@ -1076,19 +1199,19 @@ static gnu_attribute_t *allocate_gnu_attribute(gnu_attribute_kind_t kind) { attribute->have_arguments = false; return attribute; - return attribute; } /** * 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; @@ -1097,20 +1220,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; @@ -1123,7 +1253,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; @@ -1139,8 +1269,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", @@ -1148,23 +1279,24 @@ 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; } } + errorf(HERE, "'%s' is an unrecognized tls model", string.begin); } - errorf(HERE, "'%s' is an unrecognized tls model", string.begin); attribute->invalid = true; } /** * 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", @@ -1172,46 +1304,87 @@ 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; } } + errorf(HERE, "'%s' is an unrecognized visibility", string.begin); } - errorf(HERE, "'%s' is an unrecognized visibility", string.begin); attribute->invalid = true; } /** * 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; } } + errorf(HERE, "'%s' is an unrecognized model", string.begin); + } + attribute->invalid = true; +} + +static void parse_gnu_attribute_mode_arg(gnu_attribute_t *attribute) +{ + /* TODO: find out what is allowed here... */ + + /* at least: byte, word, pointer, list of machine modes + * __XXX___ is interpreted as XXX */ + add_anchor_token(')'); + + 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; } - errorf(HERE, "'%s' is an unrecognized model", string.begin); + next_token(); + + rem_anchor_token(')'); + expect(')'); + return; +end_error: attribute->invalid = true; } /** * 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", @@ -1220,23 +1393,24 @@ 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; } } + errorf(HERE, "'%s' is not an interrupt", string.begin); } - errorf(HERE, "'%s' is an interrupt", string.begin); attribute->invalid = true; } /** * 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", @@ -1244,17 +1418,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(); @@ -1276,6 +1450,19 @@ end_error: attribute->u.value = true; } +static void check_no_argument(gnu_attribute_t *attribute, const char *name) +{ + if (!attribute->have_arguments) + return; + + /* should have no arguments */ + errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); + eat_until_matching_token('('); + /* we have already consumed '(', so we stop before ')', eat it */ + eat(')'); + attribute->invalid = true; +} + /** * Parse one GNU attribute. * @@ -1352,63 +1539,66 @@ end_error: * interrupt( string literal ) * sentinel( constant expression ) */ -static void parse_gnu_attribute(gnu_attribute_t **attributes) +static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) { - gnu_attribute_t *head = *attributes; - gnu_attribute_t *last = *attributes; + gnu_attribute_t *head = *attributes; + gnu_attribute_t *last = *attributes; + decl_modifiers_t modifiers = 0; gnu_attribute_t *attribute; eat(T___attribute__); 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) { + 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) { + } else if (token.type == T_IDENTIFIER) { + const symbol_t *sym = token.v.symbol; + name = sym->string; + } else { parse_error_expected("while parsing GNU attribute", T_IDENTIFIER, NULL); break; } - const symbol_t *sym = token.v.symbol; - name = sym->string; + next_token(); 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 @@ -1418,28 +1608,14 @@ static void 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_NOINLINE: - case GNU_AK_NORETURN: case GNU_AK_NAKED: - case GNU_AK_PURE: - case GNU_AK_ALWAYS_INLINE: case GNU_AK_MALLOC: case GNU_AK_WEAK: - case GNU_AK_CONSTRUCTOR: - case GNU_AK_DESTRUCTOR: - case GNU_AK_NOTHROW: - case GNU_AK_TRANSPARENT_UNION: case GNU_AK_COMMON: case GNU_AK_NOCOMMON: - case GNU_AK_PACKED: 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: @@ -1463,23 +1639,36 @@ static void parse_gnu_attribute(gnu_attribute_t **attributes) case GNU_AK_MAY_ALIAS: case GNU_AK_MS_STRUCT: case GNU_AK_GCC_STRUCT: - case GNU_AK_DLLIMPORT: - case GNU_AK_DLLEXPORT: - if(attribute->have_arguments) { - /* should have no arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - eat_until_matching_token('('); - /* we have already consumed '(', so we stop before ')', eat it */ - eat(')'); - attribute->invalid = true; + 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_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; @@ -1489,7 +1678,7 @@ static void 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; @@ -1497,7 +1686,7 @@ static void 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; @@ -1506,50 +1695,63 @@ static void 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 + } else { parse_gnu_attribute_model_arg(attribute); + } + break; + case GNU_AK_MODE: + if (!attribute->have_arguments) { + /* should have arguments */ + errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); + } else { + parse_gnu_attribute_mode_arg(attribute); + } + 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 { @@ -1557,7 +1759,7 @@ static void parse_gnu_attribute(gnu_attribute_t **attributes) } } - if(token.type != ',') + if (token.type != ',') break; next_token(); } @@ -1566,23 +1768,27 @@ static void parse_gnu_attribute(gnu_attribute_t **attributes) expect(')'); end_error: *attributes = head; + + return modifiers; } /** * Parse GNU attributes. */ -static void parse_attributes(gnu_attribute_t **attributes) +static decl_modifiers_t parse_attributes(gnu_attribute_t **attributes) { - while(true) { + decl_modifiers_t modifiers = 0; + + while (true) { switch(token.type) { - case T___attribute__: { - parse_gnu_attribute(attributes); - break; - } + case T___attribute__: + modifiers |= parse_gnu_attribute(attributes); + 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('('); @@ -1591,15 +1797,23 @@ static void 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; + default: return modifiers; + } + + next_token(); + } } static designator_t *parse_designation(void) @@ -1607,7 +1821,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 '[': @@ -1623,7 +1837,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; @@ -1637,7 +1851,7 @@ static designator_t *parse_designation(void) } assert(designator != NULL); - if(last != NULL) { + if (last != NULL) { last->next = designator; } else { result = designator; @@ -1714,13 +1928,14 @@ static initializer_t *initializer_from_expression(type_t *orig_type, } } - type_t *const res_type = semantic_assign(type, expression, "initializer", - &expression->base.source_position); - if (res_type == NULL) + assign_error_t error = semantic_assign(type, expression); + if (error == ASSIGN_ERROR_INCOMPATIBLE) return NULL; + report_assign_error(error, type, expression, "initializer", + &expression->base.source_position); initializer_t *const result = allocate_initializer_zero(INITIALIZER_VALUE); - result->value.value = create_implicit_cast(expression, res_type); + result->value.value = create_implicit_cast(expression, type); return result; } @@ -1744,16 +1959,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); @@ -1761,7 +1976,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); @@ -1770,12 +1985,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; } @@ -1821,20 +2036,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, ")"); @@ -1879,12 +2094,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; @@ -1919,7 +2134,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); } @@ -1934,10 +2149,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); @@ -1948,18 +2163,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); @@ -1974,28 +2189,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); @@ -2010,7 +2225,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); } } @@ -2025,15 +2240,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; } @@ -2042,7 +2257,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; } } @@ -2051,7 +2266,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 { @@ -2062,26 +2277,27 @@ 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(); } } /** - * skip any {...} blocks until a closing braket is reached. + * skip any {...} blocks until a closing bracket is reached. */ 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; } @@ -2103,7 +2319,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(); } @@ -2118,7 +2334,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(); } @@ -2126,14 +2342,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; } @@ -2142,21 +2367,25 @@ static initializer_t *parse_sub_initializer(type_path_t *path, = allocate_initializer_zero(INITIALIZER_DESIGNATOR); designator_initializer->designator.designator = designator; ARR_APP1(initializer_t*, initializers, designator_initializer); + + orig_type = path->top_type; + type = orig_type != NULL ? skip_typeref(orig_type) : NULL; } 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); @@ -2165,7 +2394,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 { @@ -2177,27 +2406,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); } @@ -2207,18 +2436,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); @@ -2233,18 +2462,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 @@ -2252,19 +2481,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; @@ -2280,14 +2509,14 @@ error_parse_next: len * sizeof(initializers[0])); DEL_ARR_F(initializers); - ascend_to(path, top_path_level); + ascend_to(path, top_path_level+1); return result; end_error: skip_initializers(); DEL_ARR_F(initializers); - ascend_to(path, top_path_level); + ascend_to(path, top_path_level+1); return NULL; } @@ -2301,9 +2530,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; @@ -2329,7 +2558,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) { @@ -2345,6 +2574,12 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env) size = result->wide_string.string.size; break; + case INITIALIZER_DESIGNATOR: + case INITIALIZER_VALUE: + /* can happen for parse errors */ + size = 0; + break; + default: internal_errorf(HERE, "invalid initializer type"); } @@ -2370,8 +2605,9 @@ static declaration_t *append_declaration(declaration_t *declaration); static declaration_t *parse_compound_type_specifier(bool is_struct) { - gnu_attribute_t *attributes = NULL; - if(is_struct) { + gnu_attribute_t *attributes = NULL; + decl_modifiers_t modifiers = 0; + if (is_struct) { eat(T_struct); } else { eat(T_union); @@ -2381,20 +2617,31 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) declaration_t *declaration = NULL; if (token.type == T___attribute__) { - parse_attributes(&attributes); + 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 { @@ -2405,32 +2652,27 @@ 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); declaration->source_position = token.source_position; declaration->symbol = symbol; - declaration->parent_scope = scope; + declaration->parent_scope = scope; if (symbol != NULL) { environment_push(declaration); } append_declaration(declaration); } - if(token.type == '{') { - if(declaration->init.is_defined) { - assert(symbol != NULL); - errorf(HERE, "multiple definitions of '%s %Y'", - is_struct ? "struct" : "union", symbol); - declaration->scope.declarations = NULL; - } - declaration->init.is_defined = true; + if (token.type == '{') { + declaration->init.complete = true; parse_compound_type_entries(declaration); - parse_attributes(&attributes); + modifiers |= parse_attributes(&attributes); } + declaration->modifiers |= modifiers; return declaration; } @@ -2438,7 +2680,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; @@ -2446,7 +2688,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('}'); @@ -2460,7 +2702,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(); @@ -2472,10 +2714,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('}'); @@ -2491,12 +2733,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; @@ -2505,7 +2747,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; @@ -2516,15 +2758,15 @@ 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.is_defined) { + if (token.type == '{') { + if (declaration->init.complete) { errorf(HERE, "multiple definitions of enum %Y", symbol); } if (symbol != NULL) { environment_push(declaration); } append_declaration(declaration); - declaration->init.is_defined = 1; + declaration->init.complete = true; parse_enum_entries(type); parse_attributes(&attributes); @@ -2559,15 +2801,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(); @@ -2597,7 +2839,7 @@ end_error: return NULL; } -typedef enum { +typedef enum specifiers_t { SPECIFIER_SIGNED = 1 << 0, SPECIFIER_UNSIGNED = 1 << 1, SPECIFIER_LONG = 1 << 2, @@ -2614,10 +2856,8 @@ typedef enum { SPECIFIER_INT32 = 1 << 13, SPECIFIER_INT64 = 1 << 14, SPECIFIER_INT128 = 1 << 15, -#ifdef PROVIDE_COMPLEX SPECIFIER_COMPLEX = 1 << 16, SPECIFIER_IMAGINARY = 1 << 17, -#endif } specifiers_t; static type_t *create_builtin_type(symbol_t *const symbol, @@ -2638,8 +2878,8 @@ 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 - || declaration->storage_class != STORAGE_CLASS_TYPEDEF) + if (declaration == NULL || + declaration->storage_class != STORAGE_CLASS_TYPEDEF) return NULL; type_t *type = allocate_type_zero(TYPE_TYPEDEF, &declaration->source_position); @@ -2651,8 +2891,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; } @@ -2666,122 +2907,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->decl_modifiers; + 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 { @@ -2789,13 +3030,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: @@ -2808,20 +3049,26 @@ end_error: static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) { - type_t *type = NULL; - unsigned type_qualifiers = 0; - unsigned type_specifiers = 0; - int newtype = 0; + type_t *type = NULL; + type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE; + type_modifiers_t modifiers = TYPE_MODIFIER_NONE; + unsigned type_specifiers = 0; + int newtype = 0; 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; \ @@ -2867,9 +3114,9 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) /* type qualifiers */ #define MATCH_TYPE_QUALIFIER(token, qualifier) \ case token: \ - type_qualifiers |= qualifier; \ + qualifiers |= qualifier; \ next_token(); \ - break; + break MATCH_TYPE_QUALIFIER(T_const, TYPE_QUALIFIER_CONST); MATCH_TYPE_QUALIFIER(T_restrict, TYPE_QUALIFIER_RESTRICT); @@ -2889,34 +3136,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; + 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"); - 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") -#ifdef PROVIDE_COMPLEX - MATCH_SPECIFIER(T__Complex, SPECIFIER_COMPLEX, "_Complex") - MATCH_SPECIFIER(T__Imaginary, SPECIFIER_IMAGINARY, "_Imaginary") -#endif case T__forceinline: /* only in microsoft mode */ - specifiers->decl_modifiers |= DM_FORCEINLINE; + specifiers->modifiers |= DM_FORCEINLINE; + /* FALLTHROUGH */ case T_inline: next_token(); @@ -2925,9 +3172,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; @@ -2942,8 +3189,9 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) } case T_union: { type = allocate_type_zero(TYPE_COMPOUND_UNION, HERE); - type->compound.declaration = parse_compound_type_specifier(false); + if (type->compound.declaration->modifiers & DM_TRANSPARENT_UNION) + modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; break; } case T_enum: @@ -2957,18 +3205,14 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) next_token(); break; - case T___attribute__: - parse_attributes(&specifiers->gnu_attributes); - break; - case T_IDENTIFIER: { /* only parse identifier if we haven't found a type yet */ - if(type != NULL || type_specifiers != 0) + if (type != NULL || type_specifiers != 0) goto finish_specifiers; type_t *typedef_type = get_typedef_type(token.v.symbol); - if(typedef_type == NULL) + if (typedef_type == NULL) goto finish_specifiers; next_token(); @@ -2984,7 +3228,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 */ @@ -3100,29 +3344,21 @@ finish_specifiers: case SPECIFIER_BOOL: atomic_type = ATOMIC_TYPE_BOOL; break; -#ifdef PROVIDE_COMPLEX case SPECIFIER_FLOAT | SPECIFIER_COMPLEX: - atomic_type = ATOMIC_TYPE_FLOAT_COMPLEX; - break; - case SPECIFIER_DOUBLE | SPECIFIER_COMPLEX: - atomic_type = ATOMIC_TYPE_DOUBLE_COMPLEX; - break; - case SPECIFIER_LONG | SPECIFIER_DOUBLE | SPECIFIER_COMPLEX: - atomic_type = ATOMIC_TYPE_LONG_DOUBLE_COMPLEX; - break; case SPECIFIER_FLOAT | SPECIFIER_IMAGINARY: - atomic_type = ATOMIC_TYPE_FLOAT_IMAGINARY; + atomic_type = ATOMIC_TYPE_FLOAT; break; + case SPECIFIER_DOUBLE | SPECIFIER_COMPLEX: case SPECIFIER_DOUBLE | SPECIFIER_IMAGINARY: - atomic_type = ATOMIC_TYPE_DOUBLE_IMAGINARY; + atomic_type = ATOMIC_TYPE_DOUBLE; break; + case SPECIFIER_LONG | SPECIFIER_DOUBLE | SPECIFIER_COMPLEX: case SPECIFIER_LONG | SPECIFIER_DOUBLE | SPECIFIER_IMAGINARY: - atomic_type = ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY; + atomic_type = ATOMIC_TYPE_LONG_DOUBLE; break; -#endif default: /* invalid specifier combination, give an error message */ - if(type_specifiers == 0) { + if (type_specifiers == 0) { if (! strict_mode) { if (warning.implicit_int) { warningf(HERE, "no type specifiers in declaration, using 'int'"); @@ -3132,10 +3368,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)) { + } 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"); @@ -3143,20 +3379,32 @@ finish_specifiers: atomic_type = ATOMIC_TYPE_INVALID; } - type = allocate_type_zero(TYPE_ATOMIC, &builtin_source_position); - type->atomic.akind = atomic_type; - newtype = 1; + 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 && + atomic_type != ATOMIC_TYPE_INVALID) { + type = allocate_type_zero(TYPE_IMAGINARY, &builtin_source_position); + type->imaginary.akind = atomic_type; + } else { + type = allocate_type_zero(TYPE_ATOMIC, &builtin_source_position); + type->atomic.akind = atomic_type; + } + newtype = 1; } else { - if(type_specifiers != 0) { + if (type_specifiers != 0) { errorf(HERE, "multiple datatypes in declaration"); } } - type->base.qualifiers = type_qualifiers; /* FIXME: check type qualifiers here */ + type->base.qualifiers = qualifiers; + type->base.modifiers = modifiers; + type_t *result = typehash_insert(type); - if(newtype && result != type) { + if (newtype && result != type) { free_type(type); } @@ -3167,9 +3415,9 @@ end_error: static type_qualifiers_t parse_type_qualifiers(void) { - type_qualifiers_t type_qualifiers = TYPE_QUALIFIER_NONE; + type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE; - while(true) { + while (true) { switch(token.type) { /* type qualifiers */ MATCH_TYPE_QUALIFIER(T_const, TYPE_QUALIFIER_CONST); @@ -3183,7 +3431,7 @@ static type_qualifiers_t parse_type_qualifiers(void) MATCH_TYPE_QUALIFIER(T___sptr, TYPE_QUALIFIER_SPTR); default: - return type_qualifiers; + return qualifiers; } } } @@ -3199,46 +3447,45 @@ 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; } last_declaration = declaration; - if(token.type != ',') + if (token.type != ',') { 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 */ - if(declaration->declared_storage_class == STORAGE_CLASS_TYPEDEF) { + 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 + } 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; - - type = make_pointer_type(element_type, type->base.qualifiers); - - declaration->type = 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(type)) { + if (is_type_incomplete(skip_typeref(type))) { errorf(HERE, "incomplete type '%T' not allowed for parameter '%Y'", orig_type, declaration->symbol); } @@ -3253,53 +3500,62 @@ static declaration_t *parse_parameter(void) declaration_t *declaration = parse_declarator(&specifiers, /*may_be_abstract=*/true); - semantic_parameter(declaration); - return declaration; } static declaration_t *parse_parameters(function_type_t *type) { - if(token.type == T_IDENTIFIER) { + declaration_t *declarations = NULL; + + eat('('); + add_anchor_token(')'); + int saved_comma_state = save_and_reset_anchor_state(','); + + 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; - return parse_identifier_list(); + declarations = parse_identifier_list(); + goto parameters_finished; } } - if(token.type == ')') { + if (token.type == ')') { type->unspecified_parameters = 1; - return NULL; - } - if(token.type == T_void && look_ahead(1)->type == ')') { - next_token(); - return NULL; + goto parameters_finished; } - declaration_t *declarations = NULL; 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(); type->variadic = 1; - return declarations; + goto parameters_finished; case T_IDENTIFIER: case T___extension__: 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 { @@ -3311,15 +3567,28 @@ static declaration_t *parse_parameters(function_type_t *type) break; default: - return declarations; + goto parameters_finished; + } + if (token.type != ',') { + goto parameters_finished; } - if(token.type != ',') - return declarations; next_token(); } + + +parameters_finished: + rem_anchor_token(')'); + expect(')'); + + restore_anchor_state(',', saved_comma_state); + return declarations; + +end_error: + restore_anchor_state(',', saved_comma_state); + return NULL; } -typedef enum { +typedef enum construct_type_kind_t { CONSTRUCT_INVALID, CONSTRUCT_POINTER, CONSTRUCT_FUNCTION, @@ -3380,24 +3649,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(); } @@ -3411,18 +3680,49 @@ end_error: static construct_type_t *parse_function_declarator(declaration_t *declaration) { - eat('('); - add_anchor_token(')'); - 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 = "faslcall"; + 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; } @@ -3432,11 +3732,29 @@ static construct_type_t *parse_function_declarator(declaration_t *declaration) construct_function_type->construct_type.kind = CONSTRUCT_FUNCTION; construct_function_type->function_type = type; - rem_anchor_token(')'); - expect(')'); + return &construct_function_type->construct_type; +} -end_error: - return (construct_type_t*) construct_function_type; +static void fix_declaration_type(declaration_t *declaration) +{ + decl_modifiers_t declaration_modifiers = declaration->modifiers; + type_modifiers_t type_modifiers = declaration->type->base.modifiers; + + if (declaration_modifiers & DM_TRANSPARENT_UNION) + type_modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; + + if (declaration->type->base.modifiers == type_modifiers) + return; + + type_t *copy = duplicate_type(declaration->type); + copy->base.modifiers = type_modifiers; + + type_t *result = typehash_insert(copy); + if (result != copy) { + obstack_free(type_obst, copy); + } + + declaration->type = result; } static construct_type_t *parse_inner_declarator(declaration_t *declaration, @@ -3448,27 +3766,29 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration, construct_type_t *last = NULL; gnu_attribute_t *attributes = NULL; + declaration->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 */ - parse_attributes(&attributes); + /* TODO: find out if this is correct */ + declaration->modifiers |= parse_attributes(&attributes); + } 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; @@ -3484,12 +3804,12 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration, 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(); @@ -3513,24 +3833,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: - parse_attributes(&attributes); - /* 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 { @@ -3542,6 +3860,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) { @@ -3586,7 +3939,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); } @@ -3597,8 +3950,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); @@ -3619,10 +3972,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; @@ -3637,7 +3990,7 @@ static declaration_t *parse_declarator( { declaration_t *const declaration = allocate_declaration_zero(); declaration->declared_storage_class = specifiers->declared_storage_class; - declaration->decl_modifiers = specifiers->decl_modifiers; + declaration->modifiers = specifiers->modifiers; declaration->deprecated = specifiers->deprecated; declaration->deprecated_string = specifiers->deprecated_string; declaration->get_property_sym = specifiers->get_property_sym; @@ -3645,12 +3998,12 @@ static declaration_t *parse_declarator( 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; } @@ -3660,7 +4013,11 @@ static declaration_t *parse_declarator( type_t *const type = specifiers->type; declaration->type = construct_declarator_type(construct_type, type); - if(construct_type != NULL) { + parse_declaration_attributes(declaration); + + fix_declaration_type(declaration); + + if (construct_type != NULL) { obstack_free(&temp_obst, construct_type); } @@ -3672,7 +4029,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); } @@ -3733,11 +4090,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"); } } @@ -3753,123 +4110,141 @@ 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); + declaration_t *previous_declaration = get_declaration(symbol, namespc); + type_t *const orig_type = declaration->type; type_t *const type = skip_typeref(orig_type); if (is_type_function(type) && type->function.unspecified_parameters && - warning.strict_prototypes) { + warning.strict_prototypes && + previous_declaration == NULL) { warningf(&declaration->source_position, "function declaration '%#T' is not a prototype", 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); } - assert(declaration->symbol != NULL); - declaration_t *previous_declaration = get_declaration(symbol, namespc); - assert(declaration != previous_declaration); - if (previous_declaration != NULL) { - if (previous_declaration->parent_scope == scope) { - /* can happen for K&R style declarations */ - if(previous_declaration->type == NULL) { - previous_declaration->type = declaration->type; + if (previous_declaration != NULL + && previous_declaration->parent_scope == scope) { + /* can happen for K&R style declarations */ + if (previous_declaration->type == NULL) { + previous_declaration->type = declaration->type; + } + + const type_t *prev_type = skip_typeref(previous_declaration->type); + if (!types_compatible(type, prev_type)) { + errorf(&declaration->source_position, + "declaration '%#T' is incompatible with '%#T' (declared %P)", + orig_type, symbol, previous_declaration->type, symbol, + &previous_declaration->source_position); + } else { + unsigned old_storage_class = previous_declaration->storage_class; + if (old_storage_class == STORAGE_CLASS_ENUM_ENTRY) { + errorf(&declaration->source_position, + "redeclaration of enum entry '%Y' (declared %P)", + symbol, &previous_declaration->source_position); + return previous_declaration; } - const type_t *prev_type = skip_typeref(previous_declaration->type); - if (!types_compatible(type, prev_type)) { - errorf(&declaration->source_position, - "declaration '%#T' is incompatible with '%#T' (declared %P)", - orig_type, symbol, previous_declaration->type, symbol, - &previous_declaration->source_position); - } else { - unsigned old_storage_class = previous_declaration->storage_class; - if(old_storage_class == STORAGE_CLASS_ENUM_ENTRY) { - errorf(&declaration->source_position, - "redeclaration of enum entry '%Y' (declared %P)", - symbol, &previous_declaration->source_position); - 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; - unsigned new_storage_class = declaration->storage_class; + if (is_type_incomplete(prev_type)) { + previous_declaration->type = type; + prev_type = type; + } - if(is_type_incomplete(prev_type)) { + /* pretend no storage class means extern for function + * declarations (except if the previous declaration is neither + * none nor extern) */ + if (is_type_function(type)) { + if (prev_type->function.unspecified_parameters) { previous_declaration->type = type; prev_type = type; } - /* pretend no storage class means extern for function - * declarations (except if the previous declaration is neither - * none nor extern) */ - if (is_type_function(type)) { - switch (old_storage_class) { - case STORAGE_CLASS_NONE: - old_storage_class = STORAGE_CLASS_EXTERN; - - case STORAGE_CLASS_EXTERN: - if (is_function_definition) { - if (warning.missing_prototypes && - prev_type->function.unspecified_parameters && - !is_sym_main(symbol)) { - warningf(&declaration->source_position, - "no previous prototype for '%#T'", - orig_type, symbol); - } - } else if (new_storage_class == STORAGE_CLASS_NONE) { - new_storage_class = STORAGE_CLASS_EXTERN; - } - break; - - default: break; + switch (old_storage_class) { + case STORAGE_CLASS_NONE: + old_storage_class = STORAGE_CLASS_EXTERN; + /* FALLTHROUGH */ + + case STORAGE_CLASS_EXTERN: + if (is_definition) { + if (warning.missing_prototypes && + prev_type->function.unspecified_parameters && + !is_sym_main(symbol)) { + warningf(&declaration->source_position, + "no previous prototype for '%#T'", + orig_type, symbol); + } + } else if (new_storage_class == STORAGE_CLASS_NONE) { + new_storage_class = STORAGE_CLASS_EXTERN; } + break; + + default: + break; } + } - if (old_storage_class == STORAGE_CLASS_EXTERN && - new_storage_class == STORAGE_CLASS_EXTERN) { + if (old_storage_class == STORAGE_CLASS_EXTERN && + new_storage_class == STORAGE_CLASS_EXTERN) { warn_redundant_declaration: - if (warning.redundant_decls) { - warningf(&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) { - 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) { - goto warn_redundant_declaration; - } - if (new_storage_class == STORAGE_CLASS_NONE) { - previous_declaration->storage_class = STORAGE_CLASS_NONE; - previous_declaration->declared_storage_class = STORAGE_CLASS_NONE; - } - } + 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); + } + } else if (current_function == NULL) { + if (old_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) { + 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); - } else { - errorf(&declaration->source_position, - "redeclaration of '%Y' with different linkage (declared %P)", - symbol, &previous_declaration->source_position); - } + goto warn_redundant_declaration; } + } else if (old_storage_class == new_storage_class) { + errorf(&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); } - return previous_declaration; } - } else if (is_function_definition) { - if (declaration->storage_class != STORAGE_CLASS_STATIC) { + + previous_declaration->modifiers |= declaration->modifiers; + previous_declaration->is_inline |= declaration->is_inline; + return previous_declaration; + } 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); @@ -3879,14 +4254,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); @@ -3903,7 +4279,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); } @@ -3916,18 +4292,18 @@ static void parser_error_multiple_definition(declaration_t *declaration, } static bool is_declaration_specifier(const token_t *token, - bool only_type_specifiers) + bool only_specifiers_qualifiers) { switch(token->type) { TYPE_SPECIFIERS + TYPE_QUALIFIERS return true; case T_IDENTIFIER: return is_typedef_symbol(token->v.symbol); case T___extension__: STORAGE_CLASSES - TYPE_QUALIFIERS - return !only_type_specifiers; + return !only_specifiers_qualifiers; default: return false; @@ -3941,12 +4317,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; @@ -3959,13 +4335,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); @@ -3985,7 +4361,7 @@ static void parse_anonymous_declaration_rest( declaration->type = specifiers->type; declaration->declared_storage_class = specifiers->declared_storage_class; declaration->source_position = specifiers->source_position; - declaration->decl_modifiers = specifiers->decl_modifiers; + declaration->modifiers = specifiers->modifiers; if (declaration->declared_storage_class != STORAGE_CLASS_NONE) { warningf(&declaration->source_position, @@ -4035,11 +4411,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(','); @@ -4056,24 +4432,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; @@ -4090,7 +4466,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); @@ -4098,13 +4474,27 @@ static void parse_declaration(parsed_declaration_func finished_declaration) } } +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)) { + result = promote_integer(type); + } else if (type == type_float) { + result = type_double; + } + + return result; +} + static void parse_kr_declaration_list(declaration_t *declaration) { type_t *type = skip_typeref(declaration->type); - if(!is_type_function(type)) + if (!is_type_function(type)) return; - if(!type->function.kr_style_parameters) + if (!type->function.kr_style_parameters) return; /* push function parameters */ @@ -4113,14 +4503,14 @@ static void parse_kr_declaration_list(declaration_t *declaration) set_scope(&declaration->scope); declaration_t *parameter = declaration->scope.declarations; - for( ; parameter != NULL; parameter = parameter->next) { + for ( ; parameter != NULL; parameter = parameter->next) { assert(parameter->parent_scope == NULL); parameter->parent_scope = scope; environment_push(parameter); } /* parse declaration list */ - while(is_declaration_specifier(&token, false)) { + while (is_declaration_specifier(&token, false)) { parse_declaration(finished_kr_declaration); } @@ -4131,7 +4521,6 @@ static void parse_kr_declaration_list(declaration_t *declaration) /* update function type */ type_t *new_type = duplicate_type(type); - new_type->function.kr_style_parameters = false; function_parameter_t *parameters = NULL; function_parameter_t *last_parameter = NULL; @@ -4140,7 +4529,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); @@ -4157,22 +4546,31 @@ static void parse_kr_declaration_list(declaration_t *declaration) semantic_parameter(parameter_declaration); parameter_type = parameter_declaration->type; + /* + * we need the default promoted types for the function type + */ + parameter_type = get_default_promoted_type(parameter_type); + function_parameter_t *function_parameter = obstack_alloc(type_obst, sizeof(function_parameter[0])); 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; } last_parameter = function_parameter; } - new_type->function.parameters = parameters; + + /* § 6.9.1.7: A K&R style parameter list does NOT act as a function + * prototype */ + new_type->function.parameters = parameters; + 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); } @@ -4185,7 +4583,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", @@ -4251,6 +4650,423 @@ static void check_declarations(void) } } +static int determine_truth(expression_t const* const cond) +{ + return + !is_constant_expression(cond) ? 0 : + fold_constant(cond) != 0 ? 1 : + -1; +} + +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: + 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; + } + + expression_t *const case_expr = i->expression; + if (is_constant_expression(case_expr) && + fold_constant(case_expr) == val) { + 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: + 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) { + 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_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 (!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 @@ -4263,7 +5079,7 @@ static void parse_external_declaration(void) rem_anchor_token(';'); /* must be a declaration */ - if(token.type == ';') { + if (token.type == ';') { parse_anonymous_declaration_rest(&specifiers, append_declaration); return; } @@ -4280,15 +5096,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; @@ -4298,7 +5120,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); @@ -4309,19 +5131,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); @@ -4333,36 +5157,46 @@ 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"); + 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) { + check_reachable(body); + if (warning.unreachable_code) + check_unreachable(body); + } + 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); @@ -4384,21 +5218,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; } } @@ -4410,7 +5244,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; } @@ -4419,14 +5253,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); } @@ -4438,7 +5272,7 @@ static void parse_compound_declarators(declaration_t *struct_declaration, declaration->declared_storage_class = STORAGE_CLASS_NONE; declaration->storage_class = STORAGE_CLASS_NONE; declaration->source_position = source_position; - declaration->decl_modifiers = specifiers->decl_modifiers; + declaration->modifiers = specifiers->modifiers; declaration->type = type; } else { declaration = parse_declarator(specifiers,/*may_be_abstract=*/true); @@ -4446,12 +5280,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); } @@ -4461,11 +5295,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); } @@ -4474,11 +5308,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)", @@ -4487,14 +5321,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(); } @@ -4518,7 +5352,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(); @@ -4529,7 +5363,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... */ @@ -4707,7 +5541,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); } @@ -4717,20 +5551,43 @@ static declaration_t *create_implicit_function(symbol_t *symbol, declaration->type = type; declaration->symbol = symbol; declaration->source_position = *source_position; - declaration->parent_scope = global_scope; - scope_t *old_scope = scope; - set_scope(global_scope); + bool strict_prototypes_old = warning.strict_prototypes; + warning.strict_prototypes = false; + record_declaration(declaration); + warning.strict_prototypes = strict_prototypes_old; + + return declaration; +} - environment_push(declaration); - /* prepends the declaration to the global declarations list */ - declaration->next = scope->declarations; - scope->declarations = declaration; +/** + * Creates a return_type (func)(argument_type) function type if not + * already exists. + */ +static type_t *make_function_2_type(type_t *return_type, type_t *argument_type1, + type_t *argument_type2) +{ + function_parameter_t *parameter2 + = obstack_alloc(type_obst, sizeof(parameter2[0])); + memset(parameter2, 0, sizeof(parameter2[0])); + parameter2->type = argument_type2; - assert(scope == global_scope); - set_scope(old_scope); + function_parameter_t *parameter1 + = obstack_alloc(type_obst, sizeof(parameter1[0])); + memset(parameter1, 0, sizeof(parameter1[0])); + parameter1->type = argument_type1; + parameter1->next = parameter2; - return declaration; + type_t *type = allocate_type_zero(TYPE_FUNCTION, &builtin_source_position); + type->function.return_type = return_type; + type->function.parameters = parameter1; + + type_t *result = typehash_insert(type); + if (result != type) { + free_type(type); + } + + return result; } /** @@ -4752,7 +5609,21 @@ 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); + } + + return result; +} + +static type_t *make_function_0_type(type_t *return_type) +{ + type_t *type = allocate_type_zero(TYPE_FUNCTION, &builtin_source_position); + type->function.return_type = return_type; + type->function.parameters = NULL; + + type_t *result = typehash_insert(type); + if (result != type) { free_type(type); } @@ -4769,6 +5640,8 @@ static type_t *get_builtin_symbol_type(symbol_t *symbol) switch(symbol->ID) { case T___builtin_alloca: return make_function_1_type(type_void_ptr, type_size_t); + case T___builtin_huge_val: + return make_function_0_type(type_double); case T___builtin_nan: return make_function_1_type(type_double, type_char_ptr); case T___builtin_nanf: @@ -4777,6 +5650,8 @@ static type_t *get_builtin_symbol_type(symbol_t *symbol) return make_function_1_type(type_long_double, type_char_ptr); case T___builtin_va_end: return make_function_1_type(type_void, type_valist); + case T___builtin_expect: + return make_function_2_type(type_long, type_long, type_long); default: internal_errorf(HERE, "not implemented builtin symbol found"); } @@ -4790,7 +5665,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; @@ -4798,7 +5673,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); } @@ -4865,7 +5740,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) { @@ -4894,7 +5769,7 @@ static expression_t *parse_reference(void) declaration->used = true; /* check for deprecated functions */ - if(declaration->deprecated != 0) { + if (declaration->deprecated != 0) { const char *prefix = ""; if (is_type_function(declaration->type)) prefix = "function "; @@ -4950,7 +5825,7 @@ static expression_t *parse_cast(void) rem_anchor_token(')'); expect(')'); - if(token.type == '{') { + if (token.type == '{') { return parse_compound_literal(type); } @@ -5019,7 +5894,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(); } } @@ -5099,7 +5974,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; @@ -5109,9 +5984,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; @@ -5125,7 +6000,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])); @@ -5133,7 +6008,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; } @@ -5179,7 +6054,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(); } @@ -5352,7 +6227,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); @@ -5366,6 +6241,7 @@ end_error: return create_invalid_expression(); } +#if 0 /** * Parses a __builtin_expect() expression. */ @@ -5388,11 +6264,13 @@ static expression_t *parse_builtin_expect(void) end_error: return create_invalid_expression(); } +#endif /** * Parses a MS assume() expression. */ -static expression_t *parse_assume(void) { +static expression_t *parse_assume(void) +{ eat(T__assume); expression_t *expression @@ -5413,7 +6291,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); @@ -5423,10 +6302,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(); } @@ -5470,11 +6349,12 @@ static expression_t *parse_primary_expression(void) case T___builtin_offsetof: return parse_offsetof(); case T___builtin_va_start: return parse_va_start(); case T___builtin_va_arg: return parse_va_arg(); - case T___builtin_expect: return parse_builtin_expect(); + case T___builtin_expect: case T___builtin_alloca: case T___builtin_nan: case T___builtin_nand: case T___builtin_nanf: + case T___builtin_huge_val: case T___builtin_va_end: return parse_builtin_symbol(); case T___builtin_isgreater: case T___builtin_isgreaterequal: @@ -5497,7 +6377,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); @@ -5551,7 +6432,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; } @@ -5563,20 +6444,50 @@ static expression_t *parse_array_expression(unsigned precedence, return expression; } -static expression_t *parse_typeprop(expression_kind_t kind, unsigned precedence) +static expression_t *parse_typeprop(expression_kind_t const kind, + source_position_t const pos, + unsigned const precedence) { expression_t *tp_expression = allocate_expression_zero(kind); - tp_expression->base.type = type_size_t; + tp_expression->base.type = type_size_t; + tp_expression->base.source_position = pos; + + char const* const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof"; - if(token.type == '(' && is_declaration_specifier(look_ahead(1), true)) { + if (token.type == '(' && is_declaration_specifier(look_ahead(1), true)) { next_token(); add_anchor_token(')'); - tp_expression->typeprop.type = parse_typename(); + type_t* const orig_type = parse_typename(); + tp_expression->typeprop.type = orig_type; + + type_t const* const type = skip_typeref(orig_type); + char const* const wrong_type = + is_type_incomplete(type) ? "incomplete" : + type->kind == TYPE_FUNCTION ? "function designator" : + type->kind == TYPE_BITFIELD ? "bitfield" : + NULL; + if (wrong_type != NULL) { + errorf(&pos, "operand of %s expression must not be %s type '%T'", + what, wrong_type, type); + } + rem_anchor_token(')'); expect(')'); } else { expression_t *expression = parse_sub_expression(precedence); - expression->base.type = revert_automatic_type_conversion(expression); + + type_t* const orig_type = revert_automatic_type_conversion(expression); + expression->base.type = orig_type; + + type_t const* const type = skip_typeref(orig_type); + char const* const wrong_type = + is_type_incomplete(type) ? "incomplete" : + type->kind == TYPE_FUNCTION ? "function designator" : + type->kind == TYPE_BITFIELD ? "bitfield" : + NULL; + if (wrong_type != NULL) { + errorf(&pos, "operand of %s expression must not be expression of %s type '%T'", what, wrong_type, type); + } tp_expression->typeprop.type = expression->base.type; tp_expression->typeprop.tp_expression = expression; @@ -5589,14 +6500,16 @@ end_error: static expression_t *parse_sizeof(unsigned precedence) { + source_position_t pos = *HERE; eat(T_sizeof); - return parse_typeprop(EXPR_SIZEOF, precedence); + return parse_typeprop(EXPR_SIZEOF, pos, precedence); } static expression_t *parse_alignof(unsigned precedence) { + source_position_t pos = *HERE; eat(T___alignof__); - return parse_typeprop(EXPR_SIZEOF, precedence); + return parse_typeprop(EXPR_ALIGNOF, pos, precedence); } static expression_t *parse_select_expression(unsigned precedence, @@ -5611,7 +6524,7 @@ static expression_t *parse_select_expression(unsigned precedence, expression_t *select = allocate_expression_zero(EXPR_SELECT); select->select.compound = compound; - if(token.type != T_IDENTIFIER) { + if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing select", T_IDENTIFIER, NULL); return select; } @@ -5623,7 +6536,7 @@ static expression_t *parse_select_expression(unsigned precedence, type_t *const type = skip_typeref(orig_type); type_t *type_left = type; - if(is_pointer) { + if (is_pointer) { if (!is_type_pointer(type)) { if (is_type_valid(type)) { errorf(HERE, "left hand side of '->' is not a pointer, but '%T'", orig_type); @@ -5645,14 +6558,14 @@ static expression_t *parse_select_expression(unsigned precedence, declaration_t *const declaration = type_left->compound.declaration; - if(!declaration->init.is_defined) { + if (!declaration->init.complete) { errorf(HERE, "request for member '%Y' of incomplete type '%T'", symbol, type_left); return create_invalid_expression(); } declaration_t *iter = find_compound_entry(declaration, symbol); - if(iter == NULL) { + if (iter == NULL) { errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol); return create_invalid_expression(); } @@ -5664,18 +6577,58 @@ static expression_t *parse_select_expression(unsigned precedence, select->select.compound_entry = iter; select->base.type = expression_type; - if(expression_type->kind == TYPE_BITFIELD) { - expression_t *extract - = allocate_expression_zero(EXPR_UNARY_BITFIELD_EXTRACT); - extract->unary.value = select; - extract->base.type = expression_type->bitfield.base_type; - - return extract; + type_t *skipped = skip_typeref(iter->type); + if (skipped->kind == TYPE_BITFIELD) { + select->base.type = skipped->bitfield.base_type; } return select; } +static void check_call_argument(const function_parameter_t *parameter, + call_argument_t *argument) +{ + type_t *expected_type = parameter->type; + type_t *expected_type_skip = skip_typeref(expected_type); + assign_error_t error = ASSIGN_ERROR_INCOMPATIBLE; + expression_t *arg_expr = argument->expression; + + /* handle transparent union gnu extension */ + if (is_type_union(expected_type_skip) + && (expected_type_skip->base.modifiers + & TYPE_MODIFIER_TRANSPARENT_UNION)) { + declaration_t *union_decl = expected_type_skip->compound.declaration; + + declaration_t *declaration = union_decl->scope.declarations; + type_t *best_type = NULL; + for ( ; declaration != NULL; declaration = declaration->next) { + type_t *decl_type = declaration->type; + error = semantic_assign(decl_type, arg_expr); + if (error == ASSIGN_ERROR_INCOMPATIBLE + || error == ASSIGN_ERROR_POINTER_QUALIFIER_MISSING) + continue; + + if (error == ASSIGN_SUCCESS) { + best_type = decl_type; + } else if (best_type == NULL) { + best_type = decl_type; + } + } + + if (best_type != NULL) { + expected_type = best_type; + } + } + + error = semantic_assign(expected_type, arg_expr); + argument->expression = create_implicit_cast(argument->expression, + expected_type); + + /* TODO report exact scope in error messages (like "in 3rd parameter") */ + report_assign_error(error, expected_type, arg_expr, "function call", + &arg_expr->base.source_position); +} + /** * Parse a call expression, ie. expression '( ... )'. * @@ -5713,21 +6666,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(); } @@ -5736,57 +6689,36 @@ static expression_t *parse_call_expression(unsigned precedence, rem_anchor_token(')'); expect(')'); - if(function_type != NULL) { - function_parameter_t *parameter = function_type->parameters; - call_argument_t *argument = call->arguments; + if (function_type == NULL) + return result; + + function_parameter_t *parameter = function_type->parameters; + call_argument_t *argument = call->arguments; + if (!function_type->unspecified_parameters) { for( ; parameter != NULL && argument != NULL; parameter = parameter->next, argument = argument->next) { - type_t *expected_type = parameter->type; - /* TODO report scope in error messages */ - expression_t *const arg_expr = argument->expression; - type_t *const res_type = semantic_assign(expected_type, arg_expr, - "function call", - &arg_expr->base.source_position); - if (res_type == NULL) { - /* TODO improve error message */ - errorf(&arg_expr->base.source_position, - "Cannot call function with argument '%E' of type '%T' where type '%T' is expected", - arg_expr, arg_expr->base.type, expected_type); - } else { - argument->expression = create_implicit_cast(argument->expression, expected_type); - } + check_call_argument(parameter, argument); } - /* too few parameters */ - if(parameter != NULL) { + + if (parameter != NULL) { errorf(HERE, "too few arguments to function '%E'", expression); - } else if(argument != NULL) { - /* too many parameters */ - if(!function_type->variadic - && !function_type->unspecified_parameters) { - errorf(HERE, "too many arguments to function '%E'", expression); - } else { - /* do default promotion */ - for( ; argument != NULL; argument = argument->next) { - type_t *type = argument->expression->base.type; - - type = skip_typeref(type); - if(is_type_integer(type)) { - type = promote_integer(type); - } else if(type == type_float) { - type = type_double; - } + } else if (argument != NULL && !function_type->variadic) { + errorf(HERE, "too many arguments to function '%E'", expression); + } + } - argument->expression - = create_implicit_cast(argument->expression, type); - } + /* do default promotion */ + for( ; argument != NULL; argument = argument->next) { + type_t *type = argument->expression->base.type; - check_format(&result->call); - } - } else { - check_format(&result->call); - } + type = get_default_promoted_type(type); + + argument->expression + = create_implicit_cast(argument->expression, type); } + check_format(&result->call); + return result; end_error: return create_invalid_expression(); @@ -5838,7 +6770,7 @@ 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)) { @@ -5863,7 +6795,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; @@ -5873,15 +6806,35 @@ static expression_t *parse_conditional_expression(unsigned precedence, other_expression = true_expression; } - if(is_type_pointer(other_type)) { - if(!pointers_compatible(true_type, false_type)) { + 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) || + is_type_atomic(to2, ATOMIC_TYPE_VOID)) { + to = type_void; + } else if (types_compatible(get_unqualified_type(to1), + get_unqualified_type(to2))) { + to = to1; + } else { warningf(&expression->base.source_position, - "pointer types '%T' and '%T' in conditional expression are incompatible", true_type, false_type); + "pointer types '%T' and '%T' in conditional expression are incompatible", + true_type, false_type); + to = type_void; } - result_type = true_type; - } else if(is_null_pointer_constant(other_expression)) { - result_type = pointer_type; - } else if(is_type_integer(other_type)) { + + type_t *const copy = duplicate_type(to); + copy->base.qualifiers = to1->base.qualifiers | to2->base.qualifiers; + + type_t *const type = typehash_insert(copy); + if (type != copy) + free_type(copy); + + result_type = make_pointer_type(type, TYPE_QUALIFIER_NONE); + } else if (is_type_integer(other_type)) { warningf(&expression->base.source_position, "pointer/integer type mismatch in conditional expression ('%T' and '%T')", true_type, false_type); result_type = pointer_type; @@ -5946,19 +6899,37 @@ end_error: return create_invalid_expression(); } +static void 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); + } else if (is_type_function(points_to)) { + errorf(source_position, + "arithmetic with pointer to function type '%T' not allowed", + orig_pointer_type); + } +} + 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); - /* TODO !is_type_real && !is_type_pointer */ - if(!is_type_arithmetic(type) && type->kind != TYPE_POINTER) { - if (is_type_valid(type)) { - /* TODO: improve error message */ - errorf(HERE, "operation needs an arithmetic or pointer type"); - } - return; + if (is_type_pointer(type)) { + check_pointer_arithmetic(&expression->base.source_position, + type, orig_type); + } else if (!is_type_real(type) && is_type_valid(type)) { + /* TODO: improve error message */ + errorf(HERE, "operation needs an arithmetic or pointer type"); } - expression->base.type = orig_type; } @@ -5966,7 +6937,7 @@ 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"); @@ -6009,7 +6980,7 @@ 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); } @@ -6021,6 +6992,25 @@ static void semantic_dereference(unary_expression_t *expression) expression->base.type = result_type; } +static void set_address_taken(expression_t *expression, bool may_be_register) +{ + if (expression->kind != EXPR_REFERENCE) + return; + + declaration_t *const declaration = expression->reference.declaration; + /* happens for parse errors */ + if (declaration == NULL) + return; + + if (declaration->storage_class == STORAGE_CLASS_REGISTER && !may_be_register) { + errorf(&expression->base.source_position, + "address of register variable '%Y' requested", + declaration->symbol); + } else { + declaration->address_taken = 1; + } +} + /** * Check the semantic of the address taken expression. */ @@ -6030,20 +7020,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; - if(value->kind == EXPR_REFERENCE) { - declaration_t *const declaration = value->reference.declaration; - if(declaration != NULL) { - if (declaration->storage_class == STORAGE_CLASS_REGISTER) { - errorf(&expression->base.source_position, - "address of register variable '%Y' requested", - declaration->symbol); - } - declaration->address_taken = 1; - } - } + set_address_taken(value, false); expression->base.type = make_pointer_type(orig_type, TYPE_QUALIFIER_NONE); } @@ -6109,37 +7089,65 @@ 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); + int const rank_left = get_rank(type_left); + int const rank_right = get_rank(type_right); + + if (signed_left == signed_right) + return rank_left >= rank_right ? type_left : type_right; + + int s_rank; + int 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; + + /* FIXME ugly */ + type_t *const type = allocate_type_zero(TYPE_ATOMIC, &builtin_source_position); + switch (s_rank) { + case ATOMIC_TYPE_INT: type->atomic.akind = ATOMIC_TYPE_UINT; break; + case ATOMIC_TYPE_LONG: type->atomic.akind = ATOMIC_TYPE_ULONG; break; + case ATOMIC_TYPE_LONGLONG: type->atomic.akind = ATOMIC_TYPE_ULONGLONG; break; + + default: panic("invalid atomic type"); + } + + type_t* const result = typehash_insert(type); + if (result != type) + free_type(type); + + return result; } /** @@ -6154,7 +7162,7 @@ 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"); @@ -6177,7 +7185,7 @@ 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"); @@ -6202,19 +7210,25 @@ static void semantic_add(binary_expression_t *expression) type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); - /* § 5.6.5 */ - if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { + /* § 6.5.6 */ + 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_right) && is_type_integer(type_left)) { + } else if (is_type_pointer(type_right) && is_type_integer(type_left)) { + check_pointer_arithmetic(&expression->base.source_position, + type_right, orig_type_right); expression->base.type = type_right; } else if (is_type_valid(type_left) && is_type_valid(type_right)) { - errorf(HERE, "invalid operands to binary + ('%T', '%T')", orig_type_left, orig_type_right); + errorf(&expression->base.source_position, + "invalid operands to binary + ('%T', '%T')", + orig_type_left, orig_type_right); } } @@ -6228,24 +7242,36 @@ static void semantic_sub(binary_expression_t *expression) type_t *const type_right = skip_typeref(orig_type_right); /* § 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)) { - if(!pointers_compatible(type_left, type_right)) { - errorf(HERE, - "pointers to incompatible objects to binary '-' ('%T', '%T')", + } 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, + "subtracting pointers to incompatible types '%T' and '%T'", orig_type_left, orig_type_right); - } else { - expression->base.type = type_ptrdiff_t; + } 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"); + } else { + errorf(&expression->base.source_position, + "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 to binary '-' ('%T', '%T')", + errorf(HERE, "invalid operands of types '%T' and '%T' to binary '-'", orig_type_left, orig_type_right); } } @@ -6266,7 +7292,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 && @@ -6279,17 +7305,17 @@ 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; } - type_t *other_type = skip_typeref(other_expr->base.type); - if(const_expr != NULL) { - long val = fold_constant(const_expr); + 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 */ (void) other_type; (void) val; @@ -6319,7 +7345,75 @@ static void semantic_comparison(binary_expression_t *expression) &expression->base.source_position, type_left, type_right); } - expression->base.type = type_int; + expression->base.type = type_int; +} + +/** + * Checks if a compound type has constant fields. + */ +static bool has_const_fields(const compound_type_t *type) +{ + const scope_t *scope = &type->declaration->scope; + const declaration_t *declaration = scope->declarations; + + for (; declaration != NULL; declaration = declaration->next) { + if (declaration->namespc != NAMESPACE_NORMAL) + continue; + + const type_t *decl_type = skip_typeref(declaration->type); + if (decl_type->base.qualifiers & TYPE_QUALIFIER_CONST) + return true; + } + /* TODO */ + return false; +} + +static bool is_lvalue(const expression_t *expression) +{ + switch (expression->kind) { + case EXPR_REFERENCE: + case EXPR_ARRAY_ACCESS: + case EXPR_SELECT: + case EXPR_UNARY_DEREFERENCE: + return true; + + default: + return false; + } +} + +static bool is_valid_assignment_lhs(expression_t const* const left) +{ + type_t *const orig_type_left = revert_automatic_type_conversion(left); + type_t *const type_left = skip_typeref(orig_type_left); + + if (!is_lvalue(left)) { + errorf(HERE, "left hand side '%E' of assignment is not an lvalue", + left); + return false; + } + + if (is_type_array(type_left)) { + errorf(HERE, "cannot assign to arrays ('%E')", left); + return false; + } + if (type_left->base.qualifiers & TYPE_QUALIFIER_CONST) { + errorf(HERE, "assignment to readonly location '%E' (type '%T')", left, + orig_type_left); + return false; + } + if (is_type_incomplete(type_left)) { + errorf(HERE, "left-hand side '%E' of assignment has incomplete type '%T'", + left, orig_type_left); + return false; + } + if (is_type_compound(type_left) && has_const_fields(&type_left->compound)) { + errorf(HERE, "cannot assign to '%E' because compound type '%T' has readonly fields", + left, orig_type_left); + return false; + } + + return true; } static void semantic_arithmetic_assign(binary_expression_t *expression) @@ -6329,10 +7423,13 @@ static void semantic_arithmetic_assign(binary_expression_t *expression) type_t *orig_type_left = left->base.type; type_t *orig_type_right = right->base.type; + if (!is_valid_assignment_lhs(left)) + return; + 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"); @@ -6358,6 +7455,9 @@ static void semantic_arithmetic_addsubb_assign(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_valid_assignment_lhs(left)) + return; + if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { /* combined instructions are tricky. We can't create an implicit cast on * the left side, because we need the uncasted form for the store. @@ -6367,6 +7467,8 @@ static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression) expression->right = create_implicit_cast(right, arithmetic_type); expression->base.type = type_left; } 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_valid(type_left) && is_type_valid(type_right)) { errorf(HERE, "incompatible types '%T' and '%T' in assignment", orig_type_left, orig_type_right); @@ -6396,26 +7498,6 @@ static void semantic_logical_op(binary_expression_t *expression) expression->base.type = type_int; } -/** - * Checks if a compound type has constant fields. - */ -static bool has_const_fields(const compound_type_t *type) -{ - const scope_t *scope = &type->declaration->scope; - const declaration_t *declaration = scope->declarations; - - for (; declaration != NULL; declaration = declaration->next) { - if (declaration->namespc != NAMESPACE_NORMAL) - continue; - - const type_t *decl_type = skip_typeref(declaration->type); - if (decl_type->base.qualifiers & TYPE_QUALIFIER_CONST) - return true; - } - /* TODO */ - return false; -} - /** * Check the semantic restrictions of a binary assign expression. */ @@ -6427,38 +7509,13 @@ static void semantic_binexpr_assign(binary_expression_t *expression) type_t *type_left = revert_automatic_type_conversion(left); type_left = skip_typeref(orig_type_left); - /* must be a modifiable lvalue */ - if (is_type_array(type_left)) { - errorf(HERE, "cannot assign to arrays ('%E')", left); - return; - } - if(type_left->base.qualifiers & TYPE_QUALIFIER_CONST) { - errorf(HERE, "assignment to readonly location '%E' (type '%T')", left, - orig_type_left); + if (!is_valid_assignment_lhs(left)) return; - } - if(is_type_incomplete(type_left)) { - errorf(HERE, - "left-hand side of assignment '%E' has incomplete type '%T'", - left, orig_type_left); - return; - } - if(is_type_compound(type_left) && has_const_fields(&type_left->compound)) { - errorf(HERE, "cannot assign to '%E' because compound type '%T' has readonly fields", - left, orig_type_left); - return; - } - type_t *const res_type = semantic_assign(orig_type_left, expression->right, + assign_error_t error = semantic_assign(orig_type_left, expression->right); + report_assign_error(error, orig_type_left, expression->right, "assignment", &left->base.source_position); - if (res_type == NULL) { - errorf(&expression->base.source_position, - "cannot assign to '%T' from '%T'", - orig_type_left, expression->right->base.type); - } else { - expression->right = create_implicit_cast(expression->right, res_type); - } - + expression->right = create_implicit_cast(expression->right, orig_type_left); expression->base.type = orig_type_left; } @@ -6543,7 +7600,6 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_UNARY_CAST_IMPLICIT: return true; case EXPR_UNARY_ASSUME: return true; - case EXPR_UNARY_BITFIELD_EXTRACT: return false; case EXPR_BINARY_ADD: return false; case EXPR_BINARY_SUB: return false; @@ -6681,7 +7737,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(); } @@ -6690,7 +7746,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(); @@ -6699,14 +7755,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); @@ -6739,7 +7795,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"); } @@ -6759,7 +7815,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"); @@ -6784,13 +7840,13 @@ static void init_expression_parsers(void) register_infix_parser(parse_EXPR_UNARY_POSTFIX_DECREMENT, T_MINUSMINUS, 30); - register_infix_parser(parse_EXPR_BINARY_MUL, '*', 16); - register_infix_parser(parse_EXPR_BINARY_DIV, '/', 16); - register_infix_parser(parse_EXPR_BINARY_MOD, '%', 16); - register_infix_parser(parse_EXPR_BINARY_SHIFTLEFT, T_LESSLESS, 16); - register_infix_parser(parse_EXPR_BINARY_SHIFTRIGHT, T_GREATERGREATER, 16); - register_infix_parser(parse_EXPR_BINARY_ADD, '+', 15); - register_infix_parser(parse_EXPR_BINARY_SUB, '-', 15); + register_infix_parser(parse_EXPR_BINARY_MUL, '*', 17); + register_infix_parser(parse_EXPR_BINARY_DIV, '/', 17); + register_infix_parser(parse_EXPR_BINARY_MOD, '%', 17); + register_infix_parser(parse_EXPR_BINARY_ADD, '+', 16); + register_infix_parser(parse_EXPR_BINARY_SUB, '-', 16); + register_infix_parser(parse_EXPR_BINARY_SHIFTLEFT, T_LESSLESS, 15); + register_infix_parser(parse_EXPR_BINARY_SHIFTRIGHT, T_GREATERGREATER, 15); register_infix_parser(parse_EXPR_BINARY_LESS, '<', 14); register_infix_parser(parse_EXPR_BINARY_GREATER, '>', 14); register_infix_parser(parse_EXPR_BINARY_LESSEQUAL, T_LESSEQUAL, 14); @@ -6841,42 +7897,97 @@ static void init_expression_parsers(void) } /** - * Parse a asm statement constraints specification. + * Parse a asm statement arguments specification. */ -static asm_constraint_t *parse_asm_constraints(void) +static asm_argument_t *parse_asm_arguments(bool is_out) { - asm_constraint_t *result = NULL; - asm_constraint_t *last = NULL; + asm_argument_t *result = NULL; + asm_argument_t *last = NULL; - while(token.type == T_STRING_LITERAL || token.type == '[') { - asm_constraint_t *constraint = allocate_ast_zero(sizeof(constraint[0])); - memset(constraint, 0, sizeof(constraint[0])); + while (token.type == T_STRING_LITERAL || token.type == '[') { + asm_argument_t *argument = allocate_ast_zero(sizeof(argument[0])); + memset(argument, 0, sizeof(argument[0])); - if(token.type == '[') { + if (token.type == '[') { eat('['); - if(token.type != T_IDENTIFIER) { - parse_error_expected("while parsing asm constraint", + if (token.type != T_IDENTIFIER) { + parse_error_expected("while parsing asm argument", T_IDENTIFIER, NULL); return NULL; } - constraint->symbol = token.v.symbol; + argument->symbol = token.v.symbol; expect(']'); } - constraint->constraints = parse_string_literals(); + argument->constraints = parse_string_literals(); expect('('); - constraint->expression = parse_expression(); + add_anchor_token(')'); + expression_t *expression = parse_expression(); + 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(')'); - if(last != NULL) { - last->next = constraint; + set_address_taken(expression, true); + + if (last != NULL) { + last->next = argument; } else { - result = constraint; + result = argument; } - last = constraint; + last = argument; - if(token.type != ',') + if (token.type != ',') break; eat(','); } @@ -6898,14 +8009,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(','); } @@ -6925,7 +8036,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; } @@ -6935,21 +8046,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->inputs = parse_asm_constraints(); - if(token.type != ':') { + asm_statement->outputs = parse_asm_arguments(true); + if (token.type != ':') { rem_anchor_token(':'); goto end_of_asm; } eat(':'); - asm_statement->outputs = parse_asm_constraints(); - if(token.type != ':') { + asm_statement->inputs = parse_asm_arguments(false); + if (token.type != ':') { rem_anchor_token(':'); goto end_of_asm; } @@ -6962,6 +8073,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(); @@ -6974,11 +8092,14 @@ 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(); + PUSH_PARENT(statement); + if (c_mode & _GNUC) { if (token.type == T_DOTDOTDOT) { next_token(); @@ -6989,27 +8110,42 @@ static statement_t *parse_case_statement(void) 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; - } + errorf(pos, "case label does not reduce to an integer constant"); + } else if (current_switch != NULL) { + /* Check for duplicate case values */ + /* FIXME slow */ + long const val = fold_constant(statement->case_label.expression); + for (case_label_statement_t *l = current_switch->first_case; l != NULL; l = l->next) { + expression_t const* const e = l->expression; + if (e == NULL || !is_constant_expression(e) || fold_constant(e) != val) + continue; + + errorf(pos, "duplicate case value"); + errorf(&l->base.source_position, "previously used here"); + 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_t *const inner_stmt = parse_statement(); + statement->case_label.statement = inner_stmt; + if (inner_stmt->kind == STATEMENT_DECLARATION) { + errorf(&inner_stmt->base.source_position, "declaration after case label"); } - statement->case_label.statement = parse_statement(); + POP_PARENT; return statement; end_error: + POP_PARENT; return create_invalid_statement(); } @@ -7035,9 +8171,10 @@ 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); @@ -7047,25 +8184,34 @@ static statement_t *parse_default_statement(void) } else { /* 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) { @@ -7073,7 +8219,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; } @@ -7099,45 +8245,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 { @@ -7145,6 +8294,7 @@ static statement_t *parse_label_statement(void) } label_last = &statement->label; + POP_PARENT; return statement; } @@ -7158,6 +8308,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(); @@ -7168,13 +8320,15 @@ 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(); } @@ -7188,6 +8342,8 @@ 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('('); expression_t *const expr = parse_expression(); type_t * type = skip_typeref(expr->base.type); @@ -7206,13 +8362,15 @@ static statement_t *parse_switch(void) statement->switchs.body = parse_statement(); current_switch = rem; - if(warning.switch_default && + if (warning.switch_default && find_default_label(&statement->switchs) == NULL) { warningf(&statement->base.source_position, "switch has no default case"); } + POP_PARENT; return statement; end_error: + POP_PARENT; return create_invalid_statement(); } @@ -7237,6 +8395,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(); @@ -7245,8 +8405,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(); } @@ -7258,9 +8420,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); @@ -7273,8 +8436,10 @@ static statement_t *parse_do(void) expect(')'); expect(';'); + POP_PARENT; return statement; end_error: + POP_PARENT; return create_invalid_statement(); } @@ -7288,6 +8453,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); @@ -7295,8 +8462,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(';'); @@ -7313,13 +8480,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)) { @@ -7335,9 +8502,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); @@ -7353,10 +8522,10 @@ 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(); - return NULL; + goto end_error; } symbol_t *symbol = token.v.symbol; next_token(); @@ -7455,12 +8624,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; @@ -7474,8 +8644,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); @@ -7520,7 +8691,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(';'); @@ -7529,27 +8700,23 @@ 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"); return_value = NULL; } else { - type_t *const res_type = semantic_assign(return_type, - return_value, "'return'", &statement->base.source_position); - if (res_type == NULL) { - errorf(&statement->base.source_position, - "cannot return something of type '%T' in function returning '%T'", - return_value->base.type, return_type); - } else { - return_value = create_implicit_cast(return_value, res_type); - } + assign_error_t error = semantic_assign(return_type, return_value); + report_assign_error(error, return_type, return_value, "'return'", + &statement->base.source_position); + return_value = create_implicit_cast(return_value, return_type); } /* check for returning address of a local var */ - if (return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) { + if (return_value != NULL && + return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) { const expression_t *expression = return_value->unary.value; if (is_local_variable(expression)) { warningf(&statement->base.source_position, @@ -7557,7 +8724,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"); } @@ -7581,7 +8748,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; @@ -7613,7 +8780,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; @@ -7624,7 +8792,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(')'); @@ -7641,7 +8809,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 { @@ -7653,6 +8821,15 @@ end_error: return create_invalid_statement(); } +static statement_t *parse_empty_statement(void) +{ + if (warning.empty_statement) { + warningf(HERE, "statement is empty"); + } + eat(';'); + return create_empty_statement(); +} + /** * Parse a statement. * There's also parse_statement() which additionally checks for @@ -7664,91 +8841,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; @@ -7756,13 +8865,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(';'); @@ -7782,9 +8901,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"); } @@ -7799,9 +8918,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('}'); @@ -7811,28 +8931,28 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) statement_t *last_statement = NULL; - while(token.type != '}' && token.type != T_EOF) { + 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) { + if (last_statement != NULL) { last_statement->base.next = sub_statement; } else { statement->compound.statements = sub_statement; } - while(sub_statement->base.next != NULL) + while (sub_statement->base.next != NULL) sub_statement = sub_statement->base.next; last_statement = sub_statement; } - if(token.type == '}') { + if (token.type == '}') { next_token(); } else { errorf(&statement->base.source_position, @@ -7840,18 +8960,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"); } @@ -7864,6 +8984,7 @@ end_error: set_scope(last_scope); environment_pop_to(top); + POP_PARENT; return statement; } @@ -7896,7 +9017,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; @@ -7918,40 +9042,55 @@ 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 translation_unit_t *parse_translation_unit(void) +static void parse_translation_unit(void) { - translation_unit_t *unit = allocate_ast_zero(sizeof(unit[0])); - - assert(global_scope == NULL); - global_scope = &unit->scope; + for (;;) switch (token.type) { + DECLARATION_START + case T_IDENTIFIER: + case T___extension__: + parse_external_declaration(); + break; - assert(scope == NULL); - set_scope(&unit->scope); + case T_asm: + parse_global_asm(); + break; - initialize_builtin_types(); + case T_EOF: + return; - while(token.type != T_EOF) { - if (token.type == ';') { + case ';': /* TODO error in strict mode */ warningf(HERE, "stray ';' outside of function"); next_token(); - } else { - parse_external_declaration(); - } - } - - assert(scope == &unit->scope); - scope = NULL; - last_declaration = NULL; - - assert(global_scope == &unit->scope); - check_unused_globals(); - global_scope = NULL; + break; - return unit; + 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; + } } /** @@ -7959,7 +9098,7 @@ static translation_unit_t *parse_translation_unit(void) * * @return the translation unit or NULL if errors occurred. */ -translation_unit_t *parse(void) +void start_parsing(void) { environment_stack = NEW_ARR_F(stack_entry_t, 0); label_stack = NEW_ARR_F(stack_entry_t, 0); @@ -7970,16 +9109,43 @@ translation_unit_t *parse(void) type_set_output(stderr); ast_set_output(stderr); - lookahead_bufpos = 0; - for(int i = 0; i < MAX_LOOKAHEAD + 2; ++i) { - next_token(); - } - translation_unit_t *unit = parse_translation_unit(); + assert(unit == NULL); + unit = allocate_ast_zero(sizeof(unit[0])); + + assert(global_scope == NULL); + global_scope = &unit->scope; + + assert(scope == NULL); + set_scope(&unit->scope); + + initialize_builtin_types(); +} + +translation_unit_t *finish_parsing(void) +{ + assert(scope == &unit->scope); + scope = NULL; + last_declaration = NULL; + + assert(global_scope == &unit->scope); + check_unused_globals(); + global_scope = NULL; DEL_ARR_F(environment_stack); DEL_ARR_F(label_stack); - return unit; + translation_unit_t *result = unit; + unit = NULL; + return result; +} + +void parse(void) +{ + lookahead_bufpos = 0; + for(int i = 0; i < MAX_LOOKAHEAD + 2; ++i) { + next_token(); + } + parse_translation_unit(); } /** @@ -7987,7 +9153,7 @@ translation_unit_t *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");