X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=b85ac28eb1a40aa2a8fbd0de5d2bf0bc6f596c84;hb=134cb409e23b44ac9b9ac5d28f331b714bd58e39;hp=8b317215af21fd8a36548536fce70b0e95706052;hpb=2522d7a205b7b20b9e56e561ea615c000bd27718;p=cparser diff --git a/parser.c b/parser.c index 8b31721..b85ac28 100644 --- a/parser.c +++ b/parser.c @@ -54,7 +54,7 @@ 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 struct obstack temp_obst; +static struct obstack temp_obst; /** The current source position. */ #define HERE token.source_position @@ -68,7 +68,7 @@ static expression_t *parse_sub_expression(unsigned precedence); static expression_t *parse_expression(void); static type_t *parse_typename(void); -static void parse_compound_type_entries(void); +static void parse_compound_type_entries(declaration_t *compound_declaration); static declaration_t *parse_declarator( const declaration_specifiers_t *specifiers, bool may_be_abstract); static declaration_t *record_declaration(declaration_t *declaration); @@ -140,7 +140,7 @@ static void *allocate_ast_zero(size_t size) static declaration_t *allocate_declaration_zero(void) { - declaration_t *declaration = allocate_ast_zero(sizeof(*allocate_declaration_zero())); + declaration_t *declaration = allocate_ast_zero(sizeof(declaration_t)); declaration->type = type_error_type; return declaration; } @@ -198,8 +198,10 @@ static size_t get_expression_struct_size(expression_kind_t kind) [EXPR_INVALID] = sizeof(expression_base_t), [EXPR_REFERENCE] = sizeof(reference_expression_t), [EXPR_CONST] = sizeof(const_expression_t), + [EXPR_CHAR_CONST] = sizeof(const_expression_t), [EXPR_STRING_LITERAL] = sizeof(string_literal_expression_t), [EXPR_WIDE_STRING_LITERAL] = sizeof(wide_string_literal_expression_t), + [EXPR_COMPOUND_LITERAL] = sizeof(compound_literal_expression_t), [EXPR_CALL] = sizeof(call_expression_t), [EXPR_UNARY_FIRST] = sizeof(unary_expression_t), [EXPR_BINARY_FIRST] = sizeof(binary_expression_t), @@ -239,8 +241,8 @@ static expression_t *allocate_expression_zero(expression_kind_t kind) size_t size = get_expression_struct_size(kind); expression_t *res = allocate_ast_zero(size); - res->base.kind = kind; - res->base.datatype = type_error_type; + res->base.kind = kind; + res->base.type = type_error_type; return res; } @@ -274,13 +276,14 @@ static size_t get_type_struct_size(type_kind_t kind) * Allocate a type node of given kind and initialize all * fields with zero. */ -static type_t *allocate_type_zero(type_kind_t kind) +static type_t *allocate_type_zero(type_kind_t kind, source_position_t source_position) { size_t size = get_type_struct_size(kind); type_t *res = obstack_alloc(type_obst, size); memset(res, 0, size); - res->base.kind = kind; + res->base.kind = kind; + res->base.source_position = source_position; return res; } @@ -295,7 +298,8 @@ static size_t get_initializer_size(initializer_kind_t kind) [INITIALIZER_VALUE] = sizeof(initializer_value_t), [INITIALIZER_STRING] = sizeof(initializer_string_t), [INITIALIZER_WIDE_STRING] = sizeof(initializer_wide_string_t), - [INITIALIZER_LIST] = sizeof(initializer_list_t) + [INITIALIZER_LIST] = sizeof(initializer_list_t), + [INITIALIZER_DESIGNATOR] = sizeof(initializer_designator_t) }; assert(kind < sizeof(sizes) / sizeof(*sizes)); assert(sizes[kind] != 0); @@ -378,7 +382,7 @@ static void parse_error_expected(const char *message, ...) } va_list ap; va_start(ap, message); - errorf(HERE, "got '%K', expected %#k", &token, &ap, ", "); + errorf(HERE, "got %K, expected %#k", &token, &ap, ", "); va_end(ap); } @@ -467,39 +471,43 @@ static void eat_paren(void) } #define expect(expected) \ + do { \ if(UNLIKELY(token.type != (expected))) { \ parse_error_expected(NULL, (expected), 0); \ eat_statement(); \ return NULL; \ } \ - next_token(); + next_token(); \ + } while(0) #define expect_block(expected) \ + do { \ if(UNLIKELY(token.type != (expected))) { \ parse_error_expected(NULL, (expected), 0); \ eat_block(); \ return NULL; \ } \ - next_token(); + next_token(); \ + } while(0) #define expect_void(expected) \ + do { \ if(UNLIKELY(token.type != (expected))) { \ parse_error_expected(NULL, (expected), 0); \ eat_statement(); \ return; \ } \ - next_token(); + next_token(); \ + } while(0) static void set_scope(scope_t *new_scope) { + if(scope != NULL) { + scope->last_declaration = last_declaration; + } scope = new_scope; - last_declaration = new_scope->declarations; - if(last_declaration != NULL) { - while(last_declaration->next != NULL) { - last_declaration = last_declaration->next; - } - } + last_declaration = new_scope->last_declaration; } /** @@ -523,22 +531,15 @@ static declaration_t *get_declaration(const symbol_t *const symbol, const namesp */ static void stack_push(stack_entry_t **stack_ptr, declaration_t *declaration) { - symbol_t *symbol = declaration->symbol; - namespace_t namespc = (namespace_t)declaration->namespc; - - /* remember old declaration */ - stack_entry_t entry; - entry.symbol = symbol; - entry.old_declaration = symbol->declaration; - entry.namespc = (unsigned short) namespc; - ARR_APP1(stack_entry_t, *stack_ptr, entry); + symbol_t *symbol = declaration->symbol; + namespace_t namespc = (namespace_t) declaration->namespc; /* replace/add declaration into declaration list of the symbol */ - if(symbol->declaration == NULL) { + declaration_t *iter = symbol->declaration; + if (iter == NULL) { symbol->declaration = declaration; } else { declaration_t *iter_last = NULL; - declaration_t *iter = symbol->declaration; for( ; iter != NULL; iter_last = iter, iter = iter->symbol_next) { /* replace an entry? */ if(iter->namespc == namespc) { @@ -556,6 +557,13 @@ static void stack_push(stack_entry_t **stack_ptr, declaration_t *declaration) iter_last->symbol_next = declaration; } } + + /* remember old declaration */ + stack_entry_t entry; + entry.symbol = symbol; + entry.old_declaration = iter; + entry.namespc = (unsigned short) namespc; + ARR_APP1(stack_entry_t, *stack_ptr, entry); } static void environment_push(declaration_t *declaration) @@ -608,7 +616,9 @@ static void stack_pop_to(stack_entry_t **stack_ptr, size_t new_top) if(iter->namespc == namespc) { assert(iter_last != NULL); iter_last->symbol_next = old_declaration; - old_declaration->symbol_next = iter->symbol_next; + if(old_declaration != NULL) { + old_declaration->symbol_next = iter->symbol_next; + } break; } } @@ -667,8 +677,8 @@ static expression_t *create_cast_expression(expression_t *expression, { expression_t *cast = allocate_expression_zero(EXPR_UNARY_CAST_IMPLICIT); - cast->unary.value = expression; - cast->base.datatype = dest_type; + cast->unary.value = expression; + cast->base.type = dest_type; return cast; } @@ -689,7 +699,7 @@ static bool is_null_pointer_constant(const expression_t *expression) if (expression->kind != EXPR_CONST) return false; - type_t *const type = skip_typeref(expression->base.datatype); + type_t *const type = skip_typeref(expression->base.type); if (!is_type_integer(type)) return false; @@ -705,7 +715,7 @@ static bool is_null_pointer_constant(const expression_t *expression) static expression_t *create_implicit_cast(expression_t *expression, type_t *dest_type) { - type_t *const source_type = expression->base.datatype; + type_t *const source_type = expression->base.type; if (source_type == dest_type) return expression; @@ -718,7 +728,7 @@ static type_t *semantic_assign(type_t *orig_type_left, const expression_t *const right, const char *context) { - type_t *const orig_type_right = right->base.datatype; + 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); @@ -744,16 +754,22 @@ static type_t *semantic_assign(type_t *orig_type_left, points_to_left = get_unqualified_type(points_to_left); points_to_right = get_unqualified_type(points_to_right); - if(!is_type_atomic(points_to_left, ATOMIC_TYPE_VOID) - && !is_type_atomic(points_to_right, ATOMIC_TYPE_VOID) - && !types_compatible(points_to_left, points_to_right)) { - return NULL; + if (is_type_atomic(points_to_left, ATOMIC_TYPE_VOID) || + is_type_atomic(points_to_right, ATOMIC_TYPE_VOID)) { + return orig_type_left; + } + + if (!types_compatible(points_to_left, points_to_right)) { + warningf(right->base.source_position, + "destination type '%T' in %s is incompatible with '%E' of type '%T'", + orig_type_left, context, right, orig_type_right); } return orig_type_left; } - if (is_type_compound(type_left) && is_type_compound(type_right)) { + 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)) { @@ -801,7 +817,7 @@ static type_t *make_global_typedef(const char *name, type_t *type) record_declaration(declaration); - type_t *typedef_type = allocate_type_zero(TYPE_TYPEDEF); + type_t *typedef_type = allocate_type_zero(TYPE_TYPEDEF, builtin_source_position); typedef_type->typedeft.declaration = declaration; return typedef_type; @@ -872,26 +888,24 @@ attributes_finished: ; } -#if 0 static designator_t *parse_designation(void) { - if(token.type != '[' && token.type != '.') - return NULL; - designator_t *result = NULL; designator_t *last = NULL; - while(1) { + while(true) { designator_t *designator; switch(token.type) { case '[': designator = allocate_ast_zero(sizeof(designator[0])); + designator->source_position = token.source_position; next_token(); - designator->array_access = parse_constant_expression(); + designator->array_index = parse_constant_expression(); expect(']'); break; case '.': designator = allocate_ast_zero(sizeof(designator[0])); + designator->source_position = token.source_position; next_token(); if(token.type != T_IDENTIFIER) { parse_error_expected("while parsing designator", @@ -915,7 +929,6 @@ static designator_t *parse_designation(void) last = designator; } } -#endif static initializer_t *initializer_from_string(array_type_t *type, const string_t *const string) @@ -942,21 +955,26 @@ static initializer_t *initializer_from_wide_string(array_type_t *const type, return initializer; } -static initializer_t *initializer_from_expression(type_t *type, +static initializer_t *initializer_from_expression(type_t *orig_type, expression_t *expression) { /* TODO check that expression is a constant expression */ /* § 6.7.8.14/15 char array may be initialized by string literals */ - type_t *const expr_type = expression->base.datatype; + type_t *type = skip_typeref(orig_type); + type_t *expr_type_orig = expression->base.type; + type_t *expr_type = skip_typeref(expr_type_orig); if (is_type_array(type) && expr_type->kind == TYPE_POINTER) { array_type_t *const array_type = &type->array; type_t *const element_type = skip_typeref(array_type->element_type); if (element_type->kind == TYPE_ATOMIC) { + atomic_type_kind_t akind = element_type->atomic.akind; switch (expression->kind) { case EXPR_STRING_LITERAL: - if (element_type->atomic.akind == ATOMIC_TYPE_CHAR) { + if (akind == ATOMIC_TYPE_CHAR + || akind == ATOMIC_TYPE_SCHAR + || akind == ATOMIC_TYPE_UCHAR) { return initializer_from_string(array_type, &expression->string.value); } @@ -985,203 +1003,429 @@ static initializer_t *initializer_from_expression(type_t *type, return result; } -static initializer_t *parse_sub_initializer(type_t *type, - expression_t *expression); - -static initializer_t *parse_sub_initializer_elem(type_t *type) +static initializer_t *parse_scalar_initializer(type_t *type) { - if(token.type == '{') { - return parse_sub_initializer(type, NULL); + /* 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++; } - expression_t *expression = parse_assignment_expression(); - return parse_sub_initializer(type, expression); -} + expression_t *expression = parse_assignment_expression(); + initializer_t *initializer = initializer_from_expression(type, expression); -static bool had_initializer_brace_warning; + if(initializer == NULL) { + errorf(expression->base.source_position, + "expression '%E' doesn't match expected type '%T'", + expression, type); + /* TODO */ + return NULL; + } -static void skip_designator(void) -{ - while(1) { - if(token.type == '.') { - next_token(); - if(token.type == T_IDENTIFIER) - next_token(); - } else if(token.type == '[') { + bool additional_warning_displayed = false; + while(braces > 0) { + if(token.type == ',') { next_token(); - parse_constant_expression(); - if(token.type == ']') - next_token(); - } else { - break; } + if(token.type != '}') { + if(!additional_warning_displayed) { + warningf(HERE, "additional elements in scalar initializer"); + additional_warning_displayed = true; + } + } + eat_block(); + braces--; } + + return initializer; } -static initializer_t *parse_sub_initializer(type_t *type, - expression_t *expression) +typedef struct type_path_entry_t type_path_entry_t; +struct type_path_entry_t { + type_t *type; + union { + size_t index; + declaration_t *compound_entry; + } v; +}; + +typedef struct type_path_t type_path_t; +struct type_path_t { + type_path_entry_t *path; + type_t *top_type; + bool invalid; +}; + +static __attribute__((unused)) void debug_print_type_path(const type_path_t *path) { - if(is_type_scalar(type)) { - /* there might be extra {} hierarchies */ - if(token.type == '{') { - next_token(); - if(!had_initializer_brace_warning) { - warningf(HERE, "braces around scalar initializer"); - had_initializer_brace_warning = true; - } - initializer_t *result = parse_sub_initializer(type, NULL); - if(token.type == ',') { - next_token(); - /* TODO: warn about excessive elements */ - } - expect_block('}'); - return result; - } + size_t len = ARR_LEN(path->path); - if(expression == NULL) { - expression = parse_assignment_expression(); + if(path->invalid) { + fprintf(stderr, "invalid path"); + return; + } + + for(size_t i = 0; i < len; ++i) { + const type_path_entry_t *entry = & path->path[i]; + + type_t *type = skip_typeref(entry->type); + if(is_type_compound(type)) { + fprintf(stderr, ".%s", entry->v.compound_entry->symbol->string); + } else if(is_type_array(type)) { + fprintf(stderr, "[%u]", entry->v.index); + } else { + fprintf(stderr, "-INVALID-"); } - return initializer_from_expression(type, expression); } + fprintf(stderr, " ("); + print_type(path->top_type); + fprintf(stderr, ")"); +} - /* does the expression match the currently looked at object to initialize */ - if(expression != NULL) { - initializer_t *result = initializer_from_expression(type, expression); - if(result != NULL) - return result; +static type_path_entry_t *get_type_path_top(const type_path_t *path) +{ + size_t len = ARR_LEN(path->path); + assert(len > 0); + return & path->path[len-1]; +} + +static type_path_entry_t *append_to_type_path(type_path_t *path) +{ + size_t len = ARR_LEN(path->path); + ARR_RESIZE(type_path_entry_t, path->path, len+1); + + type_path_entry_t *result = & path->path[len]; + memset(result, 0, sizeof(result[0])); + return result; +} + +static void descend_into_subtype(type_path_t *path) +{ + type_t *orig_top_type = path->top_type; + type_t *top_type = skip_typeref(orig_top_type); + + assert(is_type_compound(top_type) || is_type_array(top_type)); + + type_path_entry_t *top = append_to_type_path(path); + top->type = 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; + path->top_type = entry->type; + } else { + assert(is_type_array(top_type)); + + top->v.index = 0; + path->top_type = top_type->array.element_type; } +} - bool read_paren = false; - if(token.type == '{') { - next_token(); - read_paren = true; +static void ascend_from_subtype(type_path_t *path) +{ + type_path_entry_t *top = get_type_path_top(path); + + path->top_type = top->type; + + size_t len = ARR_LEN(path->path); + ARR_RESIZE(type_path_entry_t, path->path, len-1); +} + +static void ascend_to(type_path_t *path, size_t top_path_level) +{ + size_t len = ARR_LEN(path->path); + assert(len >= top_path_level); + + while(len > top_path_level) { + ascend_from_subtype(path); + len = ARR_LEN(path->path); } +} - /* descend into subtype */ - initializer_t *result = NULL; - initializer_t **elems; - if(is_type_array(type)) { - if(token.type == '.') { - errorf(HERE, - "compound designator in initializer for array type '%T'", - type); - skip_designator(); - } +static bool walk_designator(type_path_t *path, const designator_t *designator, + bool used_in_offsetof) +{ + for( ; designator != NULL; designator = designator->next) { + type_path_entry_t *top = get_type_path_top(path); + type_t *orig_type = top->type; - type_t *const element_type = skip_typeref(type->array.element_type); + type_t *type = skip_typeref(orig_type); - initializer_t *sub; - had_initializer_brace_warning = false; - if(expression == NULL) { - sub = parse_sub_initializer_elem(element_type); + if(designator->symbol != NULL) { + symbol_t *symbol = designator->symbol; + 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); + } + goto failed; + } + + declaration_t *declaration = type->compound.declaration; + declaration_t *iter = declaration->scope.declarations; + for( ; iter != NULL; iter = iter->next) { + if(iter->symbol == symbol) { + break; + } + } + if(iter == NULL) { + errorf(designator->source_position, + "'%T' has no member named '%Y'", orig_type, symbol); + goto failed; + } + if(used_in_offsetof) { + type_t *real_type = skip_typeref(iter->type); + if(real_type->kind == TYPE_BITFIELD) { + errorf(designator->source_position, + "offsetof designator '%Y' may not specify bitfield", + symbol); + goto failed; + } + } + + top->type = orig_type; + top->v.compound_entry = iter; + orig_type = iter->type; } else { - sub = parse_sub_initializer(element_type, expression); + expression_t *array_index = designator->array_index; + assert(designator->array_index != NULL); + + 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)) { + goto failed; + } + + long index = fold_constant(array_index); + 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) { + long array_size = type->array.size; + if(index >= array_size) { + errorf(designator->source_position, + "designator [%E] (%d) exceeds array size %d", + array_index, index, array_size); + goto failed; + } + } + } + + top->type = orig_type; + top->v.index = (size_t) index; + orig_type = type->array.element_type; } + path->top_type = orig_type; - /* didn't match the subtypes -> try the parent type */ - if(sub == NULL) { - assert(!read_paren); - return NULL; + if(designator->next != NULL) { + descend_into_subtype(path); } + } - elems = NEW_ARR_F(initializer_t*, 0); - ARR_APP1(initializer_t*, elems, sub); + path->invalid = false; + return true; - while(true) { - if(token.type == '}') - break; - expect_block(','); - if(token.type == '}') - break; +failed: + return false; +} - sub = parse_sub_initializer_elem(element_type); - if(sub == NULL) { - /* TODO error, do nicer cleanup */ - errorf(HERE, "member initializer didn't match"); - DEL_ARR_F(elems); - return NULL; - } - ARR_APP1(initializer_t*, elems, sub); +static void advance_current_object(type_path_t *path, size_t top_path_level) +{ + if(path->invalid) + return; + + type_path_entry_t *top = get_type_path_top(path); + + type_t *type = skip_typeref(top->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)) { + declaration_t *entry = top->v.compound_entry; + + entry = entry->next; + top->v.compound_entry = entry; + if(entry != NULL) { + path->top_type = entry->type; + return; } } else { - assert(is_type_compound(type)); - scope_t *const scope = &type->compound.declaration->scope; + assert(is_type_array(type)); - if(token.type == '[') { - errorf(HERE, - "array designator in initializer for compound type '%T'", - type); - skip_designator(); + top->v.index++; + + if(!type->array.size_constant || top->v.index < type->array.size) { + return; } + } - declaration_t *first = scope->declarations; - if(first == NULL) - return NULL; - type_t *first_type = first->type; - first_type = skip_typeref(first_type); + /* we're past the last member of the current sub-aggregate, try if we + * can ascend in the type hierarchy and continue with another subobject */ + size_t len = ARR_LEN(path->path); - initializer_t *sub; - had_initializer_brace_warning = false; - if(expression == NULL) { - sub = parse_sub_initializer_elem(first_type); - } else { - sub = parse_sub_initializer(first_type, expression); + if(len > top_path_level) { + ascend_from_subtype(path); + advance_current_object(path, top_path_level); + } else { + path->invalid = true; + } +} + +static void skip_initializers(void) +{ + if(token.type == '{') + next_token(); + + while(token.type != '}') { + if(token.type == T_EOF) + return; + if(token.type == '{') { + eat_block(); + continue; } + next_token(); + } +} + +static initializer_t *parse_sub_initializer(type_path_t *path, + type_t *outer_type, size_t top_path_level) +{ + type_t *orig_type = path->top_type; + type_t *type = skip_typeref(orig_type); - /* didn't match the subtypes -> try our parent type */ - if(sub == NULL) { - assert(!read_paren); - return NULL; + /* 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)) { + skip_initializers(); + return NULL; + } + + initializer_t **initializers = NEW_ARR_F(initializer_t*, 0); + + while(true) { + designator_t *designator = NULL; + if(token.type == '.' || token.type == '[') { + designator = parse_designation(); + + /* reset path to toplevel, evaluate designator from there */ + ascend_to(path, top_path_level); + if(!walk_designator(path, designator, false)) { + /* can't continue after designation error */ + goto end_error; + } + + initializer_t *designator_initializer + = allocate_initializer_zero(INITIALIZER_DESIGNATOR); + designator_initializer->designator.designator = designator; + ARR_APP1(initializer_t*, initializers, designator_initializer); } - elems = NEW_ARR_F(initializer_t*, 0); - ARR_APP1(initializer_t*, elems, sub); + initializer_t *sub; - declaration_t *iter = first->next; - for( ; iter != NULL; iter = iter->next) { - if(iter->symbol == NULL) - continue; - if(iter->namespc != NAMESPACE_NORMAL) - continue; + if(token.type == '{') { + if(is_type_scalar(type)) { + sub = parse_scalar_initializer(type); + } else { + eat('{'); + descend_into_subtype(path); - if(token.type == '}') - break; - expect_block(','); - if(token.type == '}') - break; + sub = parse_sub_initializer(path, orig_type, top_path_level+1); - type_t *iter_type = iter->type; - iter_type = skip_typeref(iter_type); + ascend_from_subtype(path); - sub = parse_sub_initializer_elem(iter_type); - if(sub == NULL) { - /* TODO error, do nicer cleanup */ - errorf(HERE, "member initializer didn't match"); - DEL_ARR_F(elems); - return NULL; + expect_block('}'); + } + } else { + /* must be an expression */ + expression_t *expression = parse_assignment_expression(); + + /* handle { "string" } special case */ + 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 == ',') { + next_token(); + } + if(token.type != '}') { + warningf(HERE, "excessive elements in initializer for type '%T'", + orig_type); + } + /* TODO: eat , ... */ + return sub; + } + } + + /* descend into subtypes until expression matches type */ + while(true) { + orig_type = path->top_type; + type = skip_typeref(orig_type); + + sub = initializer_from_expression(orig_type, expression); + if(sub != NULL) { + break; + } + if(!is_type_valid(type)) { + goto end_error; + } + if(is_type_scalar(type)) { + errorf(expression->base.source_position, + "expression '%E' doesn't match expected type '%T'", + expression, orig_type); + goto end_error; + } + + descend_into_subtype(path); } - ARR_APP1(initializer_t*, elems, sub); } - } + ARR_APP1(initializer_t*, initializers, sub); - int len = ARR_LEN(elems); - size_t elems_size = sizeof(initializer_t*) * len; + if(token.type == '}') { + break; + } + expect(','); + if(token.type == '}') { + break; + } + advance_current_object(path, top_path_level); + } - initializer_list_t *init = allocate_ast_zero(sizeof(init[0]) + elems_size); + size_t len = ARR_LEN(initializers); + size_t size = sizeof(initializer_list_t) + len * sizeof(initializers[0]); + initializer_t *result = allocate_ast_zero(size); + result->kind = INITIALIZER_LIST; + result->list.len = len; + memcpy(&result->list.initializers, initializers, + len * sizeof(initializers[0])); - init->initializer.kind = INITIALIZER_LIST; - init->len = len; - memcpy(init->initializers, elems, elems_size); - DEL_ARR_F(elems); + ascend_to(path, top_path_level); - result = (initializer_t*) init; + /* TODO: if(is_global && !is_constant(...)) { error } */ - if(read_paren) { - if(token.type == ',') - next_token(); - expect('}'); - } return result; + +end_error: + skip_initializers(); + DEL_ARR_F(initializers); + ascend_to(path, top_path_level); + return NULL; } static initializer_t *parse_initializer(type_t *const orig_type) @@ -1196,25 +1440,37 @@ static initializer_t *parse_initializer(type_t *const orig_type) if(initializer == NULL) { errorf(HERE, "initializer expression '%E' of type '%T' is incompatible with type '%T'", - expression, expression->base.datatype, orig_type); + expression, expression->base.type, orig_type); } return initializer; } if(is_type_scalar(type)) { - /* § 6.7.8.11 */ - eat('{'); + /* TODO: § 6.7.8.11; eat {} without warning */ - expression_t *expression = parse_assignment_expression(); - result = initializer_from_expression(type, expression); + result = parse_scalar_initializer(type); if(token.type == ',') next_token(); - expect('}'); return result; + } else if(token.type == '{') { + next_token(); + + type_path_t path; + memset(&path, 0, sizeof(path)); + path.top_type = orig_type; + path.path = NEW_ARR_F(type_path_entry_t, 0); + + descend_into_subtype(&path); + + result = parse_sub_initializer(&path, orig_type, 1); + + DEL_ARR_F(path.path); + + expect('}'); } else { - result = parse_sub_initializer(type, NULL); + /* TODO ... */ } return result; @@ -1275,22 +1531,14 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) if(token.type == '{') { if(declaration->init.is_defined) { assert(symbol != NULL); - errorf(HERE, "multiple definition of '%s %Y'", + errorf(HERE, "multiple definitions of '%s %Y'", is_struct ? "struct" : "union", symbol); declaration->scope.declarations = NULL; } declaration->init.is_defined = true; - int top = environment_top(); - scope_t *last_scope = scope; - set_scope(&declaration->scope); - - parse_compound_type_entries(); + parse_compound_type_entries(declaration); parse_attributes(); - - assert(scope == &declaration->scope); - set_scope(last_scope); - environment_pop_to(top); } return declaration; @@ -1322,7 +1570,10 @@ static void parse_enum_entries(type_t *const enum_type) if(token.type == '=') { next_token(); - entry->init.enum_value = parse_constant_expression(); + expression_t *value = parse_constant_expression(); + + value = create_implicit_cast(value, enum_type); + entry->init.enum_value = value; /* TODO semantic */ } @@ -1366,7 +1617,7 @@ static type_t *parse_enum_specifier(void) declaration->parent_scope = scope; } - type_t *const type = allocate_type_zero(TYPE_ENUM); + type_t *const type = allocate_type_zero(TYPE_ENUM, declaration->source_position); type->enumt.declaration = declaration; if(token.type == '{') { @@ -1423,7 +1674,7 @@ restart: type = parse_typename(); } else { expression = parse_expression(); - type = expression->base.datatype; + type = expression->base.type; } break; @@ -1433,13 +1684,13 @@ restart: default: expression = parse_expression(); - type = expression->base.datatype; + type = expression->base.type; break; } expect(')'); - type_t *typeof_type = allocate_type_zero(TYPE_TYPEOF); + type_t *typeof_type = allocate_type_zero(TYPE_TYPEOF, expression->base.source_position); typeof_type->typeoft.expression = expression; typeof_type->typeoft.typeof_type = type; @@ -1467,7 +1718,7 @@ typedef enum { static type_t *create_builtin_type(symbol_t *const symbol, type_t *const real_type) { - type_t *type = allocate_type_zero(TYPE_BUILTIN); + type_t *type = allocate_type_zero(TYPE_BUILTIN, builtin_source_position); type->builtin.symbol = symbol; type->builtin.real_type = real_type; @@ -1486,7 +1737,7 @@ static type_t *get_typedef_type(symbol_t *symbol) || declaration->storage_class != STORAGE_CLASS_TYPEDEF) return NULL; - type_t *type = allocate_type_zero(TYPE_TYPEDEF); + type_t *type = allocate_type_zero(TYPE_TYPEDEF, declaration->source_position); type->typedeft.declaration = declaration; return type; @@ -1601,16 +1852,14 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) } break; - /* TODO: if is_type_valid(type) for the following rules should issue - * an error */ case T_struct: { - type = allocate_type_zero(TYPE_COMPOUND_STRUCT); + type = allocate_type_zero(TYPE_COMPOUND_STRUCT, HERE); type->compound.declaration = parse_compound_type_specifier(true); break; } case T_union: { - type = allocate_type_zero(TYPE_COMPOUND_STRUCT); + type = allocate_type_zero(TYPE_COMPOUND_UNION, HERE); type->compound.declaration = parse_compound_type_specifier(false); break; @@ -1627,11 +1876,14 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) break; case T___attribute__: - /* TODO */ parse_attributes(); break; case T_IDENTIFIER: { + /* only parse identifier if we haven't found a type yet */ + if(type != NULL || type_specifiers != 0) + goto finish_specifiers; + type_t *typedef_type = get_typedef_type(token.v.symbol); if(typedef_type == NULL) @@ -1763,7 +2015,7 @@ finish_specifiers: atomic_type = ATOMIC_TYPE_INVALID; } - type = allocate_type_zero(TYPE_ATOMIC); + type = allocate_type_zero(TYPE_ATOMIC, builtin_source_position); type->atomic.akind = atomic_type; newtype = 1; } else { @@ -1805,6 +2057,7 @@ static declaration_t *parse_identifier_list(void) declaration_t *last_declaration = NULL; do { declaration_t *const declaration = allocate_declaration_zero(); + declaration->type = NULL; /* a K&R parameter list has no types, yet */ declaration->source_position = token.source_position; declaration->symbol = token.v.symbol; next_token(); @@ -1849,7 +2102,7 @@ static void semantic_parameter(declaration_t *declaration) } if(is_type_incomplete(type)) { - errorf(HERE, "incomplete type ('%T') not allowed for parameter '%Y'", + errorf(HERE, "incomplete type '%T' not allowed for parameter '%Y'", orig_type, declaration->symbol); } } @@ -1934,11 +2187,11 @@ typedef enum { CONSTRUCT_POINTER, CONSTRUCT_FUNCTION, CONSTRUCT_ARRAY -} construct_type_type_t; +} construct_type_kind_t; typedef struct construct_type_t construct_type_t; struct construct_type_t { - construct_type_type_t type; + construct_type_kind_t kind; construct_type_t *next; }; @@ -1975,7 +2228,7 @@ static construct_type_t *parse_pointer_declarator(void) parsed_pointer_t *pointer = obstack_alloc(&temp_obst, sizeof(pointer[0])); memset(pointer, 0, sizeof(pointer[0])); - pointer->construct_type.type = CONSTRUCT_POINTER; + pointer->construct_type.kind = CONSTRUCT_POINTER; pointer->type_qualifiers = parse_type_qualifiers(); return (construct_type_t*) pointer; @@ -1987,7 +2240,7 @@ static construct_type_t *parse_array_declarator(void) parsed_array_t *array = obstack_alloc(&temp_obst, sizeof(array[0])); memset(array, 0, sizeof(array[0])); - array->construct_type.type = CONSTRUCT_ARRAY; + array->construct_type.kind = CONSTRUCT_ARRAY; if(token.type == T_static) { array->is_static = true; @@ -2019,7 +2272,12 @@ static construct_type_t *parse_function_declarator(declaration_t *declaration) { eat('('); - type_t *type = allocate_type_zero(TYPE_FUNCTION); + type_t *type; + if(declaration != NULL) { + type = allocate_type_zero(TYPE_FUNCTION, declaration->source_position); + } else { + type = allocate_type_zero(TYPE_FUNCTION, token.source_position); + } declaration_t *parameters = parse_parameters(&type->function); if(declaration != NULL) { @@ -2029,7 +2287,7 @@ static construct_type_t *parse_function_declarator(declaration_t *declaration) construct_function_type_t *construct_function_type = obstack_alloc(&temp_obst, sizeof(construct_function_type[0])); memset(construct_function_type, 0, sizeof(construct_function_type[0])); - construct_function_type->construct_type.type = CONSTRUCT_FUNCTION; + construct_function_type->construct_type.kind = CONSTRUCT_FUNCTION; construct_function_type->function_type = type; expect(')'); @@ -2140,7 +2398,7 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, { construct_type_t *iter = construct_list; for( ; iter != NULL; iter = iter->next) { - switch(iter->type) { + switch(iter->kind) { case CONSTRUCT_INVALID: panic("invalid type construction found"); case CONSTRUCT_FUNCTION: { @@ -2166,7 +2424,7 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, case CONSTRUCT_POINTER: { parsed_pointer_t *parsed_pointer = (parsed_pointer_t*) iter; - type_t *pointer_type = allocate_type_zero(TYPE_POINTER); + type_t *pointer_type = allocate_type_zero(TYPE_POINTER, (source_position_t){NULL, 0}); pointer_type->pointer.points_to = type; pointer_type->base.qualifiers = parsed_pointer->type_qualifiers; @@ -2176,13 +2434,22 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, case CONSTRUCT_ARRAY: { parsed_array_t *parsed_array = (parsed_array_t*) iter; - type_t *array_type = allocate_type_zero(TYPE_ARRAY); + type_t *array_type = allocate_type_zero(TYPE_ARRAY, (source_position_t){NULL, 0}); - array_type->base.qualifiers = parsed_array->type_qualifiers; - array_type->array.element_type = type; - array_type->array.is_static = parsed_array->is_static; - array_type->array.is_variable = parsed_array->is_variable; - array_type->array.size = parsed_array->size; + expression_t *size_expression = parsed_array->size; + + array_type->base.qualifiers = parsed_array->type_qualifiers; + array_type->array.element_type = type; + array_type->array.is_static = parsed_array->is_static; + array_type->array.is_variable = parsed_array->is_variable; + array_type->array.size_expression = size_expression; + + if(size_expression != NULL && + is_constant_expression(size_expression)) { + array_type->array.size_constant = true; + array_type->array.size + = fold_constant(size_expression); + } type_t *skipped_type = skip_typeref(type); if (is_type_atomic(skipped_type, ATOMIC_TYPE_VOID)) { @@ -2199,7 +2466,7 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, if(hashed_type != type) { /* the function type was constructed earlier freeing it here will * destroy other types... */ - if(iter->type != CONSTRUCT_FUNCTION) { + if(iter->kind != CONSTRUCT_FUNCTION) { free_type(type); } type = hashed_type; @@ -2314,8 +2581,8 @@ static declaration_t *internal_record_declaration( const symbol_t *const symbol = declaration->symbol; const namespace_t namespc = (namespace_t)declaration->namespc; - type_t *const orig_type = declaration->type; - const type_t *const type = skip_typeref(orig_type); + 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) { @@ -2328,7 +2595,9 @@ static declaration_t *internal_record_declaration( check_type_of_main(declaration, &type->function); } - declaration_t *const previous_declaration = get_declaration(symbol, namespc); + 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) { @@ -2337,18 +2606,27 @@ static declaration_t *internal_record_declaration( previous_declaration->type = declaration->type; } - const type_t *const prev_type = skip_typeref(previous_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 previous declaration '%#T'", - orig_type, symbol, previous_declaration->type, symbol); - errorf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol); + "declaration '%#T' is incompatible with " + "previous declaration '%#T'", + orig_type, symbol, previous_declaration->type, symbol); + errorf(previous_declaration->source_position, + "previous declaration of '%Y' was here", symbol); } else { - unsigned old_storage_class = previous_declaration->storage_class; + unsigned old_storage_class + = previous_declaration->storage_class; unsigned new_storage_class = declaration->storage_class; - /* pretend no storage class means extern for function declarations - * (except if the previous declaration is neither none nor extern) */ + if(is_type_incomplete(prev_type)) { + 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: @@ -2359,7 +2637,9 @@ static declaration_t *internal_record_declaration( 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); + 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; @@ -2374,14 +2654,20 @@ static declaration_t *internal_record_declaration( new_storage_class == STORAGE_CLASS_EXTERN) { warn_redundant_declaration: if (warning.redundant_decls) { - warningf(declaration->source_position, "redundant declaration for '%Y'", symbol); - warningf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol); + warningf(declaration->source_position, + "redundant declaration for '%Y'", symbol); + warningf(previous_declaration->source_position, + "previous declaration of '%Y' was here", + symbol); } } 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", symbol); - errorf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol); + errorf(declaration->source_position, + "static declaration of '%Y' follows non-static declaration", + symbol); + errorf(previous_declaration->source_position, + "previous declaration of '%Y' was here", symbol); } else { if (old_storage_class != STORAGE_CLASS_EXTERN && !is_function_definition) { goto warn_redundant_declaration; @@ -2392,11 +2678,15 @@ warn_redundant_declaration: } } else { if (old_storage_class == new_storage_class) { - errorf(declaration->source_position, "redeclaration of '%Y'", symbol); + errorf(declaration->source_position, + "redeclaration of '%Y'", symbol); } else { - errorf(declaration->source_position, "redeclaration of '%Y' with different linkage", symbol); + errorf(declaration->source_position, + "redeclaration of '%Y' with different linkage", + symbol); } - errorf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol); + errorf(previous_declaration->source_position, + "previous declaration of '%Y' was here", symbol); } } return previous_declaration; @@ -2404,9 +2694,12 @@ warn_redundant_declaration: } else if (is_function_definition) { if (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); + warningf(declaration->source_position, + "no previous prototype for '%#T'", orig_type, symbol); } else if (warning.missing_declarations && !is_sym_main(symbol)) { - warningf(declaration->source_position, "no previous declaration for '%#T'", orig_type, symbol); + warningf(declaration->source_position, + "no previous declaration for '%#T'", orig_type, + symbol); } } } else if (warning.missing_declarations && @@ -2415,11 +2708,11 @@ warn_redundant_declaration: declaration->storage_class == STORAGE_CLASS_NONE || declaration->storage_class == STORAGE_CLASS_THREAD )) { - warningf(declaration->source_position, "no previous declaration for '%#T'", orig_type, symbol); + warningf(declaration->source_position, + "no previous declaration for '%#T'", orig_type, symbol); } assert(declaration->parent_scope == NULL); - assert(declaration->symbol != NULL); assert(scope != NULL); declaration->parent_scope = scope; @@ -2484,32 +2777,38 @@ static void parse_init_declarator_rest(declaration_t *declaration) if(is_type_array(type) && initializer != NULL) { array_type_t *array_type = &type->array; - if(array_type->size == NULL) { - expression_t *cnst = allocate_expression_zero(EXPR_CONST); - - cnst->base.datatype = type_size_t; - + if(array_type->size_expression == NULL) { + size_t size; switch (initializer->kind) { case INITIALIZER_LIST: { - cnst->conste.v.int_value = initializer->list.len; + /* TODO */ + size = initializer->list.len; break; } case INITIALIZER_STRING: { - cnst->conste.v.int_value = initializer->string.string.size; + size = initializer->string.string.size; break; } case INITIALIZER_WIDE_STRING: { - cnst->conste.v.int_value = initializer->wide_string.string.size; + size = initializer->wide_string.string.size; break; } - default: + default: { panic("invalid initializer type"); + break; + } } - array_type->size = cnst; + expression_t *cnst = allocate_expression_zero(EXPR_CONST); + cnst->base.type = type_size_t; + cnst->conste.v.int_value = size; + + array_type->size_expression = cnst; + array_type->size_constant = true; + array_type->size = size; } } @@ -2610,9 +2909,9 @@ static declaration_t *finished_kr_declaration(declaration_t *declaration) } if(previous_declaration->type == NULL) { - previous_declaration->type = declaration->type; - previous_declaration->storage_class = declaration->storage_class; - previous_declaration->parent_scope = scope; + previous_declaration->type = declaration->type; + previous_declaration->storage_class = declaration->storage_class; + previous_declaration->parent_scope = scope; return previous_declaration; } else { return record_declaration(declaration); @@ -2626,7 +2925,7 @@ static void parse_declaration(parsed_declaration_func finished_declaration) parse_declaration_specifiers(&specifiers); if(token.type == ';') { - parse_anonymous_declaration_rest(&specifiers, finished_declaration); + parse_anonymous_declaration_rest(&specifiers, append_declaration); } else { declaration_t *declaration = parse_declarator(&specifiers, /*may_be_abstract=*/false); parse_declaration_rest(declaration, &specifiers, finished_declaration); @@ -2743,8 +3042,8 @@ static void check_labels(void) label->used = true; if (label->source_position.input_name == NULL) { print_in_function(); - errorf(goto_statement->statement.source_position, - "label '%Y' used but not defined", label->symbol); + errorf(goto_statement->base.source_position, + "label '%Y' used but not defined", label->symbol); } } goto_first = goto_last = NULL; @@ -2757,7 +3056,7 @@ static void check_labels(void) if (! label->used) { print_in_function(); - warningf(label_statement->statement.source_position, + warningf(label_statement->base.source_position, "label '%Y' defined but not used", label->symbol); } } @@ -2892,47 +3191,130 @@ end_of_parse_external_declaration: environment_pop_to(top); } -static type_t *make_bitfield_type(type_t *base, expression_t *size) +static type_t *make_bitfield_type(type_t *base, expression_t *size, + source_position_t source_position) { - type_t *type = allocate_type_zero(TYPE_BITFIELD); + type_t *type = allocate_type_zero(TYPE_BITFIELD, source_position); type->bitfield.base = base; type->bitfield.size = size; return type; } -static void parse_struct_declarators(const declaration_specifiers_t *specifiers) +static declaration_t *find_compound_entry(declaration_t *compound_declaration, + symbol_t *symbol) +{ + declaration_t *iter = compound_declaration->scope.declarations; + for( ; iter != NULL; iter = iter->next) { + if(iter->namespc != NAMESPACE_NORMAL) + continue; + + if(iter->symbol == NULL) { + type_t *type = skip_typeref(iter->type); + if(is_type_compound(type)) { + declaration_t *result + = find_compound_entry(type->compound.declaration, symbol); + if(result != NULL) + return result; + } + continue; + } + + if(iter->symbol == symbol) { + return iter; + } + } + + return NULL; +} + +static void parse_compound_declarators(declaration_t *struct_declaration, + const declaration_specifiers_t *specifiers) { - /* TODO: check constraints for struct declarations (in specifiers) */ + declaration_t *last_declaration = struct_declaration->scope.declarations; + if(last_declaration != NULL) { + while(last_declaration->next != NULL) { + last_declaration = last_declaration->next; + } + } + while(1) { declaration_t *declaration; if(token.type == ':') { + source_position_t source_position = HERE; next_token(); type_t *base_type = specifiers->type; expression_t *size = parse_constant_expression(); - type_t *type = make_bitfield_type(base_type, size); + if(!is_type_integer(skip_typeref(base_type))) { + errorf(HERE, "bitfield base type '%T' is not an integer type", + base_type); + } + + type_t *type = make_bitfield_type(base_type, size, source_position); - declaration = allocate_declaration_zero(); + declaration = allocate_declaration_zero(); declaration->namespc = NAMESPACE_NORMAL; declaration->storage_class = STORAGE_CLASS_NONE; - declaration->source_position = token.source_position; + declaration->source_position = source_position; declaration->modifiers = specifiers->decl_modifiers; declaration->type = type; } else { declaration = parse_declarator(specifiers,/*may_be_abstract=*/true); + type_t *orig_type = declaration->type; + type_t *type = skip_typeref(orig_type); + if(token.type == ':') { + source_position_t source_position = HERE; next_token(); expression_t *size = parse_constant_expression(); - type_t *type = make_bitfield_type(declaration->type, size); - declaration->type = type; + if(!is_type_integer(type)) { + errorf(HERE, "bitfield base type '%T' is not an " + "integer type", orig_type); + } + + type_t *bitfield_type = make_bitfield_type(orig_type, size, source_position); + declaration->type = bitfield_type; + } 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)) { + errorf(HERE, + "compound member '%Y' has incomplete type '%T'", + declaration->symbol, orig_type); + } else if(is_type_function(type)) { + errorf(HERE, "compound member '%Y' must not have function " + "type '%T'", declaration->symbol, orig_type); + } + } + } + + /* make sure we don't define a symbol multiple times */ + symbol_t *symbol = declaration->symbol; + if(symbol != NULL) { + declaration_t *prev_decl + = find_compound_entry(struct_declaration, symbol); + + if(prev_decl != NULL) { + assert(prev_decl->symbol == symbol); + errorf(declaration->source_position, + "multiple declarations of symbol '%Y'", symbol); + errorf(prev_decl->source_position, + "previous declaration of '%Y' was here", symbol); } } - record_declaration(declaration); + + /* append declaration */ + if(last_declaration != NULL) { + last_declaration->next = declaration; + } else { + struct_declaration->scope.declarations = declaration; + } + last_declaration = declaration; if(token.type != ',') break; @@ -2941,7 +3323,7 @@ static void parse_struct_declarators(const declaration_specifiers_t *specifiers) expect_void(';'); } -static void parse_compound_type_entries(void) +static void parse_compound_type_entries(declaration_t *compound_declaration) { eat('{'); @@ -2950,7 +3332,7 @@ static void parse_compound_type_entries(void) memset(&specifiers, 0, sizeof(specifiers)); parse_declaration_specifiers(&specifiers); - parse_struct_declarators(&specifiers); + parse_compound_declarators(compound_declaration, &specifiers); } if(token.type == T_EOF) { errorf(HERE, "EOF while parsing struct"); @@ -3021,34 +3403,82 @@ static expression_t *expected_expression_error(void) */ static expression_t *parse_string_const(void) { - expression_t *cnst = allocate_expression_zero(EXPR_STRING_LITERAL); - cnst->base.datatype = type_string; - cnst->string.value = parse_string_literals(); + wide_string_t wres; + if (token.type == T_STRING_LITERAL) { + string_t res = token.v.string; + next_token(); + while (token.type == T_STRING_LITERAL) { + res = concat_strings(&res, &token.v.string); + next_token(); + } + if (token.type != T_WIDE_STRING_LITERAL) { + expression_t *const cnst = allocate_expression_zero(EXPR_STRING_LITERAL); + cnst->base.type = type_char_ptr; + cnst->string.value = res; + return cnst; + } - return cnst; + wres = concat_string_wide_string(&res, &token.v.wide_string); + } else { + wres = token.v.wide_string; + } + next_token(); + + for (;;) { + switch (token.type) { + case T_WIDE_STRING_LITERAL: + wres = concat_wide_strings(&wres, &token.v.wide_string); + break; + + case T_STRING_LITERAL: + wres = concat_wide_string_string(&wres, &token.v.string); + break; + + default: { + expression_t *const cnst = allocate_expression_zero(EXPR_WIDE_STRING_LITERAL); + cnst->base.type = type_wchar_t_ptr; + cnst->wide_string.value = wres; + return cnst; + } + } + next_token(); + } } /** - * Parse a wide string constant. + * Parse an integer constant. */ -static expression_t *parse_wide_string_const(void) +static expression_t *parse_int_const(void) { - expression_t *const cnst = allocate_expression_zero(EXPR_WIDE_STRING_LITERAL); - cnst->base.datatype = type_wchar_t_ptr; - cnst->wide_string.value = token.v.wide_string; /* TODO concatenate */ + expression_t *cnst = allocate_expression_zero(EXPR_CONST); + cnst->base.source_position = HERE; + cnst->base.type = token.datatype; + cnst->conste.v.int_value = token.v.intvalue; + next_token(); + return cnst; } /** - * Parse an integer constant. + * Parse a character constant. */ -static expression_t *parse_int_const(void) +static expression_t *parse_char_const(void) { - expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->base.datatype = token.datatype; - cnst->conste.v.int_value = token.v.intvalue; + expression_t *cnst = allocate_expression_zero(EXPR_CHAR_CONST); + cnst->base.source_position = HERE; + cnst->base.type = token.datatype; + cnst->conste.v.chars.begin = token.v.string.begin; + cnst->conste.v.chars.size = token.v.string.size; + if (cnst->conste.v.chars.size != 1) { + if (warning.multichar && (c_mode & _GNUC)) { + /* TODO */ + warningf(HERE, "multi-character character constant"); + } else { + errorf(HERE, "more than 1 characters in character constant"); + } + } next_token(); return cnst; @@ -3060,7 +3490,7 @@ static expression_t *parse_int_const(void) static expression_t *parse_float_const(void) { expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->base.datatype = token.datatype; + cnst->base.type = token.datatype; cnst->conste.v.float_value = token.v.floatvalue; next_token(); @@ -3071,7 +3501,7 @@ static expression_t *parse_float_const(void) static declaration_t *create_implicit_function(symbol_t *symbol, const source_position_t source_position) { - type_t *ntype = allocate_type_zero(TYPE_FUNCTION); + type_t *ntype = allocate_type_zero(TYPE_FUNCTION, source_position); ntype->function.return_type = type_int; ntype->function.unspecified_parameters = true; @@ -3115,7 +3545,7 @@ static type_t *make_function_1_type(type_t *return_type, type_t *argument_type) memset(parameter, 0, sizeof(parameter[0])); parameter->type = argument_type; - type_t *type = allocate_type_zero(TYPE_FUNCTION); + type_t *type = allocate_type_zero(TYPE_FUNCTION, builtin_source_position); type->function.return_type = return_type; type->function.parameters = parameter; @@ -3138,11 +3568,11 @@ static type_t *get_builtin_symbol_type(symbol_t *symbol) case T___builtin_alloca: return make_function_1_type(type_void_ptr, type_size_t); case T___builtin_nan: - return make_function_1_type(type_double, type_string); + return make_function_1_type(type_double, type_char_ptr); case T___builtin_nanf: - return make_function_1_type(type_float, type_string); + return make_function_1_type(type_float, type_char_ptr); case T___builtin_nand: - return make_function_1_type(type_long_double, type_string); + 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); default: @@ -3185,7 +3615,7 @@ type_t *revert_automatic_type_conversion(const expression_t *expression) case EXPR_UNARY_DEREFERENCE: { const expression_t *const value = expression->unary.value; - type_t *const type = skip_typeref(value->base.datatype); + type_t *const type = skip_typeref(value->base.type); assert(is_type_pointer(type)); return type->pointer.points_to; } @@ -3194,8 +3624,8 @@ type_t *revert_automatic_type_conversion(const expression_t *expression) return get_builtin_symbol_type(expression->builtin_symbol.symbol); case EXPR_ARRAY_ACCESS: { - const expression_t *const array_ref = expression->array_access.array_ref; - type_t *const type_left = skip_typeref(array_ref->base.datatype); + const expression_t *array_ref = expression->array_access.array_ref; + type_t *type_left = skip_typeref(array_ref->base.type); if (!is_type_valid(type_left)) return type_left; assert(is_type_pointer(type_left)); @@ -3205,7 +3635,7 @@ type_t *revert_automatic_type_conversion(const expression_t *expression) default: break; } - return expression->base.datatype; + return expression->base.type; } static expression_t *parse_reference(void) @@ -3232,7 +3662,7 @@ static expression_t *parse_reference(void) source_position); } else { errorf(HERE, "unknown symbol '%Y' found.", ref->symbol); - return expression; + return create_invalid_expression(); } } @@ -3242,8 +3672,8 @@ static expression_t *parse_reference(void) * code to revert this! */ type = automatic_type_conversion(type); - ref->declaration = declaration; - ref->expression.datatype = type; + ref->declaration = declaration; + ref->base.type = type; /* this declaration is used */ declaration->used = true; @@ -3258,21 +3688,38 @@ static void check_cast_allowed(expression_t *expression, type_t *dest_type) /* TODO check if explicit cast is allowed and issue warnings/errors */ } -static expression_t *parse_cast(void) +static expression_t *parse_compound_literal(type_t *type) { - expression_t *cast = allocate_expression_zero(EXPR_UNARY_CAST); + expression_t *expression = allocate_expression_zero(EXPR_COMPOUND_LITERAL); - cast->base.source_position = token.source_position; + expression->compound_literal.type = type; + expression->compound_literal.initializer = parse_initializer(type); + expression->base.type = automatic_type_conversion(type); + + return expression; +} + +static expression_t *parse_cast(void) +{ + source_position_t source_position = token.source_position; type_t *type = parse_typename(); expect(')'); + + if(token.type == '{') { + return parse_compound_literal(type); + } + + expression_t *cast = allocate_expression_zero(EXPR_UNARY_CAST); + cast->base.source_position = source_position; + expression_t *value = parse_sub_expression(20); check_cast_allowed(value, type); - cast->base.datatype = type; - cast->unary.value = value; + cast->base.type = type; + cast->unary.value = value; return cast; } @@ -3293,12 +3740,12 @@ static expression_t *parse_statement_expression(void) stmt = stmt->base.next; if (stmt->kind == STATEMENT_EXPRESSION) { - type = stmt->expression.expression->base.datatype; + type = stmt->expression.expression->base.type; } } else { warningf(expression->base.source_position, "empty statement expression ({})"); } - expression->base.datatype = type; + expression->base.type = type; expect(')'); @@ -3338,13 +3785,10 @@ static expression_t *parse_function_keyword(void) errorf(HERE, "'__func__' used outside of a function"); } - string_literal_expression_t *expression - = allocate_ast_zero(sizeof(expression[0])); - - expression->expression.kind = EXPR_FUNCTION; - expression->expression.datatype = type_string; + expression_t *expression = allocate_expression_zero(EXPR_FUNCTION); + expression->base.type = type_char_ptr; - return (expression_t*) expression; + return expression; } static expression_t *parse_pretty_function_keyword(void) @@ -3356,18 +3800,16 @@ static expression_t *parse_pretty_function_keyword(void) errorf(HERE, "'__PRETTY_FUNCTION__' used outside of a function"); } - string_literal_expression_t *expression - = allocate_ast_zero(sizeof(expression[0])); + expression_t *expression = allocate_expression_zero(EXPR_PRETTY_FUNCTION); + expression->base.type = type_char_ptr; - expression->expression.kind = EXPR_PRETTY_FUNCTION; - expression->expression.datatype = type_string; - - return (expression_t*) expression; + return expression; } static designator_t *parse_designator(void) { - designator_t *result = allocate_ast_zero(sizeof(result[0])); + designator_t *result = allocate_ast_zero(sizeof(result[0])); + result->source_position = HERE; if(token.type != T_IDENTIFIER) { parse_error_expected("while parsing member designator", @@ -3388,8 +3830,9 @@ static designator_t *parse_designator(void) eat_paren(); return NULL; } - designator_t *designator = allocate_ast_zero(sizeof(result[0])); - designator->symbol = token.v.symbol; + designator_t *designator = allocate_ast_zero(sizeof(result[0])); + designator->source_position = HERE; + designator->symbol = token.v.symbol; next_token(); last_designator->next = designator; @@ -3398,9 +3841,10 @@ static designator_t *parse_designator(void) } if(token.type == '[') { next_token(); - designator_t *designator = allocate_ast_zero(sizeof(result[0])); - designator->array_access = parse_expression(); - if(designator->array_access == NULL) { + designator_t *designator = allocate_ast_zero(sizeof(result[0])); + designator->source_position = HERE; + designator->array_index = parse_expression(); + if(designator->array_index == NULL) { eat_paren(); return NULL; } @@ -3420,15 +3864,31 @@ static expression_t *parse_offsetof(void) { eat(T___builtin_offsetof); - expression_t *expression = allocate_expression_zero(EXPR_OFFSETOF); - expression->base.datatype = type_size_t; + expression_t *expression = allocate_expression_zero(EXPR_OFFSETOF); + expression->base.type = type_size_t; expect('('); - expression->offsetofe.type = parse_typename(); + type_t *type = parse_typename(); expect(','); - expression->offsetofe.designator = parse_designator(); + designator_t *designator = parse_designator(); expect(')'); + expression->offsetofe.type = type; + expression->offsetofe.designator = designator; + + type_path_t path; + memset(&path, 0, sizeof(path)); + path.top_type = type; + path.path = NEW_ARR_F(type_path_entry_t, 0); + + descend_into_subtype(&path); + + if(!walk_designator(&path, designator, true)) { + return create_invalid_expression(); + } + + DEL_ARR_F(path.path); + return expression; } @@ -3444,6 +3904,8 @@ static expression_t *parse_va_start(void) expression_t *const expr = parse_assignment_expression(); if (expr->kind == EXPR_REFERENCE) { declaration_t *const decl = expr->reference.declaration; + if (decl == NULL) + return create_invalid_expression(); if (decl->parent_scope == ¤t_function->scope && decl->next == NULL) { expression->va_starte.parameter = decl; @@ -3465,7 +3927,7 @@ static expression_t *parse_va_arg(void) expect('('); expression->va_arge.ap = parse_assignment_expression(); expect(','); - expression->base.datatype = parse_typename(); + expression->base.type = parse_typename(); expect(')'); return expression; @@ -3483,7 +3945,7 @@ static expression_t *parse_builtin_symbol(void) type_t *type = get_builtin_symbol_type(symbol); type = automatic_type_conversion(type); - expression->base.datatype = type; + expression->base.type = type; return expression; } @@ -3496,7 +3958,7 @@ static expression_t *parse_builtin_constant(void) expect('('); expression->builtin_constant.value = parse_assignment_expression(); expect(')'); - expression->base.datatype = type_int; + expression->base.type = type_int; return expression; } @@ -3518,7 +3980,7 @@ static expression_t *parse_builtin_prefetch(void) expression->builtin_prefetch.locality = parse_assignment_expression(); } expect(')'); - expression->base.datatype = type_void; + expression->base.type = type_void; return expression; } @@ -3559,8 +4021,8 @@ static expression_t *parse_compare_builtin(void) expression->binary.right = parse_assignment_expression(); expect(')'); - type_t *const orig_type_left = expression->binary.left->base.datatype; - type_t *const orig_type_right = expression->binary.right->base.datatype; + type_t *const orig_type_left = expression->binary.left->base.type; + type_t *const orig_type_right = expression->binary.right->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); @@ -3589,7 +4051,7 @@ static expression_t *parse_builtin_expect(void) expression->binary.right = parse_constant_expression(); expect(')'); - expression->base.datatype = expression->binary.left->base.datatype; + expression->base.type = expression->binary.left->base.type; return expression; } @@ -3604,59 +4066,45 @@ static expression_t *parse_assume(void) { expression->unary.value = parse_assignment_expression(); expect(')'); - expression->base.datatype = type_void; + expression->base.type = type_void; return expression; } static expression_t *parse_primary_expression(void) { - switch(token.type) { - case T_INTEGER: - return parse_int_const(); - case T_FLOATINGPOINT: - return parse_float_const(); - case T_STRING_LITERAL: - return parse_string_const(); - case T_WIDE_STRING_LITERAL: - return parse_wide_string_const(); - case T_IDENTIFIER: - return parse_reference(); - case T___FUNCTION__: - case T___func__: - return parse_function_keyword(); - case T___PRETTY_FUNCTION__: - return parse_pretty_function_keyword(); - case T___builtin_offsetof: - return parse_offsetof(); - case T___builtin_va_start: - return parse_va_start(); - case T___builtin_va_arg: - return parse_va_arg(); - case T___builtin_expect: - return parse_builtin_expect(); - case T___builtin_nanf: - case T___builtin_alloca: - case T___builtin_va_end: - return parse_builtin_symbol(); - case T___builtin_isgreater: - case T___builtin_isgreaterequal: - case T___builtin_isless: - case T___builtin_islessequal: - case T___builtin_islessgreater: - case T___builtin_isunordered: - return parse_compare_builtin(); - case T___builtin_constant_p: - return parse_builtin_constant(); - case T___builtin_prefetch: - return parse_builtin_prefetch(); - case T_assume: - return parse_assume(); - - case '(': - return parse_brace_expression(); - } - - errorf(HERE, "unexpected token '%K'", &token); + switch (token.type) { + case T_INTEGER: return parse_int_const(); + case T_CHARS: return parse_char_const(); + case T_FLOATINGPOINT: return parse_float_const(); + case T_STRING_LITERAL: + case T_WIDE_STRING_LITERAL: return parse_string_const(); + case T_IDENTIFIER: return parse_reference(); + case T___FUNCTION__: + case T___func__: return parse_function_keyword(); + case T___PRETTY_FUNCTION__: return parse_pretty_function_keyword(); + case T___builtin_offsetof: return parse_offsetof(); + case T___builtin_va_start: return parse_va_start(); + case T___builtin_va_arg: return parse_va_arg(); + case T___builtin_expect: return parse_builtin_expect(); + case T___builtin_alloca: + case T___builtin_nan: + case T___builtin_nand: + case T___builtin_nanf: + case T___builtin_va_end: return parse_builtin_symbol(); + case T___builtin_isgreater: + case T___builtin_isgreaterequal: + case T___builtin_isless: + case T___builtin_islessequal: + case T___builtin_islessgreater: + case T___builtin_isunordered: return parse_compare_builtin(); + case T___builtin_constant_p: return parse_builtin_constant(); + case T___builtin_prefetch: return parse_builtin_prefetch(); + case T_assume: return parse_assume(); + + case '(': return parse_brace_expression(); + } + + errorf(HERE, "unexpected token %K, expected an expression", &token); eat_statement(); return create_invalid_expression(); @@ -3666,7 +4114,7 @@ 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) { - type_t *const type = expression->base.datatype; + type_t *const type = expression->base.type; const type_t *const base_type = skip_typeref(type); if (is_type_atomic(base_type, ATOMIC_TYPE_CHAR) && @@ -3685,13 +4133,12 @@ static expression_t *parse_array_expression(unsigned precedence, expression_t *inside = parse_expression(); - array_access_expression_t *array_access - = allocate_ast_zero(sizeof(array_access[0])); + expression_t *expression = allocate_expression_zero(EXPR_ARRAY_ACCESS); - array_access->expression.kind = EXPR_ARRAY_ACCESS; + array_access_expression_t *array_access = &expression->array_access; - type_t *const orig_type_left = left->base.datatype; - type_t *const orig_type_inside = inside->base.datatype; + type_t *const orig_type_left = left->base.type; + type_t *const orig_type_inside = inside->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_inside = skip_typeref(orig_type_inside); @@ -3720,31 +4167,30 @@ static expression_t *parse_array_expression(unsigned precedence, if(token.type != ']') { parse_error_expected("Problem while parsing array access", ']', 0); - return (expression_t*) array_access; + return expression; } next_token(); - return_type = automatic_type_conversion(return_type); - array_access->expression.datatype = return_type; + return_type = automatic_type_conversion(return_type); + expression->base.type = return_type; - return (expression_t*) array_access; + return expression; } static expression_t *parse_typeprop(expression_kind_t kind, unsigned precedence) { - expression_t *tp_expression - = allocate_expression_zero(kind); - tp_expression->base.datatype = type_size_t; + expression_t *tp_expression = allocate_expression_zero(kind); + tp_expression->base.type = type_size_t; if(token.type == '(' && is_declaration_specifier(look_ahead(1), true)) { next_token(); tp_expression->typeprop.type = parse_typename(); expect(')'); } else { - expression_t *expression = parse_sub_expression(precedence); - expression->base.datatype = revert_automatic_type_conversion(expression); + expression_t *expression = parse_sub_expression(precedence); + expression->base.type = revert_automatic_type_conversion(expression); - tp_expression->typeprop.type = expression->base.datatype; + tp_expression->typeprop.type = expression->base.type; tp_expression->typeprop.tp_expression = expression; } @@ -3783,7 +4229,7 @@ static expression_t *parse_select_expression(unsigned precedence, select->select.symbol = symbol; next_token(); - type_t *const orig_type = compound->base.datatype; + type_t *const orig_type = compound->base.type; type_t *const type = skip_typeref(orig_type); type_t *type_left = type; @@ -3815,12 +4261,7 @@ static expression_t *parse_select_expression(unsigned precedence, return create_invalid_expression(); } - declaration_t *iter = declaration->scope.declarations; - for( ; iter != NULL; iter = iter->next) { - if(iter->symbol == symbol) { - break; - } - } + declaration_t *iter = find_compound_entry(declaration, symbol); if(iter == NULL) { errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol); return create_invalid_expression(); @@ -3831,13 +4272,13 @@ static expression_t *parse_select_expression(unsigned precedence, type_t *expression_type = automatic_type_conversion(iter->type); select->select.compound_entry = iter; - select->base.datatype = expression_type; + 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.datatype = expression_type->bitfield.base; + extract->unary.value = select; + extract->base.type = expression_type->bitfield.base; return extract; } @@ -3859,7 +4300,7 @@ static expression_t *parse_call_expression(unsigned precedence, call_expression_t *call = &result->call; call->function = expression; - type_t *const orig_type = expression->base.datatype; + type_t *const orig_type = expression->base.type; type_t *const type = skip_typeref(orig_type); function_type_t *function_type = NULL; @@ -3867,8 +4308,8 @@ static expression_t *parse_call_expression(unsigned precedence, type_t *const to_type = skip_typeref(type->pointer.points_to); if (is_type_function(to_type)) { - function_type = &to_type->function; - call->expression.datatype = function_type->return_type; + function_type = &to_type->function; + call->base.type = function_type->return_type; } } @@ -3913,7 +4354,7 @@ static expression_t *parse_call_expression(unsigned precedence, /* 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.datatype, expected_type); + arg_expr, arg_expr->base.type, expected_type); } else { argument->expression = create_implicit_cast(argument->expression, expected_type); } @@ -3929,7 +4370,7 @@ static expression_t *parse_call_expression(unsigned precedence, } else { /* do default promotion */ for( ; argument != NULL; argument = argument->next) { - type_t *type = argument->expression->base.datatype; + type_t *type = argument->expression->base.type; type = skip_typeref(type); if(is_type_integer(type)) { @@ -3978,7 +4419,7 @@ static expression_t *parse_conditional_expression(unsigned precedence, conditional->condition = expression; /* 6.5.15.2 */ - type_t *const condition_type_orig = expression->base.datatype; + type_t *const condition_type_orig = expression->base.type; type_t *const condition_type = skip_typeref(condition_type_orig); if (!is_type_scalar(condition_type) && is_type_valid(condition_type)) { type_error("expected a scalar type in conditional condition", @@ -3989,11 +4430,8 @@ static expression_t *parse_conditional_expression(unsigned precedence, expect(':'); expression_t *false_expression = parse_sub_expression(precedence); - conditional->true_expression = true_expression; - conditional->false_expression = false_expression; - - type_t *const orig_true_type = true_expression->base.datatype; - type_t *const orig_false_type = false_expression->base.datatype; + type_t *const orig_true_type = true_expression->base.type; + type_t *const orig_false_type = false_expression->base.type; type_t *const true_type = skip_typeref(orig_true_type); type_t *const false_type = skip_typeref(orig_false_type); @@ -4005,9 +4443,9 @@ static expression_t *parse_conditional_expression(unsigned precedence, true_expression = create_implicit_cast(true_expression, result_type); false_expression = create_implicit_cast(false_expression, result_type); - conditional->true_expression = true_expression; - conditional->false_expression = false_expression; - conditional->expression.datatype = result_type; + conditional->true_expression = true_expression; + conditional->false_expression = false_expression; + conditional->base.type = result_type; } else if (same_compound_type(true_type, false_type) || ( is_type_atomic(true_type, ATOMIC_TYPE_VOID) && is_type_atomic(false_type, ATOMIC_TYPE_VOID) @@ -4018,8 +4456,15 @@ static expression_t *parse_conditional_expression(unsigned precedence, && pointers_compatible(true_type, false_type)) { /* ok */ result_type = true_type; + } else if (is_type_pointer(true_type) + && is_null_pointer_constant(false_expression)) { + result_type = true_type; + } else if (is_type_pointer(false_type) + && is_null_pointer_constant(true_expression)) { + result_type = false_type; } else { - /* TODO */ + /* TODO: one pointer to void*, other some pointer */ + if (is_type_valid(true_type) && is_type_valid(false_type)) { type_error_incompatible("while parsing conditional", expression->base.source_position, true_type, @@ -4028,7 +4473,11 @@ static expression_t *parse_conditional_expression(unsigned precedence, result_type = type_error_type; } - conditional->expression.datatype = result_type; + conditional->true_expression + = create_implicit_cast(true_expression, result_type); + conditional->false_expression + = create_implicit_cast(false_expression, result_type); + conditional->base.type = result_type; return result; } @@ -4049,8 +4498,8 @@ static expression_t *parse_builtin_classify_type(const unsigned precedence) { eat(T___builtin_classify_type); - expression_t *result = allocate_expression_zero(EXPR_CLASSIFY_TYPE); - result->base.datatype = type_int; + expression_t *result = allocate_expression_zero(EXPR_CLASSIFY_TYPE); + result->base.type = type_int; expect('('); expression_t *expression = parse_sub_expression(precedence); @@ -4062,7 +4511,7 @@ static expression_t *parse_builtin_classify_type(const unsigned precedence) static void semantic_incdec(unary_expression_t *expression) { - type_t *const orig_type = expression->value->base.datatype; + 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) { @@ -4073,12 +4522,12 @@ static void semantic_incdec(unary_expression_t *expression) return; } - expression->expression.datatype = orig_type; + expression->base.type = orig_type; } static void semantic_unexpr_arithmetic(unary_expression_t *expression) { - type_t *const orig_type = expression->value->base.datatype; + 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_valid(type)) { @@ -4088,12 +4537,12 @@ static void semantic_unexpr_arithmetic(unary_expression_t *expression) return; } - expression->expression.datatype = orig_type; + expression->base.type = orig_type; } static void semantic_unexpr_scalar(unary_expression_t *expression) { - type_t *const orig_type = expression->value->base.datatype; + type_t *const orig_type = expression->value->base.type; type_t *const type = skip_typeref(orig_type); if (!is_type_scalar(type)) { if (is_type_valid(type)) { @@ -4102,12 +4551,12 @@ static void semantic_unexpr_scalar(unary_expression_t *expression) return; } - expression->expression.datatype = orig_type; + expression->base.type = orig_type; } static void semantic_unexpr_integer(unary_expression_t *expression) { - type_t *const orig_type = expression->value->base.datatype; + type_t *const orig_type = expression->value->base.type; type_t *const type = skip_typeref(orig_type); if (!is_type_integer(type)) { if (is_type_valid(type)) { @@ -4116,12 +4565,12 @@ static void semantic_unexpr_integer(unary_expression_t *expression) return; } - expression->expression.datatype = orig_type; + expression->base.type = orig_type; } static void semantic_dereference(unary_expression_t *expression) { - type_t *const orig_type = expression->value->base.datatype; + 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_valid(type)) { @@ -4130,9 +4579,9 @@ static void semantic_dereference(unary_expression_t *expression) return; } - type_t *result_type = type->pointer.points_to; - result_type = automatic_type_conversion(result_type); - expression->expression.datatype = result_type; + type_t *result_type = type->pointer.points_to; + result_type = automatic_type_conversion(result_type); + expression->base.type = result_type; } /** @@ -4140,10 +4589,10 @@ static void semantic_dereference(unary_expression_t *expression) */ static void semantic_take_addr(unary_expression_t *expression) { - expression_t *value = expression->value; - value->base.datatype = revert_automatic_type_conversion(value); + expression_t *value = expression->value; + value->base.type = revert_automatic_type_conversion(value); - type_t *orig_type = value->base.datatype; + type_t *orig_type = value->base.type; if(!is_type_valid(orig_type)) return; @@ -4151,7 +4600,7 @@ static void semantic_take_addr(unary_expression_t *expression) declaration_t *const declaration = value->reference.declaration; if(declaration != NULL) { if (declaration->storage_class == STORAGE_CLASS_REGISTER) { - errorf(expression->expression.source_position, + errorf(expression->base.source_position, "address of register variable '%Y' requested", declaration->symbol); } @@ -4159,7 +4608,7 @@ static void semantic_take_addr(unary_expression_t *expression) } } - expression->expression.datatype = make_pointer_type(orig_type, TYPE_QUALIFIER_NONE); + expression->base.type = make_pointer_type(orig_type, TYPE_QUALIFIER_NONE); } #define CREATE_UNARY_EXPRESSION_PARSER(token_type, unexpression_type, sfunc) \ @@ -4263,8 +4712,8 @@ static void semantic_binexpr_arithmetic(binary_expression_t *expression) { expression_t *const left = expression->left; expression_t *const right = expression->right; - type_t *const orig_type_left = left->base.datatype; - type_t *const orig_type_right = right->base.datatype; + type_t *const orig_type_left = left->base.type; + type_t *const orig_type_right = right->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); @@ -4277,17 +4726,17 @@ static void semantic_binexpr_arithmetic(binary_expression_t *expression) } 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->expression.datatype = arithmetic_type; + expression->left = create_implicit_cast(left, arithmetic_type); + expression->right = create_implicit_cast(right, arithmetic_type); + expression->base.type = arithmetic_type; } static void semantic_shift_op(binary_expression_t *expression) { expression_t *const left = expression->left; expression_t *const right = expression->right; - type_t *const orig_type_left = left->base.datatype; - type_t *const orig_type_right = right->base.datatype; + type_t *const orig_type_left = left->base.type; + type_t *const orig_type_right = right->base.type; type_t * type_left = skip_typeref(orig_type_left); type_t * type_right = skip_typeref(orig_type_right); @@ -4302,17 +4751,17 @@ static void semantic_shift_op(binary_expression_t *expression) type_left = promote_integer(type_left); type_right = promote_integer(type_right); - expression->left = create_implicit_cast(left, type_left); - expression->right = create_implicit_cast(right, type_right); - expression->expression.datatype = type_left; + expression->left = create_implicit_cast(left, type_left); + expression->right = create_implicit_cast(right, type_right); + expression->base.type = type_left; } static void semantic_add(binary_expression_t *expression) { expression_t *const left = expression->left; expression_t *const right = expression->right; - type_t *const orig_type_left = left->base.datatype; - type_t *const orig_type_right = right->base.datatype; + type_t *const orig_type_left = left->base.type; + type_t *const orig_type_right = right->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); @@ -4321,12 +4770,12 @@ static void semantic_add(binary_expression_t *expression) 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->expression.datatype = arithmetic_type; + expression->base.type = arithmetic_type; return; } else if(is_type_pointer(type_left) && is_type_integer(type_right)) { - expression->expression.datatype = type_left; + expression->base.type = type_left; } else if(is_type_pointer(type_right) && is_type_integer(type_left)) { - expression->expression.datatype = 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); } @@ -4336,28 +4785,31 @@ static void semantic_sub(binary_expression_t *expression) { expression_t *const left = expression->left; expression_t *const right = expression->right; - type_t *const orig_type_left = left->base.datatype; - type_t *const orig_type_right = right->base.datatype; + type_t *const orig_type_left = left->base.type; + type_t *const orig_type_right = right->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); /* § 5.6.5 */ 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->expression.datatype = arithmetic_type; + 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)) { - expression->expression.datatype = 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')", orig_type_left, orig_type_right); + errorf(HERE, + "pointers to incompatible objects to binary '-' ('%T', '%T')", + orig_type_left, orig_type_right); } else { - expression->expression.datatype = type_ptrdiff_t; + 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')", orig_type_left, orig_type_right); + errorf(HERE, "invalid operands to binary '-' ('%T', '%T')", + orig_type_left, orig_type_right); } } @@ -4370,8 +4822,8 @@ static void semantic_comparison(binary_expression_t *expression) { expression_t *left = expression->left; expression_t *right = expression->right; - type_t *orig_type_left = left->base.datatype; - type_t *orig_type_right = right->base.datatype; + type_t *orig_type_left = left->base.type; + type_t *orig_type_right = right->base.type; type_t *type_left = skip_typeref(orig_type_left); type_t *type_right = skip_typeref(orig_type_right); @@ -4379,21 +4831,21 @@ static void semantic_comparison(binary_expression_t *expression) /* TODO non-arithmetic types */ if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { if (warning.sign_compare && - (expression->expression.kind != EXPR_BINARY_EQUAL && - expression->expression.kind != EXPR_BINARY_NOTEQUAL) && + (expression->base.kind != EXPR_BINARY_EQUAL && + expression->base.kind != EXPR_BINARY_NOTEQUAL) && (is_type_signed(type_left) != is_type_signed(type_right))) { - warningf(expression->expression.source_position, - "comparison between signed and unsigned"); + warningf(expression->base.source_position, + "comparison between signed and unsigned"); } 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->expression.datatype = arithmetic_type; + expression->left = create_implicit_cast(left, arithmetic_type); + expression->right = create_implicit_cast(right, arithmetic_type); + expression->base.type = arithmetic_type; if (warning.float_equal && - (expression->expression.kind == EXPR_BINARY_EQUAL || - expression->expression.kind == EXPR_BINARY_NOTEQUAL) && + (expression->base.kind == EXPR_BINARY_EQUAL || + expression->base.kind == EXPR_BINARY_NOTEQUAL) && is_type_float(arithmetic_type)) { - warningf(expression->expression.source_position, + warningf(expression->base.source_position, "comparing floating point with == or != is unsafe"); } } else if (is_type_pointer(type_left) && is_type_pointer(type_right)) { @@ -4404,18 +4856,18 @@ static void semantic_comparison(binary_expression_t *expression) expression->left = create_implicit_cast(left, type_right); } else if (is_type_valid(type_left) && is_type_valid(type_right)) { type_error_incompatible("invalid operands in comparison", - expression->expression.source_position, + expression->base.source_position, type_left, type_right); } - expression->expression.datatype = type_int; + expression->base.type = type_int; } static void semantic_arithmetic_assign(binary_expression_t *expression) { expression_t *left = expression->left; expression_t *right = expression->right; - type_t *orig_type_left = left->base.datatype; - type_t *orig_type_right = right->base.datatype; + type_t *orig_type_left = left->base.type; + type_t *orig_type_right = right->base.type; type_t *type_left = skip_typeref(orig_type_left); type_t *type_right = skip_typeref(orig_type_right); @@ -4434,15 +4886,15 @@ static void semantic_arithmetic_assign(binary_expression_t *expression) * for the arithmetic operation and create a cast by itself */ type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); expression->right = create_implicit_cast(right, arithmetic_type); - expression->expression.datatype = type_left; + expression->base.type = type_left; } static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression) { expression_t *const left = expression->left; expression_t *const right = expression->right; - type_t *const orig_type_left = left->base.datatype; - type_t *const orig_type_right = right->base.datatype; + type_t *const orig_type_left = left->base.type; + type_t *const orig_type_right = right->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); @@ -4452,10 +4904,10 @@ static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression) * The ast2firm pass has to know that left_type must be right_type * for the arithmetic operation and create a cast by itself */ type_t *const arithmetic_type = semantic_arithmetic(type_left, type_right); - expression->right = create_implicit_cast(right, arithmetic_type); - expression->expression.datatype = type_left; + 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)) { - expression->expression.datatype = 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); } @@ -4468,8 +4920,8 @@ static void semantic_logical_op(binary_expression_t *expression) { expression_t *const left = expression->left; expression_t *const right = expression->right; - type_t *const orig_type_left = left->base.datatype; - type_t *const orig_type_right = right->base.datatype; + type_t *const orig_type_left = left->base.type; + type_t *const orig_type_right = right->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); @@ -4481,7 +4933,7 @@ static void semantic_logical_op(binary_expression_t *expression) return; } - expression->expression.datatype = type_int; + expression->base.type = type_int; } /** @@ -4510,7 +4962,7 @@ static bool has_const_fields(const compound_type_t *type) static void semantic_binexpr_assign(binary_expression_t *expression) { expression_t *left = expression->left; - type_t *orig_type_left = left->base.datatype; + type_t *orig_type_left = left->base.type; type_t *type_left = revert_automatic_type_conversion(left); type_left = skip_typeref(orig_type_left); @@ -4540,14 +4992,14 @@ static void semantic_binexpr_assign(binary_expression_t *expression) type_t *const res_type = semantic_assign(orig_type_left, expression->right, "assignment"); if (res_type == NULL) { - errorf(expression->expression.source_position, + errorf(expression->base.source_position, "cannot assign to '%T' from '%T'", - orig_type_left, expression->right->base.datatype); + orig_type_left, expression->right->base.type); } else { expression->right = create_implicit_cast(expression->right, res_type); } - expression->expression.datatype = orig_type_left; + expression->base.type = orig_type_left; } static bool expression_has_effect(const expression_t *const expr) @@ -4557,6 +5009,7 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_INVALID: break; case EXPR_REFERENCE: return false; case EXPR_CONST: return false; + case EXPR_CHAR_CONST: return false; case EXPR_STRING_LITERAL: return false; case EXPR_WIDE_STRING_LITERAL: return false; case EXPR_CALL: { @@ -4590,6 +5043,7 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_VA_START: return true; case EXPR_VA_ARG: return true; case EXPR_STATEMENT: return true; // TODO + case EXPR_COMPOUND_LITERAL: return false; case EXPR_UNARY_NEGATE: return false; case EXPR_UNARY_PLUS: return false; @@ -4601,8 +5055,10 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_UNARY_POSTFIX_DECREMENT: return true; case EXPR_UNARY_PREFIX_INCREMENT: return true; case EXPR_UNARY_PREFIX_DECREMENT: return true; - case EXPR_UNARY_CAST: - return is_type_atomic(expr->base.datatype, ATOMIC_TYPE_VOID); + case EXPR_UNARY_CAST: { + type_t *type = skip_typeref(expr->base.type); + return is_type_atomic(type, ATOMIC_TYPE_VOID); + } case EXPR_UNARY_CAST_IMPLICIT: return true; case EXPR_UNARY_ASSUME: return true; case EXPR_UNARY_BITFIELD_EXTRACT: return false; @@ -4659,7 +5115,7 @@ static void semantic_comma(binary_expression_t *expression) warningf(left->base.source_position, "left-hand operand of comma expression has no effect"); } } - expression->expression.datatype = expression->right->base.datatype; + expression->base.type = expression->right->base.type; } #define CREATE_BINEXPR_PARSER(token_type, binexpression_type, sfunc, lr) \ @@ -5020,6 +5476,13 @@ static statement_t *parse_case_statement(void) statement->base.source_position = token.source_position; statement->case_label.expression = parse_expression(); + if (c_mode & _GNUC) { + if (token.type == T_DOTDOTDOT) { + next_token(); + statement->case_label.end_range = parse_expression(); + } + } + expect(':'); if (! is_constant_expression(statement->case_label.expression)) { @@ -5040,7 +5503,7 @@ static statement_t *parse_case_statement(void) "case label not within a switch statement"); } } - statement->case_label.label_statement = parse_statement(); + statement->case_label.statement = parse_statement(); return statement; } @@ -5051,9 +5514,8 @@ static statement_t *parse_case_statement(void) static case_label_statement_t * find_default_label(const switch_statement_t *statement) { - for (case_label_statement_t *label = statement->first_case; - label != NULL; - label = label->next) { + case_label_statement_t *label = statement->first_case; + for ( ; label != NULL; label = label->next) { if (label->expression == NULL) return label; } @@ -5076,7 +5538,7 @@ static statement_t *parse_default_statement(void) const case_label_statement_t *def_label = find_default_label(current_switch); if (def_label != NULL) { errorf(HERE, "multiple default labels in one switch"); - errorf(def_label->statement.source_position, + errorf(def_label->base.source_position, "this is the first default label"); } else { /* link all cases into the switch statement */ @@ -5091,7 +5553,7 @@ static statement_t *parse_default_statement(void) errorf(statement->base.source_position, "'default' label not within a switch statement"); } - statement->label.label_statement = parse_statement(); + statement->case_label.statement = parse_statement(); return statement; } @@ -5141,18 +5603,17 @@ static statement_t *parse_label_statement(void) label->source_position = token.source_position; } - label_statement_t *label_statement = allocate_ast_zero(sizeof(label[0])); + statement_t *statement = allocate_statement_zero(STATEMENT_LABEL); - label_statement->statement.kind = STATEMENT_LABEL; - label_statement->statement.source_position = token.source_position; - label_statement->label = label; + statement->base.source_position = token.source_position; + statement->label.label = label; eat(':'); if(token.type == '}') { /* TODO only warn? */ errorf(HERE, "label at end of compound statement"); - return (statement_t*) label_statement; + return statement; } else { if (token.type == ';') { /* eat an empty statement here, to avoid the warning about an empty @@ -5160,19 +5621,19 @@ static statement_t *parse_label_statement(void) * a }. */ next_token(); } else { - label_statement->label_statement = parse_statement(); + statement->label.statement = parse_statement(); } } /* remember the labels's in a list for later checking */ if (label_last == NULL) { - label_first = label_statement; + label_first = &statement->label; } else { - label_last->next = label_statement; + label_last->next = &statement->label; } - label_last = label_statement; + label_last = &statement->label; - return (statement_t*) label_statement; + return statement; } /** @@ -5182,21 +5643,20 @@ static statement_t *parse_if(void) { eat(T_if); - if_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->statement.kind = STATEMENT_IF; - statement->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_IF); + statement->base.source_position = token.source_position; expect('('); - statement->condition = parse_expression(); + statement->ifs.condition = parse_expression(); expect(')'); - statement->true_statement = parse_statement(); + statement->ifs.true_statement = parse_statement(); if(token.type == T_else) { next_token(); - statement->false_statement = parse_statement(); + statement->ifs.false_statement = parse_statement(); } - return (statement_t*) statement; + return statement; } /** @@ -5206,39 +5666,42 @@ static statement_t *parse_switch(void) { eat(T_switch); - switch_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->statement.kind = STATEMENT_SWITCH; - statement->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_SWITCH); + statement->base.source_position = token.source_position; expect('('); expression_t *const expr = parse_expression(); - type_t * type = skip_typeref(expr->base.datatype); + type_t * type = skip_typeref(expr->base.type); if (is_type_integer(type)) { type = promote_integer(type); } else if (is_type_valid(type)) { - errorf(expr->base.source_position, "switch quantity is not an integer, but '%T'", type); + errorf(expr->base.source_position, + "switch quantity is not an integer, but '%T'", type); type = type_error_type; } - statement->expression = create_implicit_cast(expr, type); + statement->switchs.expression = create_implicit_cast(expr, type); expect(')'); switch_statement_t *rem = current_switch; - current_switch = statement; - statement->body = parse_statement(); - current_switch = rem; + current_switch = &statement->switchs; + statement->switchs.body = parse_statement(); + current_switch = rem; - if (warning.switch_default && find_default_label(statement) == NULL) { - warningf(statement->statement.source_position, "switch has no default case"); + if (warning.switch_default + && find_default_label(&statement->switchs) == NULL) { + warningf(statement->base.source_position, "switch has no default case"); } - return (statement_t*) statement; + return statement; } static statement_t *parse_loop_body(statement_t *const loop) { statement_t *const rem = current_loop; current_loop = loop; + statement_t *const body = parse_statement(); + current_loop = rem; return body; } @@ -5250,17 +5713,16 @@ static statement_t *parse_while(void) { eat(T_while); - while_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->statement.kind = STATEMENT_WHILE; - statement->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_WHILE); + statement->base.source_position = token.source_position; expect('('); - statement->condition = parse_expression(); + statement->whiles.condition = parse_expression(); expect(')'); - statement->body = parse_loop_body((statement_t*)statement); + statement->whiles.body = parse_loop_body(statement); - return (statement_t*) statement; + return statement; } /** @@ -5270,18 +5732,19 @@ static statement_t *parse_do(void) { eat(T_do); - do_while_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->statement.kind = STATEMENT_DO_WHILE; - statement->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_DO_WHILE); + + statement->base.source_position = token.source_position; + + statement->do_while.body = parse_loop_body(statement); - statement->body = parse_loop_body((statement_t*)statement); expect(T_while); expect('('); - statement->condition = parse_expression(); + statement->do_while.condition = parse_expression(); expect(')'); expect(';'); - return (statement_t*) statement; + return statement; } /** @@ -5291,21 +5754,24 @@ static statement_t *parse_for(void) { eat(T_for); - for_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->statement.kind = STATEMENT_FOR; - statement->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_FOR); + statement->base.source_position = token.source_position; expect('('); int top = environment_top(); scope_t *last_scope = scope; - set_scope(&statement->scope); + set_scope(&statement->fors.scope); if(token.type != ';') { if(is_declaration_specifier(&token, false)) { parse_declaration(record_declaration); } else { - statement->initialisation = parse_expression(); + expression_t *const init = parse_expression(); + statement->fors.initialisation = init; + if (warning.unused_value && !expression_has_effect(init)) { + warningf(init->base.source_position, "initialisation of 'for'-statement has no effect"); + } expect(';'); } } else { @@ -5313,20 +5779,24 @@ static statement_t *parse_for(void) } if(token.type != ';') { - statement->condition = parse_expression(); + statement->fors.condition = parse_expression(); } expect(';'); if(token.type != ')') { - statement->step = parse_expression(); + expression_t *const step = parse_expression(); + statement->fors.step = step; + if (warning.unused_value && !expression_has_effect(step)) { + warningf(step->base.source_position, "step of 'for'-statement has no effect"); + } } expect(')'); - statement->body = parse_loop_body((statement_t*)statement); + statement->fors.body = parse_loop_body(statement); - assert(scope == &statement->scope); + assert(scope == &statement->fors.scope); set_scope(last_scope); environment_pop_to(top); - return (statement_t*) statement; + return statement; } /** @@ -5346,24 +5816,22 @@ static statement_t *parse_goto(void) declaration_t *label = get_label(symbol); - goto_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - - statement->statement.kind = STATEMENT_GOTO; - statement->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_GOTO); + statement->base.source_position = token.source_position; - statement->label = label; + statement->gotos.label = label; /* remember the goto's in a list for later checking */ if (goto_last == NULL) { - goto_first = statement; + goto_first = &statement->gotos; } else { - goto_last->next = statement; + goto_last->next = &statement->gotos; } - goto_last = statement; + goto_last = &statement->gotos; expect(';'); - return (statement_t*) statement; + return statement; } /** @@ -5487,10 +5955,8 @@ static statement_t *parse_return(void) { eat(T_return); - return_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - - statement->statement.kind = STATEMENT_RETURN; - statement->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_RETURN); + statement->base.source_position = token.source_position; expression_t *return_value = NULL; if(token.type != ';') { @@ -5503,20 +5969,20 @@ static statement_t *parse_return(void) type_t *const return_type = skip_typeref(func_type->function.return_type); if(return_value != NULL) { - type_t *return_value_type = skip_typeref(return_value->base.datatype); + type_t *return_value_type = skip_typeref(return_value->base.type); if(is_type_atomic(return_type, ATOMIC_TYPE_VOID) && !is_type_atomic(return_value_type, ATOMIC_TYPE_VOID)) { - warningf(statement->statement.source_position, - "'return' with a value, in function returning 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'"); if (res_type == NULL) { - errorf(statement->statement.source_position, - "cannot return something of type '%T' in function returning '%T'", - return_value->base.datatype, return_type); + 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); } @@ -5525,19 +5991,19 @@ static statement_t *parse_return(void) if (return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) { const expression_t *expression = return_value->unary.value; if (is_local_variable(expression)) { - warningf(statement->statement.source_position, - "function returns address of local variable"); + warningf(statement->base.source_position, + "function returns address of local variable"); } } } else { if(!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { - warningf(statement->statement.source_position, - "'return' without value, in function returning non-void"); + warningf(statement->base.source_position, + "'return' without value, in function returning non-void"); } } - statement->return_value = return_value; + statement->returns.value = return_value; - return (statement_t*) statement; + return statement; } /** @@ -5694,47 +6160,47 @@ static statement_t *parse_statement(void) */ static statement_t *parse_compound_statement(void) { - compound_statement_t *const compound_statement - = allocate_ast_zero(sizeof(compound_statement[0])); - compound_statement->statement.kind = STATEMENT_COMPOUND; - compound_statement->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_COMPOUND); + + statement->base.source_position = token.source_position; eat('{'); int top = environment_top(); scope_t *last_scope = scope; - set_scope(&compound_statement->scope); + set_scope(&statement->compound.scope); statement_t *last_statement = NULL; while(token.type != '}' && token.type != T_EOF) { - statement_t *statement = parse_statement(); - if(statement == NULL) + statement_t *sub_statement = parse_statement(); + if(sub_statement == NULL) continue; if(last_statement != NULL) { - last_statement->base.next = statement; + last_statement->base.next = sub_statement; } else { - compound_statement->statements = statement; + statement->compound.statements = sub_statement; } - while(statement->base.next != NULL) - statement = statement->base.next; + while(sub_statement->base.next != NULL) + sub_statement = sub_statement->base.next; - last_statement = statement; + last_statement = sub_statement; } if(token.type == '}') { next_token(); } else { - errorf(compound_statement->statement.source_position, "end of file while looking for closing '}'"); + errorf(statement->base.source_position, + "end of file while looking for closing '}'"); } - assert(scope == &compound_statement->scope); + assert(scope == &statement->compound.scope); set_scope(last_scope); environment_pop_to(top); - return (statement_t*) compound_statement; + return statement; } /**