X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=fa554d141f212b894622806fa5c61c74fd7d342c;hb=10ddb641ca4f0624dbeb3f300479e29c3ccedefb;hp=68f9fcdf71931d0ef34c26f925601372667fcdcc;hpb=9a4380489c081acfc4400860b39b7722f2d31763;p=cparser diff --git a/parser.c b/parser.c index 68f9fcd..fa554d1 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 @@ -201,6 +201,7 @@ static size_t get_expression_struct_size(expression_kind_t kind) [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), @@ -297,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); @@ -469,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; } /** @@ -525,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) { @@ -558,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) @@ -610,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; } } @@ -760,7 +768,8 @@ static type_t *semantic_assign(type_t *orig_type_left, 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)) { @@ -879,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", @@ -922,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) @@ -949,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.type; + type_t *type = skip_typeref(orig_type); + type_t *expr_type_orig = expression->base.type; + type_t *expr_type = skip_typeref(expr_type_orig); if (is_type_array(type) && expr_type->kind == TYPE_POINTER) { array_type_t *const array_type = &type->array; type_t *const element_type = skip_typeref(array_type->element_type); 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); } @@ -992,220 +1003,432 @@ 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 == '.') { + bool additional_warning_displayed = false; + while(braces > 0) { + if(token.type == ',') { next_token(); - if(token.type == T_IDENTIFIER) - next_token(); - } else 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(path->invalid) { + fprintf(stderr, "invalid path"); + return; + } + + for(size_t i = 0; i < len; ++i) { + const type_path_entry_t *entry = & path->path[i]; - if(expression == NULL) { - expression = parse_assignment_expression(); + 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(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; + } - if(token.type == '{') { - return parse_sub_initializer(type, NULL); - } + 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; + } + } - if(expression == NULL) { - expression = parse_assignment_expression(); + top->type = orig_type; + top->v.compound_entry = iter; + orig_type = iter->type; + } else { + 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; + } - /* 6.7.8.14 + 15: we can have an optional {} around the string - * literal */ - if(read_paren && (expression->kind == EXPR_STRING_LITERAL - || expression->kind == EXPR_WIDE_STRING_LITERAL)) { - initializer_t *result - = initializer_from_expression(type, expression); - if(result != NULL) { - expect_block('}'); - return result; + 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; + } } } - } - sub = parse_sub_initializer(element_type, expression); + 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); + + /* 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; + } - /* didn't match the subtypes -> try our parent type */ - if(sub == NULL) { - assert(!read_paren); - return NULL; + 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; + } } - ARR_APP1(initializer_t*, elems, sub); - } - } - int len = ARR_LEN(elems); - size_t elems_size = sizeof(initializer_t*) * len; + /* descend into subtypes until expression matches type */ + while(true) { + orig_type = path->top_type; + type = skip_typeref(orig_type); - initializer_list_t *init = allocate_ast_zero(sizeof(init[0]) + elems_size); + 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; + } - init->initializer.kind = INITIALIZER_LIST; - init->len = len; - memcpy(init->initializers, elems, elems_size); - DEL_ARR_F(elems); + descend_into_subtype(path); + } + } + ARR_APP1(initializer_t*, initializers, sub); - result = (initializer_t*) init; + if(token.type == '}') { + break; + } + expect(','); + if(token.type == '}') { + break; + } - if(read_paren) { - if(token.type == ',') - next_token(); - expect('}'); + advance_current_object(path, top_path_level); + orig_type = path->top_type; + type = skip_typeref(orig_type); } + + 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])); + + ascend_to(path, top_path_level); + + /* TODO: if(is_global && !is_constant(...)) { error } */ + 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) @@ -1226,19 +1449,31 @@ static initializer_t *parse_initializer(type_t *const orig_type) } 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); + panic("TODO"); } return result; @@ -1338,7 +1573,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 */ } @@ -1867,7 +2105,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); } } @@ -2037,7 +2275,12 @@ static construct_type_t *parse_function_declarator(declaration_t *declaration) { eat('('); - type_t *type = allocate_type_zero(TYPE_FUNCTION, declaration->source_position); + 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) { @@ -2196,11 +2439,20 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, parsed_array_t *parsed_array = (parsed_array_t*) iter; 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)) { @@ -2528,33 +2780,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.type = 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; - array_type->has_implicit_size = true; + 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; } } @@ -2937,7 +3194,8 @@ end_of_parse_external_declaration: environment_pop_to(top); } -static type_t *make_bitfield_type(type_t *base, expression_t *size, source_position_t source_position) +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, source_position); type->bitfield.base = base; @@ -2946,6 +3204,33 @@ static type_t *make_bitfield_type(type_t *base, expression_t *size, source_posit return type; } +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) { @@ -3014,15 +3299,15 @@ static void parse_compound_declarators(declaration_t *struct_declaration, /* make sure we don't define a symbol multiple times */ symbol_t *symbol = declaration->symbol; if(symbol != NULL) { - declaration_t *iter = struct_declaration->scope.declarations; - for( ; iter != NULL; iter = iter->next) { - if(iter->symbol == symbol) { - errorf(declaration->source_position, - "multiple declarations of symbol '%Y'", symbol); - errorf(iter->source_position, - "previous declaration of '%Y' was here", symbol); - break; - } + 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); } } @@ -3121,23 +3406,46 @@ 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.type = type_char_ptr; - cnst->string.value = parse_string_literals(); - - return cnst; -} + 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; + } -/** - * Parse a wide string constant. - */ -static expression_t *parse_wide_string_const(void) -{ - expression_t *const cnst = allocate_expression_zero(EXPR_WIDE_STRING_LITERAL); - cnst->base.type = type_wchar_t_ptr; - cnst->wide_string.value = token.v.wide_string; /* TODO concatenate */ + wres = concat_string_wide_string(&res, &token.v.wide_string); + } else { + wres = token.v.wide_string; + } next_token(); - return cnst; + + 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(); + } } /** @@ -3167,7 +3475,7 @@ static expression_t *parse_char_const(void) cnst->conste.v.chars.size = token.v.string.size; if (cnst->conste.v.chars.size != 1) { - if (c_mode & _GNUC) { + if (warning.multichar && (c_mode & _GNUC)) { /* TODO */ warningf(HERE, "multi-character character constant"); } else { @@ -3357,7 +3665,7 @@ static expression_t *parse_reference(void) source_position); } else { errorf(HERE, "unknown symbol '%Y' found.", ref->symbol); - return expression; + return create_invalid_expression(); } } @@ -3383,15 +3691,32 @@ 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); @@ -3486,7 +3811,8 @@ static expression_t *parse_pretty_function_keyword(void) 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", @@ -3507,8 +3833,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; @@ -3517,9 +3844,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; } @@ -3543,11 +3871,27 @@ static expression_t *parse_offsetof(void) 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; } @@ -3731,57 +4075,39 @@ static expression_t *parse_assume(void) { static expression_t *parse_primary_expression(void) { - 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: - 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_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", &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(); @@ -3938,12 +4264,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(); @@ -4112,9 +4433,6 @@ 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.type; type_t *const orig_false_type = false_expression->base.type; type_t *const true_type = skip_typeref(orig_true_type); @@ -4141,8 +4459,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, @@ -4151,6 +4476,10 @@ static expression_t *parse_conditional_expression(unsigned precedence, result_type = type_error_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; } @@ -4717,6 +5046,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; @@ -4728,8 +5058,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.type, 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; @@ -5185,9 +5517,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; } @@ -5225,7 +5556,7 @@ static statement_t *parse_default_statement(void) errorf(statement->base.source_position, "'default' label not within a switch statement"); } - statement->label.statement = parse_statement(); + statement->case_label.statement = parse_statement(); return statement; } @@ -5439,7 +5770,11 @@ static statement_t *parse_for(void) if(is_declaration_specifier(&token, false)) { parse_declaration(record_declaration); } else { - statement->fors.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 { @@ -5451,7 +5786,11 @@ static statement_t *parse_for(void) } expect(';'); if(token.type != ')') { - statement->fors.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->fors.body = parse_loop_body(statement);