X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=6715131f79afd944860711dd2154b88daf3f99ea;hb=f017f4f5080052f95185056b3af472ab737bc64a;hp=97252daaca3f21c75a839f65fe76241c2b9f439d;hpb=5ee7d5e63a5309c4a6a94050fc55e2883dcc19c4;p=cparser diff --git a/parser.c b/parser.c index 97252da..6715131 100644 --- a/parser.c +++ b/parser.c @@ -31,7 +31,7 @@ typedef struct { typedef struct declaration_specifiers_t declaration_specifiers_t; struct declaration_specifiers_t { source_position_t source_position; - unsigned char storage_class; + unsigned char declared_storage_class; bool is_inline; decl_modifiers_t decl_modifiers; type_t *type; @@ -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); @@ -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), @@ -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; } } @@ -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)) { @@ -793,15 +809,16 @@ static type_t *make_global_typedef(const char *name, type_t *type) symbol_t *const symbol = symbol_table_insert(name); declaration_t *const declaration = allocate_declaration_zero(); - declaration->namespc = NAMESPACE_NORMAL; - declaration->storage_class = STORAGE_CLASS_TYPEDEF; - declaration->type = type; - declaration->symbol = symbol; - declaration->source_position = builtin_source_position; + declaration->namespc = NAMESPACE_NORMAL; + declaration->storage_class = STORAGE_CLASS_TYPEDEF; + declaration->declared_storage_class = STORAGE_CLASS_TYPEDEF; + declaration->type = type; + declaration->symbol = symbol; + declaration->source_position = builtin_source_position; 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 +889,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 +930,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 +956,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); } @@ -985,239 +1004,541 @@ static initializer_t *initializer_from_expression(type_t *type, return result; } -static initializer_t *parse_sub_initializer(type_t *type, - expression_t *expression); +static bool is_initializer_constant(const expression_t *expression) +{ + return is_constant_expression(expression) + || is_address_constant(expression); +} -static initializer_t *parse_sub_initializer_elem(type_t *type) +static initializer_t *parse_scalar_initializer(type_t *type, + bool must_be_constant) { - 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); -} + if(must_be_constant && !is_initializer_constant(expression)) { + errorf(expression->base.source_position, + "Initialisation expression '%E' is not constant\n", + expression); + } -static bool had_initializer_brace_warning; + initializer_t *initializer = initializer_from_expression(type, expression); -static void skip_designator(void) -{ - while(1) { - if(token.type == '.') { - next_token(); - if(token.type == T_IDENTIFIER) - next_token(); - } else if(token.type == '[') { + if(initializer == NULL) { + errorf(expression->base.source_position, + "expression '%E' doesn't match expected type '%T'", + expression, type); + /* TODO */ + return NULL; + } + + 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; /**< type of the element the path points */ + size_t max_index; /**< largest index in outermost array */ + 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, bool must_be_constant) +{ + 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); - /* didn't match the subtypes -> try our parent type */ - if(sub == NULL) { - assert(!read_paren); - return NULL; + 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, must_be_constant); + } 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, + must_be_constant); - 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('}'); } - ARR_APP1(initializer_t*, elems, sub); - } - } + } else { + /* must be an expression */ + expression_t *expression = parse_assignment_expression(); - int len = ARR_LEN(elems); - size_t elems_size = sizeof(initializer_t*) * len; + if(must_be_constant && !is_initializer_constant(expression)) { + errorf(expression->base.source_position, + "Initialisation expression '%E' is not constant\n", + expression); + } - initializer_list_t *init = allocate_ast_zero(sizeof(init[0]) + elems_size); + /* 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; + } + } - init->initializer.kind = INITIALIZER_LIST; - init->len = len; - memcpy(init->initializers, elems, elems_size); - DEL_ARR_F(elems); + /* descend into subtypes until expression matches type */ + while(true) { + orig_type = path->top_type; + type = skip_typeref(orig_type); - result = (initializer_t*) init; + 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; + } - if(read_paren) { - if(token.type == ',') - next_token(); - expect('}'); - } - return result; -} + descend_into_subtype(path); + } + } -static initializer_t *parse_initializer(type_t *const orig_type) -{ - initializer_t *result; + /* update largest index of top array */ + const type_path_entry_t *first = &path->path[0]; + type_t *first_type = first->type; + first_type = skip_typeref(first_type); + if(is_type_array(first_type)) { + size_t index = first->v.index; + if(index > path->max_index) + path->max_index = index; + } - type_t *const type = skip_typeref(orig_type); + /* append to initializers list */ + ARR_APP1(initializer_t*, initializers, sub); - if(token.type != '{') { - expression_t *expression = parse_assignment_expression(); - initializer_t *initializer = initializer_from_expression(type, expression); - if(initializer == NULL) { - errorf(HERE, - "initializer expression '%E' of type '%T' is incompatible with type '%T'", - expression, expression->base.type, orig_type); + if(token.type == '}') { + break; + } + expect(','); + if(token.type == '}') { + break; } - return initializer; + + 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); + + return result; + +end_error: + skip_initializers(); + DEL_ARR_F(initializers); + ascend_to(path, top_path_level); + return NULL; +} + +typedef struct parse_initializer_env_t { + type_t *type; /* the type of the initializer. In case of an + array type with unspecified size this gets + adjusted to the actual size. */ + initializer_t *initializer; /* initializer will be filled in here */ + bool must_be_constant; +} parse_initializer_env_t; + +static void parse_initializer(parse_initializer_env_t *env) +{ + type_t *type = skip_typeref(env->type); + initializer_t *result = NULL; + size_t max_index; + if(is_type_scalar(type)) { - /* § 6.7.8.11 */ + /* TODO: § 6.7.8.11; eat {} without warning */ + result = parse_scalar_initializer(type, env->must_be_constant); + } else if(token.type == '{') { eat('{'); - expression_t *expression = parse_assignment_expression(); - result = initializer_from_expression(type, expression); + type_path_t path; + memset(&path, 0, sizeof(path)); + path.top_type = env->type; + path.path = NEW_ARR_F(type_path_entry_t, 0); - if(token.type == ',') - next_token(); + descend_into_subtype(&path); + + result = parse_sub_initializer(&path, env->type, 1, + env->must_be_constant); + + max_index = path.max_index; + DEL_ARR_F(path.path); - expect('}'); - return result; + expect_void('}'); } else { - result = parse_sub_initializer(type, NULL); + /* parse_scalar_initializer also works in this case: we simply + * have an expression without {} around it */ + result = parse_scalar_initializer(type, env->must_be_constant); } - return result; + /* § 6.7.5 (22) array initializers for arrays with unknown size determine + * the array type size */ + if(is_type_array(type) && type->array.size_expression == NULL + && result != NULL) { + size_t size; + switch (result->kind) { + case INITIALIZER_LIST: + size = max_index + 1; + break; + + case INITIALIZER_STRING: + size = result->string.string.size; + break; + + case INITIALIZER_WIDE_STRING: + size = result->wide_string.string.size; + break; + + default: + panic("invalid initializer type"); + } + + expression_t *cnst = allocate_expression_zero(EXPR_CONST); + cnst->base.type = type_size_t; + cnst->conste.v.int_value = size; + + type_t *new_type = duplicate_type(type); + + new_type->array.size_expression = cnst; + new_type->array.size_constant = true; + new_type->array.size = size; + env->type = new_type; + } + + env->initializer = result; } static declaration_t *append_declaration(declaration_t *declaration); @@ -1275,22 +1596,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 +1635,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 +1682,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 == '{') { @@ -1439,7 +1755,7 @@ restart: 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 +1783,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 +1802,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; @@ -1505,13 +1821,13 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) switch(token.type) { /* storage class */ -#define MATCH_STORAGE_CLASS(token, class) \ - case token: \ - if(specifiers->storage_class != STORAGE_CLASS_NONE) { \ +#define MATCH_STORAGE_CLASS(token, class) \ + case token: \ + if(specifiers->declared_storage_class != STORAGE_CLASS_NONE) { \ errorf(HERE, "multiple storage classes in declaration specifiers"); \ - } \ - specifiers->storage_class = class; \ - next_token(); \ + } \ + specifiers->declared_storage_class = class; \ + next_token(); \ break; MATCH_STORAGE_CLASS(T_typedef, STORAGE_CLASS_TYPEDEF) @@ -1521,22 +1837,22 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) MATCH_STORAGE_CLASS(T_register, STORAGE_CLASS_REGISTER) case T___thread: - switch (specifiers->storage_class) { - case STORAGE_CLASS_NONE: - specifiers->storage_class = STORAGE_CLASS_THREAD; - break; + switch (specifiers->declared_storage_class) { + case STORAGE_CLASS_NONE: + specifiers->declared_storage_class = STORAGE_CLASS_THREAD; + break; - case STORAGE_CLASS_EXTERN: - specifiers->storage_class = STORAGE_CLASS_THREAD_EXTERN; - break; + case STORAGE_CLASS_EXTERN: + specifiers->declared_storage_class = STORAGE_CLASS_THREAD_EXTERN; + break; - case STORAGE_CLASS_STATIC: - specifiers->storage_class = STORAGE_CLASS_THREAD_STATIC; - break; + case STORAGE_CLASS_STATIC: + specifiers->declared_storage_class = STORAGE_CLASS_THREAD_STATIC; + break; - default: - errorf(HERE, "multiple storage classes in declaration specifiers"); - break; + default: + errorf(HERE, "multiple storage classes in declaration specifiers"); + break; } next_token(); break; @@ -1601,16 +1917,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 +1941,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 +2080,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 { @@ -1829,10 +2146,10 @@ static void semantic_parameter(declaration_t *declaration) { /* TODO: improve error messages */ - if(declaration->storage_class == STORAGE_CLASS_TYPEDEF) { + if(declaration->declared_storage_class == STORAGE_CLASS_TYPEDEF) { errorf(HERE, "typedef not allowed in parameter list"); - } else if(declaration->storage_class != STORAGE_CLASS_NONE - && declaration->storage_class != STORAGE_CLASS_REGISTER) { + } else if(declaration->declared_storage_class != STORAGE_CLASS_NONE + && declaration->declared_storage_class != STORAGE_CLASS_REGISTER) { errorf(HERE, "parameter may only have none or register storage class"); } @@ -1850,7 +2167,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); } } @@ -1935,11 +2252,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; }; @@ -1976,7 +2293,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; @@ -1988,7 +2305,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; @@ -2020,7 +2337,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) { @@ -2030,7 +2352,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(')'); @@ -2141,7 +2463,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: { @@ -2167,7 +2489,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; @@ -2177,13 +2499,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}); + + 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 = 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)) { @@ -2200,7 +2531,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; @@ -2213,10 +2544,16 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, static declaration_t *parse_declarator( const declaration_specifiers_t *specifiers, bool may_be_abstract) { - declaration_t *const declaration = allocate_declaration_zero(); - declaration->storage_class = specifiers->storage_class; - declaration->modifiers = specifiers->decl_modifiers; - declaration->is_inline = specifiers->is_inline; + declaration_t *const declaration = allocate_declaration_zero(); + declaration->declared_storage_class = specifiers->declared_storage_class; + declaration->modifiers = specifiers->decl_modifiers; + declaration->is_inline = specifiers->is_inline; + + declaration->storage_class = specifiers->declared_storage_class; + if(declaration->storage_class == STORAGE_CLASS_NONE + && scope != global_scope) { + declaration->storage_class = STORAGE_CLASS_AUTO; + } construct_type_t *construct_type = parse_inner_declarator(declaration, may_be_abstract); @@ -2329,7 +2666,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) { @@ -2406,6 +2745,7 @@ warn_redundant_declaration: } if (new_storage_class == STORAGE_CLASS_NONE) { previous_declaration->storage_class = STORAGE_CLASS_NONE; + previous_declaration->declared_storage_class = STORAGE_CLASS_NONE; } } } else { @@ -2445,7 +2785,6 @@ warn_redundant_declaration: } assert(declaration->parent_scope == NULL); - assert(declaration->symbol != NULL); assert(scope != NULL); declaration->parent_scope = scope; @@ -2497,46 +2836,28 @@ static void parse_init_declarator_rest(declaration_t *declaration) eat('='); type_t *orig_type = declaration->type; - type_t *type = type = skip_typeref(orig_type); + type_t *type = skip_typeref(orig_type); if(declaration->init.initializer != NULL) { parser_error_multiple_definition(declaration, token.source_position); } - initializer_t *initializer = parse_initializer(type); - - /* § 6.7.5 (22) array initializers for arrays with unknown size determine - * the array type size */ - 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; - - switch (initializer->kind) { - case INITIALIZER_LIST: { - cnst->conste.v.int_value = initializer->list.len; - break; - } - - case INITIALIZER_STRING: { - cnst->conste.v.int_value = initializer->string.string.size; - break; - } - - case INITIALIZER_WIDE_STRING: { - cnst->conste.v.int_value = initializer->wide_string.string.size; - break; - } + bool must_be_constant = false; + if(declaration->storage_class == STORAGE_CLASS_STATIC + || declaration->storage_class == STORAGE_CLASS_THREAD_STATIC + || declaration->parent_scope == global_scope) { + must_be_constant = true; + } - default: - panic("invalid initializer type"); - } + parse_initializer_env_t env; + env.type = orig_type; + env.must_be_constant = must_be_constant; + parse_initializer(&env); - array_type->size = cnst; - } + if(env.type != orig_type) { + orig_type = env.type; + type = skip_typeref(orig_type); + declaration->type = env.type; } if(is_type_function(type)) { @@ -2544,7 +2865,7 @@ static void parse_init_declarator_rest(declaration_t *declaration) "initializers not allowed for function types at declator '%Y' (type '%T')", declaration->symbol, orig_type); } else { - declaration->init.initializer = initializer; + declaration->init.initializer = env.initializer; } } @@ -2555,14 +2876,15 @@ static void parse_anonymous_declaration_rest( { eat(';'); - declaration_t *const declaration = allocate_declaration_zero(); - declaration->type = specifiers->type; - declaration->storage_class = specifiers->storage_class; - declaration->source_position = specifiers->source_position; + declaration_t *const declaration = allocate_declaration_zero(); + declaration->type = specifiers->type; + declaration->declared_storage_class = specifiers->declared_storage_class; + declaration->source_position = specifiers->source_position; - if (declaration->storage_class != STORAGE_CLASS_NONE) { + if (declaration->declared_storage_class != STORAGE_CLASS_NONE) { warningf(declaration->source_position, "useless storage class in empty declaration"); } + declaration->storage_class = STORAGE_CLASS_NONE; type_t *type = declaration->type; switch (type->kind) { @@ -2636,9 +2958,10 @@ 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->declared_storage_class = declaration->declared_storage_class; + previous_declaration->storage_class = declaration->storage_class; + previous_declaration->parent_scope = scope; return previous_declaration; } else { return record_declaration(declaration); @@ -2652,7 +2975,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); @@ -2918,47 +3241,131 @@ 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); + } - declaration = allocate_declaration_zero(); - declaration->namespc = NAMESPACE_NORMAL; - declaration->storage_class = STORAGE_CLASS_NONE; - declaration->source_position = token.source_position; - declaration->modifiers = specifiers->decl_modifiers; - declaration->type = type; + type_t *type = make_bitfield_type(base_type, size, source_position); + + declaration = allocate_declaration_zero(); + declaration->namespc = NAMESPACE_NORMAL; + declaration->declared_storage_class = STORAGE_CLASS_NONE; + declaration->storage_class = STORAGE_CLASS_NONE; + 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); + } } } - record_declaration(declaration); + + /* 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); + } + } + + /* append declaration */ + if(last_declaration != NULL) { + last_declaration->next = declaration; + } else { + struct_declaration->scope.declarations = declaration; + } + last_declaration = declaration; if(token.type != ',') break; @@ -2967,7 +3374,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('{'); @@ -2976,7 +3383,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"); @@ -2989,7 +3396,7 @@ static type_t *parse_typename(void) declaration_specifiers_t specifiers; memset(&specifiers, 0, sizeof(specifiers)); parse_declaration_specifiers(&specifiers); - if(specifiers.storage_class != STORAGE_CLASS_NONE) { + if(specifiers.declared_storage_class != STORAGE_CLASS_NONE) { /* TODO: improve error message, user does probably not know what a * storage class is... */ @@ -3047,34 +3454,85 @@ 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(); + 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); + /* note: that we use type_char_ptr here, which is already the + * automatic converted type. revert_automatic_type_conversion + * will construct the array type */ + cnst->base.type = type_char_ptr; + cnst->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.type = 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.type = 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; @@ -3097,7 +3555,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; @@ -3106,12 +3564,13 @@ static declaration_t *create_implicit_function(symbol_t *symbol, free_type(ntype); } - declaration_t *const declaration = allocate_declaration_zero(); - declaration->storage_class = STORAGE_CLASS_EXTERN; - declaration->type = type; - declaration->symbol = symbol; - declaration->source_position = source_position; - declaration->parent_scope = global_scope; + declaration_t *const declaration = allocate_declaration_zero(); + declaration->storage_class = STORAGE_CLASS_EXTERN; + declaration->declared_storage_class = STORAGE_CLASS_EXTERN; + declaration->type = type; + declaration->symbol = symbol; + declaration->source_position = source_position; + declaration->parent_scope = global_scope; scope_t *old_scope = scope; set_scope(global_scope); @@ -3141,7 +3600,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; @@ -3228,6 +3687,19 @@ type_t *revert_automatic_type_conversion(const expression_t *expression) return type_left->pointer.points_to; } + case EXPR_STRING_LITERAL: { + size_t size = expression->string.value.size; + return make_array_type(type_char, size, TYPE_QUALIFIER_NONE); + } + + case EXPR_WIDE_STRING_LITERAL: { + size_t size = expression->wide_string.value.size; + return make_array_type(type_wchar_t, size, TYPE_QUALIFIER_NONE); + } + + case EXPR_COMPOUND_LITERAL: + return expression->compound_literal.type; + default: break; } @@ -3258,7 +3730,7 @@ static expression_t *parse_reference(void) source_position); } else { errorf(HERE, "unknown symbol '%Y' found.", ref->symbol); - return expression; + return create_invalid_expression(); } } @@ -3284,15 +3756,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); + + parse_initializer_env_t env; + env.type = type; + env.must_be_constant = false; + parse_initializer(&env); + type = env.type; - cast->base.source_position = token.source_position; + expression->compound_literal.type = type; + expression->compound_literal.initializer = env.initializer; + 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); @@ -3387,7 +3882,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", @@ -3408,8 +3904,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; @@ -3418,9 +3915,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; } @@ -3444,11 +3942,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; } @@ -3632,53 +4146,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_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(); @@ -3835,12 +4335,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(); @@ -4009,9 +4504,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); @@ -4038,8 +4530,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, @@ -4048,6 +4547,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; } @@ -4580,6 +5083,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: { @@ -4613,6 +5117,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; @@ -4624,8 +5129,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; @@ -5043,6 +5550,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)) { @@ -5074,9 +5588,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; } @@ -5114,7 +5627,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; } @@ -5328,7 +5841,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 { @@ -5340,7 +5857,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); @@ -5434,7 +5955,6 @@ static statement_t *parse_break(void) */ static bool is_local_var_declaration(const declaration_t *declaration) { switch ((storage_class_tag_t) declaration->storage_class) { - case STORAGE_CLASS_NONE: case STORAGE_CLASS_AUTO: case STORAGE_CLASS_REGISTER: { const type_t *type = skip_typeref(declaration->type); @@ -5453,25 +5973,11 @@ static bool is_local_var_declaration(const declaration_t *declaration) { * Check if a given declaration represents a variable. */ static bool is_var_declaration(const declaration_t *declaration) { - switch ((storage_class_tag_t) declaration->storage_class) { - case STORAGE_CLASS_NONE: - case STORAGE_CLASS_EXTERN: - case STORAGE_CLASS_STATIC: - case STORAGE_CLASS_AUTO: - case STORAGE_CLASS_REGISTER: - case STORAGE_CLASS_THREAD: - case STORAGE_CLASS_THREAD_EXTERN: - case STORAGE_CLASS_THREAD_STATIC: { - const type_t *type = skip_typeref(declaration->type); - if(is_type_function(type)) { - return false; - } else { - return true; - } - } - default: + if(declaration->storage_class == STORAGE_CLASS_TYPEDEF) return false; - } + + const type_t *type = skip_typeref(declaration->type); + return !is_type_function(type); } /**