X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=844ced38873a515359c76ce737f99d737e729d3d;hb=4dc3035a5f2d96a801460695ce8d1695ef5b2292;hp=e368828e42b51a6fbe704d49a8bc4f9dc8f75fa6;hpb=1e7458bc3eba2e714c913fa35aa397d54ed99a42;p=cparser diff --git a/parser.c b/parser.c index e368828..844ced3 100644 --- a/parser.c +++ b/parser.c @@ -1,13 +1,33 @@ +/* + * This file is part of cparser. + * Copyright (C) 2007-2008 Matthias Braun + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ #include #include #include #include +#include "parser.h" #include "diagnostic.h" #include "format_check.h" -#include "parser.h" #include "lexer.h" +#include "symbol_t.h" #include "token_t.h" #include "types.h" #include "type_t.h" @@ -31,12 +51,27 @@ 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; + unsigned char alignment; /**< Alignment, 0 if not set. */ bool is_inline; - decl_modifiers_t decl_modifiers; + decl_modifiers_t decl_modifiers; /**< MS __declspec extended modifier mask */ + const char *deprecated_string; /**< can be set if declaration was marked deprecated. */ + symbol_t *get_property_sym; /**< the name of the get property if set. */ + symbol_t *put_property_sym; /**< the name of the put property if set. */ type_t *type; }; +/** + * An environment for parsing initializers (and compound literals). + */ +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. */ + declaration_t *declaration; /**< the declaration that is initialized if any */ + bool must_be_constant; +} parse_initializer_env_t; + typedef declaration_t* (*parsed_declaration_func) (declaration_t *declaration); static token_t token; @@ -44,15 +79,40 @@ static token_t lookahead_buffer[MAX_LOOKAHEAD]; static int lookahead_bufpos; static stack_entry_t *environment_stack = NULL; static stack_entry_t *label_stack = NULL; -static context_t *global_context = NULL; -static context_t *context = NULL; +static scope_t *global_scope = NULL; +static scope_t *scope = NULL; static declaration_t *last_declaration = NULL; static declaration_t *current_function = NULL; static switch_statement_t *current_switch = NULL; static statement_t *current_loop = NULL; static goto_statement_t *goto_first = NULL; static goto_statement_t *goto_last = NULL; -static struct obstack temp_obst; +static label_statement_t *label_first = NULL; +static label_statement_t *label_last = NULL; +static struct obstack temp_obst; + +/* symbols for Microsoft extended-decl-modifier */ +static const symbol_t *sym_align = NULL; +static const symbol_t *sym_allocate = NULL; +static const symbol_t *sym_dllimport = NULL; +static const symbol_t *sym_dllexport = NULL; +static const symbol_t *sym_naked = NULL; +static const symbol_t *sym_noinline = NULL; +static const symbol_t *sym_noreturn = NULL; +static const symbol_t *sym_nothrow = NULL; +static const symbol_t *sym_novtable = NULL; +static const symbol_t *sym_property = NULL; +static const symbol_t *sym_get = NULL; +static const symbol_t *sym_put = NULL; +static const symbol_t *sym_selectany = NULL; +static const symbol_t *sym_thread = NULL; +static const symbol_t *sym_uuid = NULL; +static const symbol_t *sym_deprecated = NULL; +static const symbol_t *sym_restrict = NULL; +static const symbol_t *sym_noalias = NULL; + +/** The token anchor set */ +static unsigned char token_anchor_set[T_LAST_TOKEN]; /** The current source position. */ #define HERE token.source_position @@ -66,7 +126,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); @@ -113,6 +173,7 @@ static void semantic_comparison(binary_expression_t *expression); case T_enum: \ case T___typeof__: \ case T___builtin_va_list: \ + case T_declspec: \ COMPLEX_SPECIFIERS \ IMAGINARY_SPECIFIERS @@ -138,8 +199,9 @@ static void *allocate_ast_zero(size_t size) static declaration_t *allocate_declaration_zero(void) { - declaration_t *declaration = allocate_ast_zero(sizeof(*allocate_declaration_zero())); - declaration->type = type_error_type; + declaration_t *declaration = allocate_ast_zero(sizeof(declaration_t)); + declaration->type = type_error_type; + declaration->alignment = 0; return declaration; } @@ -151,6 +213,8 @@ static declaration_t *allocate_declaration_zero(void) static size_t get_statement_struct_size(statement_kind_t kind) { static const size_t sizes[] = { + [STATEMENT_INVALID] = sizeof(invalid_statement_t), + [STATEMENT_EMPTY] = sizeof(empty_statement_t), [STATEMENT_COMPOUND] = sizeof(compound_statement_t), [STATEMENT_RETURN] = sizeof(return_statement_t), [STATEMENT_DECLARATION] = sizeof(declaration_statement_t), @@ -185,6 +249,26 @@ static statement_t *allocate_statement_zero(statement_kind_t kind) return res; } +/** + * Creates a new invalid statement. + */ +static statement_t *create_invalid_statement(void) +{ + statement_t *statement = allocate_statement_zero(STATEMENT_INVALID); + statement->base.source_position = token.source_position; + return statement; +} + +/** + * Allocate a new empty statement. + */ +static statement_t *create_empty_statement(void) +{ + statement_t *statement = allocate_statement_zero(STATEMENT_EMPTY); + statement->base.source_position = token.source_position; + return statement; +} + /** * Returns the size of an expression node. * @@ -193,28 +277,32 @@ static statement_t *allocate_statement_zero(statement_kind_t kind) static size_t get_expression_struct_size(expression_kind_t kind) { static const size_t sizes[] = { - [EXPR_INVALID] = sizeof(expression_base_t), - [EXPR_REFERENCE] = sizeof(reference_expression_t), - [EXPR_CONST] = sizeof(const_expression_t), - [EXPR_STRING_LITERAL] = sizeof(string_literal_expression_t), - [EXPR_WIDE_STRING_LITERAL] = sizeof(wide_string_literal_expression_t), - [EXPR_CALL] = sizeof(call_expression_t), - [EXPR_UNARY_FIRST] = sizeof(unary_expression_t), - [EXPR_BINARY_FIRST] = sizeof(binary_expression_t), - [EXPR_CONDITIONAL] = sizeof(conditional_expression_t), - [EXPR_SELECT] = sizeof(select_expression_t), - [EXPR_ARRAY_ACCESS] = sizeof(array_access_expression_t), - [EXPR_SIZEOF] = sizeof(sizeof_expression_t), - [EXPR_CLASSIFY_TYPE] = sizeof(classify_type_expression_t), - [EXPR_FUNCTION] = sizeof(string_literal_expression_t), - [EXPR_PRETTY_FUNCTION] = sizeof(string_literal_expression_t), - [EXPR_BUILTIN_SYMBOL] = sizeof(builtin_symbol_expression_t), - [EXPR_BUILTIN_CONSTANT_P] = sizeof(builtin_constant_expression_t), - [EXPR_BUILTIN_PREFETCH] = sizeof(builtin_prefetch_expression_t), - [EXPR_OFFSETOF] = sizeof(offsetof_expression_t), - [EXPR_VA_START] = sizeof(va_start_expression_t), - [EXPR_VA_ARG] = sizeof(va_arg_expression_t), - [EXPR_STATEMENT] = sizeof(statement_expression_t), + [EXPR_INVALID] = sizeof(expression_base_t), + [EXPR_REFERENCE] = sizeof(reference_expression_t), + [EXPR_CONST] = sizeof(const_expression_t), + [EXPR_CHARACTER_CONSTANT] = sizeof(const_expression_t), + [EXPR_WIDE_CHARACTER_CONSTANT] = 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), + [EXPR_CONDITIONAL] = sizeof(conditional_expression_t), + [EXPR_SELECT] = sizeof(select_expression_t), + [EXPR_ARRAY_ACCESS] = sizeof(array_access_expression_t), + [EXPR_SIZEOF] = sizeof(typeprop_expression_t), + [EXPR_ALIGNOF] = sizeof(typeprop_expression_t), + [EXPR_CLASSIFY_TYPE] = sizeof(classify_type_expression_t), + [EXPR_FUNCTION] = sizeof(string_literal_expression_t), + [EXPR_PRETTY_FUNCTION] = sizeof(string_literal_expression_t), + [EXPR_BUILTIN_SYMBOL] = sizeof(builtin_symbol_expression_t), + [EXPR_BUILTIN_CONSTANT_P] = sizeof(builtin_constant_expression_t), + [EXPR_BUILTIN_PREFETCH] = sizeof(builtin_prefetch_expression_t), + [EXPR_OFFSETOF] = sizeof(offsetof_expression_t), + [EXPR_VA_START] = sizeof(va_start_expression_t), + [EXPR_VA_ARG] = sizeof(va_arg_expression_t), + [EXPR_STATEMENT] = sizeof(statement_expression_t), }; if(kind >= EXPR_UNARY_FIRST && kind <= EXPR_UNARY_LAST) { return sizes[EXPR_UNARY_FIRST]; @@ -236,8 +324,8 @@ static expression_t *allocate_expression_zero(expression_kind_t kind) size_t size = get_expression_struct_size(kind); expression_t *res = allocate_ast_zero(size); - res->base.kind = kind; - res->base.datatype = type_error_type; + res->base.kind = kind; + res->base.type = type_error_type; return res; } @@ -271,13 +359,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; } @@ -292,7 +381,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); @@ -335,7 +425,6 @@ static size_t label_top(void) return ARR_LEN(label_stack); } - /** * Return the next token. */ @@ -363,6 +452,102 @@ static inline const token_t *look_ahead(int num) return &lookahead_buffer[pos]; } +/** + * Adds a token to the token anchor set (a multi-set). + */ +static void add_anchor_token(int token_type) { + assert(0 <= token_type && token_type < T_LAST_TOKEN); + ++token_anchor_set[token_type]; +} + +/** + * Remove a token from the token anchor set (a multi-set). + */ +static void rem_anchor_token(int token_type) { + assert(0 <= token_type && token_type < T_LAST_TOKEN); + --token_anchor_set[token_type]; +} + +static bool at_anchor(void) { + if(token.type < 0) + return false; + return token_anchor_set[token.type]; +} + +/** + * Eat tokens until a matching token is found. + */ +static void eat_until_matching_token(int type) { + unsigned parenthesis_count = 0; + unsigned brace_count = 0; + unsigned bracket_count = 0; + int end_token = type; + + if(type == '(') + end_token = ')'; + else if(type == '{') + end_token = '}'; + else if(type == '[') + end_token = ']'; + + while(token.type != end_token || + (parenthesis_count > 0 || brace_count > 0 || bracket_count > 0)) { + + switch(token.type) { + case T_EOF: return; + case '(': ++parenthesis_count; break; + case '{': ++brace_count; break; + case '[': ++bracket_count; break; + case ')': + if(parenthesis_count > 0) + --parenthesis_count; + break; + case '}': + if(brace_count > 0) + --brace_count; + break; + case ']': + if(bracket_count > 0) + --bracket_count; + break; + default: + break; + } + next_token(); + } +} + +/** + * Eat input tokens until an anchor is found. + */ +static void eat_until_anchor(void) { + if(token.type == T_EOF) + return; + while(token_anchor_set[token.type] == 0) { + if(token.type == '(' || token.type == '{' || token.type == '[') + eat_until_matching_token(token.type); + if(token.type == T_EOF) + break; + next_token(); + } +} + +static void eat_block(void) { + eat_until_matching_token('{'); + if(token.type == '}') + next_token(); +} + +/** + * eat all token until a ';' is reached + * or a stop token is found. + */ +static void eat_statement(void) { + eat_until_matching_token(';'); + if(token.type == ';') + next_token(); +} + #define eat(token_type) do { assert(token.type == token_type); next_token(); } while(0) /** @@ -375,7 +560,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, "a "); va_end(ap); } @@ -398,112 +583,38 @@ static void type_error_incompatible(const char *msg, } /** - * Eat an complete block, ie. '{ ... }'. - */ -static void eat_block(void) -{ - if(token.type == '{') - next_token(); - - while(token.type != '}') { - if(token.type == T_EOF) - return; - if(token.type == '{') { - eat_block(); - continue; - } - next_token(); - } - eat('}'); -} - -/** - * Eat a statement until an ';' token. - */ -static void eat_statement(void) -{ - while(token.type != ';') { - if(token.type == T_EOF) - return; - if(token.type == '}') - return; - if(token.type == '{') { - eat_block(); - continue; - } - next_token(); - } - eat(';'); -} - -/** - * Eat a parenthesed term, ie. '( ... )'. + * Expect the the current token is the expected token. + * If not, generate an error, eat the current statement, + * and goto the end_error label. */ -static void eat_paren(void) -{ - if(token.type == '(') - next_token(); - - while(token.type != ')') { - if(token.type == T_EOF) - return; - if(token.type == ')' || token.type == ';' || token.type == '}') { - return; - } - if(token.type == '(') { - eat_paren(); - continue; - } - if(token.type == '{') { - eat_block(); - continue; - } - next_token(); - } - eat(')'); -} - #define expect(expected) \ + do { \ if(UNLIKELY(token.type != (expected))) { \ parse_error_expected(NULL, (expected), 0); \ - eat_statement(); \ - return NULL; \ - } \ - next_token(); - -#define expect_block(expected) \ - if(UNLIKELY(token.type != (expected))) { \ - parse_error_expected(NULL, (expected), 0); \ - eat_block(); \ - return NULL; \ - } \ - next_token(); - -#define expect_void(expected) \ - if(UNLIKELY(token.type != (expected))) { \ - parse_error_expected(NULL, (expected), 0); \ - eat_statement(); \ - return; \ + add_anchor_token(expected); \ + eat_until_anchor(); \ + rem_anchor_token(expected); \ + goto end_error; \ } \ - next_token(); + next_token(); \ + } while(0) -static void set_context(context_t *new_context) +static void set_scope(scope_t *new_scope) { - context = new_context; - - last_declaration = new_context->declarations; - if(last_declaration != NULL) { - while(last_declaration->next != NULL) { - last_declaration = last_declaration->next; - } + if(scope != NULL) { + scope->last_declaration = last_declaration; } + scope = new_scope; + + last_declaration = new_scope->last_declaration; } /** * Search a symbol in a given namespace and returns its declaration or * NULL if this symbol was not found. */ -static declaration_t *get_declaration(const symbol_t *const symbol, const namespace_t namespc) +static declaration_t *get_declaration(const symbol_t *const symbol, + const namespace_t namespc) { declaration_t *declaration = symbol->declaration; for( ; declaration != NULL; declaration = declaration->symbol_next) { @@ -520,22 +631,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) { @@ -553,18 +657,25 @@ 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) { assert(declaration->source_position.input_name != NULL); - assert(declaration->parent_context != NULL); + assert(declaration->parent_scope != NULL); stack_push(&environment_stack, declaration); } static void label_push(declaration_t *declaration) { - declaration->parent_context = ¤t_function->context; + declaration->parent_scope = ¤t_function->scope; stack_push(&label_stack, declaration); } @@ -605,7 +716,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; } } @@ -664,8 +777,8 @@ static expression_t *create_cast_expression(expression_t *expression, { expression_t *cast = allocate_expression_zero(EXPR_UNARY_CAST_IMPLICIT); - cast->unary.value = expression; - cast->base.datatype = dest_type; + cast->unary.value = expression; + cast->base.type = dest_type; return cast; } @@ -686,7 +799,7 @@ static bool is_null_pointer_constant(const expression_t *expression) if (expression->kind != EXPR_CONST) return false; - type_t *const type = skip_typeref(expression->base.datatype); + type_t *const type = skip_typeref(expression->base.type); if (!is_type_integer(type)) return false; @@ -702,7 +815,7 @@ static bool is_null_pointer_constant(const expression_t *expression) static expression_t *create_implicit_cast(expression_t *expression, type_t *dest_type) { - type_t *const source_type = expression->base.datatype; + type_t *const source_type = expression->base.type; if (source_type == dest_type) return expression; @@ -715,7 +828,7 @@ static type_t *semantic_assign(type_t *orig_type_left, const expression_t *const right, const char *context) { - type_t *const orig_type_right = right->base.datatype; + type_t *const orig_type_right = right->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); @@ -741,16 +854,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)) { @@ -790,15 +909,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; @@ -826,7 +946,7 @@ static void parse_attributes(void) case T___attribute__: { next_token(); - expect_void('('); + expect('('); int depth = 1; while(depth > 0) { switch(token.type) { @@ -849,46 +969,47 @@ static void parse_attributes(void) } case T_asm: next_token(); - expect_void('('); + expect('('); if(token.type != T_STRING_LITERAL) { parse_error_expected("while parsing assembler attribute", T_STRING_LITERAL); - eat_paren(); + eat_until_matching_token('('); break; } else { parse_string_literals(); } - expect_void(')'); + expect(')'); break; default: goto attributes_finished; } } +end_error: 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(); + add_anchor_token(']'); + designator->array_index = parse_constant_expression(); + rem_anchor_token(']'); 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", @@ -911,8 +1032,9 @@ static designator_t *parse_designation(void) } last = designator; } +end_error: + return NULL; } -#endif static initializer_t *initializer_from_string(array_type_t *type, const string_t *const string) @@ -939,21 +1061,29 @@ static initializer_t *initializer_from_wide_string(array_type_t *const type, return initializer; } -static initializer_t *initializer_from_expression(type_t *type, +/** + * Build an initializer from a given expression. + */ +static initializer_t *initializer_from_expression(type_t *orig_type, expression_t *expression) { /* TODO check that expression is a constant expression */ /* § 6.7.8.14/15 char array may be initialized by string literals */ - type_t *const expr_type = expression->base.datatype; + type_t *type = skip_typeref(orig_type); + type_t *expr_type_orig = expression->base.type; + type_t *expr_type = skip_typeref(expr_type_orig); if (is_type_array(type) && expr_type->kind == TYPE_POINTER) { array_type_t *const array_type = &type->array; type_t *const element_type = skip_typeref(array_type->element_type); if (element_type->kind == TYPE_ATOMIC) { + atomic_type_kind_t akind = element_type->atomic.akind; switch (expression->kind) { case EXPR_STRING_LITERAL: - if (element_type->atomic.akind == ATOMIC_TYPE_CHAR) { + if (akind == ATOMIC_TYPE_CHAR + || akind == ATOMIC_TYPE_SCHAR + || akind == ATOMIC_TYPE_UCHAR) { return initializer_from_string(array_type, &expression->string.value); } @@ -982,239 +1112,645 @@ static initializer_t *initializer_from_expression(type_t *type, return result; } -static initializer_t *parse_sub_initializer(type_t *type, - expression_t *expression); +/** + * Checks if a given expression can be used as an constant initializer. + */ +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) +/** + * Parses an scalar initializer. + * + * § 6.7.8.11; eat {} without warning + */ +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); + } + + initializer_t *initializer = initializer_from_expression(type, expression); + + 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(); + } + if(token.type != '}') { + if(!additional_warning_displayed) { + warningf(HERE, "additional elements in scalar initializer"); + additional_warning_displayed = true; + } + } + eat_block(); + braces--; + } + + return initializer; } -static bool had_initializer_brace_warning; +/** + * An entry in the type path. + */ +typedef struct type_path_entry_t type_path_entry_t; +struct type_path_entry_t { + type_t *type; /**< the upper top type. restored to path->top_tye if this entry is popped. */ + union { + size_t index; /**< For array types: the current index. */ + declaration_t *compound_entry; /**< For compound types: the current declaration. */ + } v; +}; + +/** + * A type path expression a position inside compound or array types. + */ +typedef struct type_path_t type_path_t; +struct type_path_t { + type_path_entry_t *path; /**< An flexible array containing the current path. */ + type_t *top_type; /**< type of the element the path points */ + size_t max_index; /**< largest index in outermost array */ +}; -static void skip_designator(void) +/** + * Prints a type path for debugging. + */ +static __attribute__((unused)) void debug_print_type_path( + const type_path_t *path) { - while(1) { - 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(); + size_t len = ARR_LEN(path->path); + + 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)) { + /* in gcc mode structs can have no members */ + if(entry->v.compound_entry == NULL) { + assert(i == len-1); + continue; + } + fprintf(stderr, ".%s", entry->v.compound_entry->symbol->string); + } else if(is_type_array(type)) { + fprintf(stderr, "[%u]", entry->v.index); } else { - break; + fprintf(stderr, "-INVALID-"); } } + if(path->top_type != NULL) { + fprintf(stderr, " ("); + print_type(path->top_type); + fprintf(stderr, ")"); + } } -static initializer_t *parse_sub_initializer(type_t *type, - expression_t *expression) +/** + * Return the top type path entry, ie. in a path + * (type).a.b returns the b. + */ +static type_path_entry_t *get_type_path_top(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; + size_t len = ARR_LEN(path->path); + assert(len > 0); + return &path->path[len-1]; +} + +/** + * Enlarge the type path by an (empty) element. + */ +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; +} + +/** + * Descending into a sub-type. Enter the scope of the current + * top_type. + */ +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; + + if(entry != NULL) { + path->top_type = entry->type; + } else { + path->top_type = NULL; + } + } else { + assert(is_type_array(top_type)); + + top->v.index = 0; + path->top_type = top_type->array.element_type; + } +} + +/** + * Pop an entry from the given type path, ie. returning from + * (type).a.b to (type).a + */ +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); +} + +/** + * Pop entries from the given type path until the given + * path level is reached. + */ +static void ascend_to(type_path_t *path, size_t top_path_level) +{ + size_t len = ARR_LEN(path->path); + + while(len > top_path_level) { + ascend_from_subtype(path); + len = ARR_LEN(path->path); + } +} + +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 *type = skip_typeref(orig_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; } - initializer_t *result = parse_sub_initializer(type, NULL); - if(token.type == ',') { - next_token(); - /* TODO: warn about excessive elements */ + + declaration_t *declaration = type->compound.declaration; + declaration_t *iter = declaration->scope.declarations; + for( ; iter != NULL; iter = iter->next) { + if(iter->symbol == symbol) { + break; + } } - expect_block('}'); - return result; + 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 { + 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; - if(expression == NULL) { - expression = parse_assignment_expression(); + if(designator->next != NULL) { + descend_into_subtype(path); } - return initializer_from_expression(type, expression); } + return true; - /* 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; - } +failed: + return false; +} - bool read_paren = false; - if(token.type == '{') { - next_token(); - read_paren = true; - } +static void advance_current_object(type_path_t *path, size_t top_path_level) +{ + type_path_entry_t *top = get_type_path_top(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(); + 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_array(type)); - type_t *const element_type = skip_typeref(type->array.element_type); + top->v.index++; - initializer_t *sub; - had_initializer_brace_warning = false; - if(expression == NULL) { - sub = parse_sub_initializer_elem(element_type); - } else { - sub = parse_sub_initializer(element_type, expression); + if(!type->array.size_constant || top->v.index < type->array.size) { + return; } + } - /* didn't match the subtypes -> try the parent type */ - if(sub == NULL) { - assert(!read_paren); - return NULL; - } + /* 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); - elems = NEW_ARR_F(initializer_t*, 0); - ARR_APP1(initializer_t*, elems, sub); + if(len > top_path_level) { + ascend_from_subtype(path); + advance_current_object(path, top_path_level); + } else { + path->top_type = NULL; + } +} - while(true) { - if(token.type == '}') - break; - expect_block(','); - if(token.type == '}') - break; +/** + * skip until token is found. + */ +static void skip_until(int type) { + while(token.type != type) { + if(token.type == T_EOF) + return; + next_token(); + } +} - 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); +/** + * skip any {...} blocks until a closing braket is reached. + */ +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 *create_empty_initializer(void) +{ + static initializer_t empty_initializer + = { .list = { { INITIALIZER_LIST }, 0 } }; + return &empty_initializer; +} + +/** + * Parse a part of an initialiser for a struct or union, + */ +static initializer_t *parse_sub_initializer(type_path_t *path, + type_t *outer_type, size_t top_path_level, + parse_initializer_env_t *env) +{ + if(token.type == '}') { + /* empty initializer */ + return create_empty_initializer(); + } + + type_t *orig_type = path->top_type; + type_t *type = NULL; + + if (orig_type == NULL) { + /* We are initializing an empty compound. */ } else { - assert(is_type_compound(type)); - context_t *const context = &type->compound.declaration->context; + type = skip_typeref(orig_type); - if(token.type == '[') { - errorf(HERE, - "array designator in initializer for compound type '%T'", - type); - skip_designator(); + /* 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 create_empty_initializer(); } + } - declaration_t *first = context->declarations; - if(first == NULL) - return NULL; - type_t *first_type = first->type; - first_type = skip_typeref(first_type); + initializer_t **initializers = NEW_ARR_F(initializer_t*, 0); + + while(true) { + designator_t *designator = NULL; + if(token.type == '.' || token.type == '[') { + designator = parse_designation(); + + /* reset path to toplevel, evaluate designator from there */ + ascend_to(path, top_path_level); + if(!walk_designator(path, designator, false)) { + /* can't continue after designation error */ + goto end_error; + } + + initializer_t *designator_initializer + = allocate_initializer_zero(INITIALIZER_DESIGNATOR); + designator_initializer->designator.designator = designator; + ARR_APP1(initializer_t*, initializers, designator_initializer); + } initializer_t *sub; - had_initializer_brace_warning = false; - if(expression == NULL) { - sub = parse_sub_initializer_elem(first_type); + + if(token.type == '{') { + if(type != NULL && is_type_scalar(type)) { + sub = parse_scalar_initializer(type, env->must_be_constant); + } else { + eat('{'); + if(type == NULL) { + if (env->declaration != NULL) + errorf(HERE, "extra brace group at end of initializer for '%Y'", + env->declaration->symbol); + else + errorf(HERE, "extra brace group at end of initializer"); + } else + descend_into_subtype(path); + + add_anchor_token('}'); + sub = parse_sub_initializer(path, orig_type, top_path_level+1, + env); + rem_anchor_token('}'); + + if(type != NULL) { + ascend_from_subtype(path); + expect('}'); + } else { + expect('}'); + goto error_parse_next; + } + } } else { - sub = parse_sub_initializer(first_type, expression); - } + /* must be an expression */ + expression_t *expression = parse_assignment_expression(); - /* didn't match the subtypes -> try our parent type */ - if(sub == NULL) { - assert(!read_paren); - return NULL; - } + if(env->must_be_constant && !is_initializer_constant(expression)) { + errorf(expression->base.source_position, + "Initialisation expression '%E' is not constant\n", + expression); + } - elems = NEW_ARR_F(initializer_t*, 0); - ARR_APP1(initializer_t*, elems, sub); + if(type == NULL) { + /* we are already outside, ... */ + goto error_excess; + } - declaration_t *iter = first->next; - for( ; iter != NULL; iter = iter->next) { - if(iter->symbol == NULL) - continue; - if(iter->namespc != NAMESPACE_NORMAL) - continue; + /* 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; + } + } - if(token.type == '}') - break; - expect_block(','); - if(token.type == '}') - break; + /* descend into subtypes until expression matches type */ + while(true) { + orig_type = path->top_type; + type = skip_typeref(orig_type); - type_t *iter_type = iter->type; - iter_type = skip_typeref(iter_type); + sub = initializer_from_expression(orig_type, expression); + if(sub != NULL) { + break; + } + if(!is_type_valid(type)) { + goto end_error; + } + if(is_type_scalar(type)) { + errorf(expression->base.source_position, + "expression '%E' doesn't match expected type '%T'", + expression, orig_type); + goto end_error; + } - 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; + descend_into_subtype(path); } - ARR_APP1(initializer_t*, elems, sub); } - } - - int len = ARR_LEN(elems); - size_t elems_size = sizeof(initializer_t*) * len; - initializer_list_t *init = allocate_ast_zero(sizeof(init[0]) + elems_size); + /* 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; + } - init->initializer.kind = INITIALIZER_LIST; - init->len = len; - memcpy(init->initializers, elems, elems_size); - DEL_ARR_F(elems); + if(type != NULL) { + /* append to initializers list */ + ARR_APP1(initializer_t*, initializers, sub); + } else { +error_excess: + if(env->declaration != NULL) + warningf(HERE, "excess elements in struct initializer for '%Y'", + env->declaration->symbol); + else + warningf(HERE, "excess elements in struct initializer"); + } - result = (initializer_t*) init; +error_parse_next: + if(token.type == '}') { + break; + } + expect(','); + if(token.type == '}') { + break; + } - if(read_paren) { - if(token.type == ',') - next_token(); - expect('}'); + if(type != NULL) { + /* advance to the next declaration if we are not at the end */ + advance_current_object(path, top_path_level); + orig_type = path->top_type; + if(orig_type != NULL) + type = skip_typeref(orig_type); + else + type = NULL; + } } + + 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])); + + DEL_ARR_F(initializers); + ascend_to(path, top_path_level); + 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) +/** + * Parses an initializer. Parsers either a compound literal + * (env->declaration == NULL) or an initializer of a declaration. + */ +static initializer_t *parse_initializer(parse_initializer_env_t *env) { - initializer_t *result; + type_t *type = skip_typeref(env->type); + initializer_t *result = NULL; + size_t max_index; - type_t *const type = skip_typeref(orig_type); + if(is_type_scalar(type)) { + result = parse_scalar_initializer(type, env->must_be_constant); + } else if(token.type == '{') { + eat('{'); - 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.datatype, orig_type); - } - return initializer; + type_path_t path; + memset(&path, 0, sizeof(path)); + path.top_type = env->type; + path.path = NEW_ARR_F(type_path_entry_t, 0); + + descend_into_subtype(&path); + + add_anchor_token('}'); + result = parse_sub_initializer(&path, env->type, 1, env); + rem_anchor_token('}'); + + max_index = path.max_index; + DEL_ARR_F(path.path); + + expect('}'); + } else { + /* 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); } - if(is_type_scalar(type)) { - /* § 6.7.8.11 */ - eat('{'); + /* § 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: + internal_errorf(HERE, "invalid initializer type"); + } - expression_t *expression = parse_assignment_expression(); - result = initializer_from_expression(type, expression); + expression_t *cnst = allocate_expression_zero(EXPR_CONST); + cnst->base.type = type_size_t; + cnst->conste.v.int_value = size; - if(token.type == ',') - next_token(); + type_t *new_type = duplicate_type(type); - expect('}'); - return result; - } else { - result = parse_sub_initializer(type, NULL); + new_type->array.size_expression = cnst; + new_type->array.size_constant = true; + new_type->array.size = size; + env->type = new_type; } return result; +end_error: + return NULL; } static declaration_t *append_declaration(declaration_t *declaration); @@ -1262,7 +1798,7 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) (is_struct ? NAMESPACE_STRUCT : NAMESPACE_UNION); declaration->source_position = token.source_position; declaration->symbol = symbol; - declaration->parent_context = context; + declaration->parent_scope = scope; if (symbol != NULL) { environment_push(declaration); } @@ -1272,22 +1808,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->context.declarations = NULL; + declaration->scope.declarations = NULL; } declaration->init.is_defined = true; - int top = environment_top(); - context_t *last_context = context; - set_context(&declaration->context); - - parse_compound_type_entries(); + parse_compound_type_entries(declaration); parse_attributes(); - - assert(context == &declaration->context); - set_context(last_context); - environment_pop_to(top); } return declaration; @@ -1303,10 +1831,12 @@ static void parse_enum_entries(type_t *const enum_type) return; } + add_anchor_token('}'); do { if(token.type != T_IDENTIFIER) { parse_error_expected("while parsing enum entry", T_IDENTIFIER, 0); eat_block(); + rem_anchor_token('}'); return; } @@ -1319,7 +1849,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 */ } @@ -1330,8 +1863,12 @@ static void parse_enum_entries(type_t *const enum_type) break; next_token(); } while(token.type != '}'); + rem_anchor_token('}'); - expect_void('}'); + expect('}'); + +end_error: + ; } static type_t *parse_enum_specifier(void) @@ -1360,10 +1897,10 @@ static type_t *parse_enum_specifier(void) declaration->namespc = NAMESPACE_ENUM; declaration->source_position = token.source_position; declaration->symbol = symbol; - declaration->parent_context = context; + 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 == '{') { @@ -1402,6 +1939,7 @@ static type_t *parse_typeof(void) type_t *type; expect('('); + add_anchor_token(')'); expression_t *expression = NULL; @@ -1420,7 +1958,7 @@ restart: type = parse_typename(); } else { expression = parse_expression(); - type = expression->base.datatype; + type = expression->base.type; } break; @@ -1430,17 +1968,20 @@ restart: default: expression = parse_expression(); - type = expression->base.datatype; + type = expression->base.type; break; } + rem_anchor_token(')'); 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; return typeof_type; +end_error: + return NULL; } typedef enum { @@ -1464,7 +2005,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; @@ -1483,12 +2024,168 @@ 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; } +/** + * check for the allowed MS alignment values. + */ +static bool check_elignment_value(long long intvalue) { + if(intvalue < 1 || intvalue > 8192) { + errorf(HERE, "illegal alignment value"); + return false; + } + unsigned v = (unsigned)intvalue; + for(unsigned i = 1; i <= 8192; i += i) { + if (i == v) + return true; + } + errorf(HERE, "alignment must be power of two"); + return false; +} + +#define DET_MOD(name, tag) do { \ + if(*modifiers & tag) warningf(HERE, #name " used more than once"); \ + *modifiers |= tag; \ +} while(0) + +static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *specifiers) +{ + decl_modifiers_t *modifiers = &specifiers->decl_modifiers; + + while(true) { + if(token.type == T_restrict) { + next_token(); + DET_MOD(restrict, DM_RESTRICT); + goto end_loop; + } else if(token.type != T_IDENTIFIER) + break; + symbol_t *symbol = token.v.symbol; + if(symbol == sym_align) { + next_token(); + expect('('); + if(token.type != T_INTEGER) + goto end_error; + if(check_elignment_value(token.v.intvalue)) { + if(specifiers->alignment != 0) + warningf(HERE, "align used more than once"); + specifiers->alignment = (unsigned char)token.v.intvalue; + } + next_token(); + expect(')'); + } else if(symbol == sym_allocate) { + next_token(); + expect('('); + if(token.type != T_IDENTIFIER) + goto end_error; + (void)token.v.symbol; + expect(')'); + } else if(symbol == sym_dllimport) { + next_token(); + DET_MOD(dllimport, DM_DLLIMPORT); + } else if(symbol == sym_dllexport) { + next_token(); + DET_MOD(dllexport, DM_DLLEXPORT); + } else if(symbol == sym_thread) { + next_token(); + DET_MOD(thread, DM_THREAD); + } else if(symbol == sym_naked) { + next_token(); + DET_MOD(naked, DM_NAKED); + } else if(symbol == sym_noinline) { + next_token(); + DET_MOD(noinline, DM_NOINLINE); + } else if(symbol == sym_noreturn) { + next_token(); + DET_MOD(noreturn, DM_NORETURN); + } else if(symbol == sym_nothrow) { + next_token(); + DET_MOD(nothrow, DM_NOTHROW); + } else if(symbol == sym_novtable) { + next_token(); + DET_MOD(novtable, DM_NOVTABLE); + } else if(symbol == sym_property) { + next_token(); + expect('('); + for(;;) { + bool is_get = false; + if(token.type != T_IDENTIFIER) + goto end_error; + if(token.v.symbol == sym_get) { + is_get = true; + } else if(token.v.symbol == sym_put) { + } else { + errorf(HERE, "Bad property name '%Y'", token.v.symbol); + goto end_error; + } + next_token(); + expect('='); + if(token.type != T_IDENTIFIER) + goto end_error; + if(is_get) { + if(specifiers->get_property_sym != NULL) { + errorf(HERE, "get property name already specified"); + } else { + specifiers->get_property_sym = token.v.symbol; + } + } else { + if(specifiers->put_property_sym != NULL) { + errorf(HERE, "put property name already specified"); + } else { + specifiers->put_property_sym = token.v.symbol; + } + } + next_token(); + if(token.type == ',') { + next_token(); + continue; + } + break; + } + expect(')'); + } else if(symbol == sym_selectany) { + next_token(); + DET_MOD(selectany, DM_SELECTANY); + } else if(symbol == sym_uuid) { + next_token(); + expect('('); + if(token.type != T_STRING_LITERAL) + goto end_error; + next_token(); + expect(')'); + } else if(symbol == sym_deprecated) { + next_token(); + DET_MOD(deprecated, DM_DEPRECATED); + if(token.type == '(') { + next_token(); + if(token.type == T_STRING_LITERAL) { + specifiers->deprecated_string = token.v.string.begin; + next_token(); + } else { + errorf(HERE, "string literal expected"); + } + expect(')'); + } + } else if(symbol == sym_noalias) { + next_token(); + DET_MOD(noalias, DM_NOALIAS); + } else { + warningf(HERE, "Unknown modifier %Y ignored", token.v.symbol); + next_token(); + if(token.type == '(') + skip_until(')'); + } +end_loop: + if (token.type == ',') + next_token(); + } +end_error: + return; +} + static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) { type_t *type = NULL; @@ -1502,13 +2199,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) @@ -1517,23 +2214,32 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) MATCH_STORAGE_CLASS(T_auto, STORAGE_CLASS_AUTO) MATCH_STORAGE_CLASS(T_register, STORAGE_CLASS_REGISTER) + case T_declspec: + next_token(); + expect('('); + add_anchor_token(')'); + parse_microsoft_extended_decl_modifier(specifiers); + rem_anchor_token(')'); + expect(')'); + break; + 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; @@ -1598,16 +2304,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; @@ -1624,11 +2328,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) @@ -1760,7 +2467,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 { @@ -1777,6 +2484,8 @@ finish_specifiers: } specifiers->type = result; +end_error: + return; } static type_qualifiers_t parse_type_qualifiers(void) @@ -1802,6 +2511,7 @@ static declaration_t *parse_identifier_list(void) declaration_t *last_declaration = NULL; do { declaration_t *const declaration = allocate_declaration_zero(); + declaration->type = NULL; /* a K&R parameter list has no types, yet */ declaration->source_position = token.source_position; declaration->symbol = token.v.symbol; next_token(); @@ -1825,10 +2535,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"); } @@ -1846,7 +2556,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); } } @@ -1931,11 +2641,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; }; @@ -1972,7 +2682,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; @@ -1981,10 +2691,11 @@ static construct_type_t *parse_pointer_declarator(void) static construct_type_t *parse_array_declarator(void) { eat('['); + add_anchor_token(']'); 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; @@ -2007,30 +2718,41 @@ static construct_type_t *parse_array_declarator(void) array->size = parse_assignment_expression(); } + rem_anchor_token(']'); expect(']'); return (construct_type_t*) array; +end_error: + return NULL; } static construct_type_t *parse_function_declarator(declaration_t *declaration) { eat('('); + add_anchor_token(')'); - 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) { - declaration->context.declarations = parameters; + declaration->scope.declarations = parameters; } 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; + rem_anchor_token(')'); expect(')'); +end_error: return (construct_type_t*) construct_function_type; } @@ -2072,7 +2794,9 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration, break; case '(': next_token(); + add_anchor_token(')'); inner_types = parse_inner_declarator(declaration, may_be_abstract); + rem_anchor_token(')'); expect(')'); break; default: @@ -2130,6 +2854,8 @@ declarator_finished: } return first; +end_error: + return NULL; } static type_t *construct_declarator_type(construct_type_t *construct_list, @@ -2137,9 +2863,9 @@ 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"); + internal_errorf(HERE, "invalid type construction found"); case CONSTRUCT_FUNCTION: { construct_function_type_t *construct_function_type = (construct_function_type_t*) iter; @@ -2163,7 +2889,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; @@ -2173,13 +2899,29 @@ 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; + if(size_expression != NULL) { + size_expression + = create_implicit_cast(size_expression, type_size_t); + } - 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) { + if(is_constant_expression(size_expression)) { + array_type->array.size_constant = true; + array_type->array.size + = fold_constant(size_expression); + } else { + array_type->array.is_vla = true; + } + } type_t *skipped_type = skip_typeref(type); if (is_type_atomic(skipped_type, ATOMIC_TYPE_VOID)) { @@ -2196,7 +2938,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; @@ -2209,10 +2951,24 @@ 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->deprecated_string = specifiers->deprecated_string; + declaration->get_property_sym = specifiers->get_property_sym; + declaration->put_property_sym = specifiers->put_property_sym; + declaration->is_inline = specifiers->is_inline; + + declaration->storage_class = specifiers->declared_storage_class; + if(declaration->storage_class == STORAGE_CLASS_NONE + && scope != global_scope) { + declaration->storage_class = STORAGE_CLASS_AUTO; + } + + if(specifiers->alignment != 0) { + /* TODO: add checks here */ + declaration->alignment = specifiers->alignment; + } construct_type_t *construct_type = parse_inner_declarator(declaration, may_be_abstract); @@ -2243,12 +2999,62 @@ static declaration_t *append_declaration(declaration_t* const declaration) if (last_declaration != NULL) { last_declaration->next = declaration; } else { - context->declarations = declaration; + scope->declarations = declaration; } last_declaration = declaration; return declaration; } +/** + * Check if the declaration of main is suspicious. main should be a + * function with external linkage, returning int, taking either zero + * arguments, two, or three arguments of appropriate types, ie. + * + * int main([ int argc, char **argv [, char **env ] ]). + * + * @param decl the declaration to check + * @param type the function type of the declaration + */ +static void check_type_of_main(const declaration_t *const decl, const function_type_t *const func_type) +{ + if (decl->storage_class == STORAGE_CLASS_STATIC) { + warningf(decl->source_position, "'main' is normally a non-static function"); + } + if (skip_typeref(func_type->return_type) != type_int) { + warningf(decl->source_position, "return type of 'main' should be 'int', but is '%T'", func_type->return_type); + } + const function_parameter_t *parm = func_type->parameters; + if (parm != NULL) { + type_t *const first_type = parm->type; + if (!types_compatible(skip_typeref(first_type), type_int)) { + warningf(decl->source_position, "first argument of 'main' should be 'int', but is '%T'", first_type); + } + parm = parm->next; + if (parm != NULL) { + type_t *const second_type = parm->type; + if (!types_compatible(skip_typeref(second_type), type_char_ptr_ptr)) { + warningf(decl->source_position, "second argument of 'main' should be 'char**', but is '%T'", second_type); + } + parm = parm->next; + if (parm != NULL) { + type_t *const third_type = parm->type; + if (!types_compatible(skip_typeref(third_type), type_char_ptr_ptr)) { + warningf(decl->source_position, "third argument of 'main' should be 'char**', but is '%T'", third_type); + } + parm = parm->next; + if (parm != NULL) { + warningf(decl->source_position, "'main' takes only zero, two or three arguments"); + } + } + } else { + warningf(decl->source_position, "'main' takes only zero, two or three arguments"); + } + } +} + +/** + * Check if a symbol is the equal to "main". + */ static bool is_sym_main(const symbol_t *const sym) { return strcmp(sym->string, "main") == 0; @@ -2261,36 +3067,57 @@ static declaration_t *internal_record_declaration( const symbol_t *const symbol = declaration->symbol; const namespace_t namespc = (namespace_t)declaration->namespc; - const type_t *const type = skip_typeref(declaration->type); + type_t *const orig_type = declaration->type; + type_t *const type = skip_typeref(orig_type); if (is_type_function(type) && type->function.unspecified_parameters && warning.strict_prototypes) { warningf(declaration->source_position, "function declaration '%#T' is not a prototype", - type, declaration->symbol); + orig_type, declaration->symbol); } - declaration_t *const previous_declaration = get_declaration(symbol, namespc); + if (is_function_definition && warning.main && is_sym_main(symbol)) { + check_type_of_main(declaration, &type->function); + } + + assert(declaration->symbol != NULL); + declaration_t *previous_declaration = get_declaration(symbol, namespc); + assert(declaration != previous_declaration); if (previous_declaration != NULL) { - if (previous_declaration->parent_context == context) { + if (previous_declaration->parent_scope == scope) { /* can happen for K&R style declarations */ if(previous_declaration->type == NULL) { previous_declaration->type = declaration->type; } - const type_t *const prev_type = skip_typeref(previous_declaration->type); + const type_t *prev_type = skip_typeref(previous_declaration->type); if (!types_compatible(type, prev_type)) { errorf(declaration->source_position, - "declaration '%#T' is incompatible with previous declaration '%#T'", - type, symbol, previous_declaration->type, symbol); - errorf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol); + "declaration '%#T' is incompatible with " + "previous declaration '%#T'", + orig_type, symbol, previous_declaration->type, symbol); + errorf(previous_declaration->source_position, + "previous declaration of '%Y' was here", symbol); } else { unsigned old_storage_class = previous_declaration->storage_class; + if (old_storage_class == STORAGE_CLASS_ENUM_ENTRY) { + errorf(declaration->source_position, "redeclaration of enum entry '%Y'", symbol); + errorf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol); + return previous_declaration; + } + unsigned new_storage_class = declaration->storage_class; - /* pretend no storage class means extern for function declarations - * (except if the previous declaration is neither none nor extern) */ + if(is_type_incomplete(prev_type)) { + previous_declaration->type = type; + prev_type = type; + } + + /* pretend no storage class means extern for function + * declarations (except if the previous declaration is neither + * none nor extern) */ if (is_type_function(type)) { switch (old_storage_class) { case STORAGE_CLASS_NONE: @@ -2301,7 +3128,9 @@ static declaration_t *internal_record_declaration( if (warning.missing_prototypes && prev_type->function.unspecified_parameters && !is_sym_main(symbol)) { - warningf(declaration->source_position, "no previous prototype for '%#T'", type, symbol); + warningf(declaration->source_position, + "no previous prototype for '%#T'", + orig_type, symbol); } } else if (new_storage_class == STORAGE_CLASS_NONE) { new_storage_class = STORAGE_CLASS_EXTERN; @@ -2316,53 +3145,69 @@ static declaration_t *internal_record_declaration( new_storage_class == STORAGE_CLASS_EXTERN) { warn_redundant_declaration: if (warning.redundant_decls) { - warningf(declaration->source_position, "redundant declaration for '%Y'", symbol); - warningf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol); + warningf(declaration->source_position, + "redundant declaration for '%Y'", symbol); + warningf(previous_declaration->source_position, + "previous declaration of '%Y' was here", + symbol); } } else if (current_function == NULL) { if (old_storage_class != STORAGE_CLASS_STATIC && new_storage_class == STORAGE_CLASS_STATIC) { - errorf(declaration->source_position, "static declaration of '%Y' follows non-static declaration", symbol); - errorf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol); + errorf(declaration->source_position, + "static declaration of '%Y' follows non-static declaration", + symbol); + errorf(previous_declaration->source_position, + "previous declaration of '%Y' was here", symbol); } else { if (old_storage_class != STORAGE_CLASS_EXTERN && !is_function_definition) { goto warn_redundant_declaration; } if (new_storage_class == STORAGE_CLASS_NONE) { previous_declaration->storage_class = STORAGE_CLASS_NONE; + previous_declaration->declared_storage_class = STORAGE_CLASS_NONE; } } } else { if (old_storage_class == new_storage_class) { - errorf(declaration->source_position, "redeclaration of '%Y'", symbol); + errorf(declaration->source_position, + "redeclaration of '%Y'", symbol); } else { - errorf(declaration->source_position, "redeclaration of '%Y' with different linkage", symbol); + errorf(declaration->source_position, + "redeclaration of '%Y' with different linkage", + symbol); } - errorf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol); + errorf(previous_declaration->source_position, + "previous declaration of '%Y' was here", symbol); } } return previous_declaration; } - } else if (is_function_definition && - declaration->storage_class != STORAGE_CLASS_STATIC) { - if (warning.missing_prototypes && !is_sym_main(symbol)) { - warningf(declaration->source_position, "no previous prototype for '%#T'", type, symbol); - } else if (warning.missing_declarations && !is_sym_main(symbol)) { - warningf(declaration->source_position, "no previous declaration for '%#T'", type, symbol); + } else if (is_function_definition) { + if (declaration->storage_class != STORAGE_CLASS_STATIC) { + if (warning.missing_prototypes && !is_sym_main(symbol)) { + warningf(declaration->source_position, + "no previous prototype for '%#T'", orig_type, symbol); + } else if (warning.missing_declarations && !is_sym_main(symbol)) { + warningf(declaration->source_position, + "no previous declaration for '%#T'", orig_type, + symbol); + } } } else if (warning.missing_declarations && - context == global_context && ( + scope == global_scope && + !is_type_function(type) && ( declaration->storage_class == STORAGE_CLASS_NONE || declaration->storage_class == STORAGE_CLASS_THREAD )) { - warningf(declaration->source_position, "no previous declaration for '%#T'", type, symbol); + warningf(declaration->source_position, + "no previous declaration for '%#T'", orig_type, symbol); } - assert(declaration->parent_context == NULL); - assert(declaration->symbol != NULL); - assert(context != NULL); + assert(declaration->parent_scope == NULL); + assert(scope != NULL); - declaration->parent_context = context; + declaration->parent_scope = scope; environment_push(declaration); return append_declaration(declaration); @@ -2411,46 +3256,30 @@ 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.datatype = 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; - } + 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; + } - case INITIALIZER_WIDE_STRING: { - cnst->conste.v.int_value = initializer->wide_string.string.size; - break; - } + parse_initializer_env_t env; + env.type = orig_type; + env.must_be_constant = must_be_constant; + env.declaration = declaration; - default: - panic("invalid initializer type"); - } + initializer_t *initializer = 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)) { @@ -2469,14 +3298,16 @@ 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; + declaration->modifiers = specifiers->decl_modifiers; - 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) { @@ -2503,6 +3334,9 @@ static void parse_declaration_rest(declaration_t *ndeclaration, const declaration_specifiers_t *specifiers, parsed_declaration_func finished_declaration) { + add_anchor_token(';'); + add_anchor_token('='); + add_anchor_token(','); while(true) { declaration_t *declaration = finished_declaration(ndeclaration); @@ -2526,7 +3360,12 @@ static void parse_declaration_rest(declaration_t *ndeclaration, ndeclaration = parse_declarator(specifiers, /*may_be_abstract=*/false); } - expect_void(';'); + expect(';'); + +end_error: + rem_anchor_token(';'); + rem_anchor_token('='); + rem_anchor_token(','); } static declaration_t *finished_kr_declaration(declaration_t *declaration) @@ -2543,16 +3382,17 @@ static declaration_t *finished_kr_declaration(declaration_t *declaration) declaration_t *previous_declaration = get_declaration(symbol, namespc); if(previous_declaration == NULL || - previous_declaration->parent_context != context) { + previous_declaration->parent_scope != scope) { errorf(HERE, "expected declaration of a function parameter, found '%Y'", symbol); return declaration; } if(previous_declaration->type == NULL) { - previous_declaration->type = declaration->type; - previous_declaration->storage_class = declaration->storage_class; - previous_declaration->parent_context = context; + 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); @@ -2566,7 +3406,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); @@ -2583,14 +3423,14 @@ static void parse_kr_declaration_list(declaration_t *declaration) return; /* push function parameters */ - int top = environment_top(); - context_t *last_context = context; - set_context(&declaration->context); + int top = environment_top(); + scope_t *last_scope = scope; + set_scope(&declaration->scope); - declaration_t *parameter = declaration->context.declarations; + declaration_t *parameter = declaration->scope.declarations; for( ; parameter != NULL; parameter = parameter->next) { - assert(parameter->parent_context == NULL); - parameter->parent_context = context; + assert(parameter->parent_scope == NULL); + parameter->parent_scope = scope; environment_push(parameter); } @@ -2600,8 +3440,8 @@ static void parse_kr_declaration_list(declaration_t *declaration) } /* pop function parameters */ - assert(context == &declaration->context); - set_context(last_context); + assert(scope == &declaration->scope); + set_scope(last_scope); environment_pop_to(top); /* update function type */ @@ -2611,7 +3451,7 @@ static void parse_kr_declaration_list(declaration_t *declaration) function_parameter_t *parameters = NULL; function_parameter_t *last_parameter = NULL; - declaration_t *parameter_declaration = declaration->context.declarations; + declaration_t *parameter_declaration = declaration->scope.declarations; for( ; parameter_declaration != NULL; parameter_declaration = parameter_declaration->next) { type_t *parameter_type = parameter_declaration->type; @@ -2654,29 +3494,76 @@ static void parse_kr_declaration_list(declaration_t *declaration) declaration->type = type; } +static bool first_err = true; + +/** + * When called with first_err set, prints the name of the current function, + * else does noting. + */ +static void print_in_function(void) { + if (first_err) { + first_err = false; + diagnosticf("%s: In function '%Y':\n", + current_function->source_position.input_name, + current_function->symbol); + } +} + /** * Check if all labels are defined in the current function. + * Check if all labels are used in the current function. */ -static void check_for_missing_labels(void) +static void check_labels(void) { - bool first_err = true; for (const goto_statement_t *goto_statement = goto_first; - goto_statement != NULL; - goto_statement = goto_statement->next) { - const declaration_t *label = goto_statement->label; - - if (label->source_position.input_name == NULL) { - if (first_err) { - first_err = false; - diagnosticf("%s: In function '%Y':\n", - current_function->source_position.input_name, - current_function->symbol); - } - errorf(goto_statement->statement.source_position, - "label '%Y' used but not defined", label->symbol); + goto_statement != NULL; + goto_statement = goto_statement->next) { + declaration_t *label = goto_statement->label; + + label->used = true; + if (label->source_position.input_name == NULL) { + print_in_function(); + errorf(goto_statement->base.source_position, + "label '%Y' used but not defined", label->symbol); } } goto_first = goto_last = NULL; + + if (warning.unused_label) { + for (const label_statement_t *label_statement = label_first; + label_statement != NULL; + label_statement = label_statement->next) { + const declaration_t *label = label_statement->label; + + if (! label->used) { + print_in_function(); + warningf(label_statement->base.source_position, + "label '%Y' defined but not used", label->symbol); + } + } + } + label_first = label_last = NULL; +} + +/** + * Check declarations of current_function for unused entities. + */ +static void check_declarations(void) +{ + if (warning.unused_parameter) { + const scope_t *scope = ¤t_function->scope; + + const declaration_t *parameter = scope->declarations; + for (; parameter != NULL; parameter = parameter->next) { + if (! parameter->used) { + print_in_function(); + warningf(parameter->source_position, + "unused parameter '%Y'", parameter->symbol); + } + } + } + if (warning.unused_variable) { + } } static void parse_external_declaration(void) @@ -2685,7 +3572,10 @@ static void parse_external_declaration(void) * specifiers */ declaration_specifiers_t specifiers; memset(&specifiers, 0, sizeof(specifiers)); + + add_anchor_token(';'); parse_declaration_specifiers(&specifiers); + rem_anchor_token(';'); /* must be a declaration */ if(token.type == ';') { @@ -2693,9 +3583,17 @@ static void parse_external_declaration(void) return; } + add_anchor_token(','); + add_anchor_token('='); + rem_anchor_token(';'); + /* declarator is common to both function-definitions and declarations */ declaration_t *ndeclaration = parse_declarator(&specifiers, /*may_be_abstract=*/false); + rem_anchor_token(','); + rem_anchor_token('='); + rem_anchor_token(';'); + /* must be a declaration */ if(token.type == ',' || token.type == '=' || token.type == ';') { parse_declaration_rest(ndeclaration, &specifiers, record_declaration); @@ -2707,7 +3605,7 @@ static void parse_external_declaration(void) if(token.type != '{') { parse_error_expected("while parsing function definition", '{', 0); - eat_statement(); + eat_until_matching_token(';'); return; } @@ -2739,23 +3637,23 @@ static void parse_external_declaration(void) declaration_t *const declaration = record_function_definition(ndeclaration); if(ndeclaration != declaration) { - declaration->context = ndeclaration->context; + declaration->scope = ndeclaration->scope; } type = skip_typeref(declaration->type); - /* push function parameters and switch context */ - int top = environment_top(); - context_t *last_context = context; - set_context(&declaration->context); + /* push function parameters and switch scope */ + int top = environment_top(); + scope_t *last_scope = scope; + set_scope(&declaration->scope); - declaration_t *parameter = declaration->context.declarations; + declaration_t *parameter = declaration->scope.declarations; for( ; parameter != NULL; parameter = parameter->next) { - if(parameter->parent_context == &ndeclaration->context) { - parameter->parent_context = context; + if(parameter->parent_scope == &ndeclaration->scope) { + parameter->parent_scope = scope; } - assert(parameter->parent_context == NULL - || parameter->parent_context == context); - parameter->parent_context = context; + assert(parameter->parent_scope == NULL + || parameter->parent_scope == scope); + parameter->parent_scope = scope; environment_push(parameter); } @@ -2770,7 +3668,9 @@ static void parse_external_declaration(void) current_function = declaration; declaration->init.statement = parse_compound_statement(); - check_for_missing_labels(); + first_err = true; + check_labels(); + check_declarations(); assert(current_function == declaration); current_function = old_current_function; @@ -2778,71 +3678,161 @@ static void parse_external_declaration(void) } end_of_parse_external_declaration: - assert(context == &declaration->context); - set_context(last_context); + assert(scope == &declaration->scope); + set_scope(last_scope); environment_pop_to(top); } -static type_t *make_bitfield_type(type_t *base, expression_t *size) +static type_t *make_bitfield_type(type_t *base, expression_t *size, + source_position_t source_position) { - type_t *type = allocate_type_zero(TYPE_BITFIELD); + type_t *type = allocate_type_zero(TYPE_BITFIELD, source_position); type->bitfield.base = base; type->bitfield.size = size; return type; } -static void parse_struct_declarators(const declaration_specifiers_t *specifiers) +static declaration_t *find_compound_entry(declaration_t *compound_declaration, + symbol_t *symbol) +{ + declaration_t *iter = compound_declaration->scope.declarations; + for( ; iter != NULL; iter = iter->next) { + if(iter->namespc != NAMESPACE_NORMAL) + continue; + + if(iter->symbol == NULL) { + type_t *type = skip_typeref(iter->type); + if(is_type_compound(type)) { + declaration_t *result + = find_compound_entry(type->compound.declaration, symbol); + if(result != NULL) + return result; + } + continue; + } + + if(iter->symbol == symbol) { + return iter; + } + } + + return NULL; +} + +static void parse_compound_declarators(declaration_t *struct_declaration, + const declaration_specifiers_t *specifiers) { - /* TODO: check constraints for struct declarations (in specifiers) */ + declaration_t *last_declaration = struct_declaration->scope.declarations; + if(last_declaration != NULL) { + while(last_declaration->next != NULL) { + last_declaration = last_declaration->next; + } + } + while(1) { declaration_t *declaration; if(token.type == ':') { + source_position_t source_position = HERE; next_token(); type_t *base_type = specifiers->type; expression_t *size = parse_constant_expression(); - type_t *type = make_bitfield_type(base_type, size); + if(!is_type_integer(skip_typeref(base_type))) { + errorf(HERE, "bitfield base type '%T' is not an integer type", + base_type); + } + + type_t *type = make_bitfield_type(base_type, size, source_position); - declaration = allocate_declaration_zero(); - declaration->namespc = NAMESPACE_NORMAL; - declaration->storage_class = STORAGE_CLASS_NONE; - declaration->source_position = token.source_position; - declaration->modifiers = specifiers->decl_modifiers; - declaration->type = type; + 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); + } + } + } + + /* make sure we don't define a symbol multiple times */ + symbol_t *symbol = declaration->symbol; + if(symbol != NULL) { + declaration_t *prev_decl + = find_compound_entry(struct_declaration, symbol); + + if(prev_decl != NULL) { + assert(prev_decl->symbol == symbol); + errorf(declaration->source_position, + "multiple declarations of symbol '%Y'", symbol); + errorf(prev_decl->source_position, + "previous declaration of '%Y' was here", symbol); } } - record_declaration(declaration); + + /* append declaration */ + if(last_declaration != NULL) { + last_declaration->next = declaration; + } else { + struct_declaration->scope.declarations = declaration; + } + last_declaration = declaration; if(token.type != ',') break; next_token(); } - expect_void(';'); + expect(';'); + +end_error: + ; } -static void parse_compound_type_entries(void) +static void parse_compound_type_entries(declaration_t *compound_declaration) { eat('{'); + add_anchor_token('}'); while(token.type != '}' && token.type != T_EOF) { declaration_specifiers_t specifiers; memset(&specifiers, 0, sizeof(specifiers)); parse_declaration_specifiers(&specifiers); - parse_struct_declarators(&specifiers); + parse_compound_declarators(compound_declaration, &specifiers); } + rem_anchor_token('}'); + if(token.type == T_EOF) { errorf(HERE, "EOF while parsing struct"); } @@ -2854,7 +3844,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... */ @@ -2912,34 +3902,109 @@ static expression_t *expected_expression_error(void) */ static expression_t *parse_string_const(void) { - expression_t *cnst = allocate_expression_zero(EXPR_STRING_LITERAL); - cnst->base.datatype = type_string; - cnst->string.value = parse_string_literals(); + wide_string_t wres; + if (token.type == T_STRING_LITERAL) { + string_t res = token.v.string; + next_token(); + while (token.type == T_STRING_LITERAL) { + res = concat_strings(&res, &token.v.string); + next_token(); + } + if (token.type != T_WIDE_STRING_LITERAL) { + expression_t *const cnst = allocate_expression_zero(EXPR_STRING_LITERAL); + /* 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; + } + + 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 an integer constant. + */ +static expression_t *parse_int_const(void) +{ + 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 a wide string constant. + * Parse a character constant. */ -static expression_t *parse_wide_string_const(void) +static expression_t *parse_character_constant(void) { - expression_t *const cnst = allocate_expression_zero(EXPR_WIDE_STRING_LITERAL); - cnst->base.datatype = type_wchar_t_ptr; - cnst->wide_string.value = token.v.wide_string; /* TODO concatenate */ + expression_t *cnst = allocate_expression_zero(EXPR_CHARACTER_CONSTANT); + + cnst->base.source_position = HERE; + cnst->base.type = token.datatype; + cnst->conste.v.character = token.v.string; + + if (cnst->conste.v.character.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; } /** - * Parse an integer constant. + * Parse a wide character constant. */ -static expression_t *parse_int_const(void) +static expression_t *parse_wide_character_constant(void) { - expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->base.datatype = token.datatype; - cnst->conste.v.int_value = token.v.intvalue; + expression_t *cnst = allocate_expression_zero(EXPR_WIDE_CHARACTER_CONSTANT); + cnst->base.source_position = HERE; + cnst->base.type = token.datatype; + cnst->conste.v.wide_character = token.v.wide_string; + + if (cnst->conste.v.wide_character.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; @@ -2951,7 +4016,7 @@ static expression_t *parse_int_const(void) static expression_t *parse_float_const(void) { expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->base.datatype = token.datatype; + cnst->base.type = token.datatype; cnst->conste.v.float_value = token.v.floatvalue; next_token(); @@ -2962,7 +4027,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; @@ -2971,23 +4036,24 @@ 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_context = global_context; + 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; - context_t *old_context = context; - set_context(global_context); + scope_t *old_scope = scope; + set_scope(global_scope); environment_push(declaration); - /* prepend the declaration to the global declarations list */ - declaration->next = context->declarations; - context->declarations = declaration; + /* prepends the declaration to the global declarations list */ + declaration->next = scope->declarations; + scope->declarations = declaration; - assert(context == global_context); - set_context(old_context); + assert(scope == global_scope); + set_scope(old_scope); return declaration; } @@ -3006,7 +4072,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; @@ -3029,15 +4095,15 @@ static type_t *get_builtin_symbol_type(symbol_t *symbol) case T___builtin_alloca: return make_function_1_type(type_void_ptr, type_size_t); case T___builtin_nan: - return make_function_1_type(type_double, type_string); + return make_function_1_type(type_double, type_char_ptr); case T___builtin_nanf: - return make_function_1_type(type_float, type_string); + return make_function_1_type(type_float, type_char_ptr); case T___builtin_nand: - return make_function_1_type(type_long_double, type_string); + return make_function_1_type(type_long_double, type_char_ptr); case T___builtin_va_end: return make_function_1_type(type_void, type_valist); default: - panic("not implemented builtin symbol found"); + internal_errorf(HERE, "not implemented builtin symbol found"); } } @@ -3076,7 +4142,7 @@ type_t *revert_automatic_type_conversion(const expression_t *expression) case EXPR_UNARY_DEREFERENCE: { const expression_t *const value = expression->unary.value; - type_t *const type = skip_typeref(value->base.datatype); + type_t *const type = skip_typeref(value->base.type); assert(is_type_pointer(type)); return type->pointer.points_to; } @@ -3085,18 +4151,31 @@ type_t *revert_automatic_type_conversion(const expression_t *expression) return get_builtin_symbol_type(expression->builtin_symbol.symbol); case EXPR_ARRAY_ACCESS: { - const expression_t *const array_ref = expression->array_access.array_ref; - type_t *const type_left = skip_typeref(array_ref->base.datatype); + const expression_t *array_ref = expression->array_access.array_ref; + type_t *type_left = skip_typeref(array_ref->base.type); if (!is_type_valid(type_left)) return type_left; assert(is_type_pointer(type_left)); 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; } - return expression->base.datatype; + return expression->base.type; } static expression_t *parse_reference(void) @@ -3123,7 +4202,7 @@ static expression_t *parse_reference(void) source_position); } else { errorf(HERE, "unknown symbol '%Y' found.", ref->symbol); - return expression; + return create_invalid_expression(); } } @@ -3133,8 +4212,27 @@ static expression_t *parse_reference(void) * code to revert this! */ type = automatic_type_conversion(type); - ref->declaration = declaration; - ref->expression.datatype = type; + ref->declaration = declaration; + ref->base.type = type; + + /* this declaration is used */ + declaration->used = true; + + /* check for deprecated functions */ + if(declaration->modifiers & DM_DEPRECATED) { + const char *prefix = ""; + if (is_type_function(declaration->type)) + prefix = "function "; + + if (declaration->deprecated_string != NULL) { + warningf(source_position, + "%s'%Y' was declared 'deprecated(\"%s\")'", prefix, declaration->symbol, + declaration->deprecated_string); + } else { + warningf(source_position, + "%s'%Y' was declared 'deprecated'", prefix, declaration->symbol); + } + } return expression; } @@ -3146,25 +4244,59 @@ 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.declaration = NULL; + env.must_be_constant = false; + initializer_t *initializer = parse_initializer(&env); + type = env.type; + + expression->compound_literal.initializer = initializer; + expression->compound_literal.type = type; + expression->base.type = automatic_type_conversion(type); + + return expression; +} - cast->base.source_position = token.source_position; +/** + * Parse a cast expression. + */ +static expression_t *parse_cast(void) +{ + source_position_t source_position = token.source_position; type_t *type = parse_typename(); + /* matching add_anchor_token() is at call site */ + rem_anchor_token(')'); expect(')'); + + if(token.type == '{') { + return parse_compound_literal(type); + } + + expression_t *cast = allocate_expression_zero(EXPR_UNARY_CAST); + cast->base.source_position = source_position; + expression_t *value = parse_sub_expression(20); check_cast_allowed(value, type); - cast->base.datatype = type; - cast->unary.value = value; + cast->base.type = type; + cast->unary.value = value; return cast; +end_error: + return create_invalid_expression(); } +/** + * Parse a statement expression. + */ static expression_t *parse_statement_expression(void) { expression_t *expression = allocate_expression_zero(EXPR_STATEMENT); @@ -3181,21 +4313,27 @@ static expression_t *parse_statement_expression(void) stmt = stmt->base.next; if (stmt->kind == STATEMENT_EXPRESSION) { - type = stmt->expression.expression->base.datatype; + type = stmt->expression.expression->base.type; } } else { warningf(expression->base.source_position, "empty statement expression ({})"); } - expression->base.datatype = type; + expression->base.type = type; expect(')'); return expression; +end_error: + return create_invalid_expression(); } +/** + * Parse a braced expression. + */ static expression_t *parse_brace_expression(void) { eat('('); + add_anchor_token(')'); switch(token.type) { case '{': @@ -3212,9 +4350,12 @@ static expression_t *parse_brace_expression(void) } expression_t *result = parse_expression(); + rem_anchor_token(')'); expect(')'); return result; +end_error: + return create_invalid_expression(); } static expression_t *parse_function_keyword(void) @@ -3226,13 +4367,10 @@ static expression_t *parse_function_keyword(void) errorf(HERE, "'__func__' used outside of a function"); } - string_literal_expression_t *expression - = allocate_ast_zero(sizeof(expression[0])); + expression_t *expression = allocate_expression_zero(EXPR_FUNCTION); + expression->base.type = type_char_ptr; - expression->expression.kind = EXPR_FUNCTION; - expression->expression.datatype = type_string; - - return (expression_t*) expression; + return expression; } static expression_t *parse_pretty_function_keyword(void) @@ -3244,23 +4382,20 @@ static expression_t *parse_pretty_function_keyword(void) errorf(HERE, "'__PRETTY_FUNCTION__' used outside of a function"); } - string_literal_expression_t *expression - = allocate_ast_zero(sizeof(expression[0])); + expression_t *expression = allocate_expression_zero(EXPR_PRETTY_FUNCTION); + expression->base.type = type_char_ptr; - expression->expression.kind = EXPR_PRETTY_FUNCTION; - expression->expression.datatype = type_string; - - return (expression_t*) expression; + return expression; } static designator_t *parse_designator(void) { - designator_t *result = allocate_ast_zero(sizeof(result[0])); + designator_t *result = allocate_ast_zero(sizeof(result[0])); + result->source_position = HERE; if(token.type != T_IDENTIFIER) { parse_error_expected("while parsing member designator", T_IDENTIFIER, 0); - eat_paren(); return NULL; } result->symbol = token.v.symbol; @@ -3273,11 +4408,11 @@ static designator_t *parse_designator(void) if(token.type != T_IDENTIFIER) { parse_error_expected("while parsing member designator", T_IDENTIFIER, 0); - 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; @@ -3286,13 +4421,15 @@ 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) { - eat_paren(); + add_anchor_token(']'); + designator_t *designator = allocate_ast_zero(sizeof(result[0])); + designator->source_position = HERE; + designator->array_index = parse_expression(); + rem_anchor_token(']'); + expect(']'); + if(designator->array_index == NULL) { return NULL; } - expect(']'); last_designator->next = designator; last_designator = designator; @@ -3302,24 +4439,54 @@ static designator_t *parse_designator(void) } return result; +end_error: + return NULL; } +/** + * Parse the __builtin_offsetof() expression. + */ static expression_t *parse_offsetof(void) { eat(T___builtin_offsetof); - expression_t *expression = allocate_expression_zero(EXPR_OFFSETOF); - expression->base.datatype = type_size_t; + expression_t *expression = allocate_expression_zero(EXPR_OFFSETOF); + expression->base.type = type_size_t; expect('('); - expression->offsetofe.type = parse_typename(); + add_anchor_token(','); + type_t *type = parse_typename(); + rem_anchor_token(','); expect(','); - expression->offsetofe.designator = parse_designator(); + add_anchor_token(')'); + designator_t *designator = parse_designator(); + rem_anchor_token(')'); 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; +end_error: + return create_invalid_expression(); } +/** + * Parses a _builtin_va_start() expression. + */ static expression_t *parse_va_start(void) { eat(T___builtin_va_start); @@ -3327,12 +4494,16 @@ static expression_t *parse_va_start(void) expression_t *expression = allocate_expression_zero(EXPR_VA_START); expect('('); + add_anchor_token(','); expression->va_starte.ap = parse_assignment_expression(); + rem_anchor_token(','); expect(','); expression_t *const expr = parse_assignment_expression(); if (expr->kind == EXPR_REFERENCE) { declaration_t *const decl = expr->reference.declaration; - if (decl->parent_context == ¤t_function->context && + if (decl == NULL) + return create_invalid_expression(); + if (decl->parent_scope == ¤t_function->scope && decl->next == NULL) { expression->va_starte.parameter = decl; expect(')'); @@ -3340,10 +4511,13 @@ static expression_t *parse_va_start(void) } } errorf(expr->base.source_position, "second argument of 'va_start' must be last parameter of the current function"); - +end_error: return create_invalid_expression(); } +/** + * Parses a _builtin_va_arg() expression. + */ static expression_t *parse_va_arg(void) { eat(T___builtin_va_arg); @@ -3353,10 +4527,12 @@ static expression_t *parse_va_arg(void) expect('('); expression->va_arge.ap = parse_assignment_expression(); expect(','); - expression->base.datatype = parse_typename(); + expression->base.type = parse_typename(); expect(')'); return expression; +end_error: + return create_invalid_expression(); } static expression_t *parse_builtin_symbol(void) @@ -3371,10 +4547,13 @@ static expression_t *parse_builtin_symbol(void) type_t *type = get_builtin_symbol_type(symbol); type = automatic_type_conversion(type); - expression->base.datatype = type; + expression->base.type = type; return expression; } +/** + * Parses a __builtin_constant() expression. + */ static expression_t *parse_builtin_constant(void) { eat(T___builtin_constant_p); @@ -3382,13 +4561,20 @@ static expression_t *parse_builtin_constant(void) expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_CONSTANT_P); expect('('); + add_anchor_token(')'); expression->builtin_constant.value = parse_assignment_expression(); + rem_anchor_token(')'); expect(')'); - expression->base.datatype = type_int; + expression->base.type = type_int; return expression; +end_error: + return create_invalid_expression(); } +/** + * Parses a __builtin_prefetch() expression. + */ static expression_t *parse_builtin_prefetch(void) { eat(T___builtin_prefetch); @@ -3396,6 +4582,7 @@ static expression_t *parse_builtin_prefetch(void) expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_PREFETCH); expect('('); + add_anchor_token(')'); expression->builtin_prefetch.adr = parse_assignment_expression(); if (token.type == ',') { next_token(); @@ -3405,12 +4592,18 @@ static expression_t *parse_builtin_prefetch(void) next_token(); expression->builtin_prefetch.locality = parse_assignment_expression(); } + rem_anchor_token(')'); expect(')'); - expression->base.datatype = type_void; + expression->base.type = type_void; return expression; +end_error: + return create_invalid_expression(); } +/** + * Parses a __builtin_is_*() compare expression. + */ static expression_t *parse_compare_builtin(void) { expression_t *expression; @@ -3435,9 +4628,10 @@ static expression_t *parse_compare_builtin(void) expression = allocate_expression_zero(EXPR_BINARY_ISUNORDERED); break; default: - panic("invalid compare builtin found"); + internal_errorf(HERE, "invalid compare builtin found"); break; } + expression->base.source_position = HERE; next_token(); expect('('); @@ -3446,23 +4640,28 @@ static expression_t *parse_compare_builtin(void) expression->binary.right = parse_assignment_expression(); expect(')'); - type_t *const orig_type_left = expression->binary.left->base.datatype; - type_t *const orig_type_right = expression->binary.right->base.datatype; + type_t *const orig_type_left = expression->binary.left->base.type; + type_t *const orig_type_right = expression->binary.right->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); - if(!is_type_floating(type_left) && !is_type_floating(type_right)) { + if(!is_type_float(type_left) && !is_type_float(type_right)) { if (is_type_valid(type_left) && is_type_valid(type_right)) { type_error_incompatible("invalid operands in comparison", - token.source_position, orig_type_left, orig_type_right); + expression->base.source_position, orig_type_left, orig_type_right); } } else { semantic_comparison(&expression->binary); } return expression; +end_error: + return create_invalid_expression(); } +/** + * Parses a __builtin_expect() expression. + */ static expression_t *parse_builtin_expect(void) { eat(T___builtin_expect); @@ -3476,11 +4675,16 @@ static expression_t *parse_builtin_expect(void) expression->binary.right = parse_constant_expression(); expect(')'); - expression->base.datatype = expression->binary.left->base.datatype; + expression->base.type = expression->binary.left->base.type; return expression; +end_error: + return create_invalid_expression(); } +/** + * Parses a MS assume() expression. + */ static expression_t *parse_assume(void) { eat(T_assume); @@ -3488,80 +4692,56 @@ static expression_t *parse_assume(void) { = allocate_expression_zero(EXPR_UNARY_ASSUME); expect('('); + add_anchor_token(')'); expression->unary.value = parse_assignment_expression(); + rem_anchor_token(')'); expect(')'); - expression->base.datatype = type_void; - return expression; -} - -static expression_t *parse_alignof(void) { - eat(T___alignof__); - - expression_t *expression - = allocate_expression_zero(EXPR_ALIGNOF); - - expect('('); - expression->alignofe.type = parse_typename(); - expect(')'); - - expression->base.datatype = type_size_t; + expression->base.type = type_void; return expression; +end_error: + return create_invalid_expression(); } +/** + * Parses a primary expression. + */ static expression_t *parse_primary_expression(void) { - switch(token.type) { - case T_INTEGER: - return parse_int_const(); - case T_FLOATINGPOINT: - return parse_float_const(); - case T_STRING_LITERAL: - return parse_string_const(); - case T_WIDE_STRING_LITERAL: - return parse_wide_string_const(); - case T_IDENTIFIER: - return parse_reference(); - case T___FUNCTION__: - case T___func__: - return parse_function_keyword(); - case T___PRETTY_FUNCTION__: - return parse_pretty_function_keyword(); - case T___builtin_offsetof: - return parse_offsetof(); - case T___builtin_va_start: - return parse_va_start(); - case T___builtin_va_arg: - return parse_va_arg(); - case T___builtin_expect: - return parse_builtin_expect(); - case T___builtin_nanf: - case T___builtin_alloca: - case T___builtin_va_end: - return parse_builtin_symbol(); - case T___builtin_isgreater: - case T___builtin_isgreaterequal: - case T___builtin_isless: - case T___builtin_islessequal: - case T___builtin_islessgreater: - case T___builtin_isunordered: - return parse_compare_builtin(); - case T___builtin_constant_p: - return parse_builtin_constant(); - case T___builtin_prefetch: - return parse_builtin_prefetch(); - case T___alignof__: - return parse_alignof(); - case T_assume: - return parse_assume(); - - case '(': - return parse_brace_expression(); - } - - errorf(HERE, "unexpected token '%K'", &token); - eat_statement(); - + switch (token.type) { + case T_INTEGER: return parse_int_const(); + case T_CHARACTER_CONSTANT: return parse_character_constant(); + case T_WIDE_CHARACTER_CONSTANT: return parse_wide_character_constant(); + 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); return create_invalid_expression(); } @@ -3569,7 +4749,7 @@ static expression_t *parse_primary_expression(void) * Check if the expression has the character type and issue a warning then. */ static void check_for_char_index_type(const expression_t *expression) { - type_t *const type = expression->base.datatype; + type_t *const type = expression->base.type; const type_t *const base_type = skip_typeref(type); if (is_type_atomic(base_type, ATOMIC_TYPE_CHAR) && @@ -3585,16 +4765,16 @@ static expression_t *parse_array_expression(unsigned precedence, (void) precedence; eat('['); + add_anchor_token(']'); expression_t *inside = parse_expression(); - array_access_expression_t *array_access - = allocate_ast_zero(sizeof(array_access[0])); + expression_t *expression = allocate_expression_zero(EXPR_ARRAY_ACCESS); - array_access->expression.kind = EXPR_ARRAY_ACCESS; + array_access_expression_t *array_access = &expression->array_access; - type_t *const orig_type_left = left->base.datatype; - type_t *const orig_type_inside = inside->base.datatype; + type_t *const orig_type_left = left->base.type; + type_t *const orig_type_inside = inside->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_inside = skip_typeref(orig_type_inside); @@ -3621,40 +4801,53 @@ static expression_t *parse_array_expression(unsigned precedence, array_access->array_ref = create_invalid_expression(); } + rem_anchor_token(']'); if(token.type != ']') { parse_error_expected("Problem while parsing array access", ']', 0); - return (expression_t*) array_access; + return expression; } next_token(); - return_type = automatic_type_conversion(return_type); - array_access->expression.datatype = return_type; + return_type = automatic_type_conversion(return_type); + expression->base.type = return_type; - return (expression_t*) array_access; + return expression; } -static expression_t *parse_sizeof(unsigned precedence) +static expression_t *parse_typeprop(expression_kind_t kind, unsigned precedence) { - eat(T_sizeof); - - sizeof_expression_t *sizeof_expression - = allocate_ast_zero(sizeof(sizeof_expression[0])); - sizeof_expression->expression.kind = EXPR_SIZEOF; - sizeof_expression->expression.datatype = type_size_t; + expression_t *tp_expression = allocate_expression_zero(kind); + tp_expression->base.type = type_size_t; if(token.type == '(' && is_declaration_specifier(look_ahead(1), true)) { next_token(); - sizeof_expression->type = parse_typename(); + add_anchor_token(')'); + tp_expression->typeprop.type = parse_typename(); + rem_anchor_token(')'); expect(')'); } else { - expression_t *expression = parse_sub_expression(precedence); - expression->base.datatype = revert_automatic_type_conversion(expression); + expression_t *expression = parse_sub_expression(precedence); + expression->base.type = revert_automatic_type_conversion(expression); - sizeof_expression->type = expression->base.datatype; - sizeof_expression->size_expression = expression; + tp_expression->typeprop.type = expression->base.type; + tp_expression->typeprop.tp_expression = expression; } - return (expression_t*) sizeof_expression; + return tp_expression; +end_error: + return create_invalid_expression(); +} + +static expression_t *parse_sizeof(unsigned precedence) +{ + eat(T_sizeof); + return parse_typeprop(EXPR_SIZEOF, precedence); +} + +static expression_t *parse_alignof(unsigned precedence) +{ + eat(T___alignof__); + return parse_typeprop(EXPR_SIZEOF, precedence); } static expression_t *parse_select_expression(unsigned precedence, @@ -3677,7 +4870,7 @@ static expression_t *parse_select_expression(unsigned precedence, select->select.symbol = symbol; next_token(); - type_t *const orig_type = compound->base.datatype; + type_t *const orig_type = compound->base.type; type_t *const type = skip_typeref(orig_type); type_t *type_left = type; @@ -3709,12 +4902,7 @@ static expression_t *parse_select_expression(unsigned precedence, return create_invalid_expression(); } - declaration_t *iter = declaration->context.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(); @@ -3725,13 +4913,13 @@ static expression_t *parse_select_expression(unsigned precedence, type_t *expression_type = automatic_type_conversion(iter->type); select->select.compound_entry = iter; - select->base.datatype = expression_type; + select->base.type = expression_type; if(expression_type->kind == TYPE_BITFIELD) { expression_t *extract = allocate_expression_zero(EXPR_UNARY_BITFIELD_EXTRACT); - extract->unary.value = select; - extract->base.datatype = expression_type->bitfield.base; + extract->unary.value = select; + extract->base.type = expression_type->bitfield.base; return extract; } @@ -3749,11 +4937,12 @@ static expression_t *parse_call_expression(unsigned precedence, { (void) precedence; expression_t *result = allocate_expression_zero(EXPR_CALL); + result->base.source_position = expression->base.source_position; call_expression_t *call = &result->call; call->function = expression; - type_t *const orig_type = expression->base.datatype; + type_t *const orig_type = expression->base.type; type_t *const type = skip_typeref(orig_type); function_type_t *function_type = NULL; @@ -3761,8 +4950,8 @@ static expression_t *parse_call_expression(unsigned precedence, type_t *const to_type = skip_typeref(type->pointer.points_to); if (is_type_function(to_type)) { - function_type = &to_type->function; - call->expression.datatype = function_type->return_type; + function_type = &to_type->function; + call->base.type = function_type->return_type; } } @@ -3772,6 +4961,8 @@ static expression_t *parse_call_expression(unsigned precedence, /* parse arguments */ eat('('); + add_anchor_token(')'); + add_anchor_token(','); if(token.type != ')') { call_argument_t *last_argument = NULL; @@ -3792,6 +4983,8 @@ static expression_t *parse_call_expression(unsigned precedence, next_token(); } } + rem_anchor_token(','); + rem_anchor_token(')'); expect(')'); if(function_type != NULL) { @@ -3800,14 +4993,14 @@ static expression_t *parse_call_expression(unsigned precedence, for( ; parameter != NULL && argument != NULL; parameter = parameter->next, argument = argument->next) { type_t *expected_type = parameter->type; - /* TODO report context in error messages */ + /* TODO report scope in error messages */ expression_t *const arg_expr = argument->expression; type_t *const res_type = semantic_assign(expected_type, arg_expr, "function call"); if (res_type == NULL) { /* TODO improve error message */ errorf(arg_expr->base.source_position, "Cannot call function with argument '%E' of type '%T' where type '%T' is expected", - arg_expr, arg_expr->base.datatype, expected_type); + arg_expr, arg_expr->base.type, expected_type); } else { argument->expression = create_implicit_cast(argument->expression, expected_type); } @@ -3823,7 +5016,7 @@ static expression_t *parse_call_expression(unsigned precedence, } else { /* do default promotion */ for( ; argument != NULL; argument = argument->next) { - type_t *type = argument->expression->base.datatype; + type_t *type = argument->expression->base.type; type = skip_typeref(type); if(is_type_integer(type)) { @@ -3844,6 +5037,8 @@ static expression_t *parse_call_expression(unsigned precedence, } return result; +end_error: + return create_invalid_expression(); } static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right); @@ -3865,6 +5060,7 @@ static expression_t *parse_conditional_expression(unsigned precedence, expression_t *expression) { eat('?'); + add_anchor_token(':'); expression_t *result = allocate_expression_zero(EXPR_CONDITIONAL); @@ -3872,7 +5068,7 @@ static expression_t *parse_conditional_expression(unsigned precedence, conditional->condition = expression; /* 6.5.15.2 */ - type_t *const condition_type_orig = expression->base.datatype; + type_t *const condition_type_orig = expression->base.type; type_t *const condition_type = skip_typeref(condition_type_orig); if (!is_type_scalar(condition_type) && is_type_valid(condition_type)) { type_error("expected a scalar type in conditional condition", @@ -3880,14 +5076,12 @@ static expression_t *parse_conditional_expression(unsigned precedence, } expression_t *true_expression = parse_expression(); + rem_anchor_token(':'); expect(':'); expression_t *false_expression = parse_sub_expression(precedence); - conditional->true_expression = true_expression; - conditional->false_expression = false_expression; - - type_t *const orig_true_type = true_expression->base.datatype; - type_t *const orig_false_type = false_expression->base.datatype; + type_t *const orig_true_type = true_expression->base.type; + type_t *const orig_false_type = false_expression->base.type; type_t *const true_type = skip_typeref(orig_true_type); type_t *const false_type = skip_typeref(orig_false_type); @@ -3899,9 +5093,9 @@ static expression_t *parse_conditional_expression(unsigned precedence, true_expression = create_implicit_cast(true_expression, result_type); false_expression = create_implicit_cast(false_expression, result_type); - conditional->true_expression = true_expression; - conditional->false_expression = false_expression; - conditional->expression.datatype = result_type; + conditional->true_expression = true_expression; + conditional->false_expression = false_expression; + conditional->base.type = result_type; } else if (same_compound_type(true_type, false_type) || ( is_type_atomic(true_type, ATOMIC_TYPE_VOID) && is_type_atomic(false_type, ATOMIC_TYPE_VOID) @@ -3912,8 +5106,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, @@ -3922,8 +5123,14 @@ static expression_t *parse_conditional_expression(unsigned precedence, result_type = type_error_type; } - conditional->expression.datatype = result_type; + conditional->true_expression + = create_implicit_cast(true_expression, result_type); + conditional->false_expression + = create_implicit_cast(false_expression, result_type); + conditional->base.type = result_type; return result; +end_error: + return create_invalid_expression(); } /** @@ -3939,24 +5146,31 @@ static expression_t *parse_extension(unsigned precedence) return expression; } +/** + * Parse a __builtin_classify_type() expression. + */ static expression_t *parse_builtin_classify_type(const unsigned precedence) { eat(T___builtin_classify_type); - expression_t *result = allocate_expression_zero(EXPR_CLASSIFY_TYPE); - result->base.datatype = type_int; + expression_t *result = allocate_expression_zero(EXPR_CLASSIFY_TYPE); + result->base.type = type_int; expect('('); + add_anchor_token(')'); expression_t *expression = parse_sub_expression(precedence); + rem_anchor_token(')'); expect(')'); result->classify_type.type_expression = expression; return result; +end_error: + return create_invalid_expression(); } static void semantic_incdec(unary_expression_t *expression) { - type_t *const orig_type = expression->value->base.datatype; + type_t *const orig_type = expression->value->base.type; type_t *const type = skip_typeref(orig_type); /* TODO !is_type_real && !is_type_pointer */ if(!is_type_arithmetic(type) && type->kind != TYPE_POINTER) { @@ -3967,12 +5181,12 @@ static void semantic_incdec(unary_expression_t *expression) return; } - expression->expression.datatype = orig_type; + expression->base.type = orig_type; } static void semantic_unexpr_arithmetic(unary_expression_t *expression) { - type_t *const orig_type = expression->value->base.datatype; + type_t *const orig_type = expression->value->base.type; type_t *const type = skip_typeref(orig_type); if(!is_type_arithmetic(type)) { if (is_type_valid(type)) { @@ -3982,12 +5196,12 @@ static void semantic_unexpr_arithmetic(unary_expression_t *expression) return; } - expression->expression.datatype = orig_type; + expression->base.type = orig_type; } static void semantic_unexpr_scalar(unary_expression_t *expression) { - type_t *const orig_type = expression->value->base.datatype; + type_t *const orig_type = expression->value->base.type; type_t *const type = skip_typeref(orig_type); if (!is_type_scalar(type)) { if (is_type_valid(type)) { @@ -3996,12 +5210,12 @@ static void semantic_unexpr_scalar(unary_expression_t *expression) return; } - expression->expression.datatype = orig_type; + expression->base.type = orig_type; } static void semantic_unexpr_integer(unary_expression_t *expression) { - type_t *const orig_type = expression->value->base.datatype; + type_t *const orig_type = expression->value->base.type; type_t *const type = skip_typeref(orig_type); if (!is_type_integer(type)) { if (is_type_valid(type)) { @@ -4010,12 +5224,12 @@ static void semantic_unexpr_integer(unary_expression_t *expression) return; } - expression->expression.datatype = orig_type; + expression->base.type = orig_type; } static void semantic_dereference(unary_expression_t *expression) { - type_t *const orig_type = expression->value->base.datatype; + type_t *const orig_type = expression->value->base.type; type_t *const type = skip_typeref(orig_type); if(!is_type_pointer(type)) { if (is_type_valid(type)) { @@ -4024,9 +5238,9 @@ static void semantic_dereference(unary_expression_t *expression) return; } - type_t *result_type = type->pointer.points_to; - result_type = automatic_type_conversion(result_type); - expression->expression.datatype = result_type; + type_t *result_type = type->pointer.points_to; + result_type = automatic_type_conversion(result_type); + expression->base.type = result_type; } /** @@ -4034,10 +5248,10 @@ static void semantic_dereference(unary_expression_t *expression) */ static void semantic_take_addr(unary_expression_t *expression) { - expression_t *value = expression->value; - value->base.datatype = revert_automatic_type_conversion(value); + expression_t *value = expression->value; + value->base.type = revert_automatic_type_conversion(value); - type_t *orig_type = value->base.datatype; + type_t *orig_type = value->base.type; if(!is_type_valid(orig_type)) return; @@ -4045,7 +5259,7 @@ static void semantic_take_addr(unary_expression_t *expression) declaration_t *const declaration = value->reference.declaration; if(declaration != NULL) { if (declaration->storage_class == STORAGE_CLASS_REGISTER) { - errorf(expression->expression.source_position, + errorf(expression->base.source_position, "address of register variable '%Y' requested", declaration->symbol); } @@ -4053,7 +5267,7 @@ static void semantic_take_addr(unary_expression_t *expression) } } - expression->expression.datatype = make_pointer_type(orig_type, TYPE_QUALIFIER_NONE); + expression->base.type = make_pointer_type(orig_type, TYPE_QUALIFIER_NONE); } #define CREATE_UNARY_EXPRESSION_PARSER(token_type, unexpression_type, sfunc) \ @@ -4157,8 +5371,8 @@ static void semantic_binexpr_arithmetic(binary_expression_t *expression) { expression_t *const left = expression->left; expression_t *const right = expression->right; - type_t *const orig_type_left = left->base.datatype; - type_t *const orig_type_right = right->base.datatype; + type_t *const orig_type_left = left->base.type; + type_t *const orig_type_right = right->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); @@ -4171,17 +5385,17 @@ static void semantic_binexpr_arithmetic(binary_expression_t *expression) } type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); - expression->left = create_implicit_cast(left, arithmetic_type); - expression->right = create_implicit_cast(right, arithmetic_type); - expression->expression.datatype = arithmetic_type; + expression->left = create_implicit_cast(left, arithmetic_type); + expression->right = create_implicit_cast(right, arithmetic_type); + expression->base.type = arithmetic_type; } static void semantic_shift_op(binary_expression_t *expression) { expression_t *const left = expression->left; expression_t *const right = expression->right; - type_t *const orig_type_left = left->base.datatype; - type_t *const orig_type_right = right->base.datatype; + type_t *const orig_type_left = left->base.type; + type_t *const orig_type_right = right->base.type; type_t * type_left = skip_typeref(orig_type_left); type_t * type_right = skip_typeref(orig_type_right); @@ -4196,17 +5410,17 @@ static void semantic_shift_op(binary_expression_t *expression) type_left = promote_integer(type_left); type_right = promote_integer(type_right); - expression->left = create_implicit_cast(left, type_left); - expression->right = create_implicit_cast(right, type_right); - expression->expression.datatype = type_left; + expression->left = create_implicit_cast(left, type_left); + expression->right = create_implicit_cast(right, type_right); + expression->base.type = type_left; } static void semantic_add(binary_expression_t *expression) { expression_t *const left = expression->left; expression_t *const right = expression->right; - type_t *const orig_type_left = left->base.datatype; - type_t *const orig_type_right = right->base.datatype; + type_t *const orig_type_left = left->base.type; + type_t *const orig_type_right = right->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); @@ -4215,12 +5429,12 @@ static void semantic_add(binary_expression_t *expression) type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); expression->left = create_implicit_cast(left, arithmetic_type); expression->right = create_implicit_cast(right, arithmetic_type); - expression->expression.datatype = arithmetic_type; + expression->base.type = arithmetic_type; return; } else if(is_type_pointer(type_left) && is_type_integer(type_right)) { - expression->expression.datatype = type_left; + expression->base.type = type_left; } else if(is_type_pointer(type_right) && is_type_integer(type_left)) { - expression->expression.datatype = type_right; + expression->base.type = type_right; } else if (is_type_valid(type_left) && is_type_valid(type_right)) { errorf(HERE, "invalid operands to binary + ('%T', '%T')", orig_type_left, orig_type_right); } @@ -4230,47 +5444,69 @@ static void semantic_sub(binary_expression_t *expression) { expression_t *const left = expression->left; expression_t *const right = expression->right; - type_t *const orig_type_left = left->base.datatype; - type_t *const orig_type_right = right->base.datatype; + type_t *const orig_type_left = left->base.type; + type_t *const orig_type_right = right->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); /* § 5.6.5 */ if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); - expression->left = create_implicit_cast(left, arithmetic_type); - expression->right = create_implicit_cast(right, arithmetic_type); - expression->expression.datatype = arithmetic_type; + expression->left = create_implicit_cast(left, arithmetic_type); + expression->right = create_implicit_cast(right, arithmetic_type); + expression->base.type = arithmetic_type; return; } else if(is_type_pointer(type_left) && is_type_integer(type_right)) { - expression->expression.datatype = type_left; + expression->base.type = type_left; } else if(is_type_pointer(type_left) && is_type_pointer(type_right)) { if(!pointers_compatible(type_left, type_right)) { - errorf(HERE, "pointers to incompatible objects to binary '-' ('%T', '%T')", orig_type_left, orig_type_right); + errorf(HERE, + "pointers to incompatible objects to binary '-' ('%T', '%T')", + orig_type_left, orig_type_right); } else { - expression->expression.datatype = type_ptrdiff_t; + expression->base.type = type_ptrdiff_t; } } else if (is_type_valid(type_left) && is_type_valid(type_right)) { - errorf(HERE, "invalid operands to binary '-' ('%T', '%T')", orig_type_left, orig_type_right); + errorf(HERE, "invalid operands to binary '-' ('%T', '%T')", + orig_type_left, orig_type_right); } } +/** + * Check the semantics of comparison expressions. + * + * @param expression The expression to check. + */ static void semantic_comparison(binary_expression_t *expression) { expression_t *left = expression->left; expression_t *right = expression->right; - type_t *orig_type_left = left->base.datatype; - type_t *orig_type_right = right->base.datatype; + type_t *orig_type_left = left->base.type; + type_t *orig_type_right = right->base.type; type_t *type_left = skip_typeref(orig_type_left); type_t *type_right = skip_typeref(orig_type_right); /* TODO non-arithmetic types */ if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { + if (warning.sign_compare && + (expression->base.kind != EXPR_BINARY_EQUAL && + expression->base.kind != EXPR_BINARY_NOTEQUAL) && + (is_type_signed(type_left) != is_type_signed(type_right))) { + warningf(expression->base.source_position, + "comparison between signed and unsigned"); + } type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); - expression->left = create_implicit_cast(left, arithmetic_type); - expression->right = create_implicit_cast(right, arithmetic_type); - expression->expression.datatype = arithmetic_type; + expression->left = create_implicit_cast(left, arithmetic_type); + expression->right = create_implicit_cast(right, arithmetic_type); + expression->base.type = arithmetic_type; + if (warning.float_equal && + (expression->base.kind == EXPR_BINARY_EQUAL || + expression->base.kind == EXPR_BINARY_NOTEQUAL) && + is_type_float(arithmetic_type)) { + warningf(expression->base.source_position, + "comparing floating point with == or != is unsafe"); + } } else if (is_type_pointer(type_left) && is_type_pointer(type_right)) { /* TODO check compatibility */ } else if (is_type_pointer(type_left)) { @@ -4279,17 +5515,18 @@ static void semantic_comparison(binary_expression_t *expression) expression->left = create_implicit_cast(left, type_right); } else if (is_type_valid(type_left) && is_type_valid(type_right)) { type_error_incompatible("invalid operands in comparison", - token.source_position, type_left, type_right); + expression->base.source_position, + type_left, type_right); } - expression->expression.datatype = type_int; + expression->base.type = type_int; } static void semantic_arithmetic_assign(binary_expression_t *expression) { expression_t *left = expression->left; expression_t *right = expression->right; - type_t *orig_type_left = left->base.datatype; - type_t *orig_type_right = right->base.datatype; + type_t *orig_type_left = left->base.type; + type_t *orig_type_right = right->base.type; type_t *type_left = skip_typeref(orig_type_left); type_t *type_right = skip_typeref(orig_type_right); @@ -4308,15 +5545,15 @@ static void semantic_arithmetic_assign(binary_expression_t *expression) * for the arithmetic operation and create a cast by itself */ type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); expression->right = create_implicit_cast(right, arithmetic_type); - expression->expression.datatype = type_left; + expression->base.type = type_left; } static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression) { expression_t *const left = expression->left; expression_t *const right = expression->right; - type_t *const orig_type_left = left->base.datatype; - type_t *const orig_type_right = right->base.datatype; + type_t *const orig_type_left = left->base.type; + type_t *const orig_type_right = right->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); @@ -4326,10 +5563,10 @@ static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression) * The ast2firm pass has to know that left_type must be right_type * for the arithmetic operation and create a cast by itself */ type_t *const arithmetic_type = semantic_arithmetic(type_left, type_right); - expression->right = create_implicit_cast(right, arithmetic_type); - expression->expression.datatype = type_left; + expression->right = create_implicit_cast(right, arithmetic_type); + expression->base.type = type_left; } else if (is_type_pointer(type_left) && is_type_integer(type_right)) { - expression->expression.datatype = type_left; + expression->base.type = type_left; } else if (is_type_valid(type_left) && is_type_valid(type_right)) { errorf(HERE, "incompatible types '%T' and '%T' in assignment", orig_type_left, orig_type_right); } @@ -4342,8 +5579,8 @@ static void semantic_logical_op(binary_expression_t *expression) { expression_t *const left = expression->left; expression_t *const right = expression->right; - type_t *const orig_type_left = left->base.datatype; - type_t *const orig_type_right = right->base.datatype; + type_t *const orig_type_left = left->base.type; + type_t *const orig_type_right = right->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); @@ -4355,7 +5592,7 @@ static void semantic_logical_op(binary_expression_t *expression) return; } - expression->expression.datatype = type_int; + expression->base.type = type_int; } /** @@ -4363,8 +5600,8 @@ static void semantic_logical_op(binary_expression_t *expression) */ static bool has_const_fields(const compound_type_t *type) { - const context_t *context = &type->declaration->context; - const declaration_t *declaration = context->declarations; + const scope_t *scope = &type->declaration->scope; + const declaration_t *declaration = scope->declarations; for (; declaration != NULL; declaration = declaration->next) { if (declaration->namespc != NAMESPACE_NORMAL) @@ -4384,7 +5621,7 @@ static bool has_const_fields(const compound_type_t *type) static void semantic_binexpr_assign(binary_expression_t *expression) { expression_t *left = expression->left; - type_t *orig_type_left = left->base.datatype; + type_t *orig_type_left = left->base.type; type_t *type_left = revert_automatic_type_conversion(left); type_left = skip_typeref(orig_type_left); @@ -4414,25 +5651,40 @@ static void semantic_binexpr_assign(binary_expression_t *expression) type_t *const res_type = semantic_assign(orig_type_left, expression->right, "assignment"); if (res_type == NULL) { - errorf(expression->expression.source_position, + errorf(expression->base.source_position, "cannot assign to '%T' from '%T'", - orig_type_left, expression->right->base.datatype); + orig_type_left, expression->right->base.type); } else { expression->right = create_implicit_cast(expression->right, res_type); } - expression->expression.datatype = orig_type_left; + expression->base.type = orig_type_left; } +/** + * Determine if the outermost operation (or parts thereof) of the given + * expression has no effect in order to generate a warning about this fact. + * Therefore in some cases this only examines some of the operands of the + * expression (see comments in the function and examples below). + * Examples: + * f() + 23; // warning, because + has no effect + * x || f(); // no warning, because x controls execution of f() + * x ? y : f(); // warning, because y has no effect + * (void)x; // no warning to be able to suppress the warning + * This function can NOT be used for an "expression has definitely no effect"- + * analysis. */ static bool expression_has_effect(const expression_t *const expr) { switch (expr->kind) { case EXPR_UNKNOWN: break; - case EXPR_INVALID: break; + case EXPR_INVALID: return true; /* do NOT warn */ case EXPR_REFERENCE: return false; case EXPR_CONST: return false; + case EXPR_CHARACTER_CONSTANT: return false; + case EXPR_WIDE_CHARACTER_CONSTANT: return false; case EXPR_STRING_LITERAL: return false; case EXPR_WIDE_STRING_LITERAL: return false; + case EXPR_CALL: { const call_expression_t *const call = &expr->call; if (call->function->kind != EXPR_BUILTIN_SYMBOL) @@ -4443,12 +5695,16 @@ static bool expression_has_effect(const expression_t *const expr) default: return false; } } + + /* Generate the warning if either the left or right hand side of a + * conditional expression has no effect */ case EXPR_CONDITIONAL: { const conditional_expression_t *const cond = &expr->conditional; return expression_has_effect(cond->true_expression) && expression_has_effect(cond->false_expression); } + case EXPR_SELECT: return false; case EXPR_ARRAY_ACCESS: return false; case EXPR_SIZEOF: return false; @@ -4464,6 +5720,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; @@ -4475,8 +5732,14 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_UNARY_POSTFIX_DECREMENT: return true; case EXPR_UNARY_PREFIX_INCREMENT: return true; case EXPR_UNARY_PREFIX_DECREMENT: return true; - case EXPR_UNARY_CAST: - return is_type_atomic(expr->base.datatype, ATOMIC_TYPE_VOID); + + /* Treat void casts as if they have an effect in order to being able to + * suppress the warning */ + case EXPR_UNARY_CAST: { + type_t *const 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; @@ -4508,8 +5771,14 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_BINARY_BITWISE_AND_ASSIGN: return true; case EXPR_BINARY_BITWISE_XOR_ASSIGN: return true; case EXPR_BINARY_BITWISE_OR_ASSIGN: return true; + + /* Only examine the right hand side of && and ||, because the left hand + * side already has the effect of controlling the execution of the right + * hand side */ case EXPR_BINARY_LOGICAL_AND: case EXPR_BINARY_LOGICAL_OR: + /* Only examine the right hand side of a comma expression, because the left + * hand side has a separate warning */ case EXPR_BINARY_COMMA: return expression_has_effect(expr->binary.right); @@ -4522,7 +5791,7 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_BINARY_ISUNORDERED: return false; } - panic("unexpected statement"); + internal_errorf(HERE, "unexpected expression"); } static void semantic_comma(binary_expression_t *expression) @@ -4533,7 +5802,7 @@ static void semantic_comma(binary_expression_t *expression) warningf(left->base.source_position, "left-hand operand of comma expression has no effect"); } } - expression->expression.datatype = expression->right->base.datatype; + expression->base.type = expression->right->base.type; } #define CREATE_BINEXPR_PARSER(token_type, binexpression_type, sfunc, lr) \ @@ -4541,10 +5810,12 @@ static expression_t *parse_##binexpression_type(unsigned precedence, \ expression_t *left) \ { \ eat(token_type); \ + source_position_t pos = HERE; \ \ expression_t *right = parse_sub_expression(precedence + lr); \ \ expression_t *binexpr = allocate_expression_zero(binexpression_type); \ + binexpr->base.source_position = pos; \ binexpr->binary.left = left; \ binexpr->binary.right = right; \ sfunc(&binexpr->binary); \ @@ -4760,7 +6031,8 @@ static void init_expression_parsers(void) T_PLUSPLUS, 25); register_expression_parser(parse_EXPR_UNARY_PREFIX_DECREMENT, T_MINUSMINUS, 25); - register_expression_parser(parse_sizeof, T_sizeof, 25); + register_expression_parser(parse_sizeof, T_sizeof, 25); + register_expression_parser(parse_alignof, T___alignof__, 25); register_expression_parser(parse_extension, T___extension__, 25); register_expression_parser(parse_builtin_classify_type, T___builtin_classify_type, 25); @@ -4808,6 +6080,8 @@ static asm_constraint_t *parse_asm_constraints(void) } return result; +end_error: + return NULL; } /** @@ -4855,28 +6129,40 @@ static statement_t *parse_asm_statement(void) } expect('('); + add_anchor_token(')'); + add_anchor_token(':'); asm_statement->asm_text = parse_string_literals(); - if(token.type != ':') + if(token.type != ':') { + rem_anchor_token(':'); goto end_of_asm; + } eat(':'); asm_statement->inputs = parse_asm_constraints(); - if(token.type != ':') + if(token.type != ':') { + rem_anchor_token(':'); goto end_of_asm; + } eat(':'); asm_statement->outputs = parse_asm_constraints(); - if(token.type != ':') + if(token.type != ':') { + rem_anchor_token(':'); goto end_of_asm; + } + rem_anchor_token(':'); eat(':'); asm_statement->clobbers = parse_asm_clobbers(); end_of_asm: + rem_anchor_token(')'); expect(')'); expect(';'); return statement; +end_error: + return create_invalid_statement(); } /** @@ -4891,6 +6177,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)) { @@ -4911,9 +6204,11 @@ static statement_t *parse_case_statement(void) "case label not within a switch statement"); } } - statement->case_label.label_statement = parse_statement(); + statement->case_label.statement = parse_statement(); return statement; +end_error: + return create_invalid_statement(); } /** @@ -4922,9 +6217,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; } @@ -4947,7 +6241,7 @@ static statement_t *parse_default_statement(void) const case_label_statement_t *def_label = find_default_label(current_switch); if (def_label != NULL) { errorf(HERE, "multiple default labels in one switch"); - errorf(def_label->statement.source_position, + errorf(def_label->base.source_position, "this is the first default label"); } else { /* link all cases into the switch statement */ @@ -4962,9 +6256,11 @@ static statement_t *parse_default_statement(void) errorf(statement->base.source_position, "'default' label not within a switch statement"); } - statement->label.label_statement = parse_statement(); + statement->case_label.statement = parse_statement(); return statement; +end_error: + return create_invalid_statement(); } /** @@ -4977,7 +6273,7 @@ static declaration_t *get_label(symbol_t *symbol) /* if we found a label in the same function, then we already created the * declaration */ if(candidate != NULL - && candidate->parent_context == ¤t_function->context) { + && candidate->parent_scope == ¤t_function->scope) { return candidate; } @@ -5012,30 +6308,44 @@ static statement_t *parse_label_statement(void) label->source_position = token.source_position; } - label_statement_t *label_statement = allocate_ast_zero(sizeof(label[0])); + statement_t *statement = allocate_statement_zero(STATEMENT_LABEL); - label_statement->statement.kind = STATEMENT_LABEL; - label_statement->statement.source_position = token.source_position; - label_statement->label = label; + statement->base.source_position = token.source_position; + statement->label.label = label; eat(':'); if(token.type == '}') { /* TODO only warn? */ - errorf(HERE, "label at end of compound statement"); - return (statement_t*) label_statement; + if(false) { + warningf(HERE, "label at end of compound statement"); + statement->label.statement = create_empty_statement(); + } else { + errorf(HERE, "label at end of compound statement"); + statement->label.statement = create_invalid_statement(); + } + return statement; } else { if (token.type == ';') { /* eat an empty statement here, to avoid the warning about an empty * after a label. label:; is commonly used to have a label before * a }. */ + statement->label.statement = create_empty_statement(); next_token(); } else { - label_statement->label_statement = parse_statement(); + statement->label.statement = parse_statement(); } } - return (statement_t*) label_statement; + /* remember the labels's in a list for later checking */ + if (label_last == NULL) { + label_first = &statement->label; + } else { + label_last->next = &statement->label; + } + label_last = &statement->label; + + return statement; } /** @@ -5045,21 +6355,27 @@ static statement_t *parse_if(void) { eat(T_if); - if_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->statement.kind = STATEMENT_IF; - statement->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_IF); + statement->base.source_position = token.source_position; expect('('); - statement->condition = parse_expression(); + add_anchor_token(')'); + statement->ifs.condition = parse_expression(); + rem_anchor_token(')'); expect(')'); - statement->true_statement = parse_statement(); + add_anchor_token(T_else); + statement->ifs.true_statement = parse_statement(); + rem_anchor_token(T_else); + if(token.type == T_else) { next_token(); - statement->false_statement = parse_statement(); + statement->ifs.false_statement = parse_statement(); } - return (statement_t*) statement; + return statement; +end_error: + return create_invalid_statement(); } /** @@ -5069,39 +6385,44 @@ static statement_t *parse_switch(void) { eat(T_switch); - switch_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->statement.kind = STATEMENT_SWITCH; - statement->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_SWITCH); + statement->base.source_position = token.source_position; expect('('); expression_t *const expr = parse_expression(); - type_t * type = skip_typeref(expr->base.datatype); + type_t * type = skip_typeref(expr->base.type); if (is_type_integer(type)) { type = promote_integer(type); } else if (is_type_valid(type)) { - errorf(expr->base.source_position, "switch quantity is not an integer, but '%T'", type); + errorf(expr->base.source_position, + "switch quantity is not an integer, but '%T'", type); type = type_error_type; } - statement->expression = create_implicit_cast(expr, type); + statement->switchs.expression = create_implicit_cast(expr, type); expect(')'); switch_statement_t *rem = current_switch; - current_switch = statement; - statement->body = parse_statement(); - current_switch = rem; + current_switch = &statement->switchs; + statement->switchs.body = parse_statement(); + current_switch = rem; - if (warning.switch_default && find_default_label(statement) == NULL) { - warningf(statement->statement.source_position, "switch has no default case"); + if (warning.switch_default + && find_default_label(&statement->switchs) == NULL) { + warningf(statement->base.source_position, "switch has no default case"); } - return (statement_t*) statement; + return statement; +end_error: + return create_invalid_statement(); } static statement_t *parse_loop_body(statement_t *const loop) { statement_t *const rem = current_loop; current_loop = loop; + statement_t *const body = parse_statement(); + current_loop = rem; return body; } @@ -5113,17 +6434,20 @@ static statement_t *parse_while(void) { eat(T_while); - while_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->statement.kind = STATEMENT_WHILE; - statement->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_WHILE); + statement->base.source_position = token.source_position; expect('('); - statement->condition = parse_expression(); + add_anchor_token(')'); + statement->whiles.condition = parse_expression(); + rem_anchor_token(')'); expect(')'); - statement->body = parse_loop_body((statement_t*)statement); + statement->whiles.body = parse_loop_body(statement); - return (statement_t*) statement; + return statement; +end_error: + return create_invalid_statement(); } /** @@ -5133,18 +6457,25 @@ static statement_t *parse_do(void) { eat(T_do); - do_while_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->statement.kind = STATEMENT_DO_WHILE; - statement->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_DO_WHILE); + + statement->base.source_position = token.source_position; + + add_anchor_token(T_while); + statement->do_while.body = parse_loop_body(statement); + rem_anchor_token(T_while); - statement->body = parse_loop_body((statement_t*)statement); expect(T_while); expect('('); - statement->condition = parse_expression(); + add_anchor_token(')'); + statement->do_while.condition = parse_expression(); + rem_anchor_token(')'); expect(')'); expect(';'); - return (statement_t*) statement; + return statement; +end_error: + return create_invalid_statement(); } /** @@ -5154,21 +6485,26 @@ static statement_t *parse_for(void) { eat(T_for); - for_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->statement.kind = STATEMENT_FOR; - statement->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_FOR); + statement->base.source_position = token.source_position; + + int top = environment_top(); + scope_t *last_scope = scope; + set_scope(&statement->fors.scope); expect('('); - - int top = environment_top(); - context_t *last_context = context; - set_context(&statement->context); + add_anchor_token(')'); if(token.type != ';') { if(is_declaration_specifier(&token, false)) { parse_declaration(record_declaration); } else { - statement->initialisation = parse_expression(); + expression_t *const init = parse_expression(); + statement->fors.initialisation = init; + if (warning.unused_value && !expression_has_effect(init)) { + warningf(init->base.source_position, + "initialisation of 'for'-statement has no effect"); + } expect(';'); } } else { @@ -5176,20 +6512,34 @@ static statement_t *parse_for(void) } if(token.type != ';') { - statement->condition = parse_expression(); + statement->fors.condition = parse_expression(); } expect(';'); if(token.type != ')') { - statement->step = parse_expression(); + expression_t *const step = parse_expression(); + statement->fors.step = step; + if (warning.unused_value && !expression_has_effect(step)) { + warningf(step->base.source_position, + "step of 'for'-statement has no effect"); + } } + rem_anchor_token(')'); expect(')'); - statement->body = parse_loop_body((statement_t*)statement); + statement->fors.body = parse_loop_body(statement); + + assert(scope == &statement->fors.scope); + set_scope(last_scope); + environment_pop_to(top); + + return statement; - assert(context == &statement->context); - set_context(last_context); +end_error: + rem_anchor_token(')'); + assert(scope == &statement->fors.scope); + set_scope(last_scope); environment_pop_to(top); - return (statement_t*) statement; + return create_invalid_statement(); } /** @@ -5209,23 +6559,24 @@ static statement_t *parse_goto(void) declaration_t *label = get_label(symbol); - goto_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - - statement->statement.kind = STATEMENT_GOTO; - statement->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_GOTO); + statement->base.source_position = token.source_position; - statement->label = label; + statement->gotos.label = label; /* remember the goto's in a list for later checking */ if (goto_last == NULL) { - goto_first = goto_last = statement; + goto_first = &statement->gotos; } else { - goto_last->next = statement; + goto_last->next = &statement->gotos; } + goto_last = &statement->gotos; expect(';'); - return (statement_t*) statement; + return statement; +end_error: + return create_invalid_statement(); } /** @@ -5247,6 +6598,8 @@ static statement_t *parse_continue(void) expect(';'); return statement; +end_error: + return create_invalid_statement(); } /** @@ -5268,6 +6621,8 @@ static statement_t *parse_break(void) expect(';'); return statement; +end_error: + return create_invalid_statement(); } /** @@ -5275,7 +6630,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); @@ -5290,6 +6644,17 @@ static bool is_local_var_declaration(const declaration_t *declaration) { } } +/** + * Check if a given declaration represents a variable. + */ +static bool is_var_declaration(const declaration_t *declaration) { + if(declaration->storage_class == STORAGE_CLASS_TYPEDEF) + return false; + + const type_t *type = skip_typeref(declaration->type); + return !is_type_function(type); +} + /** * Check if a given expression represents a local variable. */ @@ -5302,6 +6667,21 @@ static bool is_local_variable(const expression_t *expression) return is_local_var_declaration(declaration); } +/** + * Check if a given expression represents a local variable and + * return its declaration then, else return NULL. + */ +declaration_t *expr_is_variable(const expression_t *expression) +{ + if (expression->base.kind != EXPR_REFERENCE) { + return NULL; + } + declaration_t *declaration = expression->reference.declaration; + if (is_var_declaration(declaration)) + return declaration; + return NULL; +} + /** * Parse a return statement. */ @@ -5309,10 +6689,8 @@ static statement_t *parse_return(void) { eat(T_return); - return_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - - statement->statement.kind = STATEMENT_RETURN; - statement->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_RETURN); + statement->base.source_position = token.source_position; expression_t *return_value = NULL; if(token.type != ';') { @@ -5325,20 +6703,20 @@ static statement_t *parse_return(void) type_t *const return_type = skip_typeref(func_type->function.return_type); if(return_value != NULL) { - type_t *return_value_type = skip_typeref(return_value->base.datatype); + type_t *return_value_type = skip_typeref(return_value->base.type); if(is_type_atomic(return_type, ATOMIC_TYPE_VOID) && !is_type_atomic(return_value_type, ATOMIC_TYPE_VOID)) { - warningf(statement->statement.source_position, - "'return' with a value, in function returning void"); + warningf(statement->base.source_position, + "'return' with a value, in function returning void"); return_value = NULL; } else { type_t *const res_type = semantic_assign(return_type, return_value, "'return'"); if (res_type == NULL) { - errorf(statement->statement.source_position, - "cannot return something of type '%T' in function returning '%T'", - return_value->base.datatype, return_type); + errorf(statement->base.source_position, + "cannot return something of type '%T' in function returning '%T'", + return_value->base.type, return_type); } else { return_value = create_implicit_cast(return_value, res_type); } @@ -5347,19 +6725,21 @@ static statement_t *parse_return(void) if (return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) { const expression_t *expression = return_value->unary.value; if (is_local_variable(expression)) { - warningf(statement->statement.source_position, - "function returns address of local variable"); + warningf(statement->base.source_position, + "function returns address of local variable"); } } } else { if(!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { - warningf(statement->statement.source_position, - "'return' without value, in function returning non-void"); + warningf(statement->base.source_position, + "'return' without value, in function returning non-void"); } } - statement->return_value = return_value; + statement->returns.value = return_value; - return (statement_t*) statement; + return statement; +end_error: + return create_invalid_statement(); } /** @@ -5375,7 +6755,7 @@ static statement_t *parse_declaration_statement(void) parse_declaration(record_declaration); if(before == NULL) { - statement->declaration.declarations_begin = context->declarations; + statement->declaration.declarations_begin = scope->declarations; } else { statement->declaration.declarations_begin = before->next; } @@ -5402,6 +6782,8 @@ static statement_t *parse_expression_statement(void) expect(';'); return statement; +end_error: + return create_invalid_statement(); } /** @@ -5412,6 +6794,7 @@ static statement_t *parse_statement(void) statement_t *statement = NULL; /* declaration or statement */ + add_anchor_token(';'); switch(token.type) { case T_asm: statement = parse_asm_statement(); @@ -5466,11 +6849,11 @@ static statement_t *parse_statement(void) break; case ';': - if (warning.empty_statement) { + if(warning.empty_statement) { warningf(HERE, "statement is empty"); } + statement = create_empty_statement(); next_token(); - statement = NULL; break; case T_IDENTIFIER: @@ -5504,9 +6887,10 @@ static statement_t *parse_statement(void) statement = parse_expression_statement(); break; } + rem_anchor_token(';'); - assert(statement == NULL - || statement->base.source_position.input_name != NULL); + assert(statement != NULL + && statement->base.source_position.input_name != NULL); return statement; } @@ -5516,47 +6900,54 @@ static statement_t *parse_statement(void) */ static statement_t *parse_compound_statement(void) { - compound_statement_t *const compound_statement - = allocate_ast_zero(sizeof(compound_statement[0])); - compound_statement->statement.kind = STATEMENT_COMPOUND; - compound_statement->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_COMPOUND); + + statement->base.source_position = token.source_position; eat('{'); + add_anchor_token('}'); - int top = environment_top(); - context_t *last_context = context; - set_context(&compound_statement->context); + int top = environment_top(); + scope_t *last_scope = scope; + set_scope(&statement->compound.scope); statement_t *last_statement = NULL; while(token.type != '}' && token.type != T_EOF) { - statement_t *statement = parse_statement(); - if(statement == NULL) + statement_t *sub_statement = parse_statement(); + if(is_invalid_statement(sub_statement)) { + /* an error occurred. if we are at an anchor, return */ + if(at_anchor()) + goto end_error; continue; + } if(last_statement != NULL) { - last_statement->base.next = statement; + last_statement->base.next = sub_statement; } else { - compound_statement->statements = statement; + statement->compound.statements = sub_statement; } - while(statement->base.next != NULL) - statement = statement->base.next; + while(sub_statement->base.next != NULL) + sub_statement = sub_statement->base.next; - last_statement = statement; + last_statement = sub_statement; } if(token.type == '}') { next_token(); } else { - errorf(compound_statement->statement.source_position, "end of file while looking for closing '}'"); + errorf(statement->base.source_position, + "end of file while looking for closing '}'"); } - assert(context == &compound_statement->context); - set_context(last_context); +end_error: + rem_anchor_token('}'); + assert(scope == &statement->compound.scope); + set_scope(last_scope); environment_pop_to(top); - return (statement_t*) compound_statement; + return statement; } /** @@ -5579,6 +6970,37 @@ static void initialize_builtin_types(void) type_wchar_t_ptr = make_pointer_type(type_wchar_t, TYPE_QUALIFIER_NONE); } +/** + * Check for unused global static functions and variables + */ +static void check_unused_globals(void) +{ + if (!warning.unused_function && !warning.unused_variable) + return; + + for (const declaration_t *decl = global_scope->declarations; decl != NULL; decl = decl->next) { + if (decl->used || decl->storage_class != STORAGE_CLASS_STATIC) + continue; + + type_t *const type = decl->type; + const char *s; + if (is_type_function(skip_typeref(type))) { + if (!warning.unused_function || decl->is_inline) + continue; + + s = (decl->init.statement != NULL ? "defined" : "declared"); + } else { + if (!warning.unused_variable) + continue; + + s = "defined"; + } + + warningf(decl->source_position, "'%#T' %s but not used", + type, decl->symbol, s); + } +} + /** * Parse a translation unit. */ @@ -5586,11 +7008,11 @@ static translation_unit_t *parse_translation_unit(void) { translation_unit_t *unit = allocate_ast_zero(sizeof(unit[0])); - assert(global_context == NULL); - global_context = &unit->context; + assert(global_scope == NULL); + global_scope = &unit->scope; - assert(context == NULL); - set_context(&unit->context); + assert(scope == NULL); + set_scope(&unit->scope); initialize_builtin_types(); @@ -5604,12 +7026,13 @@ static translation_unit_t *parse_translation_unit(void) } } - assert(context == &unit->context); - context = NULL; + assert(scope == &unit->scope); + scope = NULL; last_declaration = NULL; - assert(global_context == &unit->context); - global_context = NULL; + assert(global_scope == &unit->scope); + check_unused_globals(); + global_scope = NULL; return unit; } @@ -5639,9 +7062,6 @@ translation_unit_t *parse(void) DEL_ARR_F(environment_stack); DEL_ARR_F(label_stack); - if(error_count > 0) - return NULL; - return unit; } @@ -5650,6 +7070,29 @@ translation_unit_t *parse(void) */ void init_parser(void) { + if(c_mode & _MS) { + /* add predefined symbols for extended-decl-modifier */ + sym_align = symbol_table_insert("align"); + sym_allocate = symbol_table_insert("allocate"); + sym_dllimport = symbol_table_insert("dllimport"); + sym_dllexport = symbol_table_insert("dllexport"); + sym_naked = symbol_table_insert("naked"); + sym_noinline = symbol_table_insert("noinline"); + sym_noreturn = symbol_table_insert("noreturn"); + sym_nothrow = symbol_table_insert("nothrow"); + sym_novtable = symbol_table_insert("novtable"); + sym_property = symbol_table_insert("property"); + sym_get = symbol_table_insert("get"); + sym_put = symbol_table_insert("put"); + sym_selectany = symbol_table_insert("selectany"); + sym_thread = symbol_table_insert("thread"); + sym_uuid = symbol_table_insert("uuid"); + sym_deprecated = symbol_table_insert("deprecated"); + sym_restrict = symbol_table_insert("restrict"); + sym_noalias = symbol_table_insert("noalias"); + } + memset(token_anchor_set, 0, sizeof(token_anchor_set)); + init_expression_parsers(); obstack_init(&temp_obst);