X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=09930b025df14de6e72a39736917bc258c2d6257;hb=ee79a99034abe9e4702001ebdedb465148e2f2fa;hp=d2ce0cd996bb2bcd272652d5a338c67e82accb03;hpb=26073a8608126e36f18bd77c0f5ab9aa18d2d955;p=cparser diff --git a/parser.c b/parser.c index d2ce0cd..09930b0 100644 --- a/parser.c +++ b/parser.c @@ -1,6 +1,6 @@ /* * This file is part of cparser. - * Copyright (C) 2007-2008 Matthias Braun + * Copyright (C) 2007-2009 Matthias Braun * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -34,15 +34,17 @@ #include "type_hash.h" #include "ast_t.h" #include "entity_t.h" +#include "attribute_t.h" #include "lang_features.h" -#include "walk_statements.h" +#include "walk.h" #include "warning.h" +#include "printer.h" #include "adt/bitfiddle.h" #include "adt/error.h" #include "adt/array.h" //#define PRINT_TOKENS -#define MAX_LOOKAHEAD 2 +#define MAX_LOOKAHEAD 1 typedef struct { entity_t *old_entity; @@ -50,27 +52,6 @@ typedef struct { entity_namespace_t namespc; } stack_entry_t; -typedef struct argument_list_t argument_list_t; -struct argument_list_t { - long argument; - argument_list_t *next; -}; - -typedef struct gnu_attribute_t gnu_attribute_t; -struct gnu_attribute_t { - gnu_attribute_kind_t kind; /**< The kind of the GNU attribute. */ - gnu_attribute_t *next; - bool invalid; /**< Set if this attribute had argument errors, */ - bool have_arguments; /**< True, if this attribute has arguments. */ - union { - size_t value; - string_t string; - atomic_type_kind_t akind; - long argument; /**< Single argument. */ - argument_list_t *arguments; /**< List of argument expressions. */ - } u; -}; - typedef struct declaration_specifiers_t declaration_specifiers_t; struct declaration_specifiers_t { source_position_t source_position; @@ -78,12 +59,7 @@ struct declaration_specifiers_t { unsigned char alignment; /**< Alignment, 0 if not set. */ bool is_inline : 1; bool thread_local : 1; /**< GCC __thread */ - bool deprecated : 1; - decl_modifiers_t modifiers; /**< declaration modifiers */ - gnu_attribute_t *gnu_attributes; /**< list of GNU attributes */ - const char *deprecated_string; /**< can be set if declaration was marked deprecated. */ - symbol_t *get_property_sym; /**< the name of the get property if set. */ - symbol_t *put_property_sym; /**< the name of the put property if set. */ + attribute_t *attributes; /**< list of attributes */ type_t *type; }; @@ -98,14 +74,6 @@ typedef struct parse_initializer_env_t { bool must_be_constant; } parse_initializer_env_t; -/** - * Capture a MS __base extension. - */ -typedef struct based_spec_t { - source_position_t source_position; - variable_t *base_variable; -} based_spec_t; - typedef entity_t* (*parsed_declaration_func) (entity_t *declaration, bool is_definition); /** The current token. */ @@ -113,77 +81,71 @@ static token_t token; /** The lookahead ring-buffer. */ static token_t lookahead_buffer[MAX_LOOKAHEAD]; /** Position of the next token in the lookahead buffer. */ -static int lookahead_bufpos; +static size_t lookahead_bufpos; static stack_entry_t *environment_stack = NULL; static stack_entry_t *label_stack = NULL; static scope_t *file_scope = NULL; static scope_t *current_scope = NULL; /** Point to the current function declaration if inside a function. */ static function_t *current_function = NULL; -static entity_t *current_init_decl = NULL; +static entity_t *current_entity = NULL; static switch_statement_t *current_switch = NULL; static statement_t *current_loop = NULL; static statement_t *current_parent = NULL; static ms_try_statement_t *current_try = NULL; -static linkage_kind_t current_linkage = LINKAGE_INVALID; +static linkage_kind_t current_linkage; static goto_statement_t *goto_first = NULL; static goto_statement_t **goto_anchor = NULL; static label_statement_t *label_first = NULL; static label_statement_t **label_anchor = NULL; /** current translation unit. */ static translation_unit_t *unit = NULL; -/** true if we are in a type property context (evaluation only for type. */ -static bool in_type_prop = false; -/** true in we are in a __extension__ context. */ +/** true if we are in an __extension__ context. */ static bool in_gcc_extension = false; static struct obstack temp_obst; static entity_t *anonymous_entity; static declaration_t **incomplete_arrays; - - -#define PUSH_PARENT(stmt) \ - statement_t *const prev_parent = current_parent; \ - ((void)(current_parent = (stmt))) -#define POP_PARENT ((void)(current_parent = prev_parent)) +static elf_visibility_tag_t default_visibility = ELF_VISIBILITY_DEFAULT; + + +#define PUSH_PARENT(stmt) \ + statement_t *const new_parent = (stmt); \ + statement_t *const old_parent = current_parent; \ + ((void)(current_parent = new_parent)) +#define POP_PARENT() (assert(current_parent == new_parent), (void)(current_parent = old_parent)) + +#define PUSH_SCOPE(scope) \ + size_t const top = environment_top(); \ + scope_t *const new_scope = (scope); \ + scope_t *const old_scope = scope_push(new_scope) +#define POP_SCOPE() (assert(current_scope == new_scope), scope_pop(old_scope), environment_pop_to(top)) + +#define PUSH_EXTENSION() \ + (void)0; \ + bool const old_gcc_extension = in_gcc_extension; \ + while (next_if(T___extension__)) { \ + in_gcc_extension = true; \ + } \ + do {} while (0) +#define POP_EXTENSION() \ + ((void)(in_gcc_extension = old_gcc_extension)) /** special symbol used for anonymous entities. */ -static const symbol_t *sym_anonymous = NULL; - -/* 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; +static symbol_t *sym_anonymous = NULL; /** The token anchor set */ -static unsigned char token_anchor_set[T_LAST_TOKEN]; +static unsigned short token_anchor_set[T_LAST_TOKEN]; /** The current source position. */ -#define HERE (&token.source_position) +#define HERE (&token.base.source_position) /** true if we are in GCC mode. */ #define GNU_MODE ((c_mode & _GNUC) || in_gcc_extension) -static type_t *type_valist; - static statement_t *parse_compound_statement(bool inside_expression_statement); static statement_t *parse_statement(void); -static expression_t *parse_sub_expression(precedence_t); +static expression_t *parse_subexpression(precedence_t); static expression_t *parse_expression(void); static type_t *parse_typename(void); static void parse_externals(void); @@ -191,6 +153,9 @@ static void parse_external(void); static void parse_compound_type_entries(compound_t *compound_declaration); +static void check_call_argument(type_t *expected_type, + call_argument_t *argument, unsigned pos); + typedef enum declarator_flags_t { DECL_FLAGS_NONE = 0, DECL_MAY_BE_ABSTRACT = 1U << 0, @@ -201,8 +166,6 @@ typedef enum declarator_flags_t { static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, declarator_flags_t flags); -static entity_t *record_entity(entity_t *entity, bool is_definition); - static void semantic_comparison(binary_expression_t *expression); #define STORAGE_CLASSES \ @@ -248,6 +211,11 @@ static void semantic_comparison(binary_expression_t *expression); case T_unsigned: \ case T_void: \ case T_wchar_t: \ + case T__int8: \ + case T__int16: \ + case T__int32: \ + case T__int64: \ + case T__int128: \ COMPLEX_SPECIFIERS \ IMAGINARY_SPECIFIERS @@ -261,112 +229,52 @@ static void semantic_comparison(binary_expression_t *expression); TYPE_QUALIFIERS \ TYPE_SPECIFIERS -#define TYPENAME_START \ - TYPE_QUALIFIERS \ - TYPE_SPECIFIERS - -#define EXPRESSION_START \ - case '!': \ - case '&': \ - case '(': \ - case '*': \ - case '+': \ - case '-': \ - case '~': \ - case T_ANDAND: \ - case T_CHARACTER_CONSTANT: \ - case T_FLOATINGPOINT: \ - case T_INTEGER: \ - case T_MINUSMINUS: \ - case T_PLUSPLUS: \ - case T_STRING_LITERAL: \ - case T_WIDE_CHARACTER_CONSTANT: \ - case T_WIDE_STRING_LITERAL: \ - case T___FUNCDNAME__: \ - case T___FUNCSIG__: \ - case T___FUNCTION__: \ - case T___PRETTY_FUNCTION__: \ - case T___alignof__: \ - case T___builtin_alloca: \ - case T___builtin_classify_type: \ - case T___builtin_constant_p: \ - case T___builtin_expect: \ - case T___builtin_huge_val: \ - case T___builtin_inf: \ - case T___builtin_inff: \ - case T___builtin_infl: \ - case T___builtin_isgreater: \ - case T___builtin_isgreaterequal: \ - case T___builtin_isless: \ - case T___builtin_islessequal: \ - case T___builtin_islessgreater: \ - case T___builtin_isunordered: \ - case T___builtin_nan: \ - case T___builtin_nanf: \ - case T___builtin_nanl: \ - case T___builtin_offsetof: \ - case T___builtin_prefetch: \ - case T___builtin_va_arg: \ - case T___builtin_va_end: \ - case T___builtin_va_start: \ - case T___func__: \ - case T___noop: \ - case T__assume: \ - case T_delete: \ - case T_false: \ - case T_sizeof: \ - case T_throw: \ +#define EXPRESSION_START \ + case '!': \ + case '&': \ + case '(': \ + case '*': \ + case '+': \ + case '-': \ + case '~': \ + case T_ANDAND: \ + case T_CHARACTER_CONSTANT: \ + case T_FLOATINGPOINT: \ + case T_FLOATINGPOINT_HEXADECIMAL: \ + case T_INTEGER: \ + case T_INTEGER_HEXADECIMAL: \ + case T_INTEGER_OCTAL: \ + case T_MINUSMINUS: \ + case T_PLUSPLUS: \ + case T_STRING_LITERAL: \ + case T_WIDE_CHARACTER_CONSTANT: \ + case T_WIDE_STRING_LITERAL: \ + case T___FUNCDNAME__: \ + case T___FUNCSIG__: \ + case T___FUNCTION__: \ + case T___PRETTY_FUNCTION__: \ + case T___alignof__: \ + case T___builtin_classify_type: \ + case T___builtin_constant_p: \ + case T___builtin_isgreater: \ + case T___builtin_isgreaterequal: \ + case T___builtin_isless: \ + case T___builtin_islessequal: \ + case T___builtin_islessgreater: \ + case T___builtin_isunordered: \ + case T___builtin_offsetof: \ + case T___builtin_va_arg: \ + case T___builtin_va_copy: \ + case T___builtin_va_start: \ + case T___func__: \ + case T___noop: \ + case T__assume: \ + case T_delete: \ + case T_false: \ + case T_sizeof: \ + case T_throw: \ case T_true: -/** - * Allocate an AST node with given size and - * initialize all fields with zero. - */ -static void *allocate_ast_zero(size_t size) -{ - void *res = allocate_ast(size); - memset(res, 0, size); - return res; -} - -/** - * Returns the size of an entity node. - * - * @param kind the entity kind - */ -static size_t get_entity_struct_size(entity_kind_t kind) -{ - static const size_t sizes[] = { - [ENTITY_VARIABLE] = sizeof(variable_t), - [ENTITY_PARAMETER] = sizeof(parameter_t), - [ENTITY_COMPOUND_MEMBER] = sizeof(compound_member_t), - [ENTITY_FUNCTION] = sizeof(function_t), - [ENTITY_TYPEDEF] = sizeof(typedef_t), - [ENTITY_STRUCT] = sizeof(compound_t), - [ENTITY_UNION] = sizeof(compound_t), - [ENTITY_ENUM] = sizeof(enum_t), - [ENTITY_ENUM_VALUE] = sizeof(enum_value_t), - [ENTITY_LABEL] = sizeof(label_t), - [ENTITY_LOCAL_LABEL] = sizeof(label_t), - [ENTITY_NAMESPACE] = sizeof(namespace_t) - }; - assert(kind < sizeof(sizes) / sizeof(sizes[0])); - assert(sizes[kind] != 0); - return sizes[kind]; -} - -/** - * Allocate an entity of given kind and initialize all - * fields with zero. - */ -static entity_t *allocate_entity_zero(entity_kind_t kind) -{ - size_t size = get_entity_struct_size(kind); - entity_t *entity = allocate_ast_zero(size); - entity->kind = kind; - return entity; -} - /** * Returns the size of a statement node. * @@ -375,12 +283,11 @@ static entity_t *allocate_entity_zero(entity_kind_t kind) 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_ERROR] = sizeof(statement_base_t), + [STATEMENT_EMPTY] = sizeof(statement_base_t), [STATEMENT_COMPOUND] = sizeof(compound_statement_t), [STATEMENT_RETURN] = sizeof(return_statement_t), [STATEMENT_DECLARATION] = sizeof(declaration_statement_t), - [STATEMENT_LOCAL_LABEL] = sizeof(local_label_statement_t), [STATEMENT_IF] = sizeof(if_statement_t), [STATEMENT_SWITCH] = sizeof(switch_statement_t), [STATEMENT_EXPRESSION] = sizeof(expression_statement_t), @@ -396,7 +303,7 @@ static size_t get_statement_struct_size(statement_kind_t kind) [STATEMENT_MS_TRY] = sizeof(ms_try_statement_t), [STATEMENT_LEAVE] = sizeof(leave_statement_t) }; - assert(kind < sizeof(sizes) / sizeof(sizes[0])); + assert((size_t)kind < lengthof(sizes)); assert(sizes[kind] != 0); return sizes[kind]; } @@ -409,33 +316,38 @@ static size_t get_statement_struct_size(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_REFERENCE_ENUM_VALUE] = 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_FUNCNAME] = sizeof(funcname_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_LABEL_ADDRESS] = sizeof(label_address_expression_t), + [EXPR_ERROR] = sizeof(expression_base_t), + [EXPR_REFERENCE] = sizeof(reference_expression_t), + [EXPR_REFERENCE_ENUM_VALUE] = sizeof(reference_expression_t), + [EXPR_LITERAL_BOOLEAN] = sizeof(literal_expression_t), + [EXPR_LITERAL_INTEGER] = sizeof(literal_expression_t), + [EXPR_LITERAL_INTEGER_OCTAL] = sizeof(literal_expression_t), + [EXPR_LITERAL_INTEGER_HEXADECIMAL]= sizeof(literal_expression_t), + [EXPR_LITERAL_FLOATINGPOINT] = sizeof(literal_expression_t), + [EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL] = sizeof(literal_expression_t), + [EXPR_LITERAL_CHARACTER] = sizeof(literal_expression_t), + [EXPR_LITERAL_WIDE_CHARACTER] = sizeof(literal_expression_t), + [EXPR_STRING_LITERAL] = sizeof(string_literal_expression_t), + [EXPR_WIDE_STRING_LITERAL] = sizeof(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_FUNCNAME] = sizeof(funcname_expression_t), + [EXPR_BUILTIN_CONSTANT_P] = sizeof(builtin_constant_expression_t), + [EXPR_BUILTIN_TYPES_COMPATIBLE_P] = sizeof(builtin_types_compatible_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_VA_COPY] = sizeof(va_copy_expression_t), + [EXPR_STATEMENT] = sizeof(statement_expression_t), + [EXPR_LABEL_ADDRESS] = sizeof(label_address_expression_t), }; if (kind >= EXPR_UNARY_FIRST && kind <= EXPR_UNARY_LAST) { return sizes[EXPR_UNARY_FIRST]; @@ -443,7 +355,7 @@ static size_t get_expression_struct_size(expression_kind_t kind) if (kind >= EXPR_BINARY_FIRST && kind <= EXPR_BINARY_LAST) { return sizes[EXPR_BINARY_FIRST]; } - assert(kind < sizeof(sizes) / sizeof(sizes[0])); + assert((size_t)kind < lengthof(sizes)); assert(sizes[kind] != 0); return sizes[kind]; } @@ -460,13 +372,15 @@ static statement_t *allocate_statement_zero(statement_kind_t kind) res->base.kind = kind; res->base.parent = current_parent; - res->base.source_position = token.source_position; + res->base.source_position = token.base.source_position; return res; } /** * Allocate an expression node of given kind and initialize all * fields with zero. + * + * @param kind the kind of the expression to allocate */ static expression_t *allocate_expression_zero(expression_kind_t kind) { @@ -475,7 +389,7 @@ static expression_t *allocate_expression_zero(expression_kind_t kind) res->base.kind = kind; res->base.type = type_error_type; - res->base.source_position = token.source_position; + res->base.source_position = token.base.source_position; return res; } @@ -483,17 +397,19 @@ static expression_t *allocate_expression_zero(expression_kind_t kind) * Creates a new invalid expression at the source position * of the current token. */ -static expression_t *create_invalid_expression(void) +static expression_t *create_error_expression(void) { - return allocate_expression_zero(EXPR_INVALID); + expression_t *expression = allocate_expression_zero(EXPR_ERROR); + expression->base.type = type_error_type; + return expression; } /** * Creates a new invalid statement. */ -static statement_t *create_invalid_statement(void) +static statement_t *create_error_statement(void) { - return allocate_statement_zero(STATEMENT_INVALID); + return allocate_statement_zero(STATEMENT_ERROR); } /** @@ -504,50 +420,6 @@ static statement_t *create_empty_statement(void) return allocate_statement_zero(STATEMENT_EMPTY); } -/** - * Returns the size of a type node. - * - * @param kind the type kind - */ -static size_t get_type_struct_size(type_kind_t kind) -{ - static const size_t sizes[] = { - [TYPE_ATOMIC] = sizeof(atomic_type_t), - [TYPE_COMPLEX] = sizeof(complex_type_t), - [TYPE_IMAGINARY] = sizeof(imaginary_type_t), - [TYPE_BITFIELD] = sizeof(bitfield_type_t), - [TYPE_COMPOUND_STRUCT] = sizeof(compound_type_t), - [TYPE_COMPOUND_UNION] = sizeof(compound_type_t), - [TYPE_ENUM] = sizeof(enum_type_t), - [TYPE_FUNCTION] = sizeof(function_type_t), - [TYPE_POINTER] = sizeof(pointer_type_t), - [TYPE_ARRAY] = sizeof(array_type_t), - [TYPE_BUILTIN] = sizeof(builtin_type_t), - [TYPE_TYPEDEF] = sizeof(typedef_type_t), - [TYPE_TYPEOF] = sizeof(typeof_type_t), - }; - assert(sizeof(sizes) / sizeof(sizes[0]) == (int) TYPE_TYPEOF + 1); - assert(kind <= TYPE_TYPEOF); - assert(sizes[kind] != 0); - return sizes[kind]; -} - -/** - * Allocate a type node of given kind and initialize all - * fields with zero. - * - * @param kind type kind to allocate - */ -static type_t *allocate_type_zero(type_kind_t kind) -{ - size_t size = get_type_struct_size(kind); - type_t *res = obstack_alloc(type_obst, size); - memset(res, 0, size); - res->base.kind = kind; - - return res; -} - /** * Returns the size of an initializer node. * @@ -562,7 +434,7 @@ static size_t get_initializer_size(initializer_kind_t kind) [INITIALIZER_LIST] = sizeof(initializer_list_t), [INITIALIZER_DESIGNATOR] = sizeof(initializer_designator_t) }; - assert(kind < sizeof(sizes) / sizeof(*sizes)); + assert((size_t)kind < lengthof(sizes)); assert(sizes[kind] != 0); return sizes[kind]; } @@ -579,14 +451,6 @@ static initializer_t *allocate_initializer_zero(initializer_kind_t kind) return result; } -/** - * Free a type from the type obstack. - */ -static void free_type(void *type) -{ - obstack_free(type_obst, type); -} - /** * Returns the index of the top element of the environment stack. */ @@ -612,7 +476,7 @@ static inline void next_token(void) lookahead_buffer[lookahead_bufpos] = lexer_token; lexer_next_token(); - lookahead_bufpos = (lookahead_bufpos+1) % MAX_LOOKAHEAD; + lookahead_bufpos = (lookahead_bufpos + 1) % MAX_LOOKAHEAD; #ifdef PRINT_TOKENS print_token(stderr, &token); @@ -620,54 +484,64 @@ static inline void next_token(void) #endif } +static inline bool next_if(int const type) +{ + if (token.kind == type) { + next_token(); + return true; + } else { + return false; + } +} + /** * Return the next token with a given lookahead. */ -static inline const token_t *look_ahead(int num) +static inline const token_t *look_ahead(size_t num) { - assert(num > 0 && num <= MAX_LOOKAHEAD); - int pos = (lookahead_bufpos+num-1) % MAX_LOOKAHEAD; + assert(0 < num && num <= MAX_LOOKAHEAD); + size_t pos = (lookahead_bufpos + num - 1) % MAX_LOOKAHEAD; return &lookahead_buffer[pos]; } /** * Adds a token type to the token type anchor set (a multi-set). */ -static void add_anchor_token(int token_type) +static void add_anchor_token(int token_kind) { - assert(0 <= token_type && token_type < T_LAST_TOKEN); - ++token_anchor_set[token_type]; + assert(0 <= token_kind && token_kind < T_LAST_TOKEN); + ++token_anchor_set[token_kind]; } /** * Set the number of tokens types of the given type * to zero and return the old count. */ -static int save_and_reset_anchor_state(int token_type) +static int save_and_reset_anchor_state(int token_kind) { - assert(0 <= token_type && token_type < T_LAST_TOKEN); - int count = token_anchor_set[token_type]; - token_anchor_set[token_type] = 0; + assert(0 <= token_kind && token_kind < T_LAST_TOKEN); + int count = token_anchor_set[token_kind]; + token_anchor_set[token_kind] = 0; return count; } /** * Restore the number of token types to the given count. */ -static void restore_anchor_state(int token_type, int count) +static void restore_anchor_state(int token_kind, int count) { - assert(0 <= token_type && token_type < T_LAST_TOKEN); - token_anchor_set[token_type] = count; + assert(0 <= token_kind && token_kind < T_LAST_TOKEN); + token_anchor_set[token_kind] = count; } /** * Remove a token type from the token type anchor set (a multi-set). */ -static void rem_anchor_token(int token_type) +static void rem_anchor_token(int token_kind) { - assert(0 <= token_type && token_type < T_LAST_TOKEN); - assert(token_anchor_set[token_type] != 0); - --token_anchor_set[token_type]; + assert(0 <= token_kind && token_kind < T_LAST_TOKEN); + assert(token_anchor_set[token_kind] != 0); + --token_anchor_set[token_kind]; } /** @@ -676,9 +550,9 @@ static void rem_anchor_token(int token_type) */ static bool at_anchor(void) { - if (token.type < 0) + if (token.kind < 0) return false; - return token_anchor_set[token.type]; + return token_anchor_set[token.kind]; } /** @@ -697,11 +571,11 @@ static void eat_until_matching_token(int type) unsigned parenthesis_count = 0; unsigned brace_count = 0; unsigned bracket_count = 0; - while (token.type != end_token || + while (token.kind != end_token || parenthesis_count != 0 || brace_count != 0 || bracket_count != 0) { - switch (token.type) { + switch (token.kind) { case T_EOF: return; case '(': ++parenthesis_count; break; case '{': ++brace_count; break; @@ -721,7 +595,7 @@ static void eat_until_matching_token(int type) if (bracket_count > 0) --bracket_count; check_stop: - if (token.type == end_token && + if (token.kind == end_token && parenthesis_count == 0 && brace_count == 0 && bracket_count == 0) @@ -740,9 +614,9 @@ check_stop: */ static void eat_until_anchor(void) { - while (token_anchor_set[token.type] == 0) { - if (token.type == '(' || token.type == '{' || token.type == '[') - eat_until_matching_token(token.type); + while (token_anchor_set[token.kind] == 0) { + if (token.kind == '(' || token.kind == '{' || token.kind == '[') + eat_until_matching_token(token.kind); next_token(); } } @@ -753,11 +627,10 @@ static void eat_until_anchor(void) static void eat_block(void) { eat_until_matching_token('{'); - if (token.type == '}') - next_token(); + next_if('}'); } -#define eat(token_type) do { assert(token.type == (token_type)); next_token(); } while (0) +#define eat(token_kind) (assert(token.kind == (token_kind)), next_token()) /** * Report a parse error because an expected token was not found. @@ -790,18 +663,17 @@ static void type_error_incompatible(const char *msg, /** * Expect the current token is the expected token. * If not, generate an error, eat the current statement, - * and goto the end_error label. + * and goto the error_label label. */ #define expect(expected, error_label) \ do { \ - if (UNLIKELY(token.type != (expected))) { \ + if (UNLIKELY(token.kind != (expected))) { \ parse_error_expected(NULL, (expected), NULL); \ add_anchor_token(expected); \ eat_until_anchor(); \ - if (token.type == expected) \ - next_token(); \ rem_anchor_token(expected); \ - goto error_label; \ + if (token.kind != (expected)) \ + goto error_label; \ } \ next_token(); \ } while (0) @@ -837,13 +709,28 @@ static entity_t *get_entity(const symbol_t *const symbol, { entity_t *entity = symbol->entity; for (; entity != NULL; entity = entity->base.symbol_next) { - if (entity->base.namespc == namespc) + if ((namespace_tag_t)entity->base.namespc == namespc) return entity; } return NULL; } +/* §6.2.3:1 24) There is only one name space for tags even though three are + * possible. */ +static entity_t *get_tag(symbol_t const *const symbol, + entity_kind_tag_t const kind) +{ + entity_t *entity = get_entity(symbol, NAMESPACE_TAG); + if (entity != NULL && (entity_kind_tag_t)entity->kind != kind) { + errorf(HERE, + "'%Y' defined as wrong kind of tag (previous definition %P)", + symbol, &entity->base.source_position); + entity = NULL; + } + return entity; +} + /** * pushs an entity on the environment stack and links the corresponding symbol * it. @@ -852,7 +739,7 @@ static void stack_push(stack_entry_t **stack_ptr, entity_t *entity) { symbol_t *symbol = entity->base.symbol; entity_namespace_t namespc = entity->base.namespc; - assert(namespc != NAMESPACE_INVALID); + assert(namespc != 0); /* replace/add entity into entity list of the symbol */ entity_t **anchor; @@ -941,7 +828,7 @@ static void stack_pop_to(stack_entry_t **stack_ptr, size_t new_top) } } - ARR_SHRINKLEN(*stack_ptr, (int) new_top); + ARR_SHRINKLEN(*stack_ptr, new_top); } /** @@ -966,63 +853,27 @@ static void label_pop_to(size_t new_top) stack_pop_to(&label_stack, new_top); } -static int get_akind_rank(atomic_type_kind_t akind) +static atomic_type_kind_t get_akind(const type_t *type) { - return (int) akind; + assert(type->kind == TYPE_ATOMIC || type->kind == TYPE_COMPLEX + || type->kind == TYPE_IMAGINARY || type->kind == TYPE_ENUM); + return type->atomic.akind; } /** - * Return the type rank for an atomic type. - */ -static int get_rank(const type_t *type) -{ - assert(!is_typeref(type)); - /* The C-standard allows promoting enums to int or unsigned int (see § 7.2.2 - * and esp. footnote 108). However we can't fold constants (yet), so we - * can't decide whether unsigned int is possible, while int always works. - * (unsigned int would be preferable when possible... for stuff like - * struct { enum { ... } bla : 4; } ) */ - if (type->kind == TYPE_ENUM) - return get_akind_rank(ATOMIC_TYPE_INT); - - assert(type->kind == TYPE_ATOMIC); - return get_akind_rank(type->atomic.akind); -} - -/** - * Do integer promotion for a given type. + * §6.3.1.1:2 Do integer promotion for a given type. * * @param type the type to promote * @return the promoted type */ static type_t *promote_integer(type_t *type) { - if (type->kind == TYPE_BITFIELD) - type = type->bitfield.base_type; - - if (get_rank(type) < get_akind_rank(ATOMIC_TYPE_INT)) + if (get_akind_rank(get_akind(type)) < get_akind_rank(ATOMIC_TYPE_INT)) type = type_int; return type; } -/** - * Create a cast expression. - * - * @param expression the expression to cast - * @param dest_type the destination type - */ -static expression_t *create_cast_expression(expression_t *expression, - type_t *dest_type) -{ - expression_t *cast = allocate_expression_zero(EXPR_UNARY_CAST_IMPLICIT); - - cast->unary.value = expression; - cast->base.type = dest_type; - - return cast; -} - /** * Check if a given expression represents a null pointer constant. * @@ -1031,21 +882,20 @@ static expression_t *create_cast_expression(expression_t *expression, static bool is_null_pointer_constant(const expression_t *expression) { /* skip void* cast */ - if (expression->kind == EXPR_UNARY_CAST - || expression->kind == EXPR_UNARY_CAST_IMPLICIT) { - expression = expression->unary.value; + if (expression->kind == EXPR_UNARY_CAST) { + type_t *const type = skip_typeref(expression->base.type); + if (types_compatible(type, type_void_ptr)) + expression = expression->unary.value; } - /* TODO: not correct yet, should be any constant integer expression - * which evaluates to 0 */ - if (expression->kind != EXPR_CONST) - return false; - type_t *const type = skip_typeref(expression->base.type); if (!is_type_integer(type)) return false; - - return expression->conste.v.int_value == 0; + switch (is_constant_expression(expression)) { + case EXPR_CLASS_ERROR: return true; + case EXPR_CLASS_CONSTANT: return !fold_constant_to_bool(expression); + default: return false; + } } /** @@ -1062,7 +912,12 @@ static expression_t *create_implicit_cast(expression_t *expression, if (source_type == dest_type) return expression; - return create_cast_expression(expression, dest_type); + expression_t *cast = allocate_expression_zero(EXPR_UNARY_CAST); + cast->unary.value = expression; + cast->base.type = dest_type; + cast->base.implicit = true; + + return cast; } typedef enum assign_error_t { @@ -1074,10 +929,7 @@ typedef enum assign_error_t { ASSIGN_WARNING_INT_FROM_POINTER } assign_error_t; -static void report_assign_error(assign_error_t error, type_t *orig_type_left, - const expression_t *const right, - const char *context, - const source_position_t *source_position) +static void report_assign_error(assign_error_t error, type_t *orig_type_left, expression_t const *const right, char const *const context, source_position_t const *const pos) { type_t *const orig_type_right = right->base.type; type_t *const type_left = skip_typeref(orig_type_left); @@ -1087,48 +939,29 @@ static void report_assign_error(assign_error_t error, type_t *orig_type_left, case ASSIGN_SUCCESS: return; case ASSIGN_ERROR_INCOMPATIBLE: - errorf(source_position, - "destination type '%T' in %s is incompatible with type '%T'", - orig_type_left, context, orig_type_right); + errorf(pos, "destination type '%T' in %s is incompatible with type '%T'", orig_type_left, context, orig_type_right); return; case ASSIGN_ERROR_POINTER_QUALIFIER_MISSING: { - if (warning.other) { - type_t *points_to_left = skip_typeref(type_left->pointer.points_to); - type_t *points_to_right = skip_typeref(type_right->pointer.points_to); + type_t *points_to_left = skip_typeref(type_left->pointer.points_to); + type_t *points_to_right = skip_typeref(type_right->pointer.points_to); - /* the left type has all qualifiers from the right type */ - unsigned missing_qualifiers - = points_to_right->base.qualifiers & ~points_to_left->base.qualifiers; - warningf(source_position, - "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointer target type", - orig_type_left, context, orig_type_right, missing_qualifiers); - } + /* the left type has all qualifiers from the right type */ + unsigned missing_qualifiers = points_to_right->base.qualifiers & ~points_to_left->base.qualifiers; + warningf(WARN_OTHER, pos, "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointer target type", orig_type_left, context, orig_type_right, missing_qualifiers); return; } case ASSIGN_WARNING_POINTER_INCOMPATIBLE: - if (warning.other) { - warningf(source_position, - "destination type '%T' in %s is incompatible with '%E' of type '%T'", - orig_type_left, context, right, orig_type_right); - } + warningf(WARN_OTHER, pos, "destination type '%T' in %s is incompatible with '%E' of type '%T'", orig_type_left, context, right, orig_type_right); return; case ASSIGN_WARNING_POINTER_FROM_INT: - if (warning.other) { - warningf(source_position, - "%s makes pointer '%T' from integer '%T' without a cast", - context, orig_type_left, orig_type_right); - } + warningf(WARN_OTHER, pos, "%s makes pointer '%T' from integer '%T' without a cast", context, orig_type_left, orig_type_right); return; case ASSIGN_WARNING_INT_FROM_POINTER: - if (warning.other) { - warningf(source_position, - "%s makes integer '%T' from pointer '%T' without a cast", - context, orig_type_left, orig_type_right); - } + warningf(WARN_OTHER, pos, "%s makes integer '%T' from pointer '%T' without a cast", context, orig_type_left, orig_type_right); return; default: @@ -1136,7 +969,7 @@ static void report_assign_error(assign_error_t error, type_t *orig_type_left, } } -/** Implements the rules from § 6.5.16.1 */ +/** Implements the rules from §6.5.16.1 */ static assign_error_t semantic_assign(type_t *orig_type_left, const expression_t *const right) { @@ -1181,11 +1014,10 @@ static assign_error_t semantic_assign(type_t *orig_type_left, return ASSIGN_WARNING_POINTER_FROM_INT; } } else if ((is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) || - (is_type_atomic(type_left, ATOMIC_TYPE_BOOL) - && is_type_pointer(type_right))) { + (is_type_atomic(type_left, ATOMIC_TYPE_BOOL) + && is_type_pointer(type_right))) { return ASSIGN_SUCCESS; - } else if ((is_type_compound(type_left) && is_type_compound(type_right)) - || (is_type_builtin(type_left) && is_type_builtin(type_right))) { + } else if (is_type_compound(type_left) && is_type_compound(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)) { @@ -1203,9 +1035,9 @@ static assign_error_t semantic_assign(type_t *orig_type_left, static expression_t *parse_constant_expression(void) { - expression_t *result = parse_sub_expression(PREC_CONDITIONAL); + expression_t *result = parse_subexpression(PREC_CONDITIONAL); - if (!is_constant_expression(result)) { + if (is_constant_expression(result) == EXPR_CLASS_VARIABLE) { errorf(&result->base.source_position, "expression '%E' is not constant", result); } @@ -1215,92 +1047,30 @@ static expression_t *parse_constant_expression(void) static expression_t *parse_assignment_expression(void) { - return parse_sub_expression(PREC_ASSIGNMENT); + return parse_subexpression(PREC_ASSIGNMENT); +} + +static void warn_string_concat(const source_position_t *pos) +{ + warningf(WARN_TRADITIONAL, pos, "traditional C rejects string constant concatenation"); } static string_t parse_string_literals(void) { - assert(token.type == T_STRING_LITERAL); - string_t result = token.v.string; + assert(token.kind == T_STRING_LITERAL); + string_t result = token.string.string; next_token(); - while (token.type == T_STRING_LITERAL) { - result = concat_strings(&result, &token.v.string); + while (token.kind == T_STRING_LITERAL) { + warn_string_concat(&token.base.source_position); + result = concat_strings(&result, &token.string.string); next_token(); } return result; } -static const char *const gnu_attribute_names[GNU_AK_LAST] = { - [GNU_AK_CONST] = "const", - [GNU_AK_VOLATILE] = "volatile", - [GNU_AK_CDECL] = "cdecl", - [GNU_AK_STDCALL] = "stdcall", - [GNU_AK_FASTCALL] = "fastcall", - [GNU_AK_DEPRECATED] = "deprecated", - [GNU_AK_NOINLINE] = "noinline", - [GNU_AK_NORETURN] = "noreturn", - [GNU_AK_NAKED] = "naked", - [GNU_AK_PURE] = "pure", - [GNU_AK_ALWAYS_INLINE] = "always_inline", - [GNU_AK_MALLOC] = "malloc", - [GNU_AK_WEAK] = "weak", - [GNU_AK_CONSTRUCTOR] = "constructor", - [GNU_AK_DESTRUCTOR] = "destructor", - [GNU_AK_NOTHROW] = "nothrow", - [GNU_AK_TRANSPARENT_UNION] = "transparent_union", - [GNU_AK_COMMON] = "common", - [GNU_AK_NOCOMMON] = "nocommon", - [GNU_AK_PACKED] = "packed", - [GNU_AK_SHARED] = "shared", - [GNU_AK_NOTSHARED] = "notshared", - [GNU_AK_USED] = "used", - [GNU_AK_UNUSED] = "unused", - [GNU_AK_NO_INSTRUMENT_FUNCTION] = "no_instrument_function", - [GNU_AK_WARN_UNUSED_RESULT] = "warn_unused_result", - [GNU_AK_LONGCALL] = "longcall", - [GNU_AK_SHORTCALL] = "shortcall", - [GNU_AK_LONG_CALL] = "long_call", - [GNU_AK_SHORT_CALL] = "short_call", - [GNU_AK_FUNCTION_VECTOR] = "function_vector", - [GNU_AK_INTERRUPT] = "interrupt", - [GNU_AK_INTERRUPT_HANDLER] = "interrupt_handler", - [GNU_AK_NMI_HANDLER] = "nmi_handler", - [GNU_AK_NESTING] = "nesting", - [GNU_AK_NEAR] = "near", - [GNU_AK_FAR] = "far", - [GNU_AK_SIGNAL] = "signal", - [GNU_AK_EIGTHBIT_DATA] = "eightbit_data", - [GNU_AK_TINY_DATA] = "tiny_data", - [GNU_AK_SAVEALL] = "saveall", - [GNU_AK_FLATTEN] = "flatten", - [GNU_AK_SSEREGPARM] = "sseregparm", - [GNU_AK_EXTERNALLY_VISIBLE] = "externally_visible", - [GNU_AK_RETURN_TWICE] = "return_twice", - [GNU_AK_MAY_ALIAS] = "may_alias", - [GNU_AK_MS_STRUCT] = "ms_struct", - [GNU_AK_GCC_STRUCT] = "gcc_struct", - [GNU_AK_DLLIMPORT] = "dllimport", - [GNU_AK_DLLEXPORT] = "dllexport", - [GNU_AK_ALIGNED] = "aligned", - [GNU_AK_ALIAS] = "alias", - [GNU_AK_SECTION] = "section", - [GNU_AK_FORMAT] = "format", - [GNU_AK_FORMAT_ARG] = "format_arg", - [GNU_AK_WEAKREF] = "weakref", - [GNU_AK_NONNULL] = "nonnull", - [GNU_AK_TLS_MODEL] = "tls_model", - [GNU_AK_VISIBILITY] = "visibility", - [GNU_AK_REGPARM] = "regparm", - [GNU_AK_MODE] = "mode", - [GNU_AK_MODEL] = "model", - [GNU_AK_TRAP_EXIT] = "trap_exit", - [GNU_AK_SP_SWITCH] = "sp_switch", - [GNU_AK_SENTINEL] = "sentinel" -}; - /** * compare two string, ignoring double underscores on the second. */ @@ -1317,640 +1087,242 @@ static int strcmp_underscore(const char *s1, const char *s2) return strcmp(s1, s2); } -/** - * Allocate a new gnu temporal attribute of given kind. - */ -static gnu_attribute_t *allocate_gnu_attribute(gnu_attribute_kind_t kind) +static attribute_t *allocate_attribute_zero(attribute_kind_t kind) { - gnu_attribute_t *attribute = obstack_alloc(&temp_obst, sizeof(*attribute)); + attribute_t *attribute = allocate_ast_zero(sizeof(*attribute)); attribute->kind = kind; - attribute->next = NULL; - attribute->invalid = false; - attribute->have_arguments = false; - + attribute->source_position = *HERE; return attribute; } /** - * Parse one constant expression argument of the given attribute. - */ -static void parse_gnu_attribute_const_arg(gnu_attribute_t *attribute) -{ - expression_t *expression; - add_anchor_token(')'); - expression = parse_constant_expression(); - rem_anchor_token(')'); - expect(')', end_error); - attribute->u.argument = fold_constant(expression); - return; -end_error: - attribute->invalid = true; -} + * Parse (gcc) attribute argument. From gcc comments in gcc source: + * + * attribute: + * __attribute__ ( ( attribute-list ) ) + * + * attribute-list: + * attrib + * attribute_list , attrib + * + * attrib: + * empty + * any-word + * any-word ( identifier ) + * any-word ( identifier , nonempty-expr-list ) + * any-word ( expr-list ) + * + * where the "identifier" must not be declared as a type, and + * "any-word" may be any identifier (including one declared as a + * type), a reserved word storage class specifier, type specifier or + * type qualifier. ??? This still leaves out most reserved keywords + * (following the old parser), shouldn't we include them, and why not + * allow identifiers declared as types to start the arguments? + * + * Matze: this all looks confusing and little systematic, so we're even less + * strict and parse any list of things which are identifiers or + * (assignment-)expressions. + */ +static attribute_argument_t *parse_attribute_arguments(void) +{ + attribute_argument_t *first = NULL; + attribute_argument_t **anchor = &first; + if (token.kind != ')') do { + attribute_argument_t *argument = allocate_ast_zero(sizeof(*argument)); + + /* is it an identifier */ + if (token.kind == T_IDENTIFIER + && (look_ahead(1)->kind == ',' || look_ahead(1)->kind == ')')) { + symbol_t *symbol = token.identifier.symbol; + argument->kind = ATTRIBUTE_ARGUMENT_SYMBOL; + argument->v.symbol = symbol; + next_token(); + } else { + /* must be an expression */ + expression_t *expression = parse_assignment_expression(); -/** - * Parse a list of constant expressions arguments of the given attribute. - */ -static void parse_gnu_attribute_const_arg_list(gnu_attribute_t *attribute) -{ - argument_list_t **list = &attribute->u.arguments; - argument_list_t *entry; - expression_t *expression; - add_anchor_token(')'); - add_anchor_token(','); - while (true) { - expression = parse_constant_expression(); - entry = obstack_alloc(&temp_obst, sizeof(entry)); - entry->argument = fold_constant(expression); - entry->next = NULL; - *list = entry; - list = &entry->next; - if (token.type != ',') - break; - next_token(); - } - rem_anchor_token(','); - rem_anchor_token(')'); + argument->kind = ATTRIBUTE_ARGUMENT_EXPRESSION; + argument->v.expression = expression; + } + + /* append argument */ + *anchor = argument; + anchor = &argument->next; + } while (next_if(',')); expect(')', end_error); - return; + + return first; + end_error: - attribute->invalid = true; + /* TODO... */ + return first; } -/** - * Parse one string literal argument of the given attribute. - */ -static void parse_gnu_attribute_string_arg(gnu_attribute_t *attribute, - string_t *string) +static attribute_t *parse_attribute_asm(void) { - add_anchor_token('('); - if (token.type != T_STRING_LITERAL) { - parse_error_expected("while parsing attribute directive", - T_STRING_LITERAL, NULL); - goto end_error; - } - *string = parse_string_literals(); - rem_anchor_token('('); - expect(')', end_error); - return; + attribute_t *attribute = allocate_attribute_zero(ATTRIBUTE_GNU_ASM); + eat(T_asm); + + expect('(', end_error); + attribute->a.arguments = parse_attribute_arguments(); + return attribute; + end_error: - attribute->invalid = true; + return NULL; } -/** - * Parse one tls model of the given attribute. - */ -static void parse_gnu_attribute_tls_model_arg(gnu_attribute_t *attribute) +static symbol_t *get_symbol_from_token(void) { - static const char *const tls_models[] = { - "global-dynamic", - "local-dynamic", - "initial-exec", - "local-exec" - }; - string_t string = { NULL, 0 }; - parse_gnu_attribute_string_arg(attribute, &string); - if (string.begin != NULL) { - for (size_t i = 0; i < 4; ++i) { - if (strcmp(tls_models[i], string.begin) == 0) { - attribute->u.value = i; - return; - } - } - errorf(HERE, "'%s' is an unrecognized tls model", string.begin); + switch(token.kind) { + case T_IDENTIFIER: + return token.identifier.symbol; + case T_auto: + case T_char: + case T_double: + case T_enum: + case T_extern: + case T_float: + case T_int: + case T_long: + case T_register: + case T_short: + case T_static: + case T_struct: + case T_union: + case T_unsigned: + case T_void: + case T_bool: + case T__Bool: + case T_class: + case T_explicit: + case T_export: + case T_wchar_t: + case T_const: + case T_signed: + case T___real__: + case T___imag__: + case T_restrict: + case T_volatile: + case T_inline: + /* maybe we need more tokens ... add them on demand */ + return get_token_kind_symbol(token.kind); + default: + return NULL; } - attribute->invalid = true; } -/** - * Parse one tls model of the given attribute. - */ -static void parse_gnu_attribute_visibility_arg(gnu_attribute_t *attribute) +static attribute_t *parse_attribute_gnu_single(void) { - static const char *const visibilities[] = { - "default", - "protected", - "hidden", - "internal" - }; - string_t string = { NULL, 0 }; - parse_gnu_attribute_string_arg(attribute, &string); - if (string.begin != NULL) { - for (size_t i = 0; i < 4; ++i) { - if (strcmp(visibilities[i], string.begin) == 0) { - attribute->u.value = i; - return; - } - } - errorf(HERE, "'%s' is an unrecognized visibility", string.begin); + /* parse "any-word" */ + symbol_t *symbol = get_symbol_from_token(); + if (symbol == NULL) { + parse_error_expected("while parsing attribute((", T_IDENTIFIER, NULL); + return NULL; } - attribute->invalid = true; -} -/** - * Parse one (code) model of the given attribute. - */ -static void parse_gnu_attribute_model_arg(gnu_attribute_t *attribute) -{ - static const char *const visibilities[] = { - "small", - "medium", - "large" - }; - string_t string = { NULL, 0 }; - parse_gnu_attribute_string_arg(attribute, &string); - if (string.begin != NULL) { - for (int i = 0; i < 3; ++i) { - if (strcmp(visibilities[i], string.begin) == 0) { - attribute->u.value = i; - return; - } + attribute_kind_t kind; + char const *const name = symbol->string; + for (kind = ATTRIBUTE_GNU_FIRST;; ++kind) { + if (kind > ATTRIBUTE_GNU_LAST) { + warningf(WARN_ATTRIBUTE, HERE, "unknown attribute '%s' ignored", name); + /* TODO: we should still save the attribute in the list... */ + kind = ATTRIBUTE_UNKNOWN; + break; } - errorf(HERE, "'%s' is an unrecognized model", string.begin); - } - attribute->invalid = true; -} - -/** - * Parse one mode of the given attribute. - */ -static void parse_gnu_attribute_mode_arg(gnu_attribute_t *attribute) -{ - /* TODO: find out what is allowed here... */ - - /* at least: byte, word, pointer, list of machine modes - * __XXX___ is interpreted as XXX */ - add_anchor_token(')'); - if (token.type != T_IDENTIFIER) { - expect(T_IDENTIFIER, end_error); - } - - /* This isn't really correct, the backend should provide a list of machine - * specific modes (according to gcc philosophy that is...) */ - const char *symbol_str = token.v.symbol->string; - if (strcmp_underscore("QI", symbol_str) == 0 || - strcmp_underscore("byte", symbol_str) == 0) { - attribute->u.akind = ATOMIC_TYPE_CHAR; - } else if (strcmp_underscore("HI", symbol_str) == 0) { - attribute->u.akind = ATOMIC_TYPE_SHORT; - } else if (strcmp_underscore("SI", symbol_str) == 0 - || strcmp_underscore("word", symbol_str) == 0 - || strcmp_underscore("pointer", symbol_str) == 0) { - attribute->u.akind = ATOMIC_TYPE_INT; - } else if (strcmp_underscore("DI", symbol_str) == 0) { - attribute->u.akind = ATOMIC_TYPE_LONGLONG; - } else { - if (warning.other) - warningf(HERE, "ignoring unknown mode '%s'", symbol_str); - attribute->invalid = true; + const char *attribute_name = get_attribute_name(kind); + if (attribute_name != NULL + && strcmp_underscore(attribute_name, name) == 0) + break; } + + attribute_t *attribute = allocate_attribute_zero(kind); next_token(); - rem_anchor_token(')'); - expect(')', end_error); - return; -end_error: - attribute->invalid = true; -} + /* parse arguments */ + if (next_if('(')) + attribute->a.arguments = parse_attribute_arguments(); -/** - * Parse one interrupt argument of the given attribute. - */ -static void parse_gnu_attribute_interrupt_arg(gnu_attribute_t *attribute) -{ - static const char *const interrupts[] = { - "IRQ", - "FIQ", - "SWI", - "ABORT", - "UNDEF" - }; - string_t string = { NULL, 0 }; - parse_gnu_attribute_string_arg(attribute, &string); - if (string.begin != NULL) { - for (size_t i = 0; i < 5; ++i) { - if (strcmp(interrupts[i], string.begin) == 0) { - attribute->u.value = i; - return; - } - } - errorf(HERE, "'%s' is not an interrupt", string.begin); - } - attribute->invalid = true; + return attribute; } -/** - * Parse ( identifier, const expression, const expression ) - */ -static void parse_gnu_attribute_format_args(gnu_attribute_t *attribute) +static attribute_t *parse_attribute_gnu(void) { - static const char *const format_names[] = { - "printf", - "scanf", - "strftime", - "strfmon" - }; - int i; + attribute_t *first = NULL; + attribute_t **anchor = &first; - if (token.type != T_IDENTIFIER) { - parse_error_expected("while parsing format attribute directive", T_IDENTIFIER, NULL); - goto end_error; - } - const char *name = token.v.symbol->string; - for (i = 0; i < 4; ++i) { - if (strcmp_underscore(format_names[i], name) == 0) - break; - } - if (i >= 4) { - if (warning.attribute) - warningf(HERE, "'%s' is an unrecognized format function type", name); - } - next_token(); + eat(T___attribute__); + expect('(', end_error); + expect('(', end_error); - expect(',', end_error); - add_anchor_token(')'); - add_anchor_token(','); - parse_constant_expression(); - rem_anchor_token(','); - rem_anchor_token(')'); + if (token.kind != ')') do { + attribute_t *attribute = parse_attribute_gnu_single(); + if (attribute == NULL) + goto end_error; - expect(',', end_error); - add_anchor_token(')'); - parse_constant_expression(); - rem_anchor_token(')'); + *anchor = attribute; + anchor = &attribute->next; + } while (next_if(',')); expect(')', end_error); - return; + expect(')', end_error); + end_error: - attribute->u.value = true; + return first; } -/** - * Check that a given GNU attribute has no arguments. - */ -static void check_no_argument(gnu_attribute_t *attribute, const char *name) +/** Parse attributes. */ +static attribute_t *parse_attributes(attribute_t *first) { - if (!attribute->have_arguments) - return; + attribute_t **anchor = &first; + for (;;) { + while (*anchor != NULL) + anchor = &(*anchor)->next; - /* should have no arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - eat_until_matching_token('('); - /* we have already consumed '(', so we stop before ')', eat it */ - eat(')'); - attribute->invalid = true; -} + attribute_t *attribute; + switch (token.kind) { + case T___attribute__: + attribute = parse_attribute_gnu(); + if (attribute == NULL) + continue; + break; -/** - * Parse one GNU attribute. - * - * Note that attribute names can be specified WITH or WITHOUT - * double underscores, ie const or __const__. - * - * The following attributes are parsed without arguments - * const - * volatile - * cdecl - * stdcall - * fastcall - * deprecated - * noinline - * noreturn - * naked - * pure - * always_inline - * malloc - * weak - * constructor - * destructor - * nothrow - * transparent_union - * common - * nocommon - * packed - * shared - * notshared - * used - * unused - * no_instrument_function - * warn_unused_result - * longcall - * shortcall - * long_call - * short_call - * function_vector - * interrupt_handler - * nmi_handler - * nesting - * near - * far - * signal - * eightbit_data - * tiny_data - * saveall - * flatten - * sseregparm - * externally_visible - * return_twice - * may_alias - * ms_struct - * gcc_struct - * dllimport - * dllexport - * - * The following attributes are parsed with arguments - * aligned( const expression ) - * alias( string literal ) - * section( string literal ) - * format( identifier, const expression, const expression ) - * format_arg( const expression ) - * tls_model( string literal ) - * visibility( string literal ) - * regparm( const expression ) - * model( string leteral ) - * trap_exit( const expression ) - * sp_switch( string literal ) - * - * The following attributes might have arguments - * weak_ref( string literal ) - * non_null( const expression // ',' ) - * interrupt( string literal ) - * sentinel( constant expression ) - */ -static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) -{ - gnu_attribute_t *head = *attributes; - gnu_attribute_t *last = *attributes; - decl_modifiers_t modifiers = 0; - gnu_attribute_t *attribute; - - eat(T___attribute__); - expect('(', end_error); - expect('(', end_error); - - if (token.type != ')') { - /* find the end of the list */ - if (last != NULL) { - while (last->next != NULL) - last = last->next; - } - - /* non-empty attribute list */ - while (true) { - const char *name; - if (token.type == T_const) { - name = "const"; - } else if (token.type == T_volatile) { - name = "volatile"; - } else if (token.type == T_cdecl) { - /* __attribute__((cdecl)), WITH ms mode */ - name = "cdecl"; - } else if (token.type == T_IDENTIFIER) { - const symbol_t *sym = token.v.symbol; - name = sym->string; - } else { - parse_error_expected("while parsing GNU attribute", T_IDENTIFIER, NULL); - break; - } - - next_token(); - - int i; - for (i = 0; i < GNU_AK_LAST; ++i) { - if (strcmp_underscore(gnu_attribute_names[i], name) == 0) - break; - } - gnu_attribute_kind_t kind = (gnu_attribute_kind_t)i; - - attribute = NULL; - if (kind == GNU_AK_LAST) { - if (warning.attribute) - warningf(HERE, "'%s' attribute directive ignored", name); - - /* skip possible arguments */ - if (token.type == '(') { - eat_until_matching_token(')'); - } - } else { - /* check for arguments */ - attribute = allocate_gnu_attribute(kind); - if (token.type == '(') { - next_token(); - if (token.type == ')') { - /* empty args are allowed */ - next_token(); - } else - attribute->have_arguments = true; - } - - switch (kind) { - case GNU_AK_VOLATILE: - case GNU_AK_NAKED: - case GNU_AK_MALLOC: - case GNU_AK_WEAK: - case GNU_AK_COMMON: - case GNU_AK_NOCOMMON: - case GNU_AK_SHARED: - case GNU_AK_NOTSHARED: - case GNU_AK_NO_INSTRUMENT_FUNCTION: - case GNU_AK_WARN_UNUSED_RESULT: - case GNU_AK_LONGCALL: - case GNU_AK_SHORTCALL: - case GNU_AK_LONG_CALL: - case GNU_AK_SHORT_CALL: - case GNU_AK_FUNCTION_VECTOR: - case GNU_AK_INTERRUPT_HANDLER: - case GNU_AK_NMI_HANDLER: - case GNU_AK_NESTING: - case GNU_AK_NEAR: - case GNU_AK_FAR: - case GNU_AK_SIGNAL: - case GNU_AK_EIGTHBIT_DATA: - case GNU_AK_TINY_DATA: - case GNU_AK_SAVEALL: - case GNU_AK_FLATTEN: - case GNU_AK_SSEREGPARM: - case GNU_AK_EXTERNALLY_VISIBLE: - case GNU_AK_RETURN_TWICE: - case GNU_AK_MAY_ALIAS: - case GNU_AK_MS_STRUCT: - case GNU_AK_GCC_STRUCT: - goto no_arg; - - case GNU_AK_CDECL: modifiers |= DM_CDECL; goto no_arg; - case GNU_AK_FASTCALL: modifiers |= DM_FASTCALL; goto no_arg; - case GNU_AK_STDCALL: modifiers |= DM_STDCALL; goto no_arg; - case GNU_AK_UNUSED: modifiers |= DM_UNUSED; goto no_arg; - case GNU_AK_USED: modifiers |= DM_USED; goto no_arg; - case GNU_AK_PURE: modifiers |= DM_PURE; goto no_arg; - case GNU_AK_CONST: modifiers |= DM_CONST; goto no_arg; - case GNU_AK_ALWAYS_INLINE: modifiers |= DM_FORCEINLINE; goto no_arg; - case GNU_AK_DLLIMPORT: modifiers |= DM_DLLIMPORT; goto no_arg; - case GNU_AK_DLLEXPORT: modifiers |= DM_DLLEXPORT; goto no_arg; - case GNU_AK_PACKED: modifiers |= DM_PACKED; goto no_arg; - case GNU_AK_NOINLINE: modifiers |= DM_NOINLINE; goto no_arg; - case GNU_AK_NORETURN: modifiers |= DM_NORETURN; goto no_arg; - case GNU_AK_NOTHROW: modifiers |= DM_NOTHROW; goto no_arg; - case GNU_AK_TRANSPARENT_UNION: modifiers |= DM_TRANSPARENT_UNION; goto no_arg; - case GNU_AK_CONSTRUCTOR: modifiers |= DM_CONSTRUCTOR; goto no_arg; - case GNU_AK_DESTRUCTOR: modifiers |= DM_DESTRUCTOR; goto no_arg; - case GNU_AK_DEPRECATED: modifiers |= DM_DEPRECATED; goto no_arg; - - case GNU_AK_ALIGNED: - /* __align__ may be used without an argument */ - if (attribute->have_arguments) { - parse_gnu_attribute_const_arg(attribute); - } - break; - - case GNU_AK_FORMAT_ARG: - case GNU_AK_REGPARM: - case GNU_AK_TRAP_EXIT: - if (!attribute->have_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - attribute->invalid = true; - } else - parse_gnu_attribute_const_arg(attribute); - break; - case GNU_AK_ALIAS: - case GNU_AK_SECTION: - case GNU_AK_SP_SWITCH: - if (!attribute->have_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - attribute->invalid = true; - } else - parse_gnu_attribute_string_arg(attribute, &attribute->u.string); - break; - case GNU_AK_FORMAT: - if (!attribute->have_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - attribute->invalid = true; - } else - parse_gnu_attribute_format_args(attribute); - break; - case GNU_AK_WEAKREF: - /* may have one string argument */ - if (attribute->have_arguments) - parse_gnu_attribute_string_arg(attribute, &attribute->u.string); - break; - case GNU_AK_NONNULL: - if (attribute->have_arguments) - parse_gnu_attribute_const_arg_list(attribute); - break; - case GNU_AK_TLS_MODEL: - if (!attribute->have_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - } else - parse_gnu_attribute_tls_model_arg(attribute); - break; - case GNU_AK_VISIBILITY: - if (!attribute->have_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - } else - parse_gnu_attribute_visibility_arg(attribute); - break; - case GNU_AK_MODEL: - if (!attribute->have_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - } else { - parse_gnu_attribute_model_arg(attribute); - } - break; - case GNU_AK_MODE: - if (!attribute->have_arguments) { - /* should have arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - } else { - parse_gnu_attribute_mode_arg(attribute); - } - break; - case GNU_AK_INTERRUPT: - /* may have one string argument */ - if (attribute->have_arguments) - parse_gnu_attribute_interrupt_arg(attribute); - break; - case GNU_AK_SENTINEL: - /* may have one string argument */ - if (attribute->have_arguments) - parse_gnu_attribute_const_arg(attribute); - break; - case GNU_AK_LAST: - /* already handled */ - break; - -no_arg: - check_no_argument(attribute, name); - } - } - if (attribute != NULL) { - if (last != NULL) { - last->next = attribute; - last = attribute; - } else { - head = last = attribute; - } - } - - if (token.type != ',') - break; - next_token(); - } - } - expect(')', end_error); - expect(')', end_error); -end_error: - *attributes = head; - - return modifiers; -} + case T_asm: + attribute = parse_attribute_asm(); + break; -/** - * Parse GNU attributes. - */ -static decl_modifiers_t parse_attributes(gnu_attribute_t **attributes) -{ - decl_modifiers_t modifiers = 0; + case T_cdecl: + attribute = allocate_attribute_zero(ATTRIBUTE_MS_CDECL); + eat(T_cdecl); + break; - while (true) { - switch (token.type) { - case T___attribute__: - modifiers |= parse_gnu_attribute(attributes); - continue; + case T__fastcall: + attribute = allocate_attribute_zero(ATTRIBUTE_MS_FASTCALL); + eat(T__fastcall); + break; - case T_asm: - next_token(); - expect('(', end_error); - if (token.type != T_STRING_LITERAL) { - parse_error_expected("while parsing assembler attribute", - T_STRING_LITERAL, NULL); - eat_until_matching_token('('); - break; - } else { - parse_string_literals(); - } - expect(')', end_error); - continue; + case T__forceinline: + attribute = allocate_attribute_zero(ATTRIBUTE_MS_FORCEINLINE); + eat(T__forceinline); + break; - case T_cdecl: modifiers |= DM_CDECL; break; - case T__fastcall: modifiers |= DM_FASTCALL; break; - case T__stdcall: modifiers |= DM_STDCALL; break; + case T__stdcall: + attribute = allocate_attribute_zero(ATTRIBUTE_MS_STDCALL); + eat(T__stdcall); + break; case T___thiscall: /* TODO record modifier */ - if (warning.other) - warningf(HERE, "Ignoring declaration modifier %K", &token); + warningf(WARN_OTHER, HERE, "Ignoring declaration modifier %K", &token); + attribute = allocate_attribute_zero(ATTRIBUTE_MS_THISCALL); + eat(T___thiscall); break; -end_error: - default: return modifiers; + default: + return first; } - next_token(); + *anchor = attribute; + anchor = &attribute->next; } } @@ -1977,19 +1349,17 @@ static entity_t *determine_lhs_ent(expression_t *const expr, ent = determine_lhs_ent(ref, lhs_ent); lhs_ent = ent; } else { - mark_vars_read(expr->select.compound, lhs_ent); + mark_vars_read(ref, lhs_ent); } mark_vars_read(expr->array_access.index, lhs_ent); return ent; } case EXPR_SELECT: { - if (is_type_compound(skip_typeref(expr->base.type))) { + mark_vars_read(expr->select.compound, lhs_ent); + if (is_type_compound(skip_typeref(expr->base.type))) return determine_lhs_ent(expr->select.compound, lhs_ent); - } else { - mark_vars_read(expr->select.compound, lhs_ent); - return NULL; - } + return NULL; } case EXPR_UNARY_DEREFERENCE: { @@ -2066,10 +1436,13 @@ static void mark_vars_read(expression_t *const expr, entity_t *lhs_ent) return; case EXPR_ARRAY_ACCESS: { + mark_vars_read(expr->array_access.index, lhs_ent); expression_t *const ref = expr->array_access.array_ref; + if (!is_type_array(skip_typeref(revert_automatic_type_conversion(ref)))) { + if (lhs_ent == ENT_ANY) + lhs_ent = NULL; + } mark_vars_read(ref, lhs_ent); - lhs_ent = determine_lhs_ent(ref, lhs_ent); - mark_vars_read(expr->array_access.index, lhs_ent); return; } @@ -2077,6 +1450,10 @@ static void mark_vars_read(expression_t *const expr, entity_t *lhs_ent) mark_vars_read(expr->va_arge.ap, lhs_ent); return; + case EXPR_VA_COPY: + mark_vars_read(expr->va_copye.src, lhs_ent); + return; + case EXPR_UNARY_CAST: /* Special case: Use void cast to mark a variable as "read" */ if (is_type_atomic(skip_typeref(expr->base.type), ATOMIC_TYPE_VOID)) @@ -2104,7 +1481,6 @@ static void mark_vars_read(expression_t *const expr, entity_t *lhs_ent) case EXPR_UNARY_POSTFIX_DECREMENT: case EXPR_UNARY_PREFIX_INCREMENT: case EXPR_UNARY_PREFIX_DECREMENT: - case EXPR_UNARY_CAST_IMPLICIT: case EXPR_UNARY_ASSUME: unary: mark_vars_read(expr->unary.value, lhs_ent); @@ -2161,11 +1537,8 @@ unary: determine_lhs_ent(expr->va_starte.ap, lhs_ent); return; - case EXPR_UNKNOWN: - case EXPR_INVALID: - case EXPR_CONST: - case EXPR_CHARACTER_CONSTANT: - case EXPR_WIDE_CHARACTER_CONSTANT: + EXPR_LITERAL_CASES + case EXPR_ERROR: case EXPR_STRING_LITERAL: case EXPR_WIDE_STRING_LITERAL: case EXPR_COMPOUND_LITERAL: // TODO init? @@ -2173,9 +1546,8 @@ unary: case EXPR_CLASSIFY_TYPE: case EXPR_ALIGNOF: case EXPR_FUNCNAME: - case EXPR_BUILTIN_SYMBOL: case EXPR_BUILTIN_CONSTANT_P: - case EXPR_BUILTIN_PREFETCH: + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: case EXPR_OFFSETOF: case EXPR_STATEMENT: // TODO case EXPR_LABEL_ADDRESS: @@ -2188,15 +1560,15 @@ unary: static designator_t *parse_designation(void) { - designator_t *result = NULL; - designator_t *last = NULL; + designator_t *result = NULL; + designator_t **anchor = &result; - while (true) { + for (;;) { designator_t *designator; - switch (token.type) { + switch (token.kind) { case '[': designator = allocate_ast_zero(sizeof(designator[0])); - designator->source_position = token.source_position; + designator->source_position = token.base.source_position; next_token(); add_anchor_token(']'); designator->array_index = parse_constant_expression(); @@ -2205,14 +1577,14 @@ static designator_t *parse_designation(void) break; case '.': designator = allocate_ast_zero(sizeof(designator[0])); - designator->source_position = token.source_position; + designator->source_position = token.base.source_position; next_token(); - if (token.type != T_IDENTIFIER) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing designator", T_IDENTIFIER, NULL); return NULL; } - designator->symbol = token.v.symbol; + designator->symbol = token.identifier.symbol; next_token(); break; default: @@ -2221,18 +1593,14 @@ static designator_t *parse_designation(void) } assert(designator != NULL); - if (last != NULL) { - last->next = designator; - } else { - result = designator; - } - last = designator; + *anchor = designator; + anchor = &designator->next; } end_error: return NULL; } -static initializer_t *initializer_from_string(array_type_t *type, +static initializer_t *initializer_from_string(array_type_t *const type, const string_t *const string) { /* TODO: check len vs. size of array type */ @@ -2245,7 +1613,7 @@ static initializer_t *initializer_from_string(array_type_t *type, } static initializer_t *initializer_from_wide_string(array_type_t *const type, - wide_string_t *const string) + const string_t *const string) { /* TODO: check len vs. size of array type */ (void) type; @@ -2265,10 +1633,11 @@ static initializer_t *initializer_from_expression(type_t *orig_type, { /* TODO check that expression is a constant expression */ - /* § 6.7.8.14/15 char array may be initialized by string literals */ + /* §6.7.8.14/15 char array may be initialized by string literals */ 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); @@ -2276,24 +1645,26 @@ static initializer_t *initializer_from_expression(type_t *orig_type, if (element_type->kind == TYPE_ATOMIC) { atomic_type_kind_t akind = element_type->atomic.akind; switch (expression->kind) { - case EXPR_STRING_LITERAL: - if (akind == ATOMIC_TYPE_CHAR - || akind == ATOMIC_TYPE_SCHAR - || akind == ATOMIC_TYPE_UCHAR) { - return initializer_from_string(array_type, - &expression->string.value); - } + case EXPR_STRING_LITERAL: + if (akind == ATOMIC_TYPE_CHAR + || akind == ATOMIC_TYPE_SCHAR + || akind == ATOMIC_TYPE_UCHAR) { + return initializer_from_string(array_type, + &expression->string_literal.value); + } + break; - case EXPR_WIDE_STRING_LITERAL: { - type_t *bare_wchar_type = skip_typeref(type_wchar_t); - if (get_unqualified_type(element_type) == bare_wchar_type) { - return initializer_from_wide_string(array_type, - &expression->wide_string.value); - } + case EXPR_WIDE_STRING_LITERAL: { + type_t *bare_wchar_type = skip_typeref(type_wchar_t); + if (get_unqualified_type(element_type) == bare_wchar_type) { + return initializer_from_wide_string(array_type, + &expression->string_literal.value); } + break; + } - default: - break; + default: + break; } } } @@ -2305,49 +1676,43 @@ static initializer_t *initializer_from_expression(type_t *orig_type, &expression->base.source_position); initializer_t *const result = allocate_initializer_zero(INITIALIZER_VALUE); -#if 0 - if (type->kind == TYPE_BITFIELD) { - type = type->bitfield.base_type; - } -#endif result->value.value = create_implicit_cast(expression, type); return result; } /** - * Checks if a given expression can be used as an constant initializer. + * Checks if a given expression can be used as a constant initializer. */ static bool is_initializer_constant(const expression_t *expression) { - return is_constant_expression(expression) - || is_address_constant(expression); + return is_constant_expression(expression) != EXPR_CLASS_VARIABLE || + is_linker_constant(expression) != EXPR_CLASS_VARIABLE; } /** * Parses an scalar initializer. * - * § 6.7.8.11; eat {} without warning + * §6.7.8.11; eat {} without warning */ static initializer_t *parse_scalar_initializer(type_t *type, bool must_be_constant) { /* there might be extra {} hierarchies */ int braces = 0; - if (token.type == '{') { - if (warning.other) - warningf(HERE, "extra curly braces around scalar initializer"); + if (token.kind == '{') { + warningf(WARN_OTHER, HERE, "extra curly braces around scalar initializer"); do { + eat('{'); ++braces; - next_token(); - } while (token.type == '{'); + } while (token.kind == '{'); } expression_t *expression = parse_assignment_expression(); mark_vars_read(expression, NULL); if (must_be_constant && !is_initializer_constant(expression)) { errorf(&expression->base.source_position, - "Initialisation expression '%E' is not constant", + "initialisation expression '%E' is not constant", expression); } @@ -2363,12 +1728,10 @@ static initializer_t *parse_scalar_initializer(type_t *type, bool additional_warning_displayed = false; while (braces > 0) { - if (token.type == ',') { - next_token(); - } - if (token.type != '}') { - if (!additional_warning_displayed && warning.other) { - warningf(HERE, "additional elements in scalar initializer"); + next_if(','); + if (token.kind != '}') { + if (!additional_warning_displayed) { + warningf(WARN_OTHER, HERE, "additional elements in scalar initializer"); additional_warning_displayed = true; } } @@ -2548,17 +1911,14 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, if (iter == NULL) { errorf(&designator->source_position, "'%T' has no member named '%Y'", orig_type, symbol); - goto failed; + return false; } assert(iter->kind == ENTITY_COMPOUND_MEMBER); - if (used_in_offsetof) { - type_t *real_type = skip_typeref(iter->declaration.type); - if (real_type->kind == TYPE_BITFIELD) { - errorf(&designator->source_position, - "offsetof designator '%Y' may not specify bitfield", - symbol); - goto failed; - } + if (used_in_offsetof && iter->compound_member.bitfield) { + errorf(&designator->source_position, + "offsetof designator '%Y' must not specify bitfield", + symbol); + return false; } top->type = orig_type; @@ -2575,10 +1935,10 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, "[%E] designator used for non-array type '%T'", array_index, orig_type); } - goto failed; + return false; } - long index = fold_constant(array_index); + long index = fold_constant_to_int(array_index); if (!used_in_offsetof) { if (index < 0) { errorf(&designator->source_position, @@ -2587,8 +1947,8 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, 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); + "designator [%E] (%d) exceeds array size %d", + array_index, index, array_size); } } } @@ -2604,9 +1964,6 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, } } return true; - -failed: - return false; } static void advance_current_object(type_path_t *path, size_t top_path_level) @@ -2658,30 +2015,17 @@ static void advance_current_object(type_path_t *path, size_t top_path_level) } } -/** - * skip until token is found. - */ -static void skip_until(int type) -{ - while (token.type != type) { - if (token.type == T_EOF) - return; - next_token(); - } -} - /** * skip any {...} blocks until a closing bracket is reached. */ static void skip_initializers(void) { - if (token.type == '{') - next_token(); + next_if('{'); - while (token.type != '}') { - if (token.type == T_EOF) + while (token.kind != '}') { + if (token.kind == T_EOF) return; - if (token.type == '{') { + if (token.kind == '{') { eat_block(); continue; } @@ -2703,7 +2047,7 @@ static initializer_t *parse_sub_initializer(type_path_t *path, type_t *outer_type, size_t top_path_level, parse_initializer_env_t *env) { - if (token.type == '}') { + if (token.kind == '}') { /* empty initializer */ return create_empty_initializer(); } @@ -2721,14 +2065,14 @@ static initializer_t *parse_sub_initializer(type_path_t *path, while (true) { designator_t *designator = NULL; - if (token.type == '.' || token.type == '[') { + if (token.kind == '.' || token.kind == '[') { designator = parse_designation(); goto finish_designator; - } else if (token.type == T_IDENTIFIER && look_ahead(1)->type == ':') { + } else if (token.kind == T_IDENTIFIER && look_ahead(1)->kind == ':') { /* GNU-style designator ("identifier: value") */ designator = allocate_ast_zero(sizeof(designator[0])); - designator->source_position = token.source_position; - designator->symbol = token.v.symbol; + designator->source_position = token.base.source_position; + designator->symbol = token.identifier.symbol; eat(T_IDENTIFIER); eat(':'); @@ -2751,11 +2095,10 @@ finish_designator: initializer_t *sub; - if (token.type == '{') { + if (token.kind == '{') { if (type != NULL && is_type_scalar(type)) { sub = parse_scalar_initializer(type, env->must_be_constant); } else { - eat('{'); if (type == NULL) { if (env->entity != NULL) { errorf(HERE, @@ -2764,8 +2107,11 @@ finish_designator: } else { errorf(HERE, "extra brace group at end of initializer"); } - } else + eat('{'); + } else { + eat('{'); descend_into_subtype(path); + } add_anchor_token('}'); sub = parse_sub_initializer(path, orig_type, top_path_level+1, @@ -2783,6 +2129,7 @@ finish_designator: } else { /* must be an expression */ expression_t *expression = parse_assignment_expression(); + mark_vars_read(expression, NULL); if (env->must_be_constant && !is_initializer_constant(expression)) { errorf(&expression->base.source_position, @@ -2792,12 +2139,21 @@ finish_designator: if (type == NULL) { /* we are already outside, ... */ + if (outer_type == NULL) + goto error_parse_next; type_t *const outer_type_skip = skip_typeref(outer_type); if (is_type_compound(outer_type_skip) && - !outer_type_skip->compound.compound->complete) { + !outer_type_skip->compound.compound->complete) { goto error_parse_next; } - goto error_excess; + + source_position_t const* const pos = &expression->base.source_position; + if (env->entity != NULL) { + warningf(WARN_OTHER, pos, "excess elements in initializer for '%Y'", env->entity->base.symbol); + } else { + warningf(WARN_OTHER, pos, "excess elements in initializer"); + } + goto error_parse_next; } /* handle { "string" } special case */ @@ -2806,12 +2162,9 @@ finish_designator: && outer_type != NULL) { sub = initializer_from_expression(outer_type, expression); if (sub != NULL) { - if (token.type == ',') { - next_token(); - } - if (token.type != '}' && warning.other) { - warningf(HERE, "excessive elements in initializer for type '%T'", - orig_type); + next_if(','); + if (token.kind != '}') { + warningf(WARN_OTHER, HERE, "excessive elements in initializer for type '%T'", orig_type); } /* TODO: eat , ... */ return sub; @@ -2851,27 +2204,15 @@ finish_designator: path->max_index = index; } - if (type != NULL) { - /* append to initializers list */ - ARR_APP1(initializer_t*, initializers, sub); - } else { -error_excess: - if (warning.other) { - if (env->entity != NULL) { - warningf(HERE, "excess elements in struct initializer for '%Y'", - env->entity->base.symbol); - } else { - warningf(HERE, "excess elements in struct initializer"); - } - } - } + /* append to initializers list */ + ARR_APP1(initializer_t*, initializers, sub); error_parse_next: - if (token.type == '}') { + if (token.kind == '}') { break; } expect(',', end_error); - if (token.type == '}') { + if (token.kind == '}') { break; } @@ -2906,6 +2247,18 @@ end_error: return NULL; } +static expression_t *make_size_literal(size_t value) +{ + expression_t *literal = allocate_expression_zero(EXPR_LITERAL_INTEGER); + literal->base.type = type_size_t; + + char buf[128]; + snprintf(buf, sizeof(buf), "%u", (unsigned) value); + literal->literal.value = make_string(buf); + + return literal; +} + /** * Parses an initializer. Parsers either a compound literal * (env->declaration == NULL) or an initializer of a declaration. @@ -2913,12 +2266,12 @@ end_error: static initializer_t *parse_initializer(parse_initializer_env_t *env) { type_t *type = skip_typeref(env->type); - size_t max_index = 0xdeadbeaf; // TODO: Resolve this uninitialized variable problem + size_t max_index = 0; initializer_t *result; if (is_type_scalar(type)) { result = parse_scalar_initializer(type, env->must_be_constant); - } else if (token.type == '{') { + } else if (token.kind == '{') { eat('{'); type_path_t path; @@ -2936,13 +2289,14 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env) DEL_ARR_F(path.path); expect('}', end_error); +end_error:; } 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); } - /* § 6.7.8 (22) array initializers for arrays with unknown size determine + /* §6.7.8: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) { @@ -2971,13 +2325,9 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env) internal_errorf(HERE, "invalid initializer type"); } - expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->base.type = type_size_t; - cnst->conste.v.int_value = size; - type_t *new_type = duplicate_type(type); - new_type->array.size_expression = cnst; + new_type->array.size_expression = make_size_literal(size); new_type->array.size_constant = true; new_type->array.has_implicit_size = true; new_type->array.size = size; @@ -2985,8 +2335,6 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env) } return result; -end_error: - return NULL; } static void append_entity(scope_t *scope, entity_t *entity) @@ -2996,98 +2344,86 @@ static void append_entity(scope_t *scope, entity_t *entity) } else { scope->entities = entity; } - scope->last_entity = entity; + entity->base.parent_entity = current_entity; + scope->last_entity = entity; } static compound_t *parse_compound_type_specifier(bool is_struct) { - gnu_attribute_t *attributes = NULL; - decl_modifiers_t modifiers = 0; - if (is_struct) { - eat(T_struct); - } else { - eat(T_union); - } + source_position_t const pos = *HERE; + eat(is_struct ? T_struct : T_union); - symbol_t *symbol = NULL; - compound_t *compound = NULL; + symbol_t *symbol = NULL; + entity_t *entity = NULL; + attribute_t *attributes = NULL; - if (token.type == T___attribute__) { - modifiers |= parse_attributes(&attributes); + if (token.kind == T___attribute__) { + attributes = parse_attributes(NULL); } - if (token.type == T_IDENTIFIER) { - symbol = token.v.symbol; + entity_kind_tag_t const kind = is_struct ? ENTITY_STRUCT : ENTITY_UNION; + if (token.kind == T_IDENTIFIER) { + /* the compound has a name, check if we have seen it already */ + symbol = token.identifier.symbol; + entity = get_tag(symbol, kind); next_token(); - namespace_tag_t const namespc = - is_struct ? NAMESPACE_STRUCT : NAMESPACE_UNION; - entity_t *entity = get_entity(symbol, namespc); if (entity != NULL) { - assert(entity->kind == (is_struct ? ENTITY_STRUCT : ENTITY_UNION)); - compound = &entity->compound; - if (compound->base.parent_scope != current_scope && - (token.type == '{' || token.type == ';')) { - /* we're in an inner scope and have a definition. Override - existing definition in outer scope */ - compound = NULL; - } else if (compound->complete && token.type == '{') { - assert(symbol != NULL); - errorf(HERE, "multiple definitions of '%s %Y' (previous definition %P)", - is_struct ? "struct" : "union", symbol, - &compound->base.source_position); + if (entity->base.parent_scope != current_scope && + (token.kind == '{' || token.kind == ';')) { + /* we're in an inner scope and have a definition. Shadow + * existing definition in outer scope */ + entity = NULL; + } else if (entity->compound.complete && token.kind == '{') { + source_position_t const *const ppos = &entity->base.source_position; + errorf(&pos, "multiple definitions of '%N' (previous definition %P)", entity, ppos); /* clear members in the hope to avoid further errors */ - compound->members.entities = NULL; + entity->compound.members.entities = NULL; } } - } else if (token.type != '{') { - if (is_struct) { - parse_error_expected("while parsing struct type specifier", - T_IDENTIFIER, '{', NULL); - } else { - parse_error_expected("while parsing union type specifier", - T_IDENTIFIER, '{', NULL); - } + } else if (token.kind != '{') { + char const *const msg = + is_struct ? "while parsing struct type specifier" : + "while parsing union type specifier"; + parse_error_expected(msg, T_IDENTIFIER, '{', NULL); return NULL; } - if (compound == NULL) { - entity_kind_t kind = is_struct ? ENTITY_STRUCT : ENTITY_UNION; - entity_t *entity = allocate_entity_zero(kind); - compound = &entity->compound; - - compound->base.namespc = - (is_struct ? NAMESPACE_STRUCT : NAMESPACE_UNION); - compound->base.source_position = token.source_position; - compound->base.symbol = symbol; - compound->base.parent_scope = current_scope; + if (entity == NULL) { + entity = allocate_entity_zero(kind, NAMESPACE_TAG, symbol); + entity->compound.alignment = 1; + entity->base.source_position = pos; + entity->base.parent_scope = current_scope; if (symbol != NULL) { environment_push(entity); } append_entity(current_scope, entity); } - if (token.type == '{') { - parse_compound_type_entries(compound); - modifiers |= parse_attributes(&attributes); + if (token.kind == '{') { + parse_compound_type_entries(&entity->compound); + /* ISO/IEC 14882:1998(E) §7.1.3:5 */ if (symbol == NULL) { assert(anonymous_entity == NULL); - anonymous_entity = (entity_t*)compound; + anonymous_entity = entity; } } - compound->modifiers |= modifiers; - return compound; + if (attributes != NULL) { + handle_entity_attributes(attributes, entity); + } + + return &entity->compound; } static void parse_enum_entries(type_t *const enum_type) { eat('{'); - if (token.type == '}') { + if (token.kind == '}') { errorf(HERE, "empty enum not allowed"); next_token(); return; @@ -3095,21 +2431,21 @@ static void parse_enum_entries(type_t *const enum_type) add_anchor_token('}'); do { - if (token.type != T_IDENTIFIER) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing enum entry", T_IDENTIFIER, NULL); eat_block(); rem_anchor_token('}'); return; } - entity_t *entity = allocate_entity_zero(ENTITY_ENUM_VALUE); + symbol_t *symbol = token.identifier.symbol; + entity_t *const entity + = allocate_entity_zero(ENTITY_ENUM_VALUE, NAMESPACE_NORMAL, symbol); entity->enum_value.enum_type = enum_type; - entity->base.symbol = token.v.symbol; - entity->base.source_position = token.source_position; + entity->base.source_position = token.base.source_position; next_token(); - if (token.type == '=') { - next_token(); + if (next_if('=')) { expression_t *value = parse_constant_expression(); value = create_implicit_cast(value, enum_type); @@ -3119,11 +2455,7 @@ static void parse_enum_entries(type_t *const enum_type) } record_entity(entity, false); - - if (token.type != ',') - break; - next_token(); - } while (token.type != '}'); + } while (next_if(',') && token.kind != '}'); rem_anchor_token('}'); expect('}', end_error); @@ -3134,42 +2466,52 @@ end_error: static type_t *parse_enum_specifier(void) { - gnu_attribute_t *attributes = NULL; - entity_t *entity; - symbol_t *symbol; + source_position_t const pos = *HERE; + entity_t *entity; + symbol_t *symbol; eat(T_enum); - if (token.type == T_IDENTIFIER) { - symbol = token.v.symbol; - next_token(); + switch (token.kind) { + case T_IDENTIFIER: + symbol = token.identifier.symbol; + entity = get_tag(symbol, ENTITY_ENUM); + next_token(); - entity = get_entity(symbol, NAMESPACE_ENUM); - assert(entity == NULL || entity->kind == ENTITY_ENUM); - } else if (token.type != '{') { - parse_error_expected("while parsing enum type specifier", - T_IDENTIFIER, '{', NULL); - return NULL; - } else { - entity = NULL; - symbol = NULL; + if (entity != NULL) { + if (entity->base.parent_scope != current_scope && + (token.kind == '{' || token.kind == ';')) { + /* we're in an inner scope and have a definition. Shadow + * existing definition in outer scope */ + entity = NULL; + } else if (entity->enume.complete && token.kind == '{') { + source_position_t const *const ppos = &entity->base.source_position; + errorf(&pos, "multiple definitions of '%N' (previous definition %P)", entity, ppos); + } + } + break; + + case '{': + entity = NULL; + symbol = NULL; + break; + + default: + parse_error_expected("while parsing enum type specifier", + T_IDENTIFIER, '{', NULL); + return NULL; } if (entity == NULL) { - entity = allocate_entity_zero(ENTITY_ENUM); - entity->base.namespc = NAMESPACE_ENUM; - entity->base.source_position = token.source_position; - entity->base.symbol = symbol; + entity = allocate_entity_zero(ENTITY_ENUM, NAMESPACE_TAG, symbol); + entity->base.source_position = pos; entity->base.parent_scope = current_scope; } - type_t *const type = allocate_type_zero(TYPE_ENUM); - type->enumt.enume = &entity->enume; + type_t *const type = allocate_type_zero(TYPE_ENUM); + type->enumt.enume = &entity->enume; + type->enumt.base.akind = ATOMIC_TYPE_INT; - if (token.type == '{') { - if (entity->enume.complete) { - errorf(HERE, "multiple definitions of 'enum %Y' (previous definition %P)", - symbol, &entity->base.source_position); - } + if (token.kind == '{') { if (symbol != NULL) { environment_push(entity); } @@ -3177,15 +2519,15 @@ static type_t *parse_enum_specifier(void) entity->enume.complete = true; parse_enum_entries(type); - parse_attributes(&attributes); + parse_attributes(NULL); + /* ISO/IEC 14882:1998(E) §7.1.3:5 */ if (symbol == NULL) { assert(anonymous_entity == NULL); anonymous_entity = entity; } } else if (!entity->enume.complete && !(c_mode & _GNUC)) { - errorf(HERE, "'enum %Y' used before definition (incomplete enums are a GNU extension)", - symbol); + errorf(HERE, "'%T' used before definition (incomplete enums are a GNU extension)", type); } return type; @@ -3211,36 +2553,18 @@ static type_t *parse_typeof(void) expression_t *expression = NULL; - bool old_type_prop = in_type_prop; - bool old_gcc_extension = in_gcc_extension; - in_type_prop = true; - - while (token.type == T___extension__) { - /* This can be a prefix to a typename or an expression. */ - next_token(); - in_gcc_extension = true; - } - switch (token.type) { + switch (token.kind) { case T_IDENTIFIER: - if (is_typedef_symbol(token.v.symbol)) { + if (is_typedef_symbol(token.identifier.symbol)) { + DECLARATION_START type = parse_typename(); } else { + default: expression = parse_expression(); - type = expression->base.type; + type = revert_automatic_type_conversion(expression); } break; - - TYPENAME_START - type = parse_typename(); - break; - - default: - expression = parse_expression(); - type = expression->base.type; - break; } - in_type_prop = old_type_prop; - in_gcc_extension = old_gcc_extension; rem_anchor_token(')'); expect(')', end_error); @@ -3276,21 +2600,6 @@ typedef enum specifiers_t { SPECIFIER_IMAGINARY = 1 << 18, } specifiers_t; -static type_t *create_builtin_type(symbol_t *const symbol, - type_t *const real_type) -{ - type_t *type = allocate_type_zero(TYPE_BUILTIN); - type->builtin.symbol = symbol; - type->builtin.real_type = real_type; - - type_t *result = typehash_insert(type); - if (type != result) { - free_type(type); - } - - return result; -} - static type_t *get_typedef_type(symbol_t *symbol) { entity_t *entity = get_entity(symbol, NAMESPACE_NORMAL); @@ -3303,171 +2612,126 @@ static type_t *get_typedef_type(symbol_t *symbol) return type; } -/** - * check for the allowed MS alignment values. - */ -static bool check_alignment_value(long long intvalue) +static attribute_t *parse_attribute_ms_property(attribute_t *attribute) { - if (intvalue < 1 || intvalue > 8192) { - errorf(HERE, "illegal alignment value"); - return false; + expect('(', end_error); + + attribute_property_argument_t *property + = allocate_ast_zero(sizeof(*property)); + + do { + if (token.kind != T_IDENTIFIER) { + parse_error_expected("while parsing property declspec", + T_IDENTIFIER, NULL); + goto end_error; + } + + symbol_t **prop; + symbol_t *symbol = token.identifier.symbol; + if (strcmp(symbol->string, "put") == 0) { + prop = &property->put_symbol; + } else if (strcmp(symbol->string, "get") == 0) { + prop = &property->get_symbol; + } else { + errorf(HERE, "expected put or get in property declspec"); + prop = NULL; + } + eat(T_IDENTIFIER); + expect('=', end_error); + if (token.kind != T_IDENTIFIER) { + parse_error_expected("while parsing property declspec", + T_IDENTIFIER, NULL); + goto end_error; + } + if (prop != NULL) + *prop = token.identifier.symbol; + next_token(); + } while (next_if(',')); + + attribute->a.property = property; + + expect(')', end_error); + +end_error: + return attribute; +} + +static attribute_t *parse_microsoft_extended_decl_modifier_single(void) +{ + attribute_kind_t kind = ATTRIBUTE_UNKNOWN; + if (next_if(T_restrict)) { + kind = ATTRIBUTE_MS_RESTRICT; + } else if (token.kind == T_IDENTIFIER) { + const char *name = token.identifier.symbol->string; + for (attribute_kind_t k = ATTRIBUTE_MS_FIRST; k <= ATTRIBUTE_MS_LAST; + ++k) { + const char *attribute_name = get_attribute_name(k); + if (attribute_name != NULL && strcmp(attribute_name, name) == 0) { + kind = k; + break; + } + } + + if (kind == ATTRIBUTE_UNKNOWN) { + warningf(WARN_ATTRIBUTE, HERE, "unknown __declspec '%s' ignored", name); + } + } else { + parse_error_expected("while parsing __declspec", T_IDENTIFIER, NULL); + return NULL; } - unsigned v = (unsigned)intvalue; - for (unsigned i = 1; i <= 8192; i += i) { - if (i == v) - return true; + + attribute_t *attribute = allocate_attribute_zero(kind); + eat(T_IDENTIFIER); + + if (kind == ATTRIBUTE_MS_PROPERTY) { + return parse_attribute_ms_property(attribute); } - errorf(HERE, "alignment must be power of two"); - return false; -} -#define DET_MOD(name, tag) do { \ - if (*modifiers & tag && warning.other) warningf(HERE, #name " used more than once"); \ - *modifiers |= tag; \ -} while (0) + /* parse arguments */ + if (next_if('(')) + attribute->a.arguments = parse_attribute_arguments(); + + return attribute; +} -static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *specifiers) +static attribute_t *parse_microsoft_extended_decl_modifier(attribute_t *first) { - decl_modifiers_t *modifiers = &specifiers->modifiers; + eat(T__declspec); + + expect('(', end_error); + + if (next_if(')')) + return NULL; + + add_anchor_token(')'); + + attribute_t **anchor = &first; + do { + while (*anchor != NULL) + anchor = &(*anchor)->next; + + attribute_t *attribute + = parse_microsoft_extended_decl_modifier_single(); + if (attribute == NULL) + goto end_error; + + *anchor = attribute; + anchor = &attribute->next; + } while (next_if(',')); + + rem_anchor_token(')'); + expect(')', end_error); + return first; - 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('(', end_error); - if (token.type != T_INTEGER) - goto end_error; - if (check_alignment_value(token.v.intvalue)) { - if (specifiers->alignment != 0 && warning.other) - warningf(HERE, "align used more than once"); - specifiers->alignment = (unsigned char)token.v.intvalue; - } - next_token(); - expect(')', end_error); - } else if (symbol == sym_allocate) { - next_token(); - expect('(', end_error); - if (token.type != T_IDENTIFIER) - goto end_error; - (void)token.v.symbol; - expect(')', end_error); - } 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('(', end_error); - 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('=', end_error); - 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(')', end_error); - } else if (symbol == sym_selectany) { - next_token(); - DET_MOD(selectany, DM_SELECTANY); - } else if (symbol == sym_uuid) { - next_token(); - expect('(', end_error); - if (token.type != T_STRING_LITERAL) - goto end_error; - next_token(); - expect(')', end_error); - } else if (symbol == sym_deprecated) { - next_token(); - if (specifiers->deprecated != 0 && warning.other) - warningf(HERE, "deprecated used more than once"); - specifiers->deprecated = true; - 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(')', end_error); - } - } else if (symbol == sym_noalias) { - next_token(); - DET_MOD(noalias, DM_NOALIAS); - } else { - if (warning.other) - 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; + rem_anchor_token(')'); + return first; } static entity_t *create_error_entity(symbol_t *symbol, entity_kind_tag_t kind) { - entity_t *entity = allocate_entity_zero(kind); + entity_t *const entity = allocate_entity_zero(kind, NAMESPACE_NORMAL, symbol); entity->base.source_position = *HERE; - entity->base.symbol = symbol; if (is_declaration(entity)) { entity->declaration.type = type_error_type; entity->declaration.implicit = true; @@ -3475,163 +2739,26 @@ static entity_t *create_error_entity(symbol_t *symbol, entity_kind_tag_t kind) entity->typedefe.type = type_error_type; entity->typedefe.builtin = true; } - record_entity(entity, false); + if (kind != ENTITY_COMPOUND_MEMBER) + record_entity(entity, false); return entity; } -static void parse_microsoft_based(based_spec_t *based_spec) -{ - if (token.type != T_IDENTIFIER) { - parse_error_expected("while parsing __based", T_IDENTIFIER, NULL); - return; - } - symbol_t *symbol = token.v.symbol; - entity_t *entity = get_entity(symbol, NAMESPACE_NORMAL); - - if (entity == NULL || entity->base.kind != ENTITY_VARIABLE) { - errorf(HERE, "'%Y' is not a variable name.", symbol); - entity = create_error_entity(symbol, ENTITY_VARIABLE); - } else { - variable_t *variable = &entity->variable; - - if (based_spec->base_variable != NULL) { - errorf(HERE, "__based type qualifier specified more than once"); - } - based_spec->source_position = token.source_position; - based_spec->base_variable = variable; - - type_t *const type = variable->base.type; - - if (is_type_valid(type)) { - if (! is_type_pointer(skip_typeref(type))) { - errorf(HERE, "variable in __based modifier must have pointer type instead of '%T'", type); - } - if (variable->base.base.parent_scope != file_scope) { - errorf(HERE, "a nonstatic local variable may not be used in a __based specification"); - } - } - } - next_token(); -} - -/** - * Finish the construction of a struct type by calculating - * its size, offsets, alignment. - */ -static void finish_struct_type(compound_type_t *type) -{ - assert(type->compound != NULL); - - compound_t *compound = type->compound; - if (!compound->complete) - return; - - il_size_t size = 0; - il_size_t offset; - il_alignment_t alignment = 1; - bool need_pad = false; - - entity_t *entry = compound->members.entities; - for (; entry != NULL; entry = entry->base.next) { - if (entry->kind != ENTITY_COMPOUND_MEMBER) - continue; - - type_t *m_type = skip_typeref(entry->declaration.type); - if (! is_type_valid(m_type)) { - /* simply ignore errors here */ - continue; - } - il_alignment_t m_alignment = m_type->base.alignment; - if (m_alignment > alignment) - alignment = m_alignment; - - offset = (size + m_alignment - 1) & -m_alignment; - - if (offset > size) - need_pad = true; - entry->compound_member.offset = offset; - size = offset + m_type->base.size; - } - if (type->base.alignment != 0) { - alignment = type->base.alignment; - } - - offset = (size + alignment - 1) & -alignment; - if (offset > size) - need_pad = true; - - if (need_pad) { - if (warning.padded) { - warningf(&compound->base.source_position, "'%T' needs padding", type); - } - } else { - if (compound->modifiers & DM_PACKED && warning.packed) { - warningf(&compound->base.source_position, - "superfluous packed attribute on '%T'", type); - } - } - - type->base.size = offset; - type->base.alignment = alignment; -} - -/** - * Finish the construction of an union type by calculating - * its size and alignment. - */ -static void finish_union_type(compound_type_t *type) -{ - assert(type->compound != NULL); - - compound_t *compound = type->compound; - if (! compound->complete) - return; - - il_size_t size = 0; - il_alignment_t alignment = 1; - - entity_t *entry = compound->members.entities; - for (; entry != NULL; entry = entry->base.next) { - if (entry->kind != ENTITY_COMPOUND_MEMBER) - continue; - - type_t *m_type = skip_typeref(entry->declaration.type); - if (! is_type_valid(m_type)) - continue; - - entry->compound_member.offset = 0; - if (m_type->base.size > size) - size = m_type->base.size; - if (m_type->base.alignment > alignment) - alignment = m_type->base.alignment; - } - if (type->base.alignment != 0) { - alignment = type->base.alignment; - } - size = (size + alignment - 1) & -alignment; - type->base.size = size; - type->base.alignment = alignment; -} - static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) { - type_t *type = NULL; - type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE; - type_modifiers_t modifiers = TYPE_MODIFIER_NONE; - unsigned type_specifiers = 0; - bool newtype = false; - bool saw_error = false; - bool old_gcc_extension = in_gcc_extension; + type_t *type = NULL; + type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE; + unsigned type_specifiers = 0; + bool newtype = false; + bool saw_error = false; - specifiers->source_position = token.source_position; + memset(specifiers, 0, sizeof(*specifiers)); + specifiers->source_position = token.base.source_position; while (true) { - specifiers->modifiers - |= parse_attributes(&specifiers->gnu_attributes); - if (specifiers->modifiers & DM_TRANSPARENT_UNION) - modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; + specifiers->attributes = parse_attributes(specifiers->attributes); - switch (token.type) { + switch (token.kind) { /* storage class */ #define MATCH_STORAGE_CLASS(token, class) \ case token: \ @@ -3651,12 +2778,8 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) MATCH_STORAGE_CLASS(T_register, STORAGE_CLASS_REGISTER) case T__declspec: - next_token(); - expect('(', end_error); - add_anchor_token(')'); - parse_microsoft_extended_decl_modifier(specifiers); - rem_anchor_token(')'); - expect(')', end_error); + specifiers->attributes + = parse_microsoft_extended_decl_modifier(specifiers->attributes); break; case T___thread: @@ -3672,10 +2795,10 @@ check_thread_storage_class: break; char const* wrong; - case STORAGE_CLASS_AUTO: wrong = "auto"; goto wrong_thread_stoarge_class; - case STORAGE_CLASS_REGISTER: wrong = "register"; goto wrong_thread_stoarge_class; - case STORAGE_CLASS_TYPEDEF: wrong = "typedef"; goto wrong_thread_stoarge_class; -wrong_thread_stoarge_class: + case STORAGE_CLASS_AUTO: wrong = "auto"; goto wrong_thread_storage_class; + case STORAGE_CLASS_REGISTER: wrong = "register"; goto wrong_thread_storage_class; + case STORAGE_CLASS_TYPEDEF: wrong = "typedef"; goto wrong_thread_storage_class; +wrong_thread_storage_class: errorf(HERE, "'__thread' used with '%s'", wrong); break; } @@ -3699,11 +2822,6 @@ wrong_thread_stoarge_class: MATCH_TYPE_QUALIFIER(T___uptr, TYPE_QUALIFIER_UPTR); MATCH_TYPE_QUALIFIER(T___sptr, TYPE_QUALIFIER_SPTR); - case T___extension__: - next_token(); - in_gcc_extension = true; - break; - /* type specifiers */ #define MATCH_SPECIFIER(token, specifier, name) \ case token: \ @@ -3734,19 +2852,21 @@ wrong_thread_stoarge_class: MATCH_SPECIFIER(T_void, SPECIFIER_VOID, "void"); MATCH_SPECIFIER(T_wchar_t, SPECIFIER_WCHAR_T, "wchar_t"); - case T__forceinline: - /* only in microsoft mode */ - specifiers->modifiers |= DM_FORCEINLINE; - /* FALLTHROUGH */ - case T_inline: next_token(); specifiers->is_inline = true; break; +#if 0 + case T__forceinline: + next_token(); + specifiers->modifiers |= DM_FORCEINLINE; + break; +#endif + case T_long: if (type_specifiers & SPECIFIER_LONG_LONG) { - errorf(HERE, "multiple type specifiers given"); + errorf(HERE, "too many long type specifiers given"); } else if (type_specifiers & SPECIFIER_LONG) { type_specifiers |= SPECIFIER_LONG_LONG; } else { @@ -3755,28 +2875,30 @@ wrong_thread_stoarge_class: next_token(); break; - case T_struct: { +#define CHECK_DOUBLE_TYPE() \ + (type != NULL ? errorf(HERE, "multiple types in declaration specifiers") : (void)0) + + case T_struct: + CHECK_DOUBLE_TYPE(); type = allocate_type_zero(TYPE_COMPOUND_STRUCT); type->compound.compound = parse_compound_type_specifier(true); - finish_struct_type(&type->compound); break; - } - case T_union: { + case T_union: + CHECK_DOUBLE_TYPE(); type = allocate_type_zero(TYPE_COMPOUND_UNION); type->compound.compound = parse_compound_type_specifier(false); - if (type->compound.compound->modifiers & DM_TRANSPARENT_UNION) - modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; - finish_union_type(&type->compound); break; - } case T_enum: + CHECK_DOUBLE_TYPE(); type = parse_enum_specifier(); break; case T___typeof__: + CHECK_DOUBLE_TYPE(); type = parse_typeof(); break; case T___builtin_va_list: + CHECK_DOUBLE_TYPE(); type = duplicate_type(type_valist); next_token(); break; @@ -3787,7 +2909,7 @@ wrong_thread_stoarge_class: /* Be somewhat resilient to typos like 'unsigned lng* f()' in a * declaration, so it doesn't generate errors about expecting '(' or * '{' later on. */ - switch (look_ahead(1)->type) { + switch (look_ahead(1)->kind) { STORAGE_CLASSES TYPE_SPECIFIERS case T_const: @@ -3807,12 +2929,12 @@ wrong_thread_stoarge_class: } } - type_t *const typedef_type = get_typedef_type(token.v.symbol); + type_t *const typedef_type = get_typedef_type(token.identifier.symbol); if (typedef_type == NULL) { /* Be somewhat resilient to typos like 'vodi f()' at the beginning of a * declaration, so it doesn't generate 'implicit int' followed by more * errors later on. */ - token_type_t const la1_type = (token_type_t)look_ahead(1)->type; + token_kind_t const la1_type = (token_kind_t)look_ahead(1)->kind; switch (la1_type) { DECLARATION_START case T_IDENTIFIER: @@ -3820,16 +2942,15 @@ wrong_thread_stoarge_class: case '*': { errorf(HERE, "%K does not name a type", &token); - entity_t *entity = - create_error_entity(token.v.symbol, ENTITY_TYPEDEF); + symbol_t *symbol = token.identifier.symbol; + entity_t *entity + = create_error_entity(symbol, ENTITY_TYPEDEF); type = allocate_type_zero(TYPE_TYPEDEF); type->typedeft.typedefe = &entity->typedefe; next_token(); saw_error = true; - if (la1_type == '&' || la1_type == '*') - goto finish_specifiers; continue; } @@ -3850,7 +2971,7 @@ wrong_thread_stoarge_class: } finish_specifiers: - in_gcc_extension = old_gcc_extension; + specifiers->attributes = parse_attributes(specifiers->attributes); if (type == NULL || (saw_error && type_specifiers != 0)) { atomic_type_kind_t atomic_type; @@ -3915,10 +3036,7 @@ finish_specifiers: | SPECIFIER_INT: atomic_type = ATOMIC_TYPE_ULONGLONG; warn_about_long_long: - if (warning.long_long) { - warningf(&specifiers->source_position, - "ISO C90 does not support 'long long'"); - } + warningf(WARN_LONG_LONG, &specifiers->source_position, "ISO C90 does not support 'long long'"); break; case SPECIFIER_UNSIGNED | SPECIFIER_INT8: @@ -3990,64 +3108,61 @@ warn_about_long_long: case SPECIFIER_LONG | SPECIFIER_DOUBLE | SPECIFIER_IMAGINARY: atomic_type = ATOMIC_TYPE_LONG_DOUBLE; break; - default: + default: { /* invalid specifier combination, give an error message */ + source_position_t const* const pos = &specifiers->source_position; if (type_specifiers == 0) { - if (saw_error) - goto end_error; - - /* ISO/IEC 14882:1998(E) §C.1.5:4 */ - if (!(c_mode & _CXX) && !strict_mode) { - if (warning.implicit_int) { - warningf(HERE, "no type specifiers in declaration, using 'int'"); + if (!saw_error) { + /* ISO/IEC 14882:1998(E) §C.1.5:4 */ + if (!(c_mode & _CXX) && !strict_mode) { + warningf(WARN_IMPLICIT_INT, pos, "no type specifiers in declaration, using 'int'"); + atomic_type = ATOMIC_TYPE_INT; + break; + } else { + errorf(pos, "no type specifiers given in declaration"); } - atomic_type = ATOMIC_TYPE_INT; - break; - } else { - errorf(HERE, "no type specifiers given in declaration"); } } else if ((type_specifiers & SPECIFIER_SIGNED) && (type_specifiers & SPECIFIER_UNSIGNED)) { - errorf(HERE, "signed and unsigned specifiers given"); + errorf(pos, "signed and unsigned specifiers given"); } else if (type_specifiers & (SPECIFIER_SIGNED | SPECIFIER_UNSIGNED)) { - errorf(HERE, "only integer types can be signed or unsigned"); + errorf(pos, "only integer types can be signed or unsigned"); } else { - errorf(HERE, "multiple datatypes in declaration"); + errorf(pos, "multiple datatypes in declaration"); } goto end_error; } + } if (type_specifiers & SPECIFIER_COMPLEX) { - type = allocate_type_zero(TYPE_COMPLEX); - type->complex.akind = atomic_type; + type = allocate_type_zero(TYPE_COMPLEX); } else if (type_specifiers & SPECIFIER_IMAGINARY) { - type = allocate_type_zero(TYPE_IMAGINARY); - type->imaginary.akind = atomic_type; + type = allocate_type_zero(TYPE_IMAGINARY); } else { - type = allocate_type_zero(TYPE_ATOMIC); - type->atomic.akind = atomic_type; + type = allocate_type_zero(TYPE_ATOMIC); } + type->atomic.akind = atomic_type; newtype = true; } else if (type_specifiers != 0) { - errorf(HERE, "multiple datatypes in declaration"); + errorf(&specifiers->source_position, "multiple datatypes in declaration"); } /* FIXME: check type qualifiers here */ - type->base.qualifiers = qualifiers; - type->base.modifiers = modifiers; - type_t *result = typehash_insert(type); - if (newtype && result != type) { - free_type(type); + if (newtype) { + type = identify_new_type(type); + } else { + type = typehash_insert(type); } - specifiers->type = result; + if (specifiers->attributes != NULL) + type = handle_type_attributes(specifiers->attributes, type); + specifiers->type = type; return; end_error: specifiers->type = type_error_type; - return; } static type_qualifiers_t parse_type_qualifiers(void) @@ -4055,7 +3170,7 @@ static type_qualifiers_t parse_type_qualifiers(void) type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE; while (true) { - switch (token.type) { + switch (token.kind) { /* type qualifiers */ MATCH_TYPE_QUALIFIER(T_const, TYPE_QUALIFIER_CONST); MATCH_TYPE_QUALIFIER(T_restrict, TYPE_QUALIFIER_RESTRICT); @@ -4078,29 +3193,21 @@ static type_qualifiers_t parse_type_qualifiers(void) */ static void parse_identifier_list(scope_t *scope) { + assert(token.kind == T_IDENTIFIER); do { - entity_t *entity = allocate_entity_zero(ENTITY_PARAMETER); - entity->base.source_position = token.source_position; - entity->base.namespc = NAMESPACE_NORMAL; - entity->base.symbol = token.v.symbol; + entity_t *const entity = allocate_entity_zero(ENTITY_PARAMETER, NAMESPACE_NORMAL, token.identifier.symbol); + entity->base.source_position = token.base.source_position; /* a K&R parameter has no type, yet */ next_token(); if (scope != NULL) append_entity(scope, entity); - - if (token.type != ',') { - break; - } - next_token(); - } while (token.type == T_IDENTIFIER); + } while (next_if(',') && token.kind == T_IDENTIFIER); } static entity_t *parse_parameter(void) { declaration_specifiers_t specifiers; - memset(&specifiers, 0, sizeof(specifiers)); - parse_declaration_specifiers(&specifiers); entity_t *entity = parse_declarator(&specifiers, @@ -4119,10 +3226,29 @@ static void semantic_parameter_incomplete(const entity_t *entity) * incomplete type. */ type_t *type = skip_typeref(entity->declaration.type); if (is_type_incomplete(type)) { - errorf(&entity->base.source_position, - "parameter '%Y' has incomplete type '%T'", entity->base.symbol, - entity->declaration.type); + errorf(&entity->base.source_position, "'%N' has incomplete type", entity); + } +} + +static bool has_parameters(void) +{ + /* func(void) is not a parameter */ + if (token.kind == T_IDENTIFIER) { + entity_t const *const entity + = get_entity(token.identifier.symbol, NAMESPACE_NORMAL); + if (entity == NULL) + return true; + if (entity->kind != ENTITY_TYPEDEF) + return true; + if (skip_typeref(entity->typedefe.type) != type_void) + return true; + } else if (token.kind != T_void) { + return true; } + if (look_ahead(1)->kind != ')') + return true; + next_token(); + return false; } /** @@ -4135,82 +3261,60 @@ static void parse_parameters(function_type_t *type, scope_t *scope) add_anchor_token(')'); int saved_comma_state = save_and_reset_anchor_state(','); - if (token.type == T_IDENTIFIER && - !is_typedef_symbol(token.v.symbol)) { - token_type_t la1_type = (token_type_t)look_ahead(1)->type; + if (token.kind == T_IDENTIFIER + && !is_typedef_symbol(token.identifier.symbol)) { + token_kind_t la1_type = (token_kind_t)look_ahead(1)->kind; if (la1_type == ',' || la1_type == ')') { - type->kr_style_parameters = true; - type->unspecified_parameters = true; + type->kr_style_parameters = true; parse_identifier_list(scope); goto parameters_finished; } } - if (token.type == ')') { + if (token.kind == ')') { /* ISO/IEC 14882:1998(E) §C.1.6:1 */ if (!(c_mode & _CXX)) type->unspecified_parameters = true; - goto parameters_finished; - } - - function_parameter_t *parameter; - function_parameter_t *last_parameter = NULL; + } else if (has_parameters()) { + function_parameter_t **anchor = &type->parameters; + do { + switch (token.kind) { + case T_DOTDOTDOT: + next_token(); + type->variadic = true; + goto parameters_finished; - while (true) { - switch (token.type) { - case T_DOTDOTDOT: - next_token(); - type->variadic = true; - goto parameters_finished; + case T_IDENTIFIER: + DECLARATION_START + { + entity_t *entity = parse_parameter(); + if (entity->kind == ENTITY_TYPEDEF) { + errorf(&entity->base.source_position, + "typedef not allowed as function parameter"); + break; + } + assert(is_declaration(entity)); - case T_IDENTIFIER: - case T___extension__: - DECLARATION_START - { - entity_t *entity = parse_parameter(); - if (entity->kind == ENTITY_TYPEDEF) { - errorf(&entity->base.source_position, - "typedef not allowed as function parameter"); - break; - } - assert(is_declaration(entity)); + semantic_parameter_incomplete(entity); - /* func(void) is not a parameter */ - if (last_parameter == NULL - && token.type == ')' - && entity->base.symbol == NULL - && skip_typeref(entity->declaration.type) == type_void) { - goto parameters_finished; - } - semantic_parameter_incomplete(entity); + function_parameter_t *const parameter = + allocate_parameter(entity->declaration.type); - parameter = obstack_alloc(type_obst, sizeof(parameter[0])); - memset(parameter, 0, sizeof(parameter[0])); - parameter->type = entity->declaration.type; + if (scope != NULL) { + append_entity(scope, entity); + } - if (scope != NULL) { - append_entity(scope, entity); + *anchor = parameter; + anchor = ¶meter->next; + break; } - if (last_parameter != NULL) { - last_parameter->next = parameter; - } else { - type->parameters = parameter; + default: + goto parameters_finished; } - last_parameter = parameter; - break; - } - - default: - goto parameters_finished; - } - if (token.type != ',') { - goto parameters_finished; - } - next_token(); + } while (next_if(',')); } - parameters_finished: rem_anchor_token(')'); expect(')', end_error); @@ -4220,269 +3324,270 @@ end_error: } typedef enum construct_type_kind_t { - CONSTRUCT_INVALID, - CONSTRUCT_POINTER, + CONSTRUCT_POINTER = 1, CONSTRUCT_REFERENCE, CONSTRUCT_FUNCTION, CONSTRUCT_ARRAY } construct_type_kind_t; -typedef struct construct_type_t construct_type_t; -struct construct_type_t { +typedef union construct_type_t construct_type_t; + +typedef struct construct_type_base_t { construct_type_kind_t kind; + source_position_t pos; construct_type_t *next; +} construct_type_base_t; + +typedef struct parsed_pointer_t { + construct_type_base_t base; + type_qualifiers_t type_qualifiers; + variable_t *base_variable; /**< MS __based extension. */ +} parsed_pointer_t; + +typedef struct parsed_reference_t { + construct_type_base_t base; +} parsed_reference_t; + +typedef struct construct_function_type_t { + construct_type_base_t base; + type_t *function_type; +} construct_function_type_t; + +typedef struct parsed_array_t { + construct_type_base_t base; + type_qualifiers_t type_qualifiers; + bool is_static; + bool is_variable; + expression_t *size; +} parsed_array_t; + +union construct_type_t { + construct_type_kind_t kind; + construct_type_base_t base; + parsed_pointer_t pointer; + parsed_reference_t reference; + construct_function_type_t function; + parsed_array_t array; }; -typedef struct parsed_pointer_t parsed_pointer_t; -struct parsed_pointer_t { - construct_type_t construct_type; - type_qualifiers_t type_qualifiers; - variable_t *base_variable; /**< MS __based extension. */ -}; - -typedef struct parsed_reference_t parsed_reference_t; -struct parsed_reference_t { - construct_type_t construct_type; -}; - -typedef struct construct_function_type_t construct_function_type_t; -struct construct_function_type_t { - construct_type_t construct_type; - type_t *function_type; -}; - -typedef struct parsed_array_t parsed_array_t; -struct parsed_array_t { - construct_type_t construct_type; - type_qualifiers_t type_qualifiers; - bool is_static; - bool is_variable; - expression_t *size; -}; - -typedef struct construct_base_type_t construct_base_type_t; -struct construct_base_type_t { - construct_type_t construct_type; - type_t *type; -}; +static construct_type_t *allocate_declarator_zero(construct_type_kind_t const kind, size_t const size) +{ + construct_type_t *const cons = obstack_alloc(&temp_obst, size); + memset(cons, 0, size); + cons->kind = kind; + cons->base.pos = *HERE; + return cons; +} -static construct_type_t *parse_pointer_declarator(variable_t *base_variable) +/* §6.7.5.1 */ +static construct_type_t *parse_pointer_declarator(void) { + construct_type_t *const cons = allocate_declarator_zero(CONSTRUCT_POINTER, sizeof(parsed_pointer_t)); eat('*'); + cons->pointer.type_qualifiers = parse_type_qualifiers(); + //cons->pointer.base_variable = base_variable; - parsed_pointer_t *pointer = obstack_alloc(&temp_obst, sizeof(pointer[0])); - memset(pointer, 0, sizeof(pointer[0])); - pointer->construct_type.kind = CONSTRUCT_POINTER; - pointer->type_qualifiers = parse_type_qualifiers(); - pointer->base_variable = base_variable; - - return &pointer->construct_type; + return cons; } +/* ISO/IEC 14882:1998(E) §8.3.2 */ static construct_type_t *parse_reference_declarator(void) { - eat('&'); + if (!(c_mode & _CXX)) + errorf(HERE, "references are only available for C++"); - parsed_reference_t *reference = obstack_alloc(&temp_obst, sizeof(reference[0])); - memset(reference, 0, sizeof(reference[0])); - reference->construct_type.kind = CONSTRUCT_REFERENCE; + construct_type_t *const cons = allocate_declarator_zero(CONSTRUCT_REFERENCE, sizeof(parsed_reference_t)); + eat('&'); - return (construct_type_t*)reference; + return cons; } +/* §6.7.5.2 */ static construct_type_t *parse_array_declarator(void) { + construct_type_t *const cons = allocate_declarator_zero(CONSTRUCT_ARRAY, sizeof(parsed_array_t)); + parsed_array_t *const array = &cons->array; + eat('['); add_anchor_token(']'); - parsed_array_t *array = obstack_alloc(&temp_obst, sizeof(array[0])); - memset(array, 0, sizeof(array[0])); - array->construct_type.kind = CONSTRUCT_ARRAY; - - if (token.type == T_static) { - array->is_static = true; - next_token(); - } + bool is_static = next_if(T_static); type_qualifiers_t type_qualifiers = parse_type_qualifiers(); - if (type_qualifiers != 0) { - if (token.type == T_static) { - array->is_static = true; - next_token(); - } - } + + if (!is_static) + is_static = next_if(T_static); + array->type_qualifiers = type_qualifiers; + array->is_static = is_static; - if (token.type == '*' && look_ahead(1)->type == ']') { + expression_t *size = NULL; + if (token.kind == '*' && look_ahead(1)->kind == ']') { array->is_variable = true; next_token(); - } else if (token.type != ']') { - array->size = parse_assignment_expression(); + } else if (token.kind != ']') { + size = parse_assignment_expression(); + + /* §6.7.5.2:1 Array size must have integer type */ + type_t *const orig_type = size->base.type; + type_t *const type = skip_typeref(orig_type); + if (!is_type_integer(type) && is_type_valid(type)) { + errorf(&size->base.source_position, + "array size '%E' must have integer type but has type '%T'", + size, orig_type); + } + + array->size = size; + mark_vars_read(size, NULL); } + if (is_static && size == NULL) + errorf(&array->base.pos, "static array parameters require a size"); + rem_anchor_token(']'); expect(']', end_error); end_error: - return &array->construct_type; + return cons; } -static construct_type_t *parse_function_declarator(scope_t *scope, - decl_modifiers_t modifiers) +/* §6.7.5.3 */ +static construct_type_t *parse_function_declarator(scope_t *scope) { + construct_type_t *const cons = allocate_declarator_zero(CONSTRUCT_FUNCTION, sizeof(construct_function_type_t)); + type_t *type = allocate_type_zero(TYPE_FUNCTION); function_type_t *ftype = &type->function; - ftype->linkage = current_linkage; - - switch (modifiers & (DM_CDECL | DM_STDCALL | DM_FASTCALL | DM_THISCALL)) { - case DM_NONE: break; - case DM_CDECL: ftype->calling_convention = CC_CDECL; break; - case DM_STDCALL: ftype->calling_convention = CC_STDCALL; break; - case DM_FASTCALL: ftype->calling_convention = CC_FASTCALL; break; - case DM_THISCALL: ftype->calling_convention = CC_THISCALL; break; - - default: - errorf(HERE, "multiple calling conventions in declaration"); - break; - } + ftype->linkage = current_linkage; + ftype->calling_convention = CC_DEFAULT; parse_parameters(ftype, scope); - 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.kind = CONSTRUCT_FUNCTION; - construct_function_type->function_type = type; + cons->function.function_type = type; - return &construct_function_type->construct_type; + return cons; } typedef struct parse_declarator_env_t { + bool may_be_abstract : 1; + bool must_be_abstract : 1; decl_modifiers_t modifiers; symbol_t *symbol; source_position_t source_position; scope_t parameters; + attribute_t *attributes; } parse_declarator_env_t; -static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env, - bool may_be_abstract) +/* §6.7.5 */ +static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env) { /* construct a single linked list of construct_type_t's which describe * how to construct the final declarator type */ - construct_type_t *first = NULL; - construct_type_t *last = NULL; - gnu_attribute_t *attributes = NULL; + construct_type_t *first = NULL; + construct_type_t **anchor = &first; - decl_modifiers_t modifiers = parse_attributes(&attributes); - - /* MS __based extension */ - based_spec_t base_spec; - base_spec.base_variable = NULL; + env->attributes = parse_attributes(env->attributes); for (;;) { construct_type_t *type; - switch (token.type) { + //variable_t *based = NULL; /* MS __based extension */ + switch (token.kind) { case '&': - if (!(c_mode & _CXX)) - errorf(HERE, "references are only available for C++"); - if (base_spec.base_variable != NULL && warning.other) { - warningf(&base_spec.source_position, - "__based does not precede a pointer operator, ignored"); - } type = parse_reference_declarator(); - /* consumed */ - base_spec.base_variable = NULL; break; + case T__based: { + panic("based not supported anymore"); + /* FALLTHROUGH */ + } + case '*': - type = parse_pointer_declarator(base_spec.base_variable); - /* consumed */ - base_spec.base_variable = NULL; + type = parse_pointer_declarator(); break; - case T__based: - next_token(); - expect('(', end_error); - add_anchor_token(')'); - parse_microsoft_based(&base_spec); - rem_anchor_token(')'); - expect(')', end_error); - continue; - default: goto ptr_operator_end; } - if (last == NULL) { - first = type; - last = type; - } else { - last->next = type; - last = type; - } + *anchor = type; + anchor = &type->base.next; /* TODO: find out if this is correct */ - modifiers |= parse_attributes(&attributes); - } -ptr_operator_end: - if (base_spec.base_variable != NULL && warning.other) { - warningf(&base_spec.source_position, - "__based does not precede a pointer operator, ignored"); - } - - if (env != NULL) { - modifiers |= env->modifiers; - env->modifiers = modifiers; + env->attributes = parse_attributes(env->attributes); } +ptr_operator_end: ; construct_type_t *inner_types = NULL; - switch (token.type) { + switch (token.kind) { case T_IDENTIFIER: - if (env == NULL) { + if (env->must_be_abstract) { errorf(HERE, "no identifier expected in typename"); } else { - env->symbol = token.v.symbol; - env->source_position = token.source_position; + env->symbol = token.identifier.symbol; + env->source_position = token.base.source_position; } next_token(); break; - case '(': - /* §6.7.6:2 footnote 126: Empty parentheses in a type name are - * interpreted as ``function with no parameter specification'', rather - * than redundant parentheses around the omitted identifier. */ - if (look_ahead(1)->type != ')') { - next_token(); - add_anchor_token(')'); - inner_types = parse_inner_declarator(env, may_be_abstract); - if (inner_types != NULL) { - /* All later declarators only modify the return type */ - env = NULL; - } - rem_anchor_token(')'); - expect(')', end_error); + + case '(': { + /* Parenthesized declarator or function declarator? */ + token_t const *const la1 = look_ahead(1); + switch (la1->kind) { + case T_IDENTIFIER: + if (is_typedef_symbol(la1->identifier.symbol)) { + case ')': + /* §6.7.6:2 footnote 126: Empty parentheses in a type name are + * interpreted as ``function with no parameter specification'', rather + * than redundant parentheses around the omitted identifier. */ + default: + /* Function declarator. */ + if (!env->may_be_abstract) { + errorf(HERE, "function declarator must have a name"); + } + } else { + case '&': + case '(': + case '*': + case '[': + case T___attribute__: /* FIXME __attribute__ might also introduce a parameter of a function declarator. */ + /* Paranthesized declarator. */ + next_token(); + add_anchor_token(')'); + inner_types = parse_inner_declarator(env); + if (inner_types != NULL) { + /* All later declarators only modify the return type */ + env->must_be_abstract = true; + } + rem_anchor_token(')'); + expect(')', end_error); + } + break; } break; + } + default: - if (may_be_abstract) + if (env->may_be_abstract) break; parse_error_expected("while parsing declarator", T_IDENTIFIER, '(', NULL); eat_until_anchor(); return NULL; } - construct_type_t *p = last; + construct_type_t **const p = anchor; - while (true) { + for (;;) { construct_type_t *type; - switch (token.type) { + switch (token.kind) { case '(': { scope_t *scope = NULL; - if (env != NULL) + if (!env->must_be_abstract) { scope = &env->parameters; + } - type = parse_function_declarator(scope, modifiers); + type = parse_function_declarator(scope); break; } case '[': @@ -4492,205 +3597,128 @@ ptr_operator_end: goto declarator_finished; } - /* insert in the middle of the list (behind p) */ - if (p != NULL) { - type->next = p->next; - p->next = type; - } else { - type->next = first; - first = type; - } - if (last == p) { - last = type; - } + /* insert in the middle of the list (at p) */ + type->base.next = *p; + *p = type; + if (anchor == p) + anchor = &type->base.next; } declarator_finished: - /* append inner_types at the end of the list, we don't to set last anymore + /* append inner_types at the end of the list, we don't to set anchor anymore * as it's not needed anymore */ - if (last == NULL) { - assert(first == NULL); - first = inner_types; - } else { - last->next = inner_types; - } + *anchor = inner_types; return first; end_error: return NULL; } -static void parse_declaration_attributes(entity_t *entity) -{ - gnu_attribute_t *attributes = NULL; - decl_modifiers_t modifiers = parse_attributes(&attributes); - - if (entity == NULL) - return; - - type_t *type; - if (entity->kind == ENTITY_TYPEDEF) { - modifiers |= entity->typedefe.modifiers; - type = entity->typedefe.type; - } else { - assert(is_declaration(entity)); - modifiers |= entity->declaration.modifiers; - type = entity->declaration.type; - } - if (type == NULL) - return; - - /* handle these strange/stupid mode attributes */ - gnu_attribute_t *attribute = attributes; - for ( ; attribute != NULL; attribute = attribute->next) { - if (attribute->kind != GNU_AK_MODE || attribute->invalid) - continue; - - atomic_type_kind_t akind = attribute->u.akind; - if (!is_type_signed(type)) { - switch (akind) { - case ATOMIC_TYPE_CHAR: akind = ATOMIC_TYPE_UCHAR; break; - case ATOMIC_TYPE_SHORT: akind = ATOMIC_TYPE_USHORT; break; - case ATOMIC_TYPE_INT: akind = ATOMIC_TYPE_UINT; break; - case ATOMIC_TYPE_LONGLONG: akind = ATOMIC_TYPE_ULONGLONG; break; - default: - panic("invalid akind in mode attribute"); - } - } else { - switch (akind) { - case ATOMIC_TYPE_CHAR: akind = ATOMIC_TYPE_SCHAR; break; - case ATOMIC_TYPE_SHORT: akind = ATOMIC_TYPE_SHORT; break; - case ATOMIC_TYPE_INT: akind = ATOMIC_TYPE_INT; break; - case ATOMIC_TYPE_LONGLONG: akind = ATOMIC_TYPE_LONGLONG; break; - default: - panic("invalid akind in mode attribute"); - } - } - - type = make_atomic_type(akind, type->base.qualifiers); - } - - type_modifiers_t type_modifiers = type->base.modifiers; - if (modifiers & DM_TRANSPARENT_UNION) - type_modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; - - if (type->base.modifiers != type_modifiers) { - type_t *copy = duplicate_type(type); - copy->base.modifiers = type_modifiers; - - type = typehash_insert(copy); - if (type != copy) { - obstack_free(type_obst, copy); - } - } - - if (entity->kind == ENTITY_TYPEDEF) { - entity->typedefe.type = type; - entity->typedefe.modifiers = modifiers; - } else { - entity->declaration.type = type; - entity->declaration.modifiers = modifiers; - } -} - -static type_t *construct_declarator_type(construct_type_t *construct_list, type_t *type) +static type_t *construct_declarator_type(construct_type_t *construct_list, + type_t *type) { construct_type_t *iter = construct_list; - for (; iter != NULL; iter = iter->next) { + for (; iter != NULL; iter = iter->base.next) { + source_position_t const* const pos = &iter->base.pos; switch (iter->kind) { - case CONSTRUCT_INVALID: - internal_errorf(HERE, "invalid type construction found"); case CONSTRUCT_FUNCTION: { - construct_function_type_t *construct_function_type - = (construct_function_type_t*) iter; - - type_t *function_type = construct_function_type->function_type; + construct_function_type_t *function = &iter->function; + type_t *function_type = function->function_type; function_type->function.return_type = type; type_t *skipped_return_type = skip_typeref(type); - /* §6.7.5.3(1) */ + /* §6.7.5.3:1 */ if (is_type_function(skipped_return_type)) { - errorf(HERE, "function returning function is not allowed"); + errorf(pos, "function returning function is not allowed"); } else if (is_type_array(skipped_return_type)) { - errorf(HERE, "function returning array is not allowed"); + errorf(pos, "function returning array is not allowed"); } else { - if (skipped_return_type->base.qualifiers != 0 && warning.other) { - warningf(HERE, - "type qualifiers in return type of function type are meaningless"); + if (skipped_return_type->base.qualifiers != 0) { + warningf(WARN_IGNORED_QUALIFIERS, pos, "type qualifiers in return type of function type are meaningless"); } } - type = function_type; - break; + /* The function type was constructed earlier. Freeing it here will + * destroy other types. */ + type = typehash_insert(function_type); + continue; } case CONSTRUCT_POINTER: { if (is_type_reference(skip_typeref(type))) - errorf(HERE, "cannot declare a pointer to reference"); + errorf(pos, "cannot declare a pointer to reference"); - parsed_pointer_t *parsed_pointer = (parsed_pointer_t*) iter; - type = make_based_pointer_type(type, parsed_pointer->type_qualifiers, parsed_pointer->base_variable); + parsed_pointer_t *pointer = &iter->pointer; + type = make_based_pointer_type(type, pointer->type_qualifiers, pointer->base_variable); continue; } case CONSTRUCT_REFERENCE: if (is_type_reference(skip_typeref(type))) - errorf(HERE, "cannot declare a reference to reference"); + errorf(pos, "cannot declare a reference to reference"); type = make_reference_type(type); continue; case CONSTRUCT_ARRAY: { if (is_type_reference(skip_typeref(type))) - errorf(HERE, "cannot declare an array of references"); + errorf(pos, "cannot declare an array of references"); - parsed_array_t *parsed_array = (parsed_array_t*) iter; - type_t *array_type = allocate_type_zero(TYPE_ARRAY); + parsed_array_t *array = &iter->array; + type_t *array_type = allocate_type_zero(TYPE_ARRAY); - expression_t *size_expression = parsed_array->size; + expression_t *size_expression = 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->base.qualifiers = 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.is_static = array->is_static; + array_type->array.is_variable = array->is_variable; array_type->array.size_expression = size_expression; if (size_expression != NULL) { - if (is_constant_expression(size_expression)) { + switch (is_constant_expression(size_expression)) { + case EXPR_CLASS_CONSTANT: { + long const size = fold_constant_to_int(size_expression); + array_type->array.size = size; array_type->array.size_constant = true; - array_type->array.size - = fold_constant(size_expression); - } else { + /* §6.7.5.2:1 If the expression is a constant expression, + * it shall have a value greater than zero. */ + if (size < 0) { + errorf(&size_expression->base.source_position, + "size of array must be greater than zero"); + } else if (size == 0 && !GNU_MODE) { + errorf(&size_expression->base.source_position, + "size of array must be greater than zero (zero length arrays are a GCC extension)"); + } + break; + } + + case EXPR_CLASS_VARIABLE: array_type->array.is_vla = true; + break; + + case EXPR_CLASS_ERROR: + break; } } type_t *skipped_type = skip_typeref(type); - /* §6.7.5.2(1) */ + /* §6.7.5.2:1 */ if (is_type_incomplete(skipped_type)) { - errorf(HERE, "array of incomplete type '%T' is not allowed", type); + errorf(pos, "array of incomplete type '%T' is not allowed", type); } else if (is_type_function(skipped_type)) { - errorf(HERE, "array of functions is not allowed"); + errorf(pos, "array of functions is not allowed"); } - type = array_type; - break; - } + type = identify_new_type(array_type); + continue; } - - type_t *hashed_type = typehash_insert(type); - if (hashed_type != type) { - /* the function type was constructed earlier freeing it here will - * destroy other types... */ - if (iter->kind != CONSTRUCT_FUNCTION) { - free_type(type); - } - type = hashed_type; } + internal_errorf(pos, "invalid type construction found"); } return type; @@ -4701,7 +3729,7 @@ static type_t *automatic_type_conversion(type_t *orig_type); static type_t *semantic_parameter(const source_position_t *pos, type_t *type, const declaration_specifiers_t *specifiers, - symbol_t *symbol) + entity_t const *const param) { /* §6.7.5.3:7 A declaration of a parameter as ``array of type'' * shall be adjusted to ``qualified pointer to type'', @@ -4712,7 +3740,7 @@ static type_t *semantic_parameter(const source_position_t *pos, type = automatic_type_conversion(type); if (specifiers->is_inline && is_type_valid(type)) { - errorf(pos, "parameter '%Y' declared 'inline'", symbol); + errorf(pos, "'%N' declared 'inline'", param); } /* §6.9.1:6 The declarations in the declaration list shall contain @@ -4722,7 +3750,7 @@ static type_t *semantic_parameter(const source_position_t *pos, specifiers->storage_class != STORAGE_CLASS_NONE && specifiers->storage_class != STORAGE_CLASS_REGISTER) ) { - errorf(pos, "invalid storage class for parameter '%Y'", symbol); + errorf(pos, "invalid storage class for '%N'", param); } /* delay test for incomplete type, because we might have (void) @@ -4736,10 +3764,9 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, { parse_declarator_env_t env; memset(&env, 0, sizeof(env)); - env.modifiers = specifiers->modifiers; + env.may_be_abstract = (flags & DECL_MAY_BE_ABSTRACT) != 0; - construct_type_t *construct_type = - parse_inner_declarator(&env, (flags & DECL_MAY_BE_ABSTRACT) != 0); + construct_type_t *construct_type = parse_inner_declarator(&env); type_t *orig_type = construct_declarator_type(construct_type, specifiers->type); type_t *type = skip_typeref(orig_type); @@ -4748,10 +3775,17 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, obstack_free(&temp_obst, construct_type); } + attribute_t *attributes = parse_attributes(env.attributes); + /* append (shared) specifier attribute behind attributes of this + * declarator */ + attribute_t **anchor = &attributes; + while (*anchor != NULL) + anchor = &(*anchor)->next; + *anchor = specifiers->attributes; + entity_t *entity; if (specifiers->storage_class == STORAGE_CLASS_TYPEDEF) { - entity = allocate_entity_zero(ENTITY_TYPEDEF); - entity->base.symbol = env.symbol; + entity = allocate_entity_zero(ENTITY_TYPEDEF, NAMESPACE_NORMAL, env.symbol); entity->base.source_position = env.source_position; entity->typedefe.type = orig_type; @@ -4772,102 +3806,106 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, } else { /* create a declaration type entity */ if (flags & DECL_CREATE_COMPOUND_MEMBER) { - entity = allocate_entity_zero(ENTITY_COMPOUND_MEMBER); + entity = allocate_entity_zero(ENTITY_COMPOUND_MEMBER, NAMESPACE_NORMAL, env.symbol); - if (specifiers->is_inline && is_type_valid(type)) { - errorf(&env.source_position, - "compound member '%Y' declared 'inline'", env.symbol); - } + if (env.symbol != NULL) { + if (specifiers->is_inline && is_type_valid(type)) { + errorf(&env.source_position, + "compound member '%Y' declared 'inline'", env.symbol); + } - if (specifiers->thread_local || - specifiers->storage_class != STORAGE_CLASS_NONE) { - errorf(&env.source_position, - "compound member '%Y' must have no storage class", - env.symbol); + if (specifiers->thread_local || + specifiers->storage_class != STORAGE_CLASS_NONE) { + errorf(&env.source_position, + "compound member '%Y' must have no storage class", + env.symbol); + } } } else if (flags & DECL_IS_PARAMETER) { - orig_type = semantic_parameter(&env.source_position, orig_type, - specifiers, env.symbol); - - entity = allocate_entity_zero(ENTITY_PARAMETER); + entity = allocate_entity_zero(ENTITY_PARAMETER, NAMESPACE_NORMAL, env.symbol); + orig_type = semantic_parameter(&env.source_position, orig_type, specifiers, entity); } else if (is_type_function(type)) { - entity = allocate_entity_zero(ENTITY_FUNCTION); - - entity->function.is_inline = specifiers->is_inline; - entity->function.parameters = env.parameters; - - if (specifiers->thread_local || ( - specifiers->storage_class != STORAGE_CLASS_EXTERN && - specifiers->storage_class != STORAGE_CLASS_NONE && - specifiers->storage_class != STORAGE_CLASS_STATIC) - ) { - errorf(&env.source_position, - "invalid storage class for function '%Y'", env.symbol); + entity = allocate_entity_zero(ENTITY_FUNCTION, NAMESPACE_NORMAL, env.symbol); + entity->function.is_inline = specifiers->is_inline; + entity->function.elf_visibility = default_visibility; + entity->function.parameters = env.parameters; + + if (env.symbol != NULL) { + /* this needs fixes for C++ */ + bool in_function_scope = current_function != NULL; + + if (specifiers->thread_local || ( + specifiers->storage_class != STORAGE_CLASS_EXTERN && + specifiers->storage_class != STORAGE_CLASS_NONE && + (in_function_scope || specifiers->storage_class != STORAGE_CLASS_STATIC) + )) { + errorf(&env.source_position, "invalid storage class for '%N'", entity); + } } } else { - entity = allocate_entity_zero(ENTITY_VARIABLE); - - entity->variable.get_property_sym = specifiers->get_property_sym; - entity->variable.put_property_sym = specifiers->put_property_sym; - if (specifiers->alignment != 0) { - /* TODO: add checks here */ - entity->variable.alignment = specifiers->alignment; - } + entity = allocate_entity_zero(ENTITY_VARIABLE, NAMESPACE_NORMAL, env.symbol); + entity->variable.elf_visibility = default_visibility; + entity->variable.thread_local = specifiers->thread_local; - if (specifiers->is_inline && is_type_valid(type)) { - errorf(&env.source_position, - "variable '%Y' declared 'inline'", env.symbol); - } - - entity->variable.thread_local = specifiers->thread_local; + if (env.symbol != NULL) { + if (specifiers->is_inline && is_type_valid(type)) { + errorf(&env.source_position, "'%N' declared 'inline'", entity); + } - bool invalid_storage_class = false; - if (current_scope == file_scope) { - if (specifiers->storage_class != STORAGE_CLASS_EXTERN && - specifiers->storage_class != STORAGE_CLASS_NONE && - specifiers->storage_class != STORAGE_CLASS_STATIC) { - invalid_storage_class = true; + bool invalid_storage_class = false; + if (current_scope == file_scope) { + if (specifiers->storage_class != STORAGE_CLASS_EXTERN && + specifiers->storage_class != STORAGE_CLASS_NONE && + specifiers->storage_class != STORAGE_CLASS_STATIC) { + invalid_storage_class = true; + } + } else { + if (specifiers->thread_local && + specifiers->storage_class == STORAGE_CLASS_NONE) { + invalid_storage_class = true; + } } - } else { - if (specifiers->thread_local && - specifiers->storage_class == STORAGE_CLASS_NONE) { - invalid_storage_class = true; + if (invalid_storage_class) { + errorf(&env.source_position, "invalid storage class for variable '%N'", entity); } } - if (invalid_storage_class) { - errorf(&env.source_position, - "invalid storage class for variable '%Y'", env.symbol); - } } - entity->base.source_position = env.source_position; - entity->base.symbol = env.symbol; - entity->base.namespc = NAMESPACE_NORMAL; - entity->declaration.type = orig_type; - entity->declaration.modifiers = env.modifiers; - entity->declaration.deprecated_string = specifiers->deprecated_string; + entity->base.source_position = env.symbol != NULL ? env.source_position : specifiers->source_position; + entity->declaration.type = orig_type; + entity->declaration.alignment = get_type_alignment(orig_type); + entity->declaration.modifiers = env.modifiers; + entity->declaration.attributes = attributes; storage_class_t storage_class = specifiers->storage_class; entity->declaration.declared_storage_class = storage_class; - if (storage_class == STORAGE_CLASS_NONE && current_scope != file_scope) + if (storage_class == STORAGE_CLASS_NONE && current_function != NULL) storage_class = STORAGE_CLASS_AUTO; entity->declaration.storage_class = storage_class; } - parse_declaration_attributes(entity); + if (attributes != NULL) { + handle_entity_attributes(attributes, entity); + } return entity; } static type_t *parse_abstract_declarator(type_t *base_type) { - construct_type_t *construct_type = parse_inner_declarator(NULL, 1); + parse_declarator_env_t env; + memset(&env, 0, sizeof(env)); + env.may_be_abstract = true; + env.must_be_abstract = true; + + construct_type_t *construct_type = parse_inner_declarator(&env); type_t *result = construct_declarator_type(construct_type, base_type); if (construct_type != NULL) { obstack_free(&temp_obst, construct_type); } + result = handle_type_attributes(env.attributes, result); return result; } @@ -4882,45 +3920,48 @@ static type_t *parse_abstract_declarator(type_t *base_type) * @param decl the declaration to check * @param type the function type of the declaration */ -static void check_type_of_main(const entity_t *entity) +static void check_main(const entity_t *entity) { const source_position_t *pos = &entity->base.source_position; if (entity->kind != ENTITY_FUNCTION) { - warningf(pos, "'main' is not a function"); + warningf(WARN_MAIN, pos, "'main' is not a function"); return; } if (entity->declaration.storage_class == STORAGE_CLASS_STATIC) { - warningf(pos, "'main' is normally a non-static function"); + warningf(WARN_MAIN, pos, "'main' is normally a non-static function"); } type_t *type = skip_typeref(entity->declaration.type); assert(is_type_function(type)); - function_type_t *func_type = &type->function; - if (!types_compatible(skip_typeref(func_type->return_type), type_int)) { - warningf(pos, "return type of 'main' should be 'int', but is '%T'", - func_type->return_type); + function_type_t const *const func_type = &type->function; + type_t *const ret_type = func_type->return_type; + if (!types_compatible(skip_typeref(ret_type), type_int)) { + warningf(WARN_MAIN, pos, "return type of 'main' should be 'int', but is '%T'", ret_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(pos, - "first argument of 'main' should be 'int', but is '%T'", - first_type); + type_t *const first_type = skip_typeref(parm->type); + type_t *const first_type_unqual = get_unqualified_type(first_type); + if (!types_compatible(first_type_unqual, type_int)) { + warningf(WARN_MAIN, pos, "first argument of 'main' should be 'int', but is '%T'", parm->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(pos, "second argument of 'main' should be 'char**', but is '%T'", second_type); + type_t *const second_type = skip_typeref(parm->type); + type_t *const second_type_unqual + = get_unqualified_type(second_type); + if (!types_compatible(second_type_unqual, type_char_ptr_ptr)) { + warningf(WARN_MAIN, pos, "second argument of 'main' should be 'char**', but is '%T'", parm->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(pos, "third argument of 'main' should be 'char**', but is '%T'", third_type); + type_t *const third_type = skip_typeref(parm->type); + type_t *const third_type_unqual + = get_unqualified_type(third_type); + if (!types_compatible(third_type_unqual, type_char_ptr_ptr)) { + warningf(WARN_MAIN, pos, "third argument of 'main' should be 'char**', but is '%T'", parm->type); } parm = parm->next; if (parm != NULL) @@ -4928,7 +3969,7 @@ static void check_type_of_main(const entity_t *entity) } } else { warn_arg_count: - warningf(pos, "'main' takes only zero, two or three arguments"); + warningf(WARN_MAIN, pos, "'main' takes only zero, two or three arguments"); } } } @@ -4944,16 +3985,67 @@ static bool is_sym_main(const symbol_t *const sym) static void error_redefined_as_different_kind(const source_position_t *pos, const entity_t *old, entity_kind_t new_kind) { - errorf(pos, "redeclaration of %s '%Y' as %s (declared %P)", - get_entity_kind_name(old->kind), old->base.symbol, - get_entity_kind_name(new_kind), &old->base.source_position); + char const *const what = get_entity_kind_name(new_kind); + source_position_t const *const ppos = &old->base.source_position; + errorf(pos, "redeclaration of '%N' as %s (declared %P)", old, what, ppos); +} + +static bool is_entity_valid(entity_t *const ent) +{ + if (is_declaration(ent)) { + return is_type_valid(skip_typeref(ent->declaration.type)); + } else if (ent->kind == ENTITY_TYPEDEF) { + return is_type_valid(skip_typeref(ent->typedefe.type)); + } + return true; +} + +static bool contains_attribute(const attribute_t *list, const attribute_t *attr) +{ + for (const attribute_t *tattr = list; tattr != NULL; tattr = tattr->next) { + if (attributes_equal(tattr, attr)) + return true; + } + return false; +} + +/** + * test wether new_list contains any attributes not included in old_list + */ +static bool has_new_attributes(const attribute_t *old_list, + const attribute_t *new_list) +{ + for (const attribute_t *attr = new_list; attr != NULL; attr = attr->next) { + if (!contains_attribute(old_list, attr)) + return true; + } + return false; +} + +/** + * Merge in attributes from an attribute list (probably from a previous + * declaration with the same name). Warning: destroys the old structure + * of the attribute list - don't reuse attributes after this call. + */ +static void merge_in_attributes(declaration_t *decl, attribute_t *attributes) +{ + attribute_t *next; + for (attribute_t *attr = attributes; attr != NULL; attr = next) { + next = attr->next; + if (contains_attribute(decl->attributes, attr)) + continue; + + /* move attribute to new declarations attributes list */ + attr->next = decl->attributes; + decl->attributes = attr; + } } /** * record entities for the NAMESPACE_NORMAL, and produce error messages/warnings * for various problems that occur for multiple definitions */ -static entity_t *record_entity(entity_t *entity, const bool is_definition) +entity_t *record_entity(entity_t *entity, const bool is_definition) { const symbol_t *const symbol = entity->base.symbol; const namespace_tag_t namespc = (namespace_tag_t)entity->base.namespc; @@ -4963,7 +4055,7 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition) if (symbol == NULL) return entity; - entity_t *previous_entity = get_entity(symbol, namespc); + entity_t *const previous_entity = get_entity(symbol, namespc); /* pushing the same entity twice will break the stack structure */ assert(previous_entity != entity); @@ -4973,200 +4065,184 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition) assert(is_type_function(type)); if (type->function.unspecified_parameters && - warning.strict_prototypes && - previous_entity == NULL) { - warningf(pos, "function declaration '%#T' is not a prototype", - orig_type, symbol); + previous_entity == NULL && + !entity->declaration.implicit) { + warningf(WARN_STRICT_PROTOTYPES, pos, "function declaration '%#N' is not a prototype", entity); } - if (warning.main && current_scope == file_scope - && is_sym_main(symbol)) { - check_type_of_main(entity); + if (current_scope == file_scope && is_sym_main(symbol)) { + check_main(entity); } } - if (is_declaration(entity) && - warning.nested_externs && - entity->declaration.storage_class == STORAGE_CLASS_EXTERN && - current_scope != file_scope) { - warningf(pos, "nested extern declaration of '%#T'", - entity->declaration.type, symbol); + if (is_declaration(entity) && + entity->declaration.storage_class == STORAGE_CLASS_EXTERN && + current_scope != file_scope && + !entity->declaration.implicit) { + warningf(WARN_NESTED_EXTERNS, pos, "nested extern declaration of '%#N'", entity); } - if (previous_entity != NULL && - previous_entity->base.parent_scope == ¤t_function->parameters && - previous_entity->base.parent_scope->depth + 1 == current_scope->depth) { - assert(previous_entity->kind == ENTITY_PARAMETER); - errorf(pos, - "declaration '%#T' redeclares the parameter '%#T' (declared %P)", - entity->declaration.type, symbol, - previous_entity->declaration.type, symbol, - &previous_entity->base.source_position); - goto finish; - } + if (previous_entity != NULL) { + source_position_t const *const ppos = &previous_entity->base.source_position; - if (previous_entity != NULL && - previous_entity->base.parent_scope == current_scope) { - if (previous_entity->kind != entity->kind) { - error_redefined_as_different_kind(pos, previous_entity, - entity->kind); - goto finish; - } - if (previous_entity->kind == ENTITY_ENUM_VALUE) { - errorf(pos, "redeclaration of enum entry '%Y' (declared %P)", - symbol, &previous_entity->base.source_position); - goto finish; - } - if (previous_entity->kind == ENTITY_TYPEDEF) { - /* TODO: C++ allows this for exactly the same type */ - errorf(pos, "redefinition of typedef '%Y' (declared %P)", - symbol, &previous_entity->base.source_position); + if (previous_entity->base.parent_scope == ¤t_function->parameters && + previous_entity->base.parent_scope->depth + 1 == current_scope->depth) { + assert(previous_entity->kind == ENTITY_PARAMETER); + errorf(pos, "declaration of '%N' redeclares the '%N' (declared %P)", entity, previous_entity, ppos); goto finish; } - /* at this point we should have only VARIABLES or FUNCTIONS */ - assert(is_declaration(previous_entity) && is_declaration(entity)); - - declaration_t *const prev_decl = &previous_entity->declaration; - declaration_t *const decl = &entity->declaration; + if (previous_entity->base.parent_scope == current_scope) { + if (previous_entity->kind != entity->kind) { + if (is_entity_valid(previous_entity) && is_entity_valid(entity)) { + error_redefined_as_different_kind(pos, previous_entity, + entity->kind); + } + goto finish; + } + if (previous_entity->kind == ENTITY_ENUM_VALUE) { + errorf(pos, "redeclaration of '%N' (declared %P)", entity, ppos); + goto finish; + } + if (previous_entity->kind == ENTITY_TYPEDEF) { + /* TODO: C++ allows this for exactly the same type */ + errorf(pos, "redefinition of '%N' (declared %P)", entity, ppos); + goto finish; + } - /* can happen for K&R style declarations */ - if (prev_decl->type == NULL && - previous_entity->kind == ENTITY_PARAMETER && - entity->kind == ENTITY_PARAMETER) { - prev_decl->type = decl->type; - prev_decl->storage_class = decl->storage_class; - prev_decl->declared_storage_class = decl->declared_storage_class; - prev_decl->modifiers = decl->modifiers; - prev_decl->deprecated_string = decl->deprecated_string; - return previous_entity; - } + /* at this point we should have only VARIABLES or FUNCTIONS */ + assert(is_declaration(previous_entity) && is_declaration(entity)); - type_t *const orig_type = decl->type; - assert(orig_type != NULL); - type_t *const type = skip_typeref(orig_type); - type_t * prev_type = skip_typeref(prev_decl->type); + declaration_t *const prev_decl = &previous_entity->declaration; + declaration_t *const decl = &entity->declaration; - if (!types_compatible(type, prev_type)) { - errorf(pos, - "declaration '%#T' is incompatible with '%#T' (declared %P)", - orig_type, symbol, prev_decl->type, symbol, - &previous_entity->base.source_position); - } else { - unsigned old_storage_class = prev_decl->storage_class; - if (warning.redundant_decls && - is_definition && - !prev_decl->used && - !(prev_decl->modifiers & DM_USED) && - prev_decl->storage_class == STORAGE_CLASS_STATIC) { - warningf(&previous_entity->base.source_position, - "unnecessary static forward declaration for '%#T'", - prev_decl->type, symbol); + /* can happen for K&R style declarations */ + if (prev_decl->type == NULL && + previous_entity->kind == ENTITY_PARAMETER && + entity->kind == ENTITY_PARAMETER) { + prev_decl->type = decl->type; + prev_decl->storage_class = decl->storage_class; + prev_decl->declared_storage_class = decl->declared_storage_class; + prev_decl->modifiers = decl->modifiers; + return previous_entity; } - unsigned new_storage_class = decl->storage_class; - if (is_type_incomplete(prev_type)) { - prev_decl->type = type; - prev_type = type; - } + type_t *const type = skip_typeref(decl->type); + type_t *const prev_type = skip_typeref(prev_decl->type); - /* pretend no storage class means extern for function - * declarations (except if the previous declaration is neither - * none nor extern) */ - if (entity->kind == ENTITY_FUNCTION) { - if (prev_type->function.unspecified_parameters) { - prev_decl->type = type; - prev_type = type; + if (!types_compatible(type, prev_type)) { + errorf(pos, "declaration '%#N' is incompatible with '%#N' (declared %P)", entity, previous_entity, ppos); + } else { + unsigned old_storage_class = prev_decl->storage_class; + + if (is_definition && + !prev_decl->used && + !(prev_decl->modifiers & DM_USED) && + prev_decl->storage_class == STORAGE_CLASS_STATIC) { + warningf(WARN_REDUNDANT_DECLS, ppos, "unnecessary static forward declaration for '%#N'", previous_entity); } - switch (old_storage_class) { - case STORAGE_CLASS_NONE: - old_storage_class = STORAGE_CLASS_EXTERN; - /* FALLTHROUGH */ - - case STORAGE_CLASS_EXTERN: - if (is_definition) { - if (warning.missing_prototypes && - prev_type->function.unspecified_parameters && - !is_sym_main(symbol)) { - warningf(pos, "no previous prototype for '%#T'", - orig_type, symbol); - } - } else if (new_storage_class == STORAGE_CLASS_NONE) { - new_storage_class = STORAGE_CLASS_EXTERN; - } - break; + storage_class_t new_storage_class = decl->storage_class; + + /* pretend no storage class means extern for function + * declarations (except if the previous declaration is neither + * none nor extern) */ + if (entity->kind == ENTITY_FUNCTION) { + /* the previous declaration could have unspecified parameters or + * be a typedef, so use the new type */ + if (prev_type->function.unspecified_parameters || is_definition) + prev_decl->type = type; + + switch (old_storage_class) { + case STORAGE_CLASS_NONE: + old_storage_class = STORAGE_CLASS_EXTERN; + /* FALLTHROUGH */ + + case STORAGE_CLASS_EXTERN: + if (is_definition) { + if (prev_type->function.unspecified_parameters && !is_sym_main(symbol)) { + warningf(WARN_MISSING_PROTOTYPES, pos, "no previous prototype for '%#N'", entity); + } + } else if (new_storage_class == STORAGE_CLASS_NONE) { + new_storage_class = STORAGE_CLASS_EXTERN; + } + break; - default: - break; + default: + break; + } + } else if (is_type_incomplete(prev_type)) { + prev_decl->type = type; } - } - if (old_storage_class == STORAGE_CLASS_EXTERN && - new_storage_class == STORAGE_CLASS_EXTERN) { -warn_redundant_declaration: - if (!is_definition && - warning.redundant_decls && - is_type_valid(prev_type) && - strcmp(previous_entity->base.source_position.input_name, - "") != 0) { - warningf(pos, - "redundant declaration for '%Y' (declared %P)", - symbol, &previous_entity->base.source_position); - } - } else if (current_function == NULL) { - if (old_storage_class != STORAGE_CLASS_STATIC && - new_storage_class == STORAGE_CLASS_STATIC) { - errorf(pos, - "static declaration of '%Y' follows non-static declaration (declared %P)", - symbol, &previous_entity->base.source_position); - } else if (old_storage_class == STORAGE_CLASS_EXTERN) { - prev_decl->storage_class = STORAGE_CLASS_NONE; - prev_decl->declared_storage_class = STORAGE_CLASS_NONE; - } else { - /* ISO/IEC 14882:1998(E) §C.1.2:1 */ - if (c_mode & _CXX) - goto error_redeclaration; - goto warn_redundant_declaration; - } - } else if (is_type_valid(prev_type)) { - if (old_storage_class == new_storage_class) { + if (old_storage_class == STORAGE_CLASS_EXTERN && + new_storage_class == STORAGE_CLASS_EXTERN) { + +warn_redundant_declaration: ; + bool has_new_attrs + = has_new_attributes(prev_decl->attributes, + decl->attributes); + if (has_new_attrs) { + merge_in_attributes(decl, prev_decl->attributes); + } else if (!is_definition && + is_type_valid(prev_type) && + strcmp(ppos->input_name, "") != 0) { + warningf(WARN_REDUNDANT_DECLS, pos, "redundant declaration for '%Y' (declared %P)", symbol, ppos); + } + } else if (current_function == NULL) { + if (old_storage_class != STORAGE_CLASS_STATIC && + new_storage_class == STORAGE_CLASS_STATIC) { + errorf(pos, "static declaration of '%Y' follows non-static declaration (declared %P)", symbol, ppos); + } else if (old_storage_class == STORAGE_CLASS_EXTERN) { + prev_decl->storage_class = STORAGE_CLASS_NONE; + prev_decl->declared_storage_class = STORAGE_CLASS_NONE; + } else { + /* ISO/IEC 14882:1998(E) §C.1.2:1 */ + if (c_mode & _CXX) + goto error_redeclaration; + goto warn_redundant_declaration; + } + } else if (is_type_valid(prev_type)) { + if (old_storage_class == new_storage_class) { error_redeclaration: - errorf(pos, "redeclaration of '%Y' (declared %P)", - symbol, &previous_entity->base.source_position); - } else { - errorf(pos, - "redeclaration of '%Y' with different linkage (declared %P)", - symbol, &previous_entity->base.source_position); + errorf(pos, "redeclaration of '%Y' (declared %P)", symbol, ppos); + } else { + errorf(pos, "redeclaration of '%Y' with different linkage (declared %P)", symbol, ppos); + } } } + + prev_decl->modifiers |= decl->modifiers; + if (entity->kind == ENTITY_FUNCTION) { + previous_entity->function.is_inline |= entity->function.is_inline; + } + return previous_entity; } - prev_decl->modifiers |= decl->modifiers; - if (entity->kind == ENTITY_FUNCTION) { - previous_entity->function.is_inline |= entity->function.is_inline; + warning_t why; + if (is_warn_on(why = WARN_SHADOW) || + (is_warn_on(why = WARN_SHADOW_LOCAL) && previous_entity->base.parent_scope != file_scope)) { + char const *const what = get_entity_kind_name(previous_entity->kind); + warningf(why, pos, "'%N' shadows %s (declared %P)", entity, what, ppos); } - return previous_entity; } if (entity->kind == ENTITY_FUNCTION) { if (is_definition && - entity->declaration.storage_class != STORAGE_CLASS_STATIC) { - if (warning.missing_prototypes && !is_sym_main(symbol)) { - warningf(pos, "no previous prototype for '%#T'", - entity->declaration.type, symbol); - } else if (warning.missing_declarations && !is_sym_main(symbol)) { - warningf(pos, "no previous declaration for '%#T'", - entity->declaration.type, symbol); + entity->declaration.storage_class != STORAGE_CLASS_STATIC && + !is_sym_main(symbol)) { + if (is_warn_on(WARN_MISSING_PROTOTYPES)) { + warningf(WARN_MISSING_PROTOTYPES, pos, "no previous prototype for '%#N'", entity); + } else { + goto warn_missing_declaration; } } - } else if (warning.missing_declarations && - entity->kind == ENTITY_VARIABLE && - current_scope == file_scope) { - declaration_t *declaration = &entity->declaration; - if (declaration->storage_class == STORAGE_CLASS_NONE) { - warningf(pos, "no previous declaration for '%#T'", - declaration->type, symbol); + } else if (entity->kind == ENTITY_VARIABLE) { + if (current_scope == file_scope && + entity->declaration.storage_class == STORAGE_CLASS_NONE && + !entity->declaration.implicit) { +warn_missing_declaration: + warningf(WARN_MISSING_DECLARATIONS, pos, "no previous declaration for '%#N'", entity); } } @@ -5175,7 +4251,6 @@ finish: assert(current_scope != NULL); entity->base.parent_scope = current_scope; - entity->base.namespc = NAMESPACE_NORMAL; environment_push(entity); append_entity(current_scope, entity); @@ -5189,19 +4264,13 @@ static void parser_error_multiple_definition(entity_t *entity, entity->base.symbol, &entity->base.source_position); } -static bool is_declaration_specifier(const token_t *token, - bool only_specifiers_qualifiers) +static bool is_declaration_specifier(const token_t *token) { - switch (token->type) { - TYPE_SPECIFIERS - TYPE_QUALIFIERS + switch (token->kind) { + DECLARATION_START return true; case T_IDENTIFIER: - return is_typedef_symbol(token->v.symbol); - - case T___extension__: - STORAGE_CLASSES - return !only_specifiers_qualifiers; + return is_typedef_symbol(token->identifier.symbol); default: return false; @@ -5210,19 +4279,25 @@ static bool is_declaration_specifier(const token_t *token, static void parse_init_declarator_rest(entity_t *entity) { - assert(is_declaration(entity)); - declaration_t *const declaration = &entity->declaration; + type_t *orig_type = type_error_type; - eat('='); + if (entity->base.kind == ENTITY_TYPEDEF) { + source_position_t const *const pos = &entity->base.source_position; + errorf(pos, "'%N' is initialized (use __typeof__ instead)", entity); + } else { + assert(is_declaration(entity)); + orig_type = entity->declaration.type; + } - type_t *orig_type = declaration->type; - type_t *type = skip_typeref(orig_type); + type_t *type = skip_typeref(orig_type); if (entity->kind == ENTITY_VARIABLE && entity->variable.initializer != NULL) { parser_error_multiple_definition(entity, HERE); } + eat('='); + declaration_t *const declaration = &entity->declaration; bool must_be_constant = false; if (declaration->storage_class == STORAGE_CLASS_STATIC || entity->base.parent_scope == file_scope) { @@ -5230,9 +4305,8 @@ static void parse_init_declarator_rest(entity_t *entity) } if (is_type_function(type)) { - errorf(&entity->base.source_position, - "function '%#T' is initialized like a variable", - orig_type, entity->base.symbol); + source_position_t const *const pos = &entity->base.source_position; + errorf(pos, "'%N' is initialized like a variable", entity); orig_type = type_error_type; } @@ -5240,13 +4314,11 @@ static void parse_init_declarator_rest(entity_t *entity) env.type = orig_type; env.must_be_constant = must_be_constant; env.entity = entity; - current_init_decl = entity; initializer_t *initializer = parse_initializer(&env); - current_init_decl = NULL; if (entity->kind == ENTITY_VARIABLE) { - /* § 6.7.5 (22) array initializers for arrays with unknown size + /* §6.7.5:22 array initializers for arrays with unknown size * determine the array type size */ declaration->type = env.type; entity->variable.initializer = initializer; @@ -5260,31 +4332,28 @@ static void parse_anonymous_declaration_rest( eat(';'); anonymous_entity = NULL; - if (warning.other) { - if (specifiers->storage_class != STORAGE_CLASS_NONE || - specifiers->thread_local) { - warningf(&specifiers->source_position, - "useless storage class in empty declaration"); - } + source_position_t const *const pos = &specifiers->source_position; + if (specifiers->storage_class != STORAGE_CLASS_NONE || + specifiers->thread_local) { + warningf(WARN_OTHER, pos, "useless storage class in empty declaration"); + } - type_t *type = specifiers->type; - switch (type->kind) { - case TYPE_COMPOUND_STRUCT: - case TYPE_COMPOUND_UNION: { - if (type->compound.compound->base.symbol == NULL) { - warningf(&specifiers->source_position, - "unnamed struct/union that defines no instances"); - } - break; + type_t *type = specifiers->type; + switch (type->kind) { + case TYPE_COMPOUND_STRUCT: + case TYPE_COMPOUND_UNION: { + if (type->compound.compound->base.symbol == NULL) { + warningf(WARN_OTHER, pos, "unnamed struct/union that defines no instances"); } + break; + } - case TYPE_ENUM: - break; + case TYPE_ENUM: + break; - default: - warningf(&specifiers->source_position, "empty declaration"); - break; - } + default: + warningf(WARN_OTHER, pos, "empty declaration"); + break; } } @@ -5296,25 +4365,22 @@ static void check_variable_type_complete(entity_t *ent) /* §6.7:7 If an identifier for an object is declared with no linkage, the * type for the object shall be complete [...] */ declaration_t *decl = &ent->declaration; - if (decl->storage_class != STORAGE_CLASS_NONE) + if (decl->storage_class == STORAGE_CLASS_EXTERN || + decl->storage_class == STORAGE_CLASS_STATIC) return; - type_t *const orig_type = decl->type; - type_t *const type = skip_typeref(orig_type); + type_t *const type = skip_typeref(decl->type); if (!is_type_incomplete(type)) return; - /* GCC allows global arrays without size and assigns them a length of one, - * if no different declaration follows */ - if (is_type_array(type) && - c_mode & _GNUC && - ent->base.parent_scope == file_scope) { + /* §6.9.2:2 and §6.9.2:5: At the end of the translation incomplete arrays + * are given length one. */ + if (is_type_array(type) && ent->base.parent_scope == file_scope) { ARR_APP1(declaration_t*, incomplete_arrays, decl); return; } - errorf(&ent->base.source_position, "variable '%#T' has incomplete type", - orig_type, ent->base.symbol); + errorf(&ent->base.source_position, "variable '%#N' has incomplete type", ent); } @@ -5326,9 +4392,9 @@ static void parse_declaration_rest(entity_t *ndeclaration, add_anchor_token(';'); add_anchor_token(','); while (true) { - entity_t *entity = finished_declaration(ndeclaration, token.type == '='); + entity_t *entity = finished_declaration(ndeclaration, token.kind == '='); - if (token.type == '=') { + if (token.kind == '=') { parse_init_declarator_rest(entity); } else if (entity->kind == ENTITY_VARIABLE) { /* ISO/IEC 14882:1998(E) §8.5.3:3 The initializer can be omitted @@ -5337,18 +4403,16 @@ static void parse_declaration_rest(entity_t *ndeclaration, if (decl->storage_class != STORAGE_CLASS_EXTERN) { type_t *type = decl->type; if (is_type_reference(skip_typeref(type))) { - errorf(&entity->base.source_position, - "reference '%#T' must be initialized", - type, entity->base.symbol); + source_position_t const *const pos = &entity->base.source_position; + errorf(pos, "reference '%#N' must be initialized", entity); } } } check_variable_type_complete(entity); - if (token.type != ',') + if (!next_if(',')) break; - eat(','); add_anchor_token('='); ndeclaration = parse_declarator(specifiers, flags); @@ -5365,22 +4429,20 @@ end_error: static entity_t *finished_kr_declaration(entity_t *entity, bool is_definition) { symbol_t *symbol = entity->base.symbol; - if (symbol == NULL) { - errorf(HERE, "anonymous declaration not valid as function parameter"); + if (symbol == NULL) return entity; - } assert(entity->base.namespc == NAMESPACE_NORMAL); entity_t *previous_entity = get_entity(symbol, NAMESPACE_NORMAL); if (previous_entity == NULL || previous_entity->base.parent_scope != current_scope) { - errorf(HERE, "expected declaration of a function parameter, found '%Y'", + errorf(&entity->base.source_position, "expected declaration of a function parameter, found '%Y'", symbol); return entity; } if (is_definition) { - errorf(HERE, "parameter '%Y' is initialised", entity->base.symbol); + errorf(HERE, "'%N' is initialised", entity); } return record_entity(entity, false); @@ -5389,14 +4451,12 @@ static entity_t *finished_kr_declaration(entity_t *entity, bool is_definition) static void parse_declaration(parsed_declaration_func finished_declaration, declarator_flags_t flags) { - declaration_specifiers_t specifiers; - memset(&specifiers, 0, sizeof(specifiers)); - add_anchor_token(';'); + declaration_specifiers_t specifiers; parse_declaration_specifiers(&specifiers); rem_anchor_token(';'); - if (token.type == ';') { + if (token.kind == ';') { parse_anonymous_declaration_rest(&specifiers); } else { entity_t *entity = parse_declarator(&specifiers, flags); @@ -5404,6 +4464,7 @@ static void parse_declaration(parsed_declaration_func finished_declaration, } } +/* §6.5.2.2:6 */ static type_t *get_default_promoted_type(type_t *orig_type) { type_t *result = orig_type; @@ -5411,7 +4472,7 @@ static type_t *get_default_promoted_type(type_t *orig_type) type_t *type = skip_typeref(orig_type); if (is_type_integer(type)) { result = promote_integer(type); - } else if (type == type_float) { + } else if (is_type_atomic(type, ATOMIC_TYPE_FLOAT)) { result = type_double; } @@ -5428,12 +4489,9 @@ static void parse_kr_declaration_list(entity_t *entity) if (!type->function.kr_style_parameters) return; - add_anchor_token('{'); - /* push function parameters */ - size_t const top = environment_top(); - scope_t *old_scope = scope_push(&entity->function.parameters); + PUSH_SCOPE(&entity->function.parameters); entity_t *parameter = entity->function.parameters.entities; for ( ; parameter != NULL; parameter = parameter->base.next) { @@ -5444,9 +4502,8 @@ static void parse_kr_declaration_list(entity_t *entity) /* parse declaration list */ for (;;) { - switch (token.type) { + switch (token.kind) { DECLARATION_START - case T___extension__: /* This covers symbols, which are no type, too, and results in * better error messages. The typical cases are misspelled type * names and missing includes. */ @@ -5459,66 +4516,90 @@ static void parse_kr_declaration_list(entity_t *entity) } decl_list_end: - /* pop function parameters */ - assert(current_scope == &entity->function.parameters); - scope_pop(old_scope); - environment_pop_to(top); + POP_SCOPE(); /* update function type */ type_t *new_type = duplicate_type(type); - function_parameter_t *parameters = NULL; - function_parameter_t *last_parameter = NULL; + function_parameter_t *parameters = NULL; + function_parameter_t **anchor = ¶meters; + + /* did we have an earlier prototype? */ + entity_t *proto_type = get_entity(entity->base.symbol, NAMESPACE_NORMAL); + if (proto_type != NULL && proto_type->kind != ENTITY_FUNCTION) + proto_type = NULL; + + function_parameter_t *proto_parameter = NULL; + if (proto_type != NULL) { + type_t *proto_type_type = proto_type->declaration.type; + proto_parameter = proto_type_type->function.parameters; + /* If a K&R function definition has a variadic prototype earlier, then + * make the function definition variadic, too. This should conform to + * §6.7.5.3:15 and §6.9.1:8. */ + new_type->function.variadic = proto_type_type->function.variadic; + } else { + /* §6.9.1.7: A K&R style parameter list does NOT act as a function + * prototype */ + new_type->function.unspecified_parameters = true; + } + bool need_incompatible_warning = false; parameter = entity->function.parameters.entities; - for (; parameter != NULL; parameter = parameter->base.next) { + for (; parameter != NULL; parameter = parameter->base.next, + proto_parameter = + proto_parameter == NULL ? NULL : proto_parameter->next) { + if (parameter->kind != ENTITY_PARAMETER) + continue; + type_t *parameter_type = parameter->declaration.type; if (parameter_type == NULL) { + source_position_t const* const pos = ¶meter->base.source_position; if (strict_mode) { - errorf(HERE, "no type specified for function parameter '%Y'", - parameter->base.symbol); + errorf(pos, "no type specified for function '%N'", parameter); + parameter_type = type_error_type; } else { - if (warning.implicit_int) { - warningf(HERE, "no type specified for function parameter '%Y', using 'int'", - parameter->base.symbol); - } - parameter_type = type_int; - parameter->declaration.type = parameter_type; + warningf(WARN_IMPLICIT_INT, pos, "no type specified for function parameter '%N', using 'int'", parameter); + parameter_type = type_int; } + parameter->declaration.type = parameter_type; } semantic_parameter_incomplete(parameter); - parameter_type = parameter->declaration.type; - - /* - * we need the default promoted types for the function type - */ - parameter_type = get_default_promoted_type(parameter_type); - function_parameter_t *function_parameter - = obstack_alloc(type_obst, sizeof(function_parameter[0])); - memset(function_parameter, 0, sizeof(function_parameter[0])); + /* we need the default promoted types for the function type */ + type_t *not_promoted = parameter_type; + parameter_type = get_default_promoted_type(parameter_type); - function_parameter->type = parameter_type; - if (last_parameter != NULL) { - last_parameter->next = function_parameter; - } else { - parameters = function_parameter; + /* gcc special: if the type of the prototype matches the unpromoted + * type don't promote */ + if (!strict_mode && proto_parameter != NULL) { + type_t *proto_p_type = skip_typeref(proto_parameter->type); + type_t *promo_skip = skip_typeref(parameter_type); + type_t *param_skip = skip_typeref(not_promoted); + if (!types_compatible(proto_p_type, promo_skip) + && types_compatible(proto_p_type, param_skip)) { + /* don't promote */ + need_incompatible_warning = true; + parameter_type = not_promoted; + } } - last_parameter = function_parameter; + function_parameter_t *const function_parameter + = allocate_parameter(parameter_type); + + *anchor = function_parameter; + anchor = &function_parameter->next; } - /* § 6.9.1.7: A K&R style parameter list does NOT act as a function - * prototype */ - new_type->function.parameters = parameters; - new_type->function.unspecified_parameters = true; + new_type->function.parameters = parameters; + new_type = identify_new_type(new_type); - type = typehash_insert(new_type); - if (type != new_type) { - obstack_free(type_obst, new_type); + if (need_incompatible_warning) { + symbol_t const *const sym = entity->base.symbol; + source_position_t const *const pos = &entity->base.source_position; + source_position_t const *const ppos = &proto_type->base.source_position; + warningf(WARN_OTHER, pos, "declaration '%#N' is incompatible with '%#T' (declared %P)", proto_type, new_type, sym, ppos); } - - entity->declaration.type = type; + entity->declaration.type = new_type; rem_anchor_token('{'); } @@ -5533,9 +4614,8 @@ static void print_in_function(void) { if (first_err) { first_err = false; - diagnosticf("%s: In function '%Y':\n", - current_function->base.base.source_position.input_name, - current_function->base.base.symbol); + char const *const file = current_function->base.base.source_position.input_name; + diagnosticf("%s: In '%N':\n", file, (entity_t const*)current_function); } } @@ -5553,16 +4633,14 @@ static void check_labels(void) continue; label_t *label = goto_statement->label; - - label->used = true; if (label->base.source_position.input_name == NULL) { print_in_function(); - errorf(&goto_statement->base.source_position, - "label '%Y' used but not defined", label->base.symbol); + source_position_t const *const pos = &goto_statement->base.source_position; + errorf(pos, "'%N' used but not defined", (entity_t const*)label); } } - if (warning.unused_label) { + if (is_warn_on(WARN_UNUSED_LABEL)) { for (const label_statement_t *label_statement = label_first; label_statement != NULL; label_statement = label_statement->next) { @@ -5570,16 +4648,17 @@ static void check_labels(void) if (! label->used) { print_in_function(); - warningf(&label_statement->base.source_position, - "label '%Y' defined but not used", label->base.symbol); + source_position_t const *const pos = &label_statement->base.source_position; + warningf(WARN_UNUSED_LABEL, pos, "'%N' defined but not used", (entity_t const*)label); } } } } -static void warn_unused_entity(entity_t *entity, entity_t *end) +static void warn_unused_entity(warning_t const why, entity_t *entity, entity_t *const last) { - for (; entity != NULL; entity = entity->base.next) { + entity_t const *const end = last != NULL ? last->base.next : NULL; + for (; entity != end; entity = entity->base.next) { if (!is_declaration(entity)) continue; @@ -5589,18 +4668,11 @@ static void warn_unused_entity(entity_t *entity, entity_t *end) if (!declaration->used) { print_in_function(); - const char *what = get_entity_kind_name(entity->kind); - warningf(&entity->base.source_position, "%s '%Y' is unused", - what, entity->base.symbol); + warningf(why, &entity->base.source_position, "'%N' is unused", entity); } else if (entity->kind == ENTITY_VARIABLE && !entity->variable.read) { print_in_function(); - const char *what = get_entity_kind_name(entity->kind); - warningf(&entity->base.source_position, "%s '%Y' is never read", - what, entity->base.symbol); + warningf(why, &entity->base.source_position, "'%N' is never read", entity); } - - if (entity == end) - break; } } @@ -5611,13 +4683,12 @@ static void check_unused_variables(statement_t *const stmt, void *const env) switch (stmt->kind) { case STATEMENT_DECLARATION: { declaration_statement_t const *const decls = &stmt->declaration; - warn_unused_entity(decls->declarations_begin, - decls->declarations_end); + warn_unused_entity(WARN_UNUSED_VARIABLE, decls->declarations_begin, decls->declarations_end); return; } case STATEMENT_FOR: - warn_unused_entity(stmt->fors.scope.entities, NULL); + warn_unused_entity(WARN_UNUSED_VARIABLE, stmt->fors.scope.entities, NULL); return; default: @@ -5630,15 +4701,15 @@ static void check_unused_variables(statement_t *const stmt, void *const env) */ static void check_declarations(void) { - if (warning.unused_parameter) { + if (is_warn_on(WARN_UNUSED_PARAMETER)) { const scope_t *scope = ¤t_function->parameters; /* do not issue unused warnings for main */ if (!is_sym_main(current_function->base.base.symbol)) { - warn_unused_entity(scope->entities, NULL); + warn_unused_entity(WARN_UNUSED_PARAMETER, scope->entities, NULL); } } - if (warning.unused_variable) { + if (is_warn_on(WARN_UNUSED_VARIABLE)) { walk_statements(current_function->statement, check_unused_variables, NULL); } @@ -5647,12 +4718,13 @@ static void check_declarations(void) static int determine_truth(expression_t const* const cond) { return - !is_constant_expression(cond) ? 0 : - fold_constant(cond) != 0 ? 1 : + is_constant_expression(cond) != EXPR_CLASS_CONSTANT ? 0 : + fold_constant_to_bool(cond) ? 1 : -1; } static void check_reachable(statement_t *); +static bool reaches_end; static bool expression_returns(expression_t const *const expr) { @@ -5679,9 +4751,7 @@ static bool expression_returns(expression_t const *const expr) case EXPR_REFERENCE: case EXPR_REFERENCE_ENUM_VALUE: - case EXPR_CONST: - case EXPR_CHARACTER_CONSTANT: - case EXPR_WIDE_CHARACTER_CONSTANT: + EXPR_LITERAL_CASES case EXPR_STRING_LITERAL: case EXPR_WIDE_STRING_LITERAL: case EXPR_COMPOUND_LITERAL: // TODO descend into initialisers @@ -5690,17 +4760,20 @@ static bool expression_returns(expression_t const *const expr) case EXPR_SIZEOF: // TODO handle obscure VLA case case EXPR_ALIGNOF: case EXPR_FUNCNAME: - case EXPR_BUILTIN_SYMBOL: case EXPR_BUILTIN_CONSTANT_P: - case EXPR_BUILTIN_PREFETCH: + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: case EXPR_OFFSETOF: - case EXPR_INVALID: + case EXPR_ERROR: return true; - case EXPR_STATEMENT: + case EXPR_STATEMENT: { + bool old_reaches_end = reaches_end; + reaches_end = false; check_reachable(expr->statement.statement); - // TODO check if statement can be left - return true; + bool returns = reaches_end; + reaches_end = old_reaches_end; + return returns; + } case EXPR_CONDITIONAL: // TODO handle constant expression @@ -5728,6 +4801,9 @@ static bool expression_returns(expression_t const *const expr) case EXPR_VA_ARG: return expression_returns(expr->va_arge.ap); + case EXPR_VA_COPY: + return expression_returns(expr->va_copye.src); + EXPR_UNARY_CASES_MANDATORY return expression_returns(expr->unary.value); @@ -5739,9 +4815,6 @@ static bool expression_returns(expression_t const *const expr) return expression_returns(expr->binary.left) && expression_returns(expr->binary.right); - - case EXPR_UNKNOWN: - break; } panic("unhandled expression"); @@ -5784,9 +4857,8 @@ static void check_reachable(statement_t *const stmt) statement_t *last = stmt; statement_t *next; switch (stmt->kind) { - case STATEMENT_INVALID: + case STATEMENT_ERROR: case STATEMENT_EMPTY: - case STATEMENT_LOCAL_LABEL: case STATEMENT_ASM: next = stmt->base.next; break; @@ -5794,15 +4866,15 @@ static void check_reachable(statement_t *const stmt) case STATEMENT_DECLARATION: { declaration_statement_t const *const decl = &stmt->declaration; entity_t const * ent = decl->declarations_begin; - entity_t const *const last = decl->declarations_end; + entity_t const *const last_decl = decl->declarations_end; if (ent != NULL) { for (;; ent = ent->base.next) { if (ent->kind == ENTITY_VARIABLE && - ent->variable.initializer != NULL && - !initializer_returns(ent->variable.initializer)) { + ent->variable.initializer != NULL && + !initializer_returns(ent->variable.initializer)) { return; } - if (ent == last) + if (ent == last_decl) break; } } @@ -5812,6 +4884,8 @@ static void check_reachable(statement_t *const stmt) case STATEMENT_COMPOUND: next = stmt->compound.statements; + if (next == NULL) + next = stmt->base.next; break; case STATEMENT_RETURN: { @@ -5852,8 +4926,8 @@ static void check_reachable(statement_t *const stmt) if (!expression_returns(expr)) return; - if (is_constant_expression(expr)) { - long const val = fold_constant(expr); + if (is_constant_expression(expr) == EXPR_CLASS_CONSTANT) { + long const val = fold_constant_to_int(expr); case_label_statement_t * defaults = NULL; for (case_label_statement_t *i = switchs->first_case; i != NULL; i = i->next) { if (i->expression == NULL) { @@ -5898,9 +4972,8 @@ static void check_reachable(statement_t *const stmt) break; } - case STATEMENT_CONTINUE: { - statement_t *parent = stmt; - for (;;) { + case STATEMENT_CONTINUE: + for (statement_t *parent = stmt;;) { parent = parent->base.parent; if (parent == NULL) /* continue not within loop */ return; @@ -5914,11 +4987,9 @@ static void check_reachable(statement_t *const stmt) default: break; } } - } - case STATEMENT_BREAK: { - statement_t *parent = stmt; - for (;;) { + case STATEMENT_BREAK: + for (statement_t *parent = stmt;;) { parent = parent->base.parent; if (parent == NULL) /* break not within loop/switch */ return; @@ -5937,7 +5008,6 @@ static void check_reachable(statement_t *const stmt) } found_break_parent: break; - } case STATEMENT_GOTO: if (stmt->gotos.expression) { @@ -6046,24 +5116,22 @@ found_break_parent: if (next == NULL) { noreturn_candidate = false; - type_t *const type = current_function->base.type; + type_t *const type = skip_typeref(current_function->base.type); assert(is_type_function(type)); type_t *const ret = skip_typeref(type->function.return_type); - if (warning.return_type && - !is_type_atomic(ret, ATOMIC_TYPE_VOID) && + if (!is_type_atomic(ret, ATOMIC_TYPE_VOID) && is_type_valid(ret) && !is_sym_main(current_function->base.base.symbol)) { - warningf(&stmt->base.source_position, - "control reaches end of non-void function"); + source_position_t const *const pos = &stmt->base.source_position; + warningf(WARN_RETURN_TYPE, pos, "control reaches end of non-void function"); } return; } switch (next->kind) { - case STATEMENT_INVALID: + case STATEMENT_ERROR: case STATEMENT_EMPTY: case STATEMENT_DECLARATION: - case STATEMENT_LOCAL_LABEL: case STATEMENT_EXPRESSION: case STATEMENT_ASM: case STATEMENT_RETURN: @@ -6074,6 +5142,11 @@ found_break_parent: panic("invalid control flow in function"); case STATEMENT_COMPOUND: + if (next->compound.stmt_expr) { + reaches_end = true; + return; + } + /* FALLTHROUGH */ case STATEMENT_IF: case STATEMENT_SWITCH: case STATEMENT_LABEL: @@ -6183,8 +5256,8 @@ static void check_unreachable(statement_t* const stmt, void *const env) if (!stmt->base.reachable) { expression_t const *const cond = stmt->do_while.condition; if (determine_truth(cond) >= 0) { - warningf(&cond->base.source_position, - "condition of do-while-loop is unreachable"); + source_position_t const *const pos = &cond->base.source_position; + warningf(WARN_UNREACHABLE_CODE, pos, "condition of do-while-loop is unreachable"); } } return; @@ -6194,21 +5267,21 @@ static void check_unreachable(statement_t* const stmt, void *const env) // if init and step are unreachable, cond is unreachable, too if (!stmt->base.reachable && !fors->step_reachable) { - warningf(&stmt->base.source_position, "statement is unreachable"); + goto warn_unreachable; } else { if (!stmt->base.reachable && fors->initialisation != NULL) { - warningf(&fors->initialisation->base.source_position, - "initialisation of for-statement is unreachable"); + source_position_t const *const pos = &fors->initialisation->base.source_position; + warningf(WARN_UNREACHABLE_CODE, pos, "initialisation of for-statement is unreachable"); } if (!fors->condition_reachable && fors->condition != NULL) { - warningf(&fors->condition->base.source_position, - "condition of for-statement is unreachable"); + source_position_t const *const pos = &fors->condition->base.source_position; + warningf(WARN_UNREACHABLE_CODE, pos, "condition of for-statement is unreachable"); } if (!fors->step_reachable && fors->step != NULL) { - warningf(&fors->step->base.source_position, - "step of for-statement is unreachable"); + source_position_t const *const pos = &fors->step->base.source_position; + warningf(WARN_UNREACHABLE_CODE, pos, "step of for-statement is unreachable"); } } return; @@ -6239,8 +5312,10 @@ static void check_unreachable(statement_t* const stmt, void *const env) default: warn_unreachable: - if (!stmt->base.reachable) - warningf(&stmt->base.source_position, "statement is unreachable"); + if (!stmt->base.reachable) { + source_position_t const *const pos = &stmt->base.source_position; + warningf(WARN_UNREACHABLE_CODE, pos, "statement is unreachable"); + } return; } } @@ -6249,15 +5324,13 @@ static void parse_external_declaration(void) { /* function-definitions and declarations both start with declaration * specifiers */ - declaration_specifiers_t specifiers; - memset(&specifiers, 0, sizeof(specifiers)); - add_anchor_token(';'); + declaration_specifiers_t specifiers; parse_declaration_specifiers(&specifiers); rem_anchor_token(';'); /* must be a declaration */ - if (token.type == ';') { + if (token.kind == ';') { parse_anonymous_declaration_rest(&specifiers); return; } @@ -6276,7 +5349,7 @@ static void parse_external_declaration(void) rem_anchor_token(','); /* must be a declaration */ - switch (token.type) { + switch (token.kind) { case ',': case ';': case '=': @@ -6288,50 +5361,47 @@ static void parse_external_declaration(void) /* must be a function definition */ parse_kr_declaration_list(ndeclaration); - if (token.type != '{') { + if (token.kind != '{') { parse_error_expected("while parsing function definition", '{', NULL); eat_until_matching_token(';'); return; } assert(is_declaration(ndeclaration)); - type_t *type = skip_typeref(ndeclaration->declaration.type); + type_t *const orig_type = ndeclaration->declaration.type; + type_t * type = skip_typeref(orig_type); if (!is_type_function(type)) { if (is_type_valid(type)) { - errorf(HERE, "declarator '%#T' has a body but is not a function type", - type, ndeclaration->base.symbol); + errorf(HERE, "declarator '%#N' has a body but is not a function type", ndeclaration); } eat_block(); return; } - if (warning.aggregate_return && - is_type_compound(skip_typeref(type->function.return_type))) { - warningf(HERE, "function '%Y' returns an aggregate", - ndeclaration->base.symbol); + source_position_t const *const pos = &ndeclaration->base.source_position; + if (is_typeref(orig_type)) { + /* §6.9.1:2 */ + errorf(pos, "type of function definition '%#N' is a typedef", ndeclaration); } - if (warning.traditional && !type->function.unspecified_parameters) { - warningf(HERE, "traditional C rejects ISO C style function definition of function '%Y'", - ndeclaration->base.symbol); + + if (is_type_compound(skip_typeref(type->function.return_type))) { + warningf(WARN_AGGREGATE_RETURN, pos, "'%N' returns an aggregate", ndeclaration); } - if (warning.old_style_definition && type->function.unspecified_parameters) { - warningf(HERE, "old-style function definition '%Y'", - ndeclaration->base.symbol); + if (type->function.unspecified_parameters) { + warningf(WARN_OLD_STYLE_DEFINITION, pos, "old-style definition of '%N'", ndeclaration); + } else { + warningf(WARN_TRADITIONAL, pos, "traditional C rejects ISO C style definition of '%N'", ndeclaration); } - /* § 6.7.5.3 (14) a function definition with () means no + /* §6.7.5.3:14 a function definition with () means no * parameters (and not unspecified parameters) */ - if (type->function.unspecified_parameters - && type->function.parameters == NULL - && !type->function.kr_style_parameters) { - type_t *duplicate = duplicate_type(type); - duplicate->function.unspecified_parameters = false; + if (type->function.unspecified_parameters && + type->function.parameters == NULL) { + type_t *copy = duplicate_type(type); + copy->function.unspecified_parameters = false; + type = identify_new_type(copy); - type = typehash_insert(duplicate); - if (type != duplicate) { - obstack_free(type_obst, duplicate); - } ndeclaration->declaration.type = type; } @@ -6339,16 +5409,14 @@ static void parse_external_declaration(void) assert(entity->kind == ENTITY_FUNCTION); assert(ndeclaration->kind == ENTITY_FUNCTION); - function_t *function = &entity->function; + function_t *const function = &entity->function; if (ndeclaration != entity) { function->parameters = ndeclaration->function.parameters; } assert(is_declaration(entity)); type = skip_typeref(entity->declaration.type); - /* push function parameters and switch scope */ - size_t const top = environment_top(); - scope_t *old_scope = scope_push(&function->parameters); + PUSH_SCOPE(&function->parameters); entity_t *parameter = function->parameters.entities; for (; parameter != NULL; parameter = parameter->base.next) { @@ -6372,8 +5440,10 @@ static void parse_external_declaration(void) /* parse function body */ int label_stack_top = label_top(); function_t *old_current_function = current_function; + entity_t *old_current_entity = current_entity; current_function = function; - current_parent = NULL; + current_entity = entity; + PUSH_PARENT(NULL); goto_first = NULL; goto_anchor = &goto_first; @@ -6385,171 +5455,263 @@ static void parse_external_declaration(void) first_err = true; check_labels(); check_declarations(); - if (warning.return_type || - warning.unreachable_code || - (warning.missing_noreturn - && !(function->base.modifiers & DM_NORETURN))) { + if (is_warn_on(WARN_RETURN_TYPE) || + is_warn_on(WARN_UNREACHABLE_CODE) || + (is_warn_on(WARN_MISSING_NORETURN) && !(function->base.modifiers & DM_NORETURN))) { noreturn_candidate = true; check_reachable(body); - if (warning.unreachable_code) + if (is_warn_on(WARN_UNREACHABLE_CODE)) walk_statements(body, check_unreachable, NULL); - if (warning.missing_noreturn && - noreturn_candidate && + if (noreturn_candidate && !(function->base.modifiers & DM_NORETURN)) { - warningf(&body->base.source_position, - "function '%#T' is candidate for attribute 'noreturn'", - type, entity->base.symbol); + source_position_t const *const pos = &body->base.source_position; + warningf(WARN_MISSING_NORETURN, pos, "function '%#N' is candidate for attribute 'noreturn'", entity); } } - assert(current_parent == NULL); + POP_PARENT(); assert(current_function == function); + assert(current_entity == entity); + current_entity = old_current_entity; current_function = old_current_function; label_pop_to(label_stack_top); } - assert(current_scope == &function->parameters); - scope_pop(old_scope); - environment_pop_to(top); + POP_SCOPE(); } -static type_t *make_bitfield_type(type_t *base_type, expression_t *size, - source_position_t *source_position, - const symbol_t *symbol) +static entity_t *find_compound_entry(compound_t *compound, symbol_t *symbol) { - type_t *type = allocate_type_zero(TYPE_BITFIELD); + entity_t *iter = compound->members.entities; + for (; iter != NULL; iter = iter->base.next) { + if (iter->kind != ENTITY_COMPOUND_MEMBER) + continue; + + if (iter->base.symbol == symbol) { + return iter; + } else if (iter->base.symbol == NULL) { + /* search in anonymous structs and unions */ + type_t *type = skip_typeref(iter->declaration.type); + if (is_type_compound(type)) { + if (find_compound_entry(type->compound.compound, symbol) + != NULL) + return iter; + } + continue; + } + } + + return NULL; +} - type->bitfield.base_type = base_type; - type->bitfield.size_expression = size; +static void check_deprecated(const source_position_t *source_position, + const entity_t *entity) +{ + if (!is_declaration(entity)) + return; + if ((entity->declaration.modifiers & DM_DEPRECATED) == 0) + return; - il_size_t bit_size; - type_t *skipped_type = skip_typeref(base_type); - if (!is_type_integer(skipped_type)) { - errorf(HERE, "bitfield base type '%T' is not an integer type", - base_type); - bit_size = 0; + source_position_t const *const epos = &entity->base.source_position; + char const *const msg = get_deprecated_string(entity->declaration.attributes); + if (msg != NULL) { + warningf(WARN_DEPRECATED_DECLARATIONS, source_position, "'%N' is deprecated (declared %P): \"%s\"", entity, epos, msg); } else { - bit_size = skipped_type->base.size * 8; + warningf(WARN_DEPRECATED_DECLARATIONS, source_position, "'%N' is deprecated (declared %P)", entity, epos); } +} - if (is_constant_expression(size)) { - long v = fold_constant(size); - if (v < 0) { - errorf(source_position, "negative width in bit-field '%Y'", symbol); - } else if (v == 0) { - errorf(source_position, "zero width for bit-field '%Y'", symbol); - } else if (bit_size > 0 && (il_size_t)v > bit_size) { - errorf(source_position, "width of '%Y' exceeds its type", symbol); - } else { - type->bitfield.bit_size = v; +static expression_t *create_select(const source_position_t *pos, + expression_t *addr, + type_qualifiers_t qualifiers, + entity_t *entry) +{ + assert(entry->kind == ENTITY_COMPOUND_MEMBER); + + check_deprecated(pos, entry); + + expression_t *select = allocate_expression_zero(EXPR_SELECT); + select->select.compound = addr; + select->select.compound_entry = entry; + + type_t *entry_type = entry->declaration.type; + type_t *res_type = get_qualified_type(entry_type, qualifiers); + + /* bitfields need special treatment */ + if (entry->compound_member.bitfield) { + unsigned bit_size = entry->compound_member.bit_size; + /* if fewer bits than an int, convert to int (see §6.3.1.1) */ + if (bit_size < get_atomic_type_size(ATOMIC_TYPE_INT) * BITS_PER_BYTE) { + res_type = type_int; } } - return type; + /* we always do the auto-type conversions; the & and sizeof parser contains + * code to revert this! */ + select->base.type = automatic_type_conversion(res_type); + + + return select; } -static entity_t *find_compound_entry(compound_t *compound, symbol_t *symbol) +/** + * Find entry with symbol in compound. Search anonymous structs and unions and + * creates implicit select expressions for them. + * Returns the adress for the innermost compound. + */ +static expression_t *find_create_select(const source_position_t *pos, + expression_t *addr, + type_qualifiers_t qualifiers, + compound_t *compound, symbol_t *symbol) { entity_t *iter = compound->members.entities; for (; iter != NULL; iter = iter->base.next) { if (iter->kind != ENTITY_COMPOUND_MEMBER) continue; - if (iter->base.symbol == symbol) { - return iter; - } else if (iter->base.symbol == NULL) { - type_t *type = skip_typeref(iter->declaration.type); - if (is_type_compound(type)) { - entity_t *result - = find_compound_entry(type->compound.compound, symbol); - if (result != NULL) - return result; - } - continue; + symbol_t *iter_symbol = iter->base.symbol; + if (iter_symbol == NULL) { + type_t *type = iter->declaration.type; + if (type->kind != TYPE_COMPOUND_STRUCT + && type->kind != TYPE_COMPOUND_UNION) + continue; + + compound_t *sub_compound = type->compound.compound; + + if (find_compound_entry(sub_compound, symbol) == NULL) + continue; + + expression_t *sub_addr = create_select(pos, addr, qualifiers, iter); + sub_addr->base.source_position = *pos; + sub_addr->base.implicit = true; + return find_create_select(pos, sub_addr, qualifiers, sub_compound, + symbol); + } + + if (iter_symbol == symbol) { + return create_select(pos, addr, qualifiers, iter); } } return NULL; } -static void parse_compound_declarators(compound_t *compound, - const declaration_specifiers_t *specifiers) +static void parse_bitfield_member(entity_t *entity) { - while (true) { - entity_t *entity; + eat(':'); - if (token.type == ':') { - source_position_t source_position = *HERE; - next_token(); + expression_t *size = parse_constant_expression(); + long size_long; + + assert(entity->kind == ENTITY_COMPOUND_MEMBER); + type_t *type = entity->declaration.type; + if (!is_type_integer(skip_typeref(type))) { + errorf(HERE, "bitfield base type '%T' is not an integer type", + type); + } + + if (is_constant_expression(size) != EXPR_CLASS_CONSTANT) { + /* error already reported by parse_constant_expression */ + size_long = get_type_size(type) * 8; + } else { + size_long = fold_constant_to_int(size); + + const symbol_t *symbol = entity->base.symbol; + const symbol_t *user_symbol + = symbol == NULL ? sym_anonymous : symbol; + unsigned bit_size = get_type_size(type) * 8; + if (size_long < 0) { + errorf(HERE, "negative width in bit-field '%Y'", user_symbol); + } else if (size_long == 0 && symbol != NULL) { + errorf(HERE, "zero width for bit-field '%Y'", user_symbol); + } else if (bit_size > 0 && (unsigned)size_long > bit_size) { + errorf(HERE, "width of bitfield '%Y' exceeds its type", + user_symbol); + } else { + /* hope that people don't invent crazy types with more bits + * than our struct can hold */ + assert(size_long < + (1 << sizeof(entity->compound_member.bit_size)*8)); + } + } - type_t *base_type = specifiers->type; - expression_t *size = parse_constant_expression(); + entity->compound_member.bitfield = true; + entity->compound_member.bit_size = (unsigned char)size_long; +} - type_t *type = make_bitfield_type(base_type, size, - &source_position, sym_anonymous); +static void parse_compound_declarators(compound_t *compound, + const declaration_specifiers_t *specifiers) +{ + do { + entity_t *entity; - entity = allocate_entity_zero(ENTITY_COMPOUND_MEMBER); - entity->base.namespc = NAMESPACE_NORMAL; - entity->base.source_position = source_position; + if (token.kind == ':') { + /* anonymous bitfield */ + type_t *type = specifiers->type; + entity_t *entity = allocate_entity_zero(ENTITY_COMPOUND_MEMBER, + NAMESPACE_NORMAL, NULL); + entity->base.source_position = *HERE; entity->declaration.declared_storage_class = STORAGE_CLASS_NONE; entity->declaration.storage_class = STORAGE_CLASS_NONE; - entity->declaration.modifiers = specifiers->modifiers; entity->declaration.type = type; - } else { - entity = parse_declarator(specifiers, - DECL_MAY_BE_ABSTRACT | DECL_CREATE_COMPOUND_MEMBER); - assert(entity->kind == ENTITY_COMPOUND_MEMBER); - if (token.type == ':') { - source_position_t source_position = *HERE; - next_token(); - expression_t *size = parse_constant_expression(); + parse_bitfield_member(entity); - type_t *type = entity->declaration.type; - type_t *bitfield_type = make_bitfield_type(type, size, - &source_position, entity->base.symbol); - entity->declaration.type = bitfield_type; + attribute_t *attributes = parse_attributes(NULL); + attribute_t **anchor = &attributes; + while (*anchor != NULL) + anchor = &(*anchor)->next; + *anchor = specifiers->attributes; + if (attributes != NULL) { + handle_entity_attributes(attributes, entity); } - } + entity->declaration.attributes = attributes; - /* make sure we don't define a symbol multiple times */ - symbol_t *symbol = entity->base.symbol; - if (symbol != NULL) { - entity_t *prev = find_compound_entry(compound, symbol); + append_entity(&compound->members, entity); + } else { + entity = parse_declarator(specifiers, + DECL_MAY_BE_ABSTRACT | DECL_CREATE_COMPOUND_MEMBER); + source_position_t const *const pos = &entity->base.source_position; + if (entity->kind == ENTITY_TYPEDEF) { + errorf(pos, "typedef not allowed as compound member"); + } else { + assert(entity->kind == ENTITY_COMPOUND_MEMBER); + + /* make sure we don't define a symbol multiple times */ + symbol_t *symbol = entity->base.symbol; + if (symbol != NULL) { + entity_t *prev = find_compound_entry(compound, symbol); + if (prev != NULL) { + source_position_t const *const ppos = &prev->base.source_position; + errorf(pos, "multiple declarations of symbol '%Y' (declared %P)", symbol, ppos); + } + } - if (prev != NULL) { - errorf(&entity->base.source_position, - "multiple declarations of symbol '%Y' (declared %P)", - symbol, &prev->base.source_position); - } - } + if (token.kind == ':') { + parse_bitfield_member(entity); - append_entity(&compound->members, entity); + attribute_t *attributes = parse_attributes(NULL); + handle_entity_attributes(attributes, entity); + } else { + type_t *orig_type = entity->declaration.type; + type_t *type = skip_typeref(orig_type); + if (is_type_function(type)) { + errorf(pos, "'%N' must not have function type '%T'", entity, orig_type); + } else if (is_type_incomplete(type)) { + /* §6.7.2.1:16 flexible array member */ + if (!is_type_array(type) || + token.kind != ';' || + look_ahead(1)->kind != '}') { + errorf(pos, "'%N' has incomplete type '%T'", entity, orig_type); + } + } + } - type_t *orig_type = entity->declaration.type; - type_t *type = skip_typeref(orig_type); - if (is_type_function(type)) { - errorf(&entity->base.source_position, - "compound member '%Y' must not have function type '%T'", - entity->base.symbol, orig_type); - } else if (is_type_incomplete(type)) { - /* §6.7.2.1:16 flexible array member */ - if (is_type_array(type) && - token.type == ';' && - look_ahead(1)->type == '}') { - compound->has_flexible_member = true; - } else { - errorf(&entity->base.source_position, - "compound member '%Y' has incomplete type '%T'", - entity->base.symbol, orig_type); + append_entity(&compound->members, entity); } } - - if (token.type != ',') - break; - next_token(); - } + } while (next_if(',')); expect(';', end_error); end_error: @@ -6561,35 +5723,40 @@ static void parse_compound_type_entries(compound_t *compound) eat('{'); add_anchor_token('}'); - while (token.type != '}') { - if (token.type == T_EOF) { - errorf(HERE, "EOF while parsing struct"); - break; - } - declaration_specifiers_t specifiers; - memset(&specifiers, 0, sizeof(specifiers)); - parse_declaration_specifiers(&specifiers); + for (;;) { + switch (token.kind) { + DECLARATION_START + case T___extension__: + case T_IDENTIFIER: { + PUSH_EXTENSION(); + declaration_specifiers_t specifiers; + parse_declaration_specifiers(&specifiers); + parse_compound_declarators(compound, &specifiers); + POP_EXTENSION(); + break; + } - parse_compound_declarators(compound, &specifiers); + default: + rem_anchor_token('}'); + expect('}', end_error); +end_error: + /* §6.7.2.1:7 */ + compound->complete = true; + return; + } } - rem_anchor_token('}'); - next_token(); - - /* §6.7.2.1:7 */ - compound->complete = true; } 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 || - specifiers.thread_local) { + if (specifiers.storage_class != STORAGE_CLASS_NONE + || specifiers.thread_local) { /* TODO: improve error message, user does probably not know what a * storage class is... */ - errorf(HERE, "typename may not have a storage class"); + errorf(&specifiers.source_position, "typename must not have a storage class"); } type_t *result = parse_abstract_declarator(specifiers.type); @@ -6606,11 +5773,11 @@ typedef expression_t* (*parse_expression_infix_function)(expression_t *left); typedef struct expression_parser_function_t expression_parser_function_t; struct expression_parser_function_t { parse_expression_function parser; - unsigned infix_precedence; + precedence_t infix_precedence; parse_expression_infix_function infix_parser; }; -expression_parser_function_t expression_parsers[T_LAST_TOKEN]; +static expression_parser_function_t expression_parsers[T_LAST_TOKEN]; /** * Prints an error message if an expression was expected but not read @@ -6618,282 +5785,255 @@ expression_parser_function_t expression_parsers[T_LAST_TOKEN]; static expression_t *expected_expression_error(void) { /* skip the error message if the error token was read */ - if (token.type != T_ERROR) { + if (token.kind != T_ERROR) { errorf(HERE, "expected expression, got token %K", &token); } next_token(); - return create_invalid_expression(); + return create_error_expression(); +} + +static type_t *get_string_type(void) +{ + return is_warn_on(WARN_WRITE_STRINGS) ? type_const_char_ptr : type_char_ptr; +} + +static type_t *get_wide_string_type(void) +{ + return is_warn_on(WARN_WRITE_STRINGS) ? type_const_wchar_t_ptr : type_wchar_t_ptr; } /** * Parse a string constant. */ -static expression_t *parse_string_const(void) +static expression_t *parse_string_literal(void) { - wide_string_t wres; - if (token.type == T_STRING_LITERAL) { - string_t res = token.v.string; + source_position_t begin = token.base.source_position; + string_t res = token.string.string; + bool is_wide = (token.kind == T_WIDE_STRING_LITERAL); + + next_token(); + while (token.kind == T_STRING_LITERAL + || token.kind == T_WIDE_STRING_LITERAL) { + warn_string_concat(&token.base.source_position); + res = concat_strings(&res, &token.string.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 = warning.write_strings ? type_const_char_ptr : type_char_ptr; - cnst->string.value = res; - return cnst; - } + is_wide |= token.kind == T_WIDE_STRING_LITERAL; + } - wres = concat_string_wide_string(&res, &token.v.wide_string); + expression_t *literal; + if (is_wide) { + literal = allocate_expression_zero(EXPR_WIDE_STRING_LITERAL); + literal->base.type = get_wide_string_type(); } else { - wres = token.v.wide_string; + literal = allocate_expression_zero(EXPR_STRING_LITERAL); + literal->base.type = get_string_type(); } - next_token(); - - for (;;) { - switch (token.type) { - case T_WIDE_STRING_LITERAL: - wres = concat_wide_strings(&wres, &token.v.wide_string); - break; + literal->base.source_position = begin; + literal->literal.value = res; - 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 = warning.write_strings ? type_const_wchar_t_ptr : type_wchar_t_ptr; - cnst->wide_string.value = wres; - return cnst; - } - } - next_token(); - } + return literal; } /** * Parse a boolean constant. */ -static expression_t *parse_bool_const(bool value) +static expression_t *parse_boolean_literal(bool value) { - expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->base.type = type_bool; - cnst->conste.v.int_value = value; + expression_t *literal = allocate_expression_zero(EXPR_LITERAL_BOOLEAN); + literal->base.type = type_bool; + literal->literal.value.begin = value ? "true" : "false"; + literal->literal.value.size = value ? 4 : 5; next_token(); - - return cnst; + return literal; } -/** - * Parse an integer constant. - */ -static expression_t *parse_int_const(void) +static void warn_traditional_suffix(void) { - expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->base.type = token.datatype; - cnst->conste.v.int_value = token.v.intvalue; - - next_token(); - - return cnst; + warningf(WARN_TRADITIONAL, HERE, "traditional C rejects the '%S' suffix", + &token.number.suffix); } -/** - * Parse a character constant. - */ -static expression_t *parse_character_constant(void) +static void check_integer_suffix(void) { - expression_t *cnst = allocate_expression_zero(EXPR_CHARACTER_CONSTANT); - cnst->base.type = token.datatype; - cnst->conste.v.character = token.v.string; + const string_t *suffix = &token.number.suffix; + if (suffix->size == 0) + return; - if (cnst->conste.v.character.size != 1) { - if (!GNU_MODE) { - errorf(HERE, "more than 1 character in character constant"); - } else if (warning.multichar) { - warningf(HERE, "multi-character character constant"); + bool not_traditional = false; + const char *c = suffix->begin; + if (*c == 'l' || *c == 'L') { + ++c; + if (*c == *(c-1)) { + not_traditional = true; + ++c; + if (*c == 'u' || *c == 'U') { + ++c; + } + } else if (*c == 'u' || *c == 'U') { + not_traditional = true; + ++c; + } + } else if (*c == 'u' || *c == 'U') { + not_traditional = true; + ++c; + if (*c == 'l' || *c == 'L') { + ++c; + if (*c == *(c-1)) { + ++c; + } } } - next_token(); - - return cnst; + if (*c != '\0') { + errorf(&token.base.source_position, + "invalid suffix '%S' on integer constant", suffix); + } else if (not_traditional) { + warn_traditional_suffix(); + } } -/** - * Parse a wide character constant. - */ -static expression_t *parse_wide_character_constant(void) +static type_t *check_floatingpoint_suffix(void) { - expression_t *cnst = allocate_expression_zero(EXPR_WIDE_CHARACTER_CONSTANT); - cnst->base.type = token.datatype; - cnst->conste.v.wide_character = token.v.wide_string; + const string_t *suffix = &token.number.suffix; + type_t *type = type_double; + if (suffix->size == 0) + return type; - if (cnst->conste.v.wide_character.size != 1) { - if (!GNU_MODE) { - errorf(HERE, "more than 1 character in character constant"); - } else if (warning.multichar) { - warningf(HERE, "multi-character character constant"); - } + bool not_traditional = false; + const char *c = suffix->begin; + if (*c == 'f' || *c == 'F') { + ++c; + type = type_float; + } else if (*c == 'l' || *c == 'L') { + ++c; + type = type_long_double; + } + if (*c != '\0') { + errorf(&token.base.source_position, + "invalid suffix '%S' on floatingpoint constant", suffix); + } else if (not_traditional) { + warn_traditional_suffix(); } - next_token(); - return cnst; + return type; } /** - * Parse a float constant. + * Parse an integer constant. */ -static expression_t *parse_float_const(void) -{ - expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->base.type = token.datatype; - cnst->conste.v.float_value = token.v.floatvalue; - - next_token(); - - return cnst; -} - -static entity_t *create_implicit_function(symbol_t *symbol, - const source_position_t *source_position) +static expression_t *parse_number_literal(void) { - type_t *ntype = allocate_type_zero(TYPE_FUNCTION); - ntype->function.return_type = type_int; - ntype->function.unspecified_parameters = true; - ntype->function.linkage = LINKAGE_C; + expression_kind_t kind; + type_t *type; - type_t *type = typehash_insert(ntype); - if (type != ntype) { - free_type(ntype); + switch (token.kind) { + case T_INTEGER: + kind = EXPR_LITERAL_INTEGER; + check_integer_suffix(); + type = type_int; + break; + case T_INTEGER_OCTAL: + kind = EXPR_LITERAL_INTEGER_OCTAL; + check_integer_suffix(); + type = type_int; + break; + case T_INTEGER_HEXADECIMAL: + kind = EXPR_LITERAL_INTEGER_HEXADECIMAL; + check_integer_suffix(); + type = type_int; + break; + case T_FLOATINGPOINT: + kind = EXPR_LITERAL_FLOATINGPOINT; + type = check_floatingpoint_suffix(); + break; + case T_FLOATINGPOINT_HEXADECIMAL: + kind = EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL; + type = check_floatingpoint_suffix(); + break; + default: + panic("unexpected token type in parse_number_literal"); } - entity_t *entity = allocate_entity_zero(ENTITY_FUNCTION); - entity->declaration.storage_class = STORAGE_CLASS_EXTERN; - entity->declaration.declared_storage_class = STORAGE_CLASS_EXTERN; - entity->declaration.type = type; - entity->declaration.implicit = true; - entity->base.symbol = symbol; - entity->base.source_position = *source_position; - - bool strict_prototypes_old = warning.strict_prototypes; - warning.strict_prototypes = false; - record_entity(entity, false); - warning.strict_prototypes = strict_prototypes_old; + expression_t *literal = allocate_expression_zero(kind); + literal->base.type = type; + literal->literal.value = token.number.number; + literal->literal.suffix = token.number.suffix; + next_token(); - return entity; + /* integer type depends on the size of the number and the size + * representable by the types. The backend/codegeneration has to determine + * that + */ + determine_literal_type(&literal->literal); + return literal; } /** - * Creates a return_type (func)(argument_type) function type if not - * already exists. + * Parse a character constant. */ -static type_t *make_function_2_type(type_t *return_type, type_t *argument_type1, - type_t *argument_type2) +static expression_t *parse_character_constant(void) { - function_parameter_t *parameter2 - = obstack_alloc(type_obst, sizeof(parameter2[0])); - memset(parameter2, 0, sizeof(parameter2[0])); - parameter2->type = argument_type2; - - function_parameter_t *parameter1 - = obstack_alloc(type_obst, sizeof(parameter1[0])); - memset(parameter1, 0, sizeof(parameter1[0])); - parameter1->type = argument_type1; - parameter1->next = parameter2; - - type_t *type = allocate_type_zero(TYPE_FUNCTION); - type->function.return_type = return_type; - type->function.parameters = parameter1; + expression_t *literal = allocate_expression_zero(EXPR_LITERAL_CHARACTER); + literal->base.type = c_mode & _CXX ? type_char : type_int; + literal->literal.value = token.string.string; - type_t *result = typehash_insert(type); - if (result != type) { - free_type(type); + size_t len = literal->literal.value.size; + if (len > 1) { + if (!GNU_MODE && !(c_mode & _C99)) { + errorf(HERE, "more than 1 character in character constant"); + } else { + literal->base.type = type_int; + warningf(WARN_MULTICHAR, HERE, "multi-character character constant"); + } } - return result; + next_token(); + return literal; } /** - * Creates a return_type (func)(argument_type) function type if not - * already exists. - * - * @param return_type the return type - * @param argument_type the argument type + * Parse a wide character constant. */ -static type_t *make_function_1_type(type_t *return_type, type_t *argument_type) +static expression_t *parse_wide_character_constant(void) { - function_parameter_t *parameter - = obstack_alloc(type_obst, sizeof(parameter[0])); - memset(parameter, 0, sizeof(parameter[0])); - parameter->type = argument_type; + expression_t *literal = allocate_expression_zero(EXPR_LITERAL_WIDE_CHARACTER); + literal->base.type = type_int; + literal->literal.value = token.string.string; - type_t *type = allocate_type_zero(TYPE_FUNCTION); - type->function.return_type = return_type; - type->function.parameters = parameter; - - type_t *result = typehash_insert(type); - if (result != type) { - free_type(type); + size_t len = wstrlen(&literal->literal.value); + if (len > 1) { + warningf(WARN_MULTICHAR, HERE, "multi-character character constant"); } - return result; + next_token(); + return literal; } -static type_t *make_function_0_type(type_t *return_type) +static entity_t *create_implicit_function(symbol_t *symbol, + const source_position_t *source_position) { - type_t *type = allocate_type_zero(TYPE_FUNCTION); - type->function.return_type = return_type; - type->function.parameters = NULL; + type_t *ntype = allocate_type_zero(TYPE_FUNCTION); + ntype->function.return_type = type_int; + ntype->function.unspecified_parameters = true; + ntype->function.linkage = LINKAGE_C; + type_t *type = identify_new_type(ntype); - type_t *result = typehash_insert(type); - if (result != type) { - free_type(type); - } + entity_t *const entity = allocate_entity_zero(ENTITY_FUNCTION, NAMESPACE_NORMAL, symbol); + entity->declaration.storage_class = STORAGE_CLASS_EXTERN; + entity->declaration.declared_storage_class = STORAGE_CLASS_EXTERN; + entity->declaration.type = type; + entity->declaration.implicit = true; + entity->base.source_position = *source_position; - return result; -} + if (current_scope != NULL) + record_entity(entity, false); -/** - * Creates a function type for some function like builtins. - * - * @param symbol the symbol describing the builtin - */ -static type_t *get_builtin_symbol_type(symbol_t *symbol) -{ - switch (symbol->ID) { - case T___builtin_alloca: - return make_function_1_type(type_void_ptr, type_size_t); - case T___builtin_huge_val: - return make_function_0_type(type_double); - case T___builtin_inf: - return make_function_0_type(type_double); - case T___builtin_inff: - return make_function_0_type(type_float); - case T___builtin_infl: - return make_function_0_type(type_long_double); - case T___builtin_nan: - return make_function_1_type(type_double, type_char_ptr); - case T___builtin_nanf: - return make_function_1_type(type_float, type_char_ptr); - case T___builtin_nanl: - return make_function_1_type(type_long_double, type_char_ptr); - case T___builtin_va_end: - return make_function_1_type(type_void, type_valist); - case T___builtin_expect: - return make_function_2_type(type_long, type_long, type_long); - default: - internal_errorf(HERE, "not implemented builtin identifier found"); - } + return entity; } /** - * Performs automatic type cast as described in § 6.3.2.1. + * Performs automatic type cast as described in §6.3.2.1. * * @param orig_type the original type */ @@ -6917,101 +6057,158 @@ static type_t *automatic_type_conversion(type_t *orig_type) /** * reverts the automatic casts of array to pointer types and function - * to function-pointer types as defined § 6.3.2.1 + * to function-pointer types as defined §6.3.2.1 */ type_t *revert_automatic_type_conversion(const expression_t *expression) { switch (expression->kind) { - case EXPR_REFERENCE: { - entity_t *entity = expression->reference.entity; - if (is_declaration(entity)) { - return entity->declaration.type; - } else if (entity->kind == ENTITY_ENUM_VALUE) { - return entity->enum_value.enum_type; - } else { - panic("no declaration or enum in reference"); - } + case EXPR_REFERENCE: { + entity_t *entity = expression->reference.entity; + if (is_declaration(entity)) { + return entity->declaration.type; + } else if (entity->kind == ENTITY_ENUM_VALUE) { + return entity->enum_value.enum_type; + } else { + panic("no declaration or enum in reference"); } + } - case EXPR_SELECT: { - entity_t *entity = expression->select.compound_entry; - assert(is_declaration(entity)); - type_t *type = entity->declaration.type; - return get_qualified_type(type, - expression->base.type->base.qualifiers); - } + case EXPR_SELECT: { + entity_t *entity = expression->select.compound_entry; + assert(is_declaration(entity)); + type_t *type = entity->declaration.type; + return get_qualified_type(type, expression->base.type->base.qualifiers); + } - case EXPR_UNARY_DEREFERENCE: { - const expression_t *const value = expression->unary.value; - type_t *const type = skip_typeref(value->base.type); - assert(is_type_pointer(type)); - return type->pointer.points_to; - } + case EXPR_UNARY_DEREFERENCE: { + const expression_t *const value = expression->unary.value; + type_t *const type = skip_typeref(value->base.type); + if (!is_type_pointer(type)) + return type_error_type; + return type->pointer.points_to; + } + + case EXPR_ARRAY_ACCESS: { + const expression_t *array_ref = expression->array_access.array_ref; + type_t *type_left = skip_typeref(array_ref->base.type); + if (!is_type_pointer(type_left)) + return type_error_type; + return type_left->pointer.points_to; + } - case EXPR_BUILTIN_SYMBOL: - return get_builtin_symbol_type(expression->builtin_symbol.symbol); + case EXPR_STRING_LITERAL: { + size_t size = expression->string_literal.value.size; + return make_array_type(type_char, size, TYPE_QUALIFIER_NONE); + } - case EXPR_ARRAY_ACCESS: { - 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_WIDE_STRING_LITERAL: { + size_t size = wstrlen(&expression->string_literal.value); + return make_array_type(type_wchar_t, size, TYPE_QUALIFIER_NONE); + } - case EXPR_STRING_LITERAL: { - size_t size = expression->string.value.size; - return make_array_type(type_char, size, TYPE_QUALIFIER_NONE); - } + case EXPR_COMPOUND_LITERAL: + return expression->compound_literal.type; - case EXPR_WIDE_STRING_LITERAL: { - size_t size = expression->wide_string.value.size; - return make_array_type(type_wchar_t, size, TYPE_QUALIFIER_NONE); - } + default: + break; + } + return expression->base.type; +} - case EXPR_COMPOUND_LITERAL: - return expression->compound_literal.type; +/** + * Find an entity matching a symbol in a scope. + * Uses current scope if scope is NULL + */ +static entity_t *lookup_entity(const scope_t *scope, symbol_t *symbol, + namespace_tag_t namespc) +{ + if (scope == NULL) { + return get_entity(symbol, namespc); + } - default: break; + /* we should optimize here, if scope grows above a certain size we should + construct a hashmap here... */ + entity_t *entity = scope->entities; + for ( ; entity != NULL; entity = entity->base.next) { + if (entity->base.symbol == symbol + && (namespace_tag_t)entity->base.namespc == namespc) + break; } - return expression->base.type; + return entity; } -static expression_t *parse_reference(void) +static entity_t *parse_qualified_identifier(void) { - symbol_t *const symbol = token.v.symbol; + /* namespace containing the symbol */ + symbol_t *symbol; + source_position_t pos; + const scope_t *lookup_scope = NULL; - entity_t *entity = get_entity(symbol, NAMESPACE_NORMAL); + if (next_if(T_COLONCOLON)) + lookup_scope = &unit->scope; + + entity_t *entity; + while (true) { + if (token.kind != T_IDENTIFIER) { + parse_error_expected("while parsing identifier", T_IDENTIFIER, NULL); + return create_error_entity(sym_anonymous, ENTITY_VARIABLE); + } + symbol = token.identifier.symbol; + pos = *HERE; + next_token(); + + /* lookup entity */ + entity = lookup_entity(lookup_scope, symbol, NAMESPACE_NORMAL); + + if (!next_if(T_COLONCOLON)) + break; + + switch (entity->kind) { + case ENTITY_NAMESPACE: + lookup_scope = &entity->namespacee.members; + break; + case ENTITY_STRUCT: + case ENTITY_UNION: + case ENTITY_CLASS: + lookup_scope = &entity->compound.members; + break; + default: + errorf(&pos, "'%Y' must be a namespace, class, struct or union (but is a %s)", + symbol, get_entity_kind_name(entity->kind)); + + /* skip further qualifications */ + while (next_if(T_IDENTIFIER) && next_if(T_COLONCOLON)) {} + + return create_error_entity(sym_anonymous, ENTITY_VARIABLE); + } + } if (entity == NULL) { - if (!strict_mode && look_ahead(1)->type == '(') { + if (!strict_mode && token.kind == '(') { /* an implicitly declared function */ - if (warning.error_implicit_function_declaration) { - errorf(HERE, "implicit declaration of function '%Y'", symbol); - } else if (warning.implicit_function_declaration) { - warningf(HERE, "implicit declaration of function '%Y'", symbol); - } - - entity = create_implicit_function(symbol, HERE); + warningf(WARN_IMPLICIT_FUNCTION_DECLARATION, &pos, + "implicit declaration of function '%Y'", symbol); + entity = create_implicit_function(symbol, &pos); } else { - errorf(HERE, "unknown identifier '%Y' found.", symbol); + errorf(&pos, "unknown identifier '%Y' found.", symbol); entity = create_error_entity(symbol, ENTITY_VARIABLE); } } - type_t *orig_type; + return entity; +} +static expression_t *parse_reference(void) +{ + source_position_t const pos = token.base.source_position; + entity_t *const entity = parse_qualified_identifier(); + + type_t *orig_type; if (is_declaration(entity)) { orig_type = entity->declaration.type; } else if (entity->kind == ENTITY_ENUM_VALUE) { orig_type = entity->enum_value.enum_type; - } else if (entity->kind == ENTITY_TYPEDEF) { - errorf(HERE, "encountered typedef name '%Y' while parsing expression", - symbol); - next_token(); - return create_invalid_expression(); } else { panic("expected declaration or enum value in reference"); } @@ -7024,9 +6221,10 @@ static expression_t *parse_reference(void) if (entity->kind == ENTITY_ENUM_VALUE) kind = EXPR_REFERENCE_ENUM_VALUE; - expression_t *expression = allocate_expression_zero(kind); - expression->reference.entity = entity; - expression->base.type = type; + expression_t *expression = allocate_expression_zero(kind); + expression->base.source_position = pos; + expression->base.type = type; + expression->reference.entity = entity; /* this declaration is used */ if (is_declaration(entity)) { @@ -7034,8 +6232,9 @@ static expression_t *parse_reference(void) } if (entity->base.parent_scope != file_scope - && entity->base.parent_scope->depth < current_function->parameters.depth - && is_type_valid(orig_type) && !is_type_function(orig_type)) { + && (current_function != NULL + && entity->base.parent_scope->depth < current_function->parameters.depth) + && (entity->kind == ENTITY_VARIABLE || entity->kind == ENTITY_PARAMETER)) { if (entity->kind == ENTITY_VARIABLE) { /* access of a variable from an outer function */ entity->variable.address_taken = true; @@ -7045,33 +6244,8 @@ static expression_t *parse_reference(void) current_function->need_closure = true; } - /* check for deprecated functions */ - if (warning.deprecated_declarations - && is_declaration(entity) - && entity->declaration.modifiers & DM_DEPRECATED) { - declaration_t *declaration = &entity->declaration; - - char const *const prefix = entity->kind == ENTITY_FUNCTION ? - "function" : "variable"; - - if (declaration->deprecated_string != NULL) { - warningf(HERE, "%s '%Y' is deprecated (declared %P): \"%s\"", - prefix, entity->base.symbol, &entity->base.source_position, - declaration->deprecated_string); - } else { - warningf(HERE, "%s '%Y' is deprecated (declared %P)", prefix, - entity->base.symbol, &entity->base.source_position); - } - } - - if (warning.init_self && entity == current_init_decl && !in_type_prop - && entity->kind == ENTITY_VARIABLE) { - current_init_decl = NULL; - warningf(HERE, "variable '%#T' is initialized by itself", - entity->declaration.type, entity->base.symbol); - } + check_deprecated(&pos, entity); - next_token(); return expression; } @@ -7107,25 +6281,22 @@ static bool semantic_cast(expression_t *cast) return false; } - if (warning.cast_qual && - is_type_pointer(src_type) && - is_type_pointer(dst_type)) { + if (is_type_pointer(src_type) && is_type_pointer(dst_type)) { type_t *src = skip_typeref(src_type->pointer.points_to); type_t *dst = skip_typeref(dst_type->pointer.points_to); unsigned missing_qualifiers = src->base.qualifiers & ~dst->base.qualifiers; if (missing_qualifiers != 0) { - warningf(pos, - "cast discards qualifiers '%Q' in pointer target type of '%T'", - missing_qualifiers, orig_type_right); + warningf(WARN_CAST_QUAL, pos, "cast discards qualifiers '%Q' in pointer target type of '%T'", missing_qualifiers, orig_type_right); } } return true; } -static expression_t *parse_compound_literal(type_t *type) +static expression_t *parse_compound_literal(source_position_t const *const pos, type_t *type) { expression_t *expression = allocate_expression_zero(EXPR_COMPOUND_LITERAL); + expression->base.source_position = *pos; parse_initializer_env_t env; env.type = type; @@ -7146,23 +6317,24 @@ static expression_t *parse_compound_literal(type_t *type) */ static expression_t *parse_cast(void) { - add_anchor_token(')'); + source_position_t const pos = *HERE; - source_position_t source_position = token.source_position; + eat('('); + add_anchor_token(')'); type_t *type = parse_typename(); rem_anchor_token(')'); expect(')', end_error); - if (token.type == '{') { - return parse_compound_literal(type); + if (token.kind == '{') { + return parse_compound_literal(&pos, type); } expression_t *cast = allocate_expression_zero(EXPR_UNARY_CAST); - cast->base.source_position = source_position; + cast->base.source_position = pos; - expression_t *value = parse_sub_expression(PREC_CAST); + expression_t *value = parse_subexpression(PREC_CAST); cast->base.type = type; cast->unary.value = value; @@ -7172,7 +6344,7 @@ static expression_t *parse_cast(void) return cast; end_error: - return create_invalid_expression(); + return create_error_expression(); } /** @@ -7180,11 +6352,13 @@ end_error: */ static expression_t *parse_statement_expression(void) { - add_anchor_token(')'); - expression_t *expression = allocate_expression_zero(EXPR_STATEMENT); + eat('('); + add_anchor_token(')'); + statement_t *statement = parse_compound_statement(true); + statement->compound.stmt_expr = true; expression->statement.statement = statement; /* find last statement and use its type */ @@ -7197,8 +6371,9 @@ static expression_t *parse_statement_expression(void) if (stmt->kind == STATEMENT_EXPRESSION) { type = stmt->expression.expression->base.type; } - } else if (warning.other) { - warningf(&expression->base.source_position, "empty statement expression ({})"); + } else { + source_position_t const *const pos = &expression->base.source_position; + warningf(WARN_OTHER, pos, "empty statement expression ({})"); } expression->base.type = type; @@ -7214,22 +6389,20 @@ end_error: */ static expression_t *parse_parenthesized_expression(void) { - eat('('); - - switch (token.type) { + token_t const* const la1 = look_ahead(1); + switch (la1->kind) { case '{': /* gcc extension: a statement expression */ return parse_statement_expression(); - TYPE_QUALIFIERS - TYPE_SPECIFIERS - return parse_cast(); case T_IDENTIFIER: - if (is_typedef_symbol(token.v.symbol)) { + if (is_typedef_symbol(la1->identifier.symbol)) { + DECLARATION_START return parse_cast(); } } + eat('('); add_anchor_token(')'); expression_t *result = parse_expression(); result->base.parenthesized = true; @@ -7307,34 +6480,32 @@ static designator_t *parse_designator(void) designator_t *result = allocate_ast_zero(sizeof(result[0])); result->source_position = *HERE; - if (token.type != T_IDENTIFIER) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing member designator", T_IDENTIFIER, NULL); return NULL; } - result->symbol = token.v.symbol; + result->symbol = token.identifier.symbol; next_token(); designator_t *last_designator = result; while (true) { - if (token.type == '.') { - next_token(); - if (token.type != T_IDENTIFIER) { + if (next_if('.')) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing member designator", T_IDENTIFIER, NULL); return NULL; } designator_t *designator = allocate_ast_zero(sizeof(result[0])); designator->source_position = *HERE; - designator->symbol = token.v.symbol; + designator->symbol = token.identifier.symbol; next_token(); last_designator->next = designator; last_designator = designator; continue; } - if (token.type == '[') { - next_token(); + if (next_if('[')) { add_anchor_token(']'); designator_t *designator = allocate_ast_zero(sizeof(result[0])); designator->source_position = *HERE; @@ -7388,14 +6559,14 @@ static expression_t *parse_offsetof(void) descend_into_subtype(&path); if (!walk_designator(&path, designator, true)) { - return create_invalid_expression(); + return create_error_expression(); } DEL_ARR_F(path.path); return expression; end_error: - return create_invalid_expression(); + return create_error_expression(); } /** @@ -7415,9 +6586,12 @@ static expression_t *parse_va_start(void) expression_t *const expr = parse_assignment_expression(); if (expr->kind == EXPR_REFERENCE) { entity_t *const entity = expr->reference.entity; - if (entity->base.parent_scope != ¤t_function->parameters - || entity->base.next != NULL - || entity->kind != ENTITY_PARAMETER) { + if (!current_function->base.type->function.variadic) { + errorf(&expr->base.source_position, + "'va_start' used in non-variadic function"); + } else if (entity->base.parent_scope != ¤t_function->parameters || + entity->base.next != NULL || + entity->kind != ENTITY_PARAMETER) { errorf(&expr->base.source_position, "second argument of 'va_start' must be last parameter of the current function"); } else { @@ -7428,11 +6602,11 @@ static expression_t *parse_va_start(void) } expect(')', end_error); end_error: - return create_invalid_expression(); + return create_error_expression(); } /** - * Parses a _builtin_va_arg() expression. + * Parses a __builtin_va_arg() expression. */ static expression_t *parse_va_arg(void) { @@ -7441,34 +6615,51 @@ static expression_t *parse_va_arg(void) eat(T___builtin_va_arg); expect('(', end_error); - expression->va_arge.ap = parse_assignment_expression(); + call_argument_t ap; + ap.expression = parse_assignment_expression(); + expression->va_arge.ap = ap.expression; + check_call_argument(type_valist, &ap, 1); + expect(',', end_error); expression->base.type = parse_typename(); expect(')', end_error); return expression; end_error: - return create_invalid_expression(); + return create_error_expression(); } -static expression_t *parse_builtin_symbol(void) +/** + * Parses a __builtin_va_copy() expression. + */ +static expression_t *parse_va_copy(void) { - expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_SYMBOL); + expression_t *expression = allocate_expression_zero(EXPR_VA_COPY); - symbol_t *symbol = token.v.symbol; + eat(T___builtin_va_copy); - expression->builtin_symbol.symbol = symbol; - next_token(); + expect('(', end_error); + expression_t *dst = parse_assignment_expression(); + assign_error_t error = semantic_assign(type_valist, dst); + report_assign_error(error, type_valist, dst, "call argument 1", + &dst->base.source_position); + expression->va_copye.dst = dst; - type_t *type = get_builtin_symbol_type(symbol); - type = automatic_type_conversion(type); + expect(',', end_error); + + call_argument_t src; + src.expression = parse_assignment_expression(); + check_call_argument(type_valist, &src, 2); + expression->va_copye.src = src.expression; + expect(')', end_error); - expression->base.type = type; return expression; +end_error: + return create_error_expression(); } /** - * Parses a __builtin_constant() expression. + * Parses a __builtin_constant_p() expression. */ static expression_t *parse_builtin_constant(void) { @@ -7485,36 +6676,32 @@ static expression_t *parse_builtin_constant(void) return expression; end_error: - return create_invalid_expression(); + return create_error_expression(); } /** - * Parses a __builtin_prefetch() expression. + * Parses a __builtin_types_compatible_p() expression. */ -static expression_t *parse_builtin_prefetch(void) +static expression_t *parse_builtin_types_compatible(void) { - expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_PREFETCH); + expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_TYPES_COMPATIBLE_P); - eat(T___builtin_prefetch); + eat(T___builtin_types_compatible_p); expect('(', end_error); add_anchor_token(')'); - expression->builtin_prefetch.adr = parse_assignment_expression(); - if (token.type == ',') { - next_token(); - expression->builtin_prefetch.rw = parse_assignment_expression(); - } - if (token.type == ',') { - next_token(); - expression->builtin_prefetch.locality = parse_assignment_expression(); - } + add_anchor_token(','); + expression->builtin_types_compatible.left = parse_typename(); + rem_anchor_token(','); + expect(',', end_error); + expression->builtin_types_compatible.right = parse_typename(); rem_anchor_token(')'); expect(')', end_error); - expression->base.type = type_void; + expression->base.type = type_int; return expression; end_error: - return create_invalid_expression(); + return create_error_expression(); } /** @@ -7524,7 +6711,7 @@ static expression_t *parse_compare_builtin(void) { expression_t *expression; - switch (token.type) { + switch (token.kind) { case T___builtin_isgreater: expression = allocate_expression_zero(EXPR_BINARY_ISGREATER); break; @@ -7571,33 +6758,8 @@ static expression_t *parse_compare_builtin(void) return expression; end_error: - return create_invalid_expression(); -} - -#if 0 -/** - * Parses a __builtin_expect(, end_error) expression. - */ -static expression_t *parse_builtin_expect(void, end_error) -{ - expression_t *expression - = allocate_expression_zero(EXPR_BINARY_BUILTIN_EXPECT); - - eat(T___builtin_expect); - - expect('(', end_error); - expression->binary.left = parse_assignment_expression(); - expect(',', end_error); - expression->binary.right = parse_constant_expression(); - expect(')', end_error); - - expression->base.type = expression->binary.left->base.type; - - return expression; -end_error: - return create_invalid_expression(); + return create_error_expression(); } -#endif /** * Parses a MS assume() expression. @@ -7617,44 +6779,31 @@ static expression_t *parse_assume(void) expression->base.type = type_void; return expression; end_error: - return create_invalid_expression(); + return create_error_expression(); } /** - * Return the declaration for a given label symbol or create a new one. - * - * @param symbol the symbol of the label + * Return the label for the current symbol or create a new one. */ -static label_t *get_label(symbol_t *symbol) +static label_t *get_label(void) { - entity_t *label; + assert(token.kind == T_IDENTIFIER); assert(current_function != NULL); - label = get_entity(symbol, NAMESPACE_LABEL); - /* if we found a local label, we already created the declaration */ + entity_t *label = get_entity(token.identifier.symbol, NAMESPACE_LABEL); + /* If we find a local label, we already created the declaration. */ if (label != NULL && label->kind == ENTITY_LOCAL_LABEL) { if (label->base.parent_scope != current_scope) { assert(label->base.parent_scope->depth < current_scope->depth); current_function->goto_to_outer = true; } - return &label->label; - } - - label = get_entity(symbol, NAMESPACE_LABEL); - /* if we found a label in the same function, then we already created the - * declaration */ - if (label != NULL - && label->base.parent_scope == ¤t_function->parameters) { - return &label->label; + } else if (label == NULL || label->base.parent_scope != ¤t_function->parameters) { + /* There is no matching label in the same function, so create a new one. */ + label = allocate_entity_zero(ENTITY_LABEL, NAMESPACE_LABEL, token.identifier.symbol); + label_push(label); } - /* otherwise we need to create a new one */ - label = allocate_entity_zero(ENTITY_LABEL); - label->base.namespc = NAMESPACE_LABEL; - label->base.symbol = symbol; - - label_push(label); - + eat(T_IDENTIFIER); return &label->label; } @@ -7663,28 +6812,24 @@ static label_t *get_label(symbol_t *symbol) */ static expression_t *parse_label_address(void) { - source_position_t source_position = token.source_position; + source_position_t source_position = token.base.source_position; eat(T_ANDAND); - if (token.type != T_IDENTIFIER) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing label address", T_IDENTIFIER, NULL); - goto end_error; + return create_error_expression(); } - symbol_t *symbol = token.v.symbol; - next_token(); - label_t *label = get_label(symbol); + label_t *const label = get_label(); label->used = true; label->address_taken = true; expression_t *expression = allocate_expression_zero(EXPR_LABEL_ADDRESS); expression->base.source_position = source_position; - /* label address is threaten as a void pointer */ + /* label address is treated as a void pointer */ expression->base.type = type_void_ptr; expression->label_address.label = label; return expression; -end_error: - return create_invalid_expression(); } /** @@ -7693,34 +6838,29 @@ end_error: static expression_t *parse_noop_expression(void) { /* the result is a (int)0 */ - expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->base.type = type_int; - cnst->conste.v.int_value = 0; - cnst->conste.is_ms_noop = true; + expression_t *literal = allocate_expression_zero(EXPR_LITERAL_MS_NOOP); + literal->base.type = type_int; + literal->literal.value.begin = "__noop"; + literal->literal.value.size = 6; eat(T___noop); - if (token.type == '(') { + if (token.kind == '(') { /* parse arguments */ eat('('); add_anchor_token(')'); add_anchor_token(','); - if (token.type != ')') { - while (true) { - (void)parse_assignment_expression(); - if (token.type != ',') - break; - next_token(); - } - } + if (token.kind != ')') do { + (void)parse_assignment_expression(); + } while (next_if(',')); } rem_anchor_token(','); rem_anchor_token(')'); expect(')', end_error); end_error: - return cnst; + return literal; } /** @@ -7728,79 +6868,76 @@ end_error: */ static expression_t *parse_primary_expression(void) { - switch (token.type) { - case T_false: return parse_bool_const(false); - case T_true: return parse_bool_const(true); - 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___FUNCSIG__: return parse_funcsig_keyword(); - case T___FUNCDNAME__: return parse_funcdname_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: - case T___builtin_alloca: - case T___builtin_inf: - case T___builtin_inff: - case T___builtin_infl: - case T___builtin_nan: - case T___builtin_nanf: - case T___builtin_nanl: - case T___builtin_huge_val: - 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 T_ANDAND: - if (GNU_MODE) - return parse_label_address(); - break; + switch (token.kind) { + case T_false: return parse_boolean_literal(false); + case T_true: return parse_boolean_literal(true); + case T_INTEGER: + case T_INTEGER_OCTAL: + case T_INTEGER_HEXADECIMAL: + case T_FLOATINGPOINT: + case T_FLOATINGPOINT_HEXADECIMAL: return parse_number_literal(); + case T_CHARACTER_CONSTANT: return parse_character_constant(); + case T_WIDE_CHARACTER_CONSTANT: return parse_wide_character_constant(); + case T_STRING_LITERAL: + case T_WIDE_STRING_LITERAL: return parse_string_literal(); + case T___FUNCTION__: + case T___func__: return parse_function_keyword(); + case T___PRETTY_FUNCTION__: return parse_pretty_function_keyword(); + case T___FUNCSIG__: return parse_funcsig_keyword(); + case T___FUNCDNAME__: return parse_funcdname_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_va_copy: return parse_va_copy(); + 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_types_compatible_p: return parse_builtin_types_compatible(); + case T__assume: return parse_assume(); + case T_ANDAND: + if (GNU_MODE) + return parse_label_address(); + break; + + case '(': return parse_parenthesized_expression(); + case T___noop: return parse_noop_expression(); - case '(': return parse_parenthesized_expression(); - case T___noop: return parse_noop_expression(); + /* Gracefully handle type names while parsing expressions. */ + case T_COLONCOLON: + return parse_reference(); + case T_IDENTIFIER: + if (!is_typedef_symbol(token.identifier.symbol)) { + return parse_reference(); + } + /* FALLTHROUGH */ + DECLARATION_START { + source_position_t const pos = *HERE; + declaration_specifiers_t specifiers; + parse_declaration_specifiers(&specifiers); + type_t const *const type = parse_abstract_declarator(specifiers.type); + errorf(&pos, "encountered type '%T' while parsing expression", type); + return create_error_expression(); + } } errorf(HERE, "unexpected token %K, expected an expression", &token); - return create_invalid_expression(); -} - -/** - * 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.type; - const type_t *const base_type = skip_typeref(type); - - if (is_type_atomic(base_type, ATOMIC_TYPE_CHAR) && - warning.char_subscripts) { - warningf(&expression->base.source_position, - "array subscript has type '%T'", type); - } + eat_until_anchor(); + return create_error_expression(); } static expression_t *parse_array_expression(expression_t *left) { - expression_t *expression = allocate_expression_zero(EXPR_ARRAY_ACCESS); + expression_t *const expr = allocate_expression_zero(EXPR_ARRAY_ACCESS); + array_access_expression_t *const arr = &expr->array_access; eat('['); add_anchor_token(']'); - expression_t *inside = parse_expression(); + expression_t *const inside = parse_expression(); type_t *const orig_type_left = left->base.type; type_t *const orig_type_inside = inside->base.type; @@ -7808,36 +6945,53 @@ static expression_t *parse_array_expression(expression_t *left) type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_inside = skip_typeref(orig_type_inside); - type_t *return_type; - array_access_expression_t *array_access = &expression->array_access; + expression_t *ref; + expression_t *idx; + type_t *idx_type; + type_t *res_type; if (is_type_pointer(type_left)) { - return_type = type_left->pointer.points_to; - array_access->array_ref = left; - array_access->index = inside; - check_for_char_index_type(inside); + ref = left; + idx = inside; + idx_type = type_inside; + res_type = type_left->pointer.points_to; + goto check_idx; } else if (is_type_pointer(type_inside)) { - return_type = type_inside->pointer.points_to; - array_access->array_ref = inside; - array_access->index = left; - array_access->flipped = true; - check_for_char_index_type(left); + arr->flipped = true; + ref = inside; + idx = left; + idx_type = type_left; + res_type = type_inside->pointer.points_to; +check_idx: + res_type = automatic_type_conversion(res_type); + if (!is_type_integer(idx_type)) { + errorf(&idx->base.source_position, "array subscript must have integer type"); + } else if (is_type_atomic(idx_type, ATOMIC_TYPE_CHAR)) { + source_position_t const *const pos = &idx->base.source_position; + warningf(WARN_CHAR_SUBSCRIPTS, pos, "array subscript has char type"); + } } else { if (is_type_valid(type_left) && is_type_valid(type_inside)) { - errorf(HERE, - "array access on object with non-pointer types '%T', '%T'", - orig_type_left, orig_type_inside); + errorf(&expr->base.source_position, "invalid types '%T[%T]' for array access", orig_type_left, orig_type_inside); } - return_type = type_error_type; - array_access->array_ref = left; - array_access->index = inside; + res_type = type_error_type; + ref = left; + idx = inside; } - expression->base.type = automatic_type_conversion(return_type); + arr->array_ref = ref; + arr->index = idx; + arr->base.type = res_type; rem_anchor_token(']'); expect(']', end_error); end_error: - return expression; + return expr; +} + +static bool is_bitfield(const expression_t *expression) +{ + return expression->kind == EXPR_SELECT + && expression->select.compound_entry->compound_member.bitfield; } static expression_t *parse_typeprop(expression_kind_t const kind) @@ -7847,29 +7001,32 @@ static expression_t *parse_typeprop(expression_kind_t const kind) eat(kind == EXPR_SIZEOF ? T_sizeof : T___alignof__); - /* we only refer to a type property, mark this case */ - bool old = in_type_prop; - in_type_prop = true; - type_t *orig_type; expression_t *expression; - if (token.type == '(' && is_declaration_specifier(look_ahead(1), true)) { + if (token.kind == '(' && is_declaration_specifier(look_ahead(1))) { + source_position_t const pos = *HERE; next_token(); add_anchor_token(')'); orig_type = parse_typename(); rem_anchor_token(')'); expect(')', end_error); - if (token.type == '{') { + if (token.kind == '{') { /* It was not sizeof(type) after all. It is sizeof of an expression * starting with a compound literal */ - expression = parse_compound_literal(orig_type); + expression = parse_compound_literal(&pos, orig_type); goto typeprop_expression; } } else { - expression = parse_sub_expression(PREC_UNARY); + expression = parse_subexpression(PREC_UNARY); typeprop_expression: + if (is_bitfield(expression)) { + char const* const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof"; + errorf(&tp_expression->base.source_position, + "operand of %s expression must not be a bitfield", what); + } + tp_expression->typeprop.tp_expression = expression; orig_type = revert_automatic_type_conversion(expression); @@ -7878,12 +7035,21 @@ typeprop_expression: tp_expression->typeprop.type = orig_type; type_t const* const type = skip_typeref(orig_type); - char const* const wrong_type = - GNU_MODE && is_type_atomic(type, ATOMIC_TYPE_VOID) ? NULL : - is_type_incomplete(type) ? "incomplete" : - type->kind == TYPE_FUNCTION ? "function designator" : - type->kind == TYPE_BITFIELD ? "bitfield" : - NULL; + char const* wrong_type = NULL; + if (is_type_incomplete(type)) { + if (!is_type_atomic(type, ATOMIC_TYPE_VOID) || !GNU_MODE) + wrong_type = "incomplete"; + } else if (type->kind == TYPE_FUNCTION) { + if (GNU_MODE) { + /* function types are allowed (and return 1) */ + source_position_t const *const pos = &tp_expression->base.source_position; + char const *const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof"; + warningf(WARN_OTHER, pos, "%s expression with function argument returns invalid result", what); + } else { + wrong_type = "function"; + } + } + if (wrong_type != NULL) { char const* const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof"; errorf(&tp_expression->base.source_position, @@ -7892,7 +7058,6 @@ typeprop_expression: } end_error: - in_type_prop = old; return tp_expression; } @@ -7906,92 +7071,74 @@ static expression_t *parse_alignof(void) return parse_typeprop(EXPR_ALIGNOF); } -static expression_t *parse_select_expression(expression_t *compound) +static expression_t *parse_select_expression(expression_t *addr) { - expression_t *select = allocate_expression_zero(EXPR_SELECT); - select->select.compound = compound; - - assert(token.type == '.' || token.type == T_MINUSGREATER); - bool is_pointer = (token.type == T_MINUSGREATER); + assert(token.kind == '.' || token.kind == T_MINUSGREATER); + bool select_left_arrow = (token.kind == T_MINUSGREATER); + source_position_t const pos = *HERE; next_token(); - if (token.type != T_IDENTIFIER) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing select", T_IDENTIFIER, NULL); - return select; + return create_error_expression(); } - symbol_t *symbol = token.v.symbol; + symbol_t *symbol = token.identifier.symbol; next_token(); - type_t *const orig_type = compound->base.type; + type_t *const orig_type = addr->base.type; type_t *const type = skip_typeref(orig_type); type_t *type_left; bool saw_error = false; if (is_type_pointer(type)) { - if (!is_pointer) { - errorf(HERE, + if (!select_left_arrow) { + errorf(&pos, "request for member '%Y' in something not a struct or union, but '%T'", symbol, orig_type); saw_error = true; } type_left = skip_typeref(type->pointer.points_to); } else { - if (is_pointer && is_type_valid(type)) { - errorf(HERE, "left hand side of '->' is not a pointer, but '%T'", orig_type); + if (select_left_arrow && is_type_valid(type)) { + errorf(&pos, "left hand side of '->' is not a pointer, but '%T'", orig_type); saw_error = true; } type_left = type; } - entity_t *entry; - if (type_left->kind == TYPE_COMPOUND_STRUCT || - type_left->kind == TYPE_COMPOUND_UNION) { - compound_t *compound = type_left->compound.compound; - - if (!compound->complete) { - errorf(HERE, "request for member '%Y' of incomplete type '%T'", - symbol, type_left); - goto create_error_entry; - } + if (type_left->kind != TYPE_COMPOUND_STRUCT && + type_left->kind != TYPE_COMPOUND_UNION) { - entry = find_compound_entry(compound, symbol); - if (entry == NULL) { - errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol); - goto create_error_entry; - } - } else { if (is_type_valid(type_left) && !saw_error) { - errorf(HERE, + errorf(&pos, "request for member '%Y' in something not a struct or union, but '%T'", symbol, type_left); } -create_error_entry: - entry = create_error_entity(symbol, ENTITY_COMPOUND_MEMBER); + return create_error_expression(); } - assert(is_declaration(entry)); - select->select.compound_entry = entry; - - type_t *entry_type = entry->declaration.type; - type_t *res_type - = get_qualified_type(entry_type, type_left->base.qualifiers); + compound_t *compound = type_left->compound.compound; + if (!compound->complete) { + errorf(&pos, "request for member '%Y' in incomplete type '%T'", + symbol, type_left); + return create_error_expression(); + } - /* we always do the auto-type conversions; the & and sizeof parser contains - * code to revert this! */ - select->base.type = automatic_type_conversion(res_type); + type_qualifiers_t qualifiers = type_left->base.qualifiers; + expression_t *result = + find_create_select(&pos, addr, qualifiers, compound, symbol); - type_t *skipped = skip_typeref(res_type); - if (skipped->kind == TYPE_BITFIELD) { - select->base.type = skipped->bitfield.base_type; + if (result == NULL) { + errorf(&pos, "'%T' has no member named '%Y'", orig_type, symbol); + return create_error_expression(); } - return select; + return result; } -static void check_call_argument(const function_parameter_t *parameter, +static void check_call_argument(type_t *expected_type, call_argument_t *argument, unsigned pos) { - type_t *expected_type = parameter->type; type_t *expected_type_skip = skip_typeref(expected_type); assign_error_t error = ASSIGN_ERROR_INCOMPATIBLE; expression_t *arg_expr = argument->expression; @@ -7999,8 +7146,7 @@ static void check_call_argument(const function_parameter_t *parameter, /* handle transparent union gnu extension */ if (is_type_union(expected_type_skip) - && (expected_type_skip->base.modifiers - & TYPE_MODIFIER_TRANSPARENT_UNION)) { + && (get_type_modifiers(expected_type) & DM_TRANSPARENT_UNION)) { compound_t *union_decl = expected_type_skip->compound.compound; type_t *best_type = NULL; entity_t *entry = union_decl->members.entities; @@ -8025,25 +7171,88 @@ static void check_call_argument(const function_parameter_t *parameter, } error = semantic_assign(expected_type, arg_expr); - argument->expression = create_implicit_cast(argument->expression, - expected_type); + argument->expression = create_implicit_cast(arg_expr, expected_type); if (error != ASSIGN_SUCCESS) { /* report exact scope in error messages (like "in argument 3") */ char buf[64]; snprintf(buf, sizeof(buf), "call argument %u", pos); - report_assign_error(error, expected_type, arg_expr, buf, - &arg_expr->base.source_position); - } else if (warning.traditional || warning.conversion) { + report_assign_error(error, expected_type, arg_expr, buf, + &arg_expr->base.source_position); + } else { type_t *const promoted_type = get_default_promoted_type(arg_type); if (!types_compatible(expected_type_skip, promoted_type) && !types_compatible(expected_type_skip, type_void_ptr) && !types_compatible(type_void_ptr, promoted_type)) { /* Deliberately show the skipped types in this warning */ - warningf(&arg_expr->base.source_position, - "passing call argument %u as '%T' rather than '%T' due to prototype", - pos, expected_type_skip, promoted_type); + source_position_t const *const apos = &arg_expr->base.source_position; + warningf(WARN_TRADITIONAL, apos, "passing call argument %u as '%T' rather than '%T' due to prototype", pos, expected_type_skip, promoted_type); + } + } +} + +/** + * Handle the semantic restrictions of builtin calls + */ +static void handle_builtin_argument_restrictions(call_expression_t *call) +{ + entity_t *entity = call->function->reference.entity; + switch (entity->function.btk) { + case BUILTIN_FIRM: + switch (entity->function.b.firm_builtin_kind) { + case ir_bk_return_address: + case ir_bk_frame_address: { + /* argument must be constant */ + call_argument_t *argument = call->arguments; + + if (is_constant_expression(argument->expression) == EXPR_CLASS_VARIABLE) { + errorf(&call->base.source_position, + "argument of '%Y' must be a constant expression", + call->function->reference.entity->base.symbol); + } + break; + } + case ir_bk_prefetch: + /* second and third argument must be constant if existent */ + if (call->arguments == NULL) + break; + call_argument_t *rw = call->arguments->next; + call_argument_t *locality = NULL; + + if (rw != NULL) { + if (is_constant_expression(rw->expression) == EXPR_CLASS_VARIABLE) { + errorf(&call->base.source_position, + "second argument of '%Y' must be a constant expression", + call->function->reference.entity->base.symbol); + } + locality = rw->next; + } + if (locality != NULL) { + if (is_constant_expression(locality->expression) == EXPR_CLASS_VARIABLE) { + errorf(&call->base.source_position, + "third argument of '%Y' must be a constant expression", + call->function->reference.entity->base.symbol); + } + locality = rw->next; + } + break; + default: + break; + } + + case BUILTIN_OBJECT_SIZE: + if (call->arguments == NULL) + break; + + call_argument_t *arg = call->arguments->next; + if (arg != NULL && is_constant_expression(arg->expression) == EXPR_CLASS_VARIABLE) { + errorf(&call->base.source_position, + "second argument of '%Y' must be a constant expression", + call->function->reference.entity->base.symbol); } + break; + default: + break; } } @@ -8072,7 +7281,9 @@ static expression_t *parse_call_expression(expression_t *expression) } if (function_type == NULL && is_type_valid(type)) { - errorf(HERE, "called object '%E' (type '%T') is not a pointer to a function", expression, orig_type); + errorf(HERE, + "called object '%E' (type '%T') is not a pointer to a function", + expression, orig_type); } /* parse arguments */ @@ -8080,24 +7291,15 @@ static expression_t *parse_call_expression(expression_t *expression) add_anchor_token(')'); add_anchor_token(','); - if (token.type != ')') { - call_argument_t *last_argument = NULL; - - while (true) { - call_argument_t *argument = allocate_ast_zero(sizeof(argument[0])); - + if (token.kind != ')') { + call_argument_t **anchor = &call->arguments; + do { + call_argument_t *argument = allocate_ast_zero(sizeof(*argument)); argument->expression = parse_assignment_expression(); - if (last_argument == NULL) { - call->arguments = argument; - } else { - last_argument->next = argument; - } - last_argument = argument; - if (token.type != ',') - break; - next_token(); - } + *anchor = argument; + anchor = &argument->next; + } while (next_if(',')); } rem_anchor_token(','); rem_anchor_token(')'); @@ -8106,37 +7308,48 @@ static expression_t *parse_call_expression(expression_t *expression) if (function_type == NULL) return result; + /* check type and count of call arguments */ function_parameter_t *parameter = function_type->parameters; call_argument_t *argument = call->arguments; if (!function_type->unspecified_parameters) { for (unsigned pos = 0; parameter != NULL && argument != NULL; parameter = parameter->next, argument = argument->next) { - check_call_argument(parameter, argument, ++pos); + check_call_argument(parameter->type, argument, ++pos); } if (parameter != NULL) { - errorf(HERE, "too few arguments to function '%E'", expression); + errorf(&expression->base.source_position, "too few arguments to function '%E'", expression); } else if (argument != NULL && !function_type->variadic) { - errorf(HERE, "too many arguments to function '%E'", expression); + errorf(&argument->expression->base.source_position, "too many arguments to function '%E'", expression); } } - /* do default promotion */ + /* do default promotion for other arguments */ for (; argument != NULL; argument = argument->next) { - type_t *type = argument->expression->base.type; + type_t *argument_type = argument->expression->base.type; + if (!is_type_object(skip_typeref(argument_type))) { + errorf(&argument->expression->base.source_position, + "call argument '%E' must not be void", argument->expression); + } - type = get_default_promoted_type(type); + argument_type = get_default_promoted_type(argument_type); argument->expression - = create_implicit_cast(argument->expression, type); + = create_implicit_cast(argument->expression, argument_type); } - check_format(&result->call); + check_format(call); + + if (is_type_compound(skip_typeref(function_type->return_type))) { + source_position_t const *const pos = &expression->base.source_position; + warningf(WARN_AGGREGATE_RETURN, pos, "function call has aggregate value"); + } - if (warning.aggregate_return && - is_type_compound(skip_typeref(function_type->return_type))) { - warningf(&result->base.source_position, - "function call has aggregate value"); + if (expression->kind == EXPR_REFERENCE) { + reference_expression_t *reference = &expression->reference; + if (reference->entity->kind == ENTITY_FUNCTION && + reference->entity->function.btk != BUILTIN_NONE) + handle_builtin_argument_restrictions(call); } end_error: @@ -8184,27 +7397,22 @@ static expression_t const *get_reference_address(expression_t const *expr) static void warn_reference_address_as_bool(expression_t const* expr) { - if (!warning.address) - return; - expr = get_reference_address(expr); if (expr != NULL) { - warningf(&expr->base.source_position, - "the address of '%Y' will always evaluate as 'true'", - expr->reference.entity->base.symbol); + source_position_t const *const pos = &expr->base.source_position; + entity_t const *const ent = expr->reference.entity; + warningf(WARN_ADDRESS, pos, "the address of '%N' will always evaluate as 'true'", ent); } } static void warn_assignment_in_condition(const expression_t *const expr) { - if (!warning.parentheses) - return; if (expr->base.kind != EXPR_BINARY_ASSIGN) return; if (expr->base.parenthesized) return; - warningf(&expr->base.source_position, - "suggest parentheses around assignment used as truth value"); + source_position_t const *const pos = &expr->base.source_position; + warningf(WARN_PARENTHESES, pos, "suggest parentheses around assignment used as truth value"); } static void semantic_condition(expression_t const *const expr, @@ -8240,7 +7448,7 @@ static expression_t *parse_conditional_expression(expression_t *expression) expression_t *true_expression = expression; bool gnu_cond = false; - if (GNU_MODE && token.type == ':') { + if (GNU_MODE && token.kind == ':') { gnu_cond = true; } else { true_expression = parse_expression(); @@ -8249,7 +7457,7 @@ static expression_t *parse_conditional_expression(expression_t *expression) expect(':', end_error); end_error:; expression_t *false_expression = - parse_sub_expression(c_mode & _CXX ? PREC_ASSIGNMENT : PREC_CONDITIONAL); + parse_subexpression(c_mode & _CXX ? PREC_ASSIGNMENT : PREC_CONDITIONAL); type_t *const orig_true_type = true_expression->base.type; type_t *const orig_false_type = false_expression->base.type; @@ -8257,7 +7465,8 @@ end_error:; type_t *const false_type = skip_typeref(orig_false_type); /* 6.5.15.3 */ - type_t *result_type; + source_position_t const *const pos = &conditional->base.source_position; + type_t *result_type; if (is_type_atomic(true_type, ATOMIC_TYPE_VOID) || is_type_atomic(false_type, ATOMIC_TYPE_VOID)) { /* ISO/IEC 14882:1998(E) §5.16:2 */ @@ -8266,25 +7475,15 @@ end_error:; } else if (false_expression->kind == EXPR_UNARY_THROW) { result_type = true_type; } else { - if (warning.other && ( - !is_type_atomic(true_type, ATOMIC_TYPE_VOID) || - !is_type_atomic(false_type, ATOMIC_TYPE_VOID) - )) { - warningf(&conditional->base.source_position, - "ISO C forbids conditional expression with only one void side"); + if (!is_type_atomic(true_type, ATOMIC_TYPE_VOID) || + !is_type_atomic(false_type, ATOMIC_TYPE_VOID)) { + warningf(WARN_OTHER, pos, "ISO C forbids conditional expression with only one void side"); } result_type = type_void; } } else if (is_type_arithmetic(true_type) && is_type_arithmetic(false_type)) { result_type = semantic_arithmetic(true_type, false_type); - - 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->base.type = result_type; } else if (same_compound_type(true_type, false_type)) { /* just take 1 of the 2 types */ result_type = true_type; @@ -8317,11 +7516,7 @@ end_error:; get_unqualified_type(to2))) { to = to1; } else { - if (warning.other) { - warningf(&conditional->base.source_position, - "pointer types '%T' and '%T' in conditional expression are incompatible", - true_type, false_type); - } + warningf(WARN_OTHER, pos, "pointer types '%T' and '%T' in conditional expression are incompatible", true_type, false_type); to = type_void; } @@ -8329,23 +7524,15 @@ end_error:; get_qualified_type(to, to1->base.qualifiers | to2->base.qualifiers); result_type = make_pointer_type(type, TYPE_QUALIFIER_NONE); } else if (is_type_integer(other_type)) { - if (warning.other) { - warningf(&conditional->base.source_position, - "pointer/integer type mismatch in conditional expression ('%T' and '%T')", true_type, false_type); - } + warningf(WARN_OTHER, pos, "pointer/integer type mismatch in conditional expression ('%T' and '%T')", true_type, false_type); result_type = pointer_type; } else { - if (is_type_valid(other_type)) { - type_error_incompatible("while parsing conditional", - &expression->base.source_position, true_type, false_type); - } - result_type = type_error_type; + goto types_incompatible; } } else { +types_incompatible: if (is_type_valid(true_type) && is_type_valid(false_type)) { - type_error_incompatible("while parsing conditional", - &conditional->base.source_position, true_type, - false_type); + type_error_incompatible("while parsing conditional", pos, true_type, false_type); } result_type = type_error_type; } @@ -8363,12 +7550,9 @@ end_error:; */ static expression_t *parse_extension(void) { - eat(T___extension__); - - bool old_gcc_extension = in_gcc_extension; - in_gcc_extension = true; - expression_t *expression = parse_sub_expression(PREC_UNARY); - in_gcc_extension = old_gcc_extension; + PUSH_EXTENSION(); + expression_t *expression = parse_subexpression(PREC_UNARY); + POP_EXTENSION(); return expression; } @@ -8391,7 +7575,7 @@ static expression_t *parse_builtin_classify_type(void) return result; end_error: - return create_invalid_expression(); + return create_error_expression(); } /** @@ -8405,24 +7589,24 @@ static expression_t *parse_delete(void) eat(T_delete); - if (token.type == '[') { - next_token(); + if (next_if('[')) { result->kind = EXPR_UNARY_DELETE_ARRAY; expect(']', end_error); end_error:; } - expression_t *const value = parse_sub_expression(PREC_CAST); + expression_t *const value = parse_subexpression(PREC_CAST); result->unary.value = value; type_t *const type = skip_typeref(value->base.type); if (!is_type_pointer(type)) { - errorf(&value->base.source_position, - "operand of delete must have pointer type"); - } else if (warning.other && - is_type_atomic(skip_typeref(type->pointer.points_to), ATOMIC_TYPE_VOID)) { - warningf(&value->base.source_position, - "deleting 'void*' is undefined"); + if (is_type_valid(type)) { + errorf(&value->base.source_position, + "operand of delete must have pointer type"); + } + } else if (is_type_atomic(skip_typeref(type->pointer.points_to), ATOMIC_TYPE_VOID)) { + source_position_t const *const pos = &value->base.source_position; + warningf(WARN_OTHER, pos, "deleting 'void*' is undefined"); } return result; @@ -8440,7 +7624,7 @@ static expression_t *parse_throw(void) eat(T_throw); expression_t *value = NULL; - switch (token.type) { + switch (token.kind) { EXPRESSION_START { value = parse_assignment_expression(); /* ISO/IEC 14882:1998(E) §15.1:3 */ @@ -8480,10 +7664,8 @@ static bool check_pointer_arithmetic(const source_position_t *source_position, "arithmetic with pointer to incomplete type '%T' not allowed", orig_pointer_type); return false; - } else if (warning.pointer_arith) { - warningf(source_position, - "pointer of type '%T' used in arithmetic", - orig_pointer_type); + } else { + warningf(WARN_POINTER_ARITH, source_position, "pointer of type '%T' used in arithmetic", orig_pointer_type); } } else if (is_type_function(points_to)) { if (!GNU_MODE) { @@ -8491,10 +7673,8 @@ static bool check_pointer_arithmetic(const source_position_t *source_position, "arithmetic with pointer to function type '%T' not allowed", orig_pointer_type); return false; - } else if (warning.pointer_arith) { - warningf(source_position, - "pointer to a function '%T' used in arithmetic", - orig_pointer_type); + } else { + warningf(WARN_POINTER_ARITH, source_position, "pointer to a function '%T' used in arithmetic", orig_pointer_type); } } return true; @@ -8502,7 +7682,7 @@ static bool check_pointer_arithmetic(const source_position_t *source_position, static bool is_lvalue(const expression_t *expression) { - /* TODO: doesn't seem to be consistent with §6.3.2.1 (1) */ + /* TODO: doesn't seem to be consistent with §6.3.2.1:1 */ switch (expression->kind) { case EXPR_ARRAY_ACCESS: case EXPR_COMPOUND_LITERAL: @@ -8512,14 +7692,14 @@ static bool is_lvalue(const expression_t *expression) return true; default: { - type_t *type = skip_typeref(expression->base.type); - return - /* ISO/IEC 14882:1998(E) §3.10:3 */ - is_type_reference(type) || - /* Claim it is an lvalue, if the type is invalid. There was a parse - * error before, which maybe prevented properly recognizing it as - * lvalue. */ - !is_type_valid(type); + type_t *type = skip_typeref(expression->base.type); + return + /* ISO/IEC 14882:1998(E) §3.10:3 */ + is_type_reference(type) || + /* Claim it is an lvalue, if the type is invalid. There was a parse + * error before, which maybe prevented properly recognizing it as + * lvalue. */ + !is_type_valid(type); } } } @@ -8546,6 +7726,13 @@ static void semantic_incdec(unary_expression_t *expression) expression->base.type = orig_type; } +static void promote_unary_int_expr(unary_expression_t *const expr, type_t *const type) +{ + type_t *const res_type = promote_integer(type); + expr->base.type = res_type; + expr->value = create_implicit_cast(expr->value, res_type); +} + static void semantic_unexpr_arithmetic(unary_expression_t *expression) { type_t *const orig_type = expression->value->base.type; @@ -8557,17 +7744,18 @@ static void semantic_unexpr_arithmetic(unary_expression_t *expression) "operation needs an arithmetic type"); } return; + } else if (is_type_integer(type)) { + promote_unary_int_expr(expression, type); + } else { + expression->base.type = orig_type; } - - expression->base.type = orig_type; } static void semantic_unexpr_plus(unary_expression_t *expression) { semantic_unexpr_arithmetic(expression); - if (warning.traditional) - warningf(&expression->base.source_position, - "traditional C rejects the unary plus operator"); + source_position_t const *const pos = &expression->base.source_position; + warningf(WARN_TRADITIONAL, pos, "traditional C rejects the unary plus operator"); } static void semantic_not(unary_expression_t *expression) @@ -8589,7 +7777,7 @@ static void semantic_unexpr_integer(unary_expression_t *expression) return; } - expression->base.type = orig_type; + promote_unary_int_expr(expression, type); } static void semantic_dereference(unary_expression_t *expression) @@ -8627,9 +7815,8 @@ static void set_address_taken(expression_t *expression, bool may_be_register) if (entity->declaration.storage_class == STORAGE_CLASS_REGISTER && !may_be_register) { - errorf(&expression->base.source_position, - "address of register %s '%Y' requested", - get_entity_kind_name(entity->kind), entity->base.symbol); + source_position_t const *const pos = &expression->base.source_position; + errorf(pos, "address of register '%N' requested", entity); } if (entity->kind == ENTITY_VARIABLE) { @@ -8657,10 +7844,9 @@ static void semantic_take_addr(unary_expression_t *expression) if (!is_lvalue(value)) { errorf(&expression->base.source_position, "'&' requires an lvalue"); } - if (type->kind == TYPE_BITFIELD) { + if (is_bitfield(value)) { errorf(&expression->base.source_position, - "'&' not allowed on object with bitfield type '%T'", - type); + "'&' not allowed on bitfield"); } set_address_taken(value, false); @@ -8668,13 +7854,13 @@ static void semantic_take_addr(unary_expression_t *expression) expression->base.type = make_pointer_type(orig_type, TYPE_QUALIFIER_NONE); } -#define CREATE_UNARY_EXPRESSION_PARSER(token_type, unexpression_type, sfunc) \ +#define CREATE_UNARY_EXPRESSION_PARSER(token_kind, unexpression_type, sfunc) \ static expression_t *parse_##unexpression_type(void) \ { \ expression_t *unary_expression \ = allocate_expression_zero(unexpression_type); \ - eat(token_type); \ - unary_expression->unary.value = parse_sub_expression(PREC_UNARY); \ + eat(token_kind); \ + unary_expression->unary.value = parse_subexpression(PREC_UNARY); \ \ sfunc(&unary_expression->unary); \ \ @@ -8698,13 +7884,13 @@ CREATE_UNARY_EXPRESSION_PARSER(T_PLUSPLUS, EXPR_UNARY_PREFIX_INCREMENT, CREATE_UNARY_EXPRESSION_PARSER(T_MINUSMINUS, EXPR_UNARY_PREFIX_DECREMENT, semantic_incdec) -#define CREATE_UNARY_POSTFIX_EXPRESSION_PARSER(token_type, unexpression_type, \ +#define CREATE_UNARY_POSTFIX_EXPRESSION_PARSER(token_kind, unexpression_type, \ sfunc) \ static expression_t *parse_##unexpression_type(expression_t *left) \ { \ expression_t *unary_expression \ = allocate_expression_zero(unexpression_type); \ - eat(token_type); \ + eat(token_kind); \ unary_expression->unary.value = left; \ \ sfunc(&unary_expression->unary); \ @@ -8726,7 +7912,7 @@ static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right) type_left = get_unqualified_type(type_left); type_right = get_unqualified_type(type_right); - /* § 6.3.1.8 Usual arithmetic conversions */ + /* §6.3.1.8 Usual arithmetic conversions */ if (type_left == type_long_double || type_right == type_long_double) { return type_long_double; } else if (type_left == type_double || type_right == type_double) { @@ -8741,45 +7927,44 @@ static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right) if (type_left == type_right) return type_left; - bool const signed_left = is_type_signed(type_left); - bool const signed_right = is_type_signed(type_right); - int const rank_left = get_rank(type_left); - int const rank_right = get_rank(type_right); + bool const signed_left = is_type_signed(type_left); + bool const signed_right = is_type_signed(type_right); + unsigned const rank_left = get_akind_rank(get_akind(type_left)); + unsigned const rank_right = get_akind_rank(get_akind(type_right)); if (signed_left == signed_right) return rank_left >= rank_right ? type_left : type_right; - int s_rank; - int u_rank; + unsigned s_rank; + unsigned u_rank; + atomic_type_kind_t s_akind; + atomic_type_kind_t u_akind; type_t *s_type; type_t *u_type; if (signed_left) { - s_rank = rank_left; s_type = type_left; - u_rank = rank_right; u_type = type_right; } else { - s_rank = rank_right; s_type = type_right; - u_rank = rank_left; u_type = type_left; } + s_akind = get_akind(s_type); + u_akind = get_akind(u_type); + s_rank = get_akind_rank(s_akind); + u_rank = get_akind_rank(u_akind); if (u_rank >= s_rank) return u_type; - /* casting rank to atomic_type_kind is a bit hacky, but makes things - * easier here... */ - if (get_atomic_type_size((atomic_type_kind_t) s_rank) - > get_atomic_type_size((atomic_type_kind_t) u_rank)) + if (get_atomic_type_size(s_akind) > get_atomic_type_size(u_akind)) return s_type; - switch (s_rank) { - case ATOMIC_TYPE_INT: return type_unsigned_int; - case ATOMIC_TYPE_LONG: return type_unsigned_long; - case ATOMIC_TYPE_LONGLONG: return type_unsigned_long_long; + switch (s_akind) { + case ATOMIC_TYPE_INT: return type_unsigned_int; + case ATOMIC_TYPE_LONG: return type_unsigned_long; + case ATOMIC_TYPE_LONGLONG: return type_unsigned_long_long; - default: panic("invalid atomic type"); + default: panic("invalid atomic type"); } } @@ -8810,31 +7995,59 @@ static void semantic_binexpr_arithmetic(binary_expression_t *expression) expression->base.type = arithmetic_type; } +static void semantic_binexpr_integer(binary_expression_t *const expression) +{ + expression_t *const left = expression->left; + expression_t *const right = expression->right; + 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); + + if (!is_type_integer(type_left) || !is_type_integer(type_right)) { + /* TODO: improve error message */ + if (is_type_valid(type_left) && is_type_valid(type_right)) { + errorf(&expression->base.source_position, + "operation needs integer types"); + } + return; + } + + type_t *const result_type = semantic_arithmetic(type_left, type_right); + expression->left = create_implicit_cast(left, result_type); + expression->right = create_implicit_cast(right, result_type); + expression->base.type = result_type; +} + static void warn_div_by_zero(binary_expression_t const *const expression) { - if (!warning.div_by_zero || - !is_type_integer(expression->base.type)) + if (!is_type_integer(expression->base.type)) return; expression_t const *const right = expression->right; /* The type of the right operand can be different for /= */ - if (is_type_integer(right->base.type) && - is_constant_expression(right) && - fold_constant(right) == 0) { - warningf(&expression->base.source_position, "division by zero"); + if (is_type_integer(right->base.type) && + is_constant_expression(right) == EXPR_CLASS_CONSTANT && + !fold_constant_to_bool(right)) { + source_position_t const *const pos = &expression->base.source_position; + warningf(WARN_DIV_BY_ZERO, pos, "division by zero"); } } /** * Check the semantic restrictions for a div/mod expression. */ -static void semantic_divmod_arithmetic(binary_expression_t *expression) { +static void semantic_divmod_arithmetic(binary_expression_t *expression) +{ semantic_binexpr_arithmetic(expression); warn_div_by_zero(expression); } static void warn_addsub_in_shift(const expression_t *const expr) { + if (expr->base.parenthesized) + return; + char op; switch (expr->kind) { case EXPR_BINARY_ADD: op = '+'; break; @@ -8842,11 +8055,11 @@ static void warn_addsub_in_shift(const expression_t *const expr) default: return; } - warningf(&expr->base.source_position, - "suggest parentheses around '%c' inside shift", op); + source_position_t const *const pos = &expr->base.source_position; + warningf(WARN_PARENTHESES, pos, "suggest parentheses around '%c' inside shift", op); } -static void semantic_shift_op(binary_expression_t *expression) +static bool semantic_shift(binary_expression_t *expression) { expression_t *const left = expression->left; expression_t *const right = expression->right; @@ -8861,19 +8074,44 @@ static void semantic_shift_op(binary_expression_t *expression) errorf(&expression->base.source_position, "operands of shift operation must have integer types"); } - return; + return false; } - if (warning.parentheses) { - warn_addsub_in_shift(left); - warn_addsub_in_shift(right); + type_left = promote_integer(type_left); + + if (is_constant_expression(right) == EXPR_CLASS_CONSTANT) { + source_position_t const *const pos = &right->base.source_position; + long const count = fold_constant_to_int(right); + if (count < 0) { + warningf(WARN_OTHER, pos, "shift count must be non-negative"); + } else if ((unsigned long)count >= + get_atomic_type_size(type_left->atomic.akind) * 8) { + warningf(WARN_OTHER, pos, "shift count must be less than type width"); + } } - type_left = promote_integer(type_left); - type_right = promote_integer(type_right); + type_right = promote_integer(type_right); + expression->right = create_implicit_cast(right, type_right); + + return true; +} + +static void semantic_shift_op(binary_expression_t *expression) +{ + expression_t *const left = expression->left; + expression_t *const right = expression->right; + + if (!semantic_shift(expression)) + return; + warn_addsub_in_shift(left); + warn_addsub_in_shift(right); + + type_t *const orig_type_left = left->base.type; + type_t * type_left = skip_typeref(orig_type_left); + + type_left = promote_integer(type_left); expression->left = create_implicit_cast(left, type_left); - expression->right = create_implicit_cast(right, type_right); expression->base.type = type_left; } @@ -8886,13 +8124,12 @@ static void semantic_add(binary_expression_t *expression) type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); - /* § 6.5.6 */ + /* §6.5.6 */ if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); expression->left = create_implicit_cast(left, arithmetic_type); expression->right = create_implicit_cast(right, arithmetic_type); expression->base.type = arithmetic_type; - return; } else if (is_type_pointer(type_left) && is_type_integer(type_right)) { check_pointer_arithmetic(&expression->base.source_position, type_left, orig_type_left); @@ -8918,13 +8155,12 @@ static void semantic_sub(binary_expression_t *expression) type_t *const type_right = skip_typeref(orig_type_right); source_position_t const *const pos = &expression->base.source_position; - /* § 5.6.5 */ + /* §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->base.type = arithmetic_type; - return; } else if (is_type_pointer(type_left) && is_type_integer(type_right)) { check_pointer_arithmetic(&expression->base.source_position, type_left, orig_type_left); @@ -8940,8 +8176,8 @@ static void semantic_sub(binary_expression_t *expression) if (!is_type_atomic(unqual_left, ATOMIC_TYPE_VOID)) { errorf(pos, "subtracting pointers to non-object types '%T'", orig_type_left); - } else if (warning.other) { - warningf(pos, "subtracting pointers to void"); + } else { + warningf(WARN_OTHER, pos, "subtracting pointers to void"); } } expression->base.type = type_ptrdiff_t; @@ -8960,29 +8196,45 @@ static void warn_string_literal_address(expression_t const* expr) expr = expr->unary.value; } - if (expr->kind == EXPR_STRING_LITERAL || - expr->kind == EXPR_WIDE_STRING_LITERAL) { - warningf(&expr->base.source_position, - "comparison with string literal results in unspecified behaviour"); + if (expr->kind == EXPR_STRING_LITERAL + || expr->kind == EXPR_WIDE_STRING_LITERAL) { + source_position_t const *const pos = &expr->base.source_position; + warningf(WARN_ADDRESS, pos, "comparison with string literal results in unspecified behaviour"); } } -static void warn_comparison_in_comparison(const expression_t *const expr) +static bool maybe_negative(expression_t const *const expr) { - if (expr->base.parenthesized) - return; - switch (expr->base.kind) { - case EXPR_BINARY_LESS: - case EXPR_BINARY_GREATER: - case EXPR_BINARY_LESSEQUAL: - case EXPR_BINARY_GREATEREQUAL: - case EXPR_BINARY_NOTEQUAL: - case EXPR_BINARY_EQUAL: - warningf(&expr->base.source_position, - "comparisons like 'x <= y < z' do not have their mathematical meaning"); - break; - default: - break; + switch (is_constant_expression(expr)) { + case EXPR_CLASS_ERROR: return false; + case EXPR_CLASS_CONSTANT: return constant_is_negative(expr); + default: return true; + } +} + +static void warn_comparison(source_position_t const *const pos, expression_t const *const expr, expression_t const *const other) +{ + warn_string_literal_address(expr); + + expression_t const* const ref = get_reference_address(expr); + if (ref != NULL && is_null_pointer_constant(other)) { + entity_t const *const ent = ref->reference.entity; + warningf(WARN_ADDRESS, pos, "the address of '%N' will never be NULL", ent); + } + + if (!expr->base.parenthesized) { + switch (expr->base.kind) { + case EXPR_BINARY_LESS: + case EXPR_BINARY_GREATER: + case EXPR_BINARY_LESSEQUAL: + case EXPR_BINARY_GREATEREQUAL: + case EXPR_BINARY_NOTEQUAL: + case EXPR_BINARY_EQUAL: + warningf(WARN_PARENTHESES, pos, "comparisons like 'x <= y < z' do not have their mathematical meaning"); + break; + default: + break; + } } } @@ -8993,32 +8245,12 @@ static void warn_comparison_in_comparison(const expression_t *const expr) */ static void semantic_comparison(binary_expression_t *expression) { - expression_t *left = expression->left; - expression_t *right = expression->right; - - if (warning.address) { - warn_string_literal_address(left); - warn_string_literal_address(right); - - expression_t const* const func_left = get_reference_address(left); - if (func_left != NULL && is_null_pointer_constant(right)) { - warningf(&expression->base.source_position, - "the address of '%Y' will never be NULL", - func_left->reference.entity->base.symbol); - } - - expression_t const* const func_right = get_reference_address(right); - if (func_right != NULL && is_null_pointer_constant(right)) { - warningf(&expression->base.source_position, - "the address of '%Y' will never be NULL", - func_right->reference.entity->base.symbol); - } - } + source_position_t const *const pos = &expression->base.source_position; + expression_t *const left = expression->left; + expression_t *const right = expression->right; - if (warning.parentheses) { - warn_comparison_in_comparison(left); - warn_comparison_in_comparison(right); - } + warn_comparison(pos, left, right); + warn_comparison(pos, right, left); type_t *orig_type_left = left->base.type; type_t *orig_type_right = right->base.type; @@ -9027,46 +8259,29 @@ static void semantic_comparison(binary_expression_t *expression) /* TODO non-arithmetic types */ if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { - /* test for signed vs unsigned compares */ - if (warning.sign_compare && - (expression->base.kind != EXPR_BINARY_EQUAL && - expression->base.kind != EXPR_BINARY_NOTEQUAL) && - (is_type_signed(type_left) != is_type_signed(type_right))) { - - /* check if 1 of the operands is a constant, in this case we just - * check wether we can safely represent the resulting constant in - * the type of the other operand. */ - expression_t *const_expr = NULL; - expression_t *other_expr = NULL; - - if (is_constant_expression(left)) { - const_expr = left; - other_expr = right; - } else if (is_constant_expression(right)) { - const_expr = right; - other_expr = left; - } + type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); - if (const_expr != NULL) { - type_t *other_type = skip_typeref(other_expr->base.type); - long val = fold_constant(const_expr); - /* TODO: check if val can be represented by other_type */ - (void) other_type; - (void) val; + /* test for signed vs unsigned compares */ + if (is_type_integer(arithmetic_type)) { + bool const signed_left = is_type_signed(type_left); + bool const signed_right = is_type_signed(type_right); + if (signed_left != signed_right) { + /* FIXME long long needs better const folding magic */ + /* TODO check whether constant value can be represented by other type */ + if ((signed_left && maybe_negative(left)) || + (signed_right && maybe_negative(right))) { + warningf(WARN_SIGN_COMPARE, pos, "comparison between signed and unsigned"); + } } - warningf(&expression->base.source_position, - "comparison between signed and unsigned"); } - type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); + expression->left = create_implicit_cast(left, arithmetic_type); expression->right = create_implicit_cast(right, arithmetic_type); expression->base.type = arithmetic_type; - if (warning.float_equal && - (expression->base.kind == EXPR_BINARY_EQUAL || + if ((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"); + warningf(WARN_FLOAT_EQUAL, pos, "comparing floating point with == or != is unsafe"); } } else if (is_type_pointer(type_left) && is_type_pointer(type_right)) { /* TODO check compatibility */ @@ -9075,9 +8290,7 @@ static void semantic_comparison(binary_expression_t *expression) } else if (is_type_pointer(type_right)) { expression->left = create_implicit_cast(left, type_right); } else if (is_type_valid(type_left) && is_type_valid(type_right)) { - type_error_incompatible("invalid operands in comparison", - &expression->base.source_position, - type_left, type_right); + type_error_incompatible("invalid operands in comparison", pos, type_left, type_right); } expression->base.type = c_mode & _CXX ? type_bool : type_int; } @@ -9108,33 +8321,33 @@ static bool is_valid_assignment_lhs(expression_t const* const left) type_t *const type_left = skip_typeref(orig_type_left); if (!is_lvalue(left)) { - errorf(HERE, "left hand side '%E' of assignment is not an lvalue", + errorf(&left->base.source_position, "left hand side '%E' of assignment is not an lvalue", left); return false; } if (left->kind == EXPR_REFERENCE && left->reference.entity->kind == ENTITY_FUNCTION) { - errorf(HERE, "cannot assign to function '%E'", left); + errorf(&left->base.source_position, "cannot assign to function '%E'", left); return false; } if (is_type_array(type_left)) { - errorf(HERE, "cannot assign to array '%E'", left); + errorf(&left->base.source_position, "cannot assign to array '%E'", left); return false; } if (type_left->base.qualifiers & TYPE_QUALIFIER_CONST) { - errorf(HERE, "assignment to readonly location '%E' (type '%T')", left, + errorf(&left->base.source_position, "assignment to read-only location '%E' (type '%T')", left, orig_type_left); return false; } if (is_type_incomplete(type_left)) { - errorf(HERE, "left-hand side '%E' of assignment has incomplete type '%T'", + errorf(&left->base.source_position, "left-hand side '%E' of assignment has incomplete type '%T'", left, orig_type_left); return false; } if (is_type_compound(type_left) && has_const_fields(&type_left->compound)) { - errorf(HERE, "cannot assign to '%E' because compound type '%T' has readonly fields", + errorf(&left->base.source_position, "cannot assign to '%E' because compound type '%T' has read-only fields", left, orig_type_left); return false; } @@ -9210,14 +8423,58 @@ static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression) } } +static void semantic_integer_assign(binary_expression_t *expression) +{ + expression_t *left = expression->left; + expression_t *right = expression->right; + type_t *orig_type_left = left->base.type; + type_t *orig_type_right = right->base.type; + + if (!is_valid_assignment_lhs(left)) + return; + + type_t *type_left = skip_typeref(orig_type_left); + type_t *type_right = skip_typeref(orig_type_right); + + if (!is_type_integer(type_left) || !is_type_integer(type_right)) { + /* TODO: improve error message */ + if (is_type_valid(type_left) && is_type_valid(type_right)) { + errorf(&expression->base.source_position, + "operation needs integer types"); + } + return; + } + + /* combined instructions are tricky. We can't create an implicit cast on + * the left side, because we need the uncasted form for the store. + * 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 *arithmetic_type = semantic_arithmetic(type_left, type_right); + expression->right = create_implicit_cast(right, arithmetic_type); + expression->base.type = type_left; +} + +static void semantic_shift_assign(binary_expression_t *expression) +{ + expression_t *left = expression->left; + + if (!is_valid_assignment_lhs(left)) + return; + + if (!semantic_shift(expression)) + return; + + expression->base.type = skip_typeref(left->base.type); +} + static void warn_logical_and_within_or(const expression_t *const expr) { if (expr->base.kind != EXPR_BINARY_LOGICAL_AND) return; if (expr->base.parenthesized) return; - warningf(&expr->base.source_position, - "suggest parentheses around && within ||"); + source_position_t const *const pos = &expr->base.source_position; + warningf(WARN_PARENTHESES, pos, "suggest parentheses around && within ||"); } /** @@ -9229,8 +8486,7 @@ static void semantic_logical_op(binary_expression_t *expression) * §6.5.14:2 Each of the operands shall have scalar type. */ semantic_condition(expression->left, "left operand of logical operator"); semantic_condition(expression->right, "right operand of logical operator"); - if (expression->base.kind == EXPR_BINARY_LOGICAL_OR && - warning.parentheses) { + if (expression->base.kind == EXPR_BINARY_LOGICAL_OR) { warn_logical_and_within_or(expression->left); warn_logical_and_within_or(expression->right); } @@ -9270,64 +8526,71 @@ static void semantic_binexpr_assign(binary_expression_t *expression) static bool expression_has_effect(const expression_t *const expr) { switch (expr->kind) { - case EXPR_UNKNOWN: break; - case EXPR_INVALID: return true; /* do NOT warn */ - case EXPR_REFERENCE: return false; - case EXPR_REFERENCE_ENUM_VALUE: return false; + case EXPR_ERROR: return true; /* do NOT warn */ + case EXPR_REFERENCE: return false; + case EXPR_REFERENCE_ENUM_VALUE: return false; + case EXPR_LABEL_ADDRESS: return false; + /* suppress the warning for microsoft __noop operations */ - case EXPR_CONST: return expr->conste.is_ms_noop; - 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_LABEL_ADDRESS: return false; + case EXPR_LITERAL_MS_NOOP: return true; + case EXPR_LITERAL_BOOLEAN: + case EXPR_LITERAL_CHARACTER: + case EXPR_LITERAL_WIDE_CHARACTER: + case EXPR_LITERAL_INTEGER: + case EXPR_LITERAL_INTEGER_OCTAL: + case EXPR_LITERAL_INTEGER_HEXADECIMAL: + case EXPR_LITERAL_FLOATINGPOINT: + case EXPR_LITERAL_FLOATINGPOINT_HEXADECIMAL: 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) + if (call->function->kind != EXPR_REFERENCE) return true; - switch (call->function->builtin_symbol.symbol->ID) { - case T___builtin_va_end: return true; - default: return false; + switch (call->function->reference.entity->function.btk) { + /* FIXME: which builtins have no effect? */ + default: return true; } } /* 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; + conditional_expression_t const *const cond = &expr->conditional; + expression_t const *const t = cond->true_expression; return - expression_has_effect(cond->true_expression) && + (t == NULL || expression_has_effect(t)) && expression_has_effect(cond->false_expression); } - case EXPR_SELECT: return false; - case EXPR_ARRAY_ACCESS: return false; - case EXPR_SIZEOF: return false; - case EXPR_CLASSIFY_TYPE: return false; - case EXPR_ALIGNOF: return false; - - case EXPR_FUNCNAME: return false; - case EXPR_BUILTIN_SYMBOL: break; /* handled in EXPR_CALL */ - case EXPR_BUILTIN_CONSTANT_P: return false; - case EXPR_BUILTIN_PREFETCH: return true; - case EXPR_OFFSETOF: return false; - 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; - case EXPR_UNARY_BITWISE_NEGATE: return false; - case EXPR_UNARY_NOT: return false; - case EXPR_UNARY_DEREFERENCE: return false; - case EXPR_UNARY_TAKE_ADDRESS: return false; - case EXPR_UNARY_POSTFIX_INCREMENT: return true; - case EXPR_UNARY_POSTFIX_DECREMENT: return true; - case EXPR_UNARY_PREFIX_INCREMENT: return true; - case EXPR_UNARY_PREFIX_DECREMENT: return true; + case EXPR_SELECT: return false; + case EXPR_ARRAY_ACCESS: return false; + case EXPR_SIZEOF: return false; + case EXPR_CLASSIFY_TYPE: return false; + case EXPR_ALIGNOF: return false; + + case EXPR_FUNCNAME: return false; + case EXPR_BUILTIN_CONSTANT_P: return false; + case EXPR_BUILTIN_TYPES_COMPATIBLE_P: return false; + case EXPR_OFFSETOF: return false; + case EXPR_VA_START: return true; + case EXPR_VA_ARG: return true; + case EXPR_VA_COPY: 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; + case EXPR_UNARY_BITWISE_NEGATE: return false; + case EXPR_UNARY_NOT: return false; + case EXPR_UNARY_DEREFERENCE: return false; + case EXPR_UNARY_TAKE_ADDRESS: return false; + case EXPR_UNARY_POSTFIX_INCREMENT: return true; + case EXPR_UNARY_POSTFIX_DECREMENT: return true; + case EXPR_UNARY_PREFIX_INCREMENT: return true; + case EXPR_UNARY_PREFIX_DECREMENT: return true; /* Treat void casts as if they have an effect in order to being able to * suppress the warning */ @@ -9336,39 +8599,38 @@ static bool expression_has_effect(const expression_t *const expr) return is_type_atomic(type, ATOMIC_TYPE_VOID); } - case EXPR_UNARY_CAST_IMPLICIT: return true; - case EXPR_UNARY_ASSUME: return true; - case EXPR_UNARY_DELETE: return true; - case EXPR_UNARY_DELETE_ARRAY: return true; - case EXPR_UNARY_THROW: return true; - - case EXPR_BINARY_ADD: return false; - case EXPR_BINARY_SUB: return false; - case EXPR_BINARY_MUL: return false; - case EXPR_BINARY_DIV: return false; - case EXPR_BINARY_MOD: return false; - case EXPR_BINARY_EQUAL: return false; - case EXPR_BINARY_NOTEQUAL: return false; - case EXPR_BINARY_LESS: return false; - case EXPR_BINARY_LESSEQUAL: return false; - case EXPR_BINARY_GREATER: return false; - case EXPR_BINARY_GREATEREQUAL: return false; - case EXPR_BINARY_BITWISE_AND: return false; - case EXPR_BINARY_BITWISE_OR: return false; - case EXPR_BINARY_BITWISE_XOR: return false; - case EXPR_BINARY_SHIFTLEFT: return false; - case EXPR_BINARY_SHIFTRIGHT: return false; - case EXPR_BINARY_ASSIGN: return true; - case EXPR_BINARY_MUL_ASSIGN: return true; - case EXPR_BINARY_DIV_ASSIGN: return true; - case EXPR_BINARY_MOD_ASSIGN: return true; - case EXPR_BINARY_ADD_ASSIGN: return true; - case EXPR_BINARY_SUB_ASSIGN: return true; - case EXPR_BINARY_SHIFTLEFT_ASSIGN: return true; - case EXPR_BINARY_SHIFTRIGHT_ASSIGN: return true; - case EXPR_BINARY_BITWISE_AND_ASSIGN: return true; - case EXPR_BINARY_BITWISE_XOR_ASSIGN: return true; - case EXPR_BINARY_BITWISE_OR_ASSIGN: return true; + case EXPR_UNARY_ASSUME: return true; + case EXPR_UNARY_DELETE: return true; + case EXPR_UNARY_DELETE_ARRAY: return true; + case EXPR_UNARY_THROW: return true; + + case EXPR_BINARY_ADD: return false; + case EXPR_BINARY_SUB: return false; + case EXPR_BINARY_MUL: return false; + case EXPR_BINARY_DIV: return false; + case EXPR_BINARY_MOD: return false; + case EXPR_BINARY_EQUAL: return false; + case EXPR_BINARY_NOTEQUAL: return false; + case EXPR_BINARY_LESS: return false; + case EXPR_BINARY_LESSEQUAL: return false; + case EXPR_BINARY_GREATER: return false; + case EXPR_BINARY_GREATEREQUAL: return false; + case EXPR_BINARY_BITWISE_AND: return false; + case EXPR_BINARY_BITWISE_OR: return false; + case EXPR_BINARY_BITWISE_XOR: return false; + case EXPR_BINARY_SHIFTLEFT: return false; + case EXPR_BINARY_SHIFTRIGHT: return false; + case EXPR_BINARY_ASSIGN: return true; + case EXPR_BINARY_MUL_ASSIGN: return true; + case EXPR_BINARY_DIV_ASSIGN: return true; + case EXPR_BINARY_MOD_ASSIGN: return true; + case EXPR_BINARY_ADD_ASSIGN: return true; + case EXPR_BINARY_SUB_ASSIGN: return true; + case EXPR_BINARY_SHIFTLEFT_ASSIGN: return true; + case EXPR_BINARY_SHIFTRIGHT_ASSIGN: return true; + 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 @@ -9380,12 +8642,12 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_BINARY_COMMA: return expression_has_effect(expr->binary.right); - case EXPR_BINARY_ISGREATER: return false; - case EXPR_BINARY_ISGREATEREQUAL: return false; - case EXPR_BINARY_ISLESS: return false; - case EXPR_BINARY_ISLESSEQUAL: return false; - case EXPR_BINARY_ISLESSGREATER: return false; - case EXPR_BINARY_ISUNORDERED: return false; + case EXPR_BINARY_ISGREATER: return false; + case EXPR_BINARY_ISGREATEREQUAL: return false; + case EXPR_BINARY_ISLESS: return false; + case EXPR_BINARY_ISLESSEQUAL: return false; + case EXPR_BINARY_ISLESSGREATER: return false; + case EXPR_BINARY_ISUNORDERED: return false; } internal_errorf(HERE, "unexpected expression"); @@ -9393,12 +8655,10 @@ static bool expression_has_effect(const expression_t *const expr) static void semantic_comma(binary_expression_t *expression) { - if (warning.unused_value) { - const expression_t *const left = expression->left; - if (!expression_has_effect(left)) { - warningf(&left->base.source_position, - "left-hand operand of comma expression has no effect"); - } + const expression_t *const left = expression->left; + if (!expression_has_effect(left)) { + source_position_t const *const pos = &left->base.source_position; + warningf(WARN_UNUSED_VALUE, pos, "left-hand operand of comma expression has no effect"); } expression->base.type = expression->right->base.type; } @@ -9406,14 +8666,14 @@ static void semantic_comma(binary_expression_t *expression) /** * @param prec_r precedence of the right operand */ -#define CREATE_BINEXPR_PARSER(token_type, binexpression_type, prec_r, sfunc) \ +#define CREATE_BINEXPR_PARSER(token_kind, binexpression_type, prec_r, sfunc) \ static expression_t *parse_##binexpression_type(expression_t *left) \ { \ expression_t *binexpr = allocate_expression_zero(binexpression_type); \ binexpr->binary.left = left; \ - eat(token_type); \ + eat(token_kind); \ \ - expression_t *right = parse_sub_expression(prec_r); \ + expression_t *right = parse_subexpression(prec_r); \ \ binexpr->binary.right = right; \ sfunc(&binexpr->binary); \ @@ -9434,9 +8694,9 @@ CREATE_BINEXPR_PARSER(T_LESSEQUAL, EXPR_BINARY_LESSEQUAL, PR CREATE_BINEXPR_PARSER(T_GREATEREQUAL, EXPR_BINARY_GREATEREQUAL, PREC_SHIFT, semantic_comparison) CREATE_BINEXPR_PARSER(T_EXCLAMATIONMARKEQUAL, EXPR_BINARY_NOTEQUAL, PREC_RELATIONAL, semantic_comparison) CREATE_BINEXPR_PARSER(T_EQUALEQUAL, EXPR_BINARY_EQUAL, PREC_RELATIONAL, semantic_comparison) -CREATE_BINEXPR_PARSER('&', EXPR_BINARY_BITWISE_AND, PREC_EQUALITY, semantic_binexpr_arithmetic) -CREATE_BINEXPR_PARSER('^', EXPR_BINARY_BITWISE_XOR, PREC_AND, semantic_binexpr_arithmetic) -CREATE_BINEXPR_PARSER('|', EXPR_BINARY_BITWISE_OR, PREC_XOR, semantic_binexpr_arithmetic) +CREATE_BINEXPR_PARSER('&', EXPR_BINARY_BITWISE_AND, PREC_EQUALITY, semantic_binexpr_integer) +CREATE_BINEXPR_PARSER('^', EXPR_BINARY_BITWISE_XOR, PREC_AND, semantic_binexpr_integer) +CREATE_BINEXPR_PARSER('|', EXPR_BINARY_BITWISE_OR, PREC_XOR, semantic_binexpr_integer) CREATE_BINEXPR_PARSER(T_ANDAND, EXPR_BINARY_LOGICAL_AND, PREC_OR, semantic_logical_op) CREATE_BINEXPR_PARSER(T_PIPEPIPE, EXPR_BINARY_LOGICAL_OR, PREC_LOGICAL_AND, semantic_logical_op) CREATE_BINEXPR_PARSER('=', EXPR_BINARY_ASSIGN, PREC_ASSIGNMENT, semantic_binexpr_assign) @@ -9445,23 +8705,22 @@ CREATE_BINEXPR_PARSER(T_MINUSEQUAL, EXPR_BINARY_SUB_ASSIGN, PR CREATE_BINEXPR_PARSER(T_ASTERISKEQUAL, EXPR_BINARY_MUL_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) CREATE_BINEXPR_PARSER(T_SLASHEQUAL, EXPR_BINARY_DIV_ASSIGN, PREC_ASSIGNMENT, semantic_divmod_assign) CREATE_BINEXPR_PARSER(T_PERCENTEQUAL, EXPR_BINARY_MOD_ASSIGN, PREC_ASSIGNMENT, semantic_divmod_assign) -CREATE_BINEXPR_PARSER(T_LESSLESSEQUAL, EXPR_BINARY_SHIFTLEFT_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) -CREATE_BINEXPR_PARSER(T_GREATERGREATEREQUAL, EXPR_BINARY_SHIFTRIGHT_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) -CREATE_BINEXPR_PARSER(T_ANDEQUAL, EXPR_BINARY_BITWISE_AND_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) -CREATE_BINEXPR_PARSER(T_PIPEEQUAL, EXPR_BINARY_BITWISE_OR_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) -CREATE_BINEXPR_PARSER(T_CARETEQUAL, EXPR_BINARY_BITWISE_XOR_ASSIGN, PREC_ASSIGNMENT, semantic_arithmetic_assign) +CREATE_BINEXPR_PARSER(T_LESSLESSEQUAL, EXPR_BINARY_SHIFTLEFT_ASSIGN, PREC_ASSIGNMENT, semantic_shift_assign) +CREATE_BINEXPR_PARSER(T_GREATERGREATEREQUAL, EXPR_BINARY_SHIFTRIGHT_ASSIGN, PREC_ASSIGNMENT, semantic_shift_assign) +CREATE_BINEXPR_PARSER(T_ANDEQUAL, EXPR_BINARY_BITWISE_AND_ASSIGN, PREC_ASSIGNMENT, semantic_integer_assign) +CREATE_BINEXPR_PARSER(T_PIPEEQUAL, EXPR_BINARY_BITWISE_OR_ASSIGN, PREC_ASSIGNMENT, semantic_integer_assign) +CREATE_BINEXPR_PARSER(T_CARETEQUAL, EXPR_BINARY_BITWISE_XOR_ASSIGN, PREC_ASSIGNMENT, semantic_integer_assign) CREATE_BINEXPR_PARSER(',', EXPR_BINARY_COMMA, PREC_ASSIGNMENT, semantic_comma) -static expression_t *parse_sub_expression(precedence_t precedence) +static expression_t *parse_subexpression(precedence_t precedence) { - if (token.type < 0) { + if (token.kind < 0) { return expected_expression_error(); } expression_parser_function_t *parser - = &expression_parsers[token.type]; - source_position_t source_position = token.source_position; + = &expression_parsers[token.kind]; expression_t *left; if (parser->parser != NULL) { @@ -9470,14 +8729,13 @@ static expression_t *parse_sub_expression(precedence_t precedence) left = parse_primary_expression(); } assert(left != NULL); - left->base.source_position = source_position; while (true) { - if (token.type < 0) { + if (token.kind < 0) { return expected_expression_error(); } - parser = &expression_parsers[token.type]; + parser = &expression_parsers[token.kind]; if (parser->infix_parser == NULL) break; if (parser->infix_precedence < precedence) @@ -9486,8 +8744,6 @@ static expression_t *parse_sub_expression(precedence_t precedence) left = parser->infix_parser(left); assert(left != NULL); - assert(left->kind != EXPR_UNKNOWN); - left->base.source_position = source_position; } return left; @@ -9498,22 +8754,22 @@ static expression_t *parse_sub_expression(precedence_t precedence) */ static expression_t *parse_expression(void) { - return parse_sub_expression(PREC_EXPRESSION); + return parse_subexpression(PREC_EXPRESSION); } /** * Register a parser for a prefix-like operator. * * @param parser the parser function - * @param token_type the token type of the prefix token + * @param token_kind the token type of the prefix token */ static void register_expression_parser(parse_expression_function parser, - int token_type) + int token_kind) { - expression_parser_function_t *entry = &expression_parsers[token_type]; + expression_parser_function_t *entry = &expression_parsers[token_kind]; if (entry->parser != NULL) { - diagnosticf("for token '%k'\n", (token_type_t)token_type); + diagnosticf("for token '%k'\n", (token_kind_t)token_kind); panic("trying to register multiple expression parsers for a token"); } entry->parser = parser; @@ -9523,16 +8779,16 @@ static void register_expression_parser(parse_expression_function parser, * Register a parser for an infix operator with given precedence. * * @param parser the parser function - * @param token_type the token type of the infix operator + * @param token_kind the token type of the infix operator * @param precedence the precedence of the operator */ static void register_infix_parser(parse_expression_infix_function parser, - int token_type, unsigned precedence) + int token_kind, precedence_t precedence) { - expression_parser_function_t *entry = &expression_parsers[token_type]; + expression_parser_function_t *entry = &expression_parsers[token_kind]; if (entry->infix_parser != NULL) { - diagnosticf("for token '%k'\n", (token_type_t)token_type); + diagnosticf("for token '%k'\n", (token_kind_t)token_kind); panic("trying to register multiple infix expression parsers for a " "token"); } @@ -9609,18 +8865,17 @@ static asm_argument_t *parse_asm_arguments(bool is_out) asm_argument_t *result = NULL; asm_argument_t **anchor = &result; - while (token.type == T_STRING_LITERAL || token.type == '[') { + while (token.kind == T_STRING_LITERAL || token.kind == '[') { asm_argument_t *argument = allocate_ast_zero(sizeof(argument[0])); memset(argument, 0, sizeof(argument[0])); - if (token.type == '[') { - eat('['); - if (token.type != T_IDENTIFIER) { + if (next_if('[')) { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing asm argument", T_IDENTIFIER, NULL); return NULL; } - argument->symbol = token.v.symbol; + argument->symbol = token.identifier.symbol; expect(']', end_error); } @@ -9646,7 +8901,7 @@ static asm_argument_t *parse_asm_arguments(bool is_out) size = get_atomic_type_size(akind); } else { flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC; - size = get_atomic_type_size(get_intptr_kind()); + size = get_type_size(type_void_ptr); } do { @@ -9662,7 +8917,7 @@ static asm_argument_t *parse_asm_arguments(bool is_out) value_size = get_atomic_type_size(value_akind); } else if (value_kind == TYPE_POINTER) { value_flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC; - value_size = get_atomic_type_size(get_intptr_kind()); + value_size = get_type_size(type_void_ptr); } else { break; } @@ -9680,7 +8935,9 @@ static asm_argument_t *parse_asm_arguments(bool is_out) "asm output argument is not an lvalue"); } - if (argument->constraints.begin[0] == '+') + if (argument->constraints.begin[0] == '=') + determine_lhs_ent(expression, NULL); + else mark_vars_read(expression, NULL); } else { mark_vars_read(expression, NULL); @@ -9693,9 +8950,8 @@ static asm_argument_t *parse_asm_arguments(bool is_out) *anchor = argument; anchor = &argument->next; - if (token.type != ',') + if (!next_if(',')) break; - eat(','); } return result; @@ -9708,23 +8964,18 @@ end_error: */ static asm_clobber_t *parse_asm_clobbers(void) { - asm_clobber_t *result = NULL; - asm_clobber_t *last = NULL; + asm_clobber_t *result = NULL; + asm_clobber_t **anchor = &result; - while (token.type == T_STRING_LITERAL) { + while (token.kind == T_STRING_LITERAL) { asm_clobber_t *clobber = allocate_ast_zero(sizeof(clobber[0])); clobber->clobber = parse_string_literals(); - if (last != NULL) { - last->next = clobber; - } else { - result = clobber; - } - last = clobber; + *anchor = clobber; + anchor = &clobber->next; - if (token.type != ',') + if (!next_if(',')) break; - eat(','); } return result; @@ -9740,36 +8991,35 @@ static statement_t *parse_asm_statement(void) eat(T_asm); - if (token.type == T_volatile) { - next_token(); + if (next_if(T_volatile)) asm_statement->is_volatile = true; - } expect('(', end_error); add_anchor_token(')'); - add_anchor_token(':'); + if (token.kind != T_STRING_LITERAL) { + parse_error_expected("after asm(", T_STRING_LITERAL, NULL); + goto end_of_asm; + } asm_statement->asm_text = parse_string_literals(); - if (token.type != ':') { + add_anchor_token(':'); + if (!next_if(':')) { rem_anchor_token(':'); goto end_of_asm; } - eat(':'); asm_statement->outputs = parse_asm_arguments(true); - if (token.type != ':') { + if (!next_if(':')) { rem_anchor_token(':'); goto end_of_asm; } - eat(':'); asm_statement->inputs = parse_asm_arguments(false); - if (token.type != ':') { + if (!next_if(':')) { rem_anchor_token(':'); goto end_of_asm; } rem_anchor_token(':'); - eat(':'); asm_statement->clobbers = parse_asm_clobbers(); @@ -9786,7 +9036,39 @@ end_of_asm: return statement; end_error: - return create_invalid_statement(); + return create_error_statement(); +} + +static statement_t *parse_label_inner_statement(statement_t const *const label, char const *const label_kind) +{ + statement_t *inner_stmt; + switch (token.kind) { + case '}': + errorf(&label->base.source_position, "%s at end of compound statement", label_kind); + inner_stmt = create_error_statement(); + break; + + case ';': + if (label->kind == STATEMENT_LABEL) { + /* Eat an empty statement here, to avoid the warning about an empty + * statement after a label. label:; is commonly used to have a label + * before a closing brace. */ + inner_stmt = create_empty_statement(); + next_token(); + break; + } + /* FALLTHROUGH */ + + default: + inner_stmt = parse_statement(); + /* ISO/IEC 9899:1999(E) §6.8:1/6.8.2:1 Declarations are no statements */ + /* ISO/IEC 14882:1998(E) §6:1/§6.7 Declarations are statements */ + if (inner_stmt->kind == STATEMENT_DECLARATION && !(c_mode & _CXX)) { + errorf(&inner_stmt->base.source_position, "declaration after %s", label_kind); + } + break; + } + return inner_stmt; } /** @@ -9801,40 +9083,35 @@ static statement_t *parse_case_statement(void) expression_t *const expression = parse_expression(); statement->case_label.expression = expression; - if (!is_constant_expression(expression)) { - /* This check does not prevent the error message in all cases of an - * prior error while parsing the expression. At least it catches the - * common case of a mistyped enum entry. */ - if (is_type_valid(skip_typeref(expression->base.type))) { + expression_classification_t const expr_class = is_constant_expression(expression); + if (expr_class != EXPR_CLASS_CONSTANT) { + if (expr_class != EXPR_CLASS_ERROR) { errorf(pos, "case label does not reduce to an integer constant"); } statement->case_label.is_bad = true; } else { - long const val = fold_constant(expression); + long const val = fold_constant_to_int(expression); statement->case_label.first_case = val; statement->case_label.last_case = val; } if (GNU_MODE) { - if (token.type == T_DOTDOTDOT) { - next_token(); + if (next_if(T_DOTDOTDOT)) { expression_t *const end_range = parse_expression(); statement->case_label.end_range = end_range; - if (!is_constant_expression(end_range)) { - /* This check does not prevent the error message in all cases of an - * prior error while parsing the expression. At least it catches the - * common case of a mistyped enum entry. */ - if (is_type_valid(skip_typeref(end_range->base.type))) { + expression_classification_t const end_class = is_constant_expression(end_range); + if (end_class != EXPR_CLASS_CONSTANT) { + if (end_class != EXPR_CLASS_ERROR) { errorf(pos, "case range does not reduce to an integer constant"); } statement->case_label.is_bad = true; } else { - long const val = fold_constant(end_range); + long const val = fold_constant_to_int(end_range); statement->case_label.last_case = val; - if (warning.other && val < statement->case_label.first_case) { + if (val < statement->case_label.first_case) { statement->case_label.is_empty_range = true; - warningf(pos, "empty range specified"); + warningf(WARN_OTHER, pos, "empty range specified"); } } } @@ -9872,13 +9149,9 @@ end_error: errorf(pos, "case label not within a switch statement"); } - statement_t *const inner_stmt = parse_statement(); - statement->case_label.statement = inner_stmt; - if (inner_stmt->kind == STATEMENT_DECLARATION) { - errorf(&inner_stmt->base.source_position, "declaration after case label"); - } + statement->case_label.statement = parse_label_inner_statement(statement, "case label"); - POP_PARENT; + POP_PARENT(); return statement; } @@ -9894,11 +9167,12 @@ static statement_t *parse_default_statement(void) PUSH_PARENT(statement); expect(':', end_error); +end_error: + if (current_switch != NULL) { const case_label_statement_t *def_label = current_switch->default_label; if (def_label != NULL) { - errorf(HERE, "multiple default labels in one switch (previous declared %P)", - &def_label->base.source_position); + errorf(&statement->base.source_position, "multiple default labels in one switch (previous declared %P)", &def_label->base.source_position); } else { current_switch->default_label = &statement->case_label; @@ -9915,17 +9189,10 @@ static statement_t *parse_default_statement(void) "'default' label not within a switch statement"); } - statement_t *const inner_stmt = parse_statement(); - statement->case_label.statement = inner_stmt; - if (inner_stmt->kind == STATEMENT_DECLARATION) { - errorf(&inner_stmt->base.source_position, "declaration after default label"); - } + statement->case_label.statement = parse_label_inner_statement(statement, "default label"); - POP_PARENT; + POP_PARENT(); return statement; -end_error: - POP_PARENT; - return create_invalid_statement(); } /** @@ -9933,61 +9200,50 @@ end_error: */ static statement_t *parse_label_statement(void) { - assert(token.type == T_IDENTIFIER); - symbol_t *symbol = token.v.symbol; - label_t *label = get_label(symbol); - statement_t *const statement = allocate_statement_zero(STATEMENT_LABEL); - statement->label.label = label; - - next_token(); + label_t *const label = get_label(); + statement->label.label = label; PUSH_PARENT(statement); /* if statement is already set then the label is defined twice, * otherwise it was just mentioned in a goto/local label declaration so far */ + source_position_t const* const pos = &statement->base.source_position; if (label->statement != NULL) { - errorf(HERE, "duplicate label '%Y' (declared %P)", - symbol, &label->base.source_position); + errorf(pos, "duplicate '%N' (declared %P)", (entity_t const*)label, &label->base.source_position); } else { - label->base.source_position = token.source_position; + label->base.source_position = *pos; label->statement = statement; } eat(':'); - if (token.type == '}') { - /* TODO only warn? */ - if (warning.other && 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(); - } - } else if (token.type == ';') { - /* Eat an empty statement here, to avoid the warning about an empty - * statement after a label. label:; is commonly used to have a label - * before a closing brace. */ - statement->label.statement = create_empty_statement(); - next_token(); - } else { - statement_t *const inner_stmt = parse_statement(); - statement->label.statement = inner_stmt; - if (inner_stmt->kind == STATEMENT_DECLARATION) { - errorf(&inner_stmt->base.source_position, "declaration after label"); - } + if (token.kind == T___attribute__ && !(c_mode & _CXX)) { + parse_attributes(NULL); // TODO process attributes } + statement->label.statement = parse_label_inner_statement(statement, "label"); + /* remember the labels in a list for later checking */ *label_anchor = &statement->label; label_anchor = &statement->label.next; - POP_PARENT; + POP_PARENT(); return statement; } +static statement_t *parse_inner_statement(void) +{ + statement_t *const stmt = parse_statement(); + /* ISO/IEC 9899:1999(E) §6.8:1/6.8.2:1 Declarations are no statements */ + /* ISO/IEC 14882:1998(E) §6:1/§6.7 Declarations are statements */ + if (stmt->kind == STATEMENT_DECLARATION && !(c_mode & _CXX)) { + errorf(&stmt->base.source_position, "declaration as inner statement, use {}"); + } + return stmt; +} + /** * Parse an if statement. */ @@ -10016,21 +9272,29 @@ end_error: rem_anchor_token('{'); add_anchor_token(T_else); - statement_t *const true_stmt = parse_statement(); + statement_t *const true_stmt = parse_inner_statement(); statement->ifs.true_statement = true_stmt; rem_anchor_token(T_else); - if (token.type == T_else) { - next_token(); - statement->ifs.false_statement = parse_statement(); - } else if (warning.parentheses && - true_stmt->kind == STATEMENT_IF && + if (true_stmt->kind == STATEMENT_EMPTY) { + warningf(WARN_EMPTY_BODY, HERE, + "suggest braces around empty body in an ‘if’ statement"); + } + + if (next_if(T_else)) { + statement->ifs.false_statement = parse_inner_statement(); + + if (statement->ifs.false_statement->kind == STATEMENT_EMPTY) { + warningf(WARN_EMPTY_BODY, HERE, + "suggest braces around empty body in an ‘if’ statement"); + } + } else if (true_stmt->kind == STATEMENT_IF && true_stmt->ifs.false_statement != NULL) { - warningf(&true_stmt->base.source_position, - "suggest explicit braces to avoid ambiguous 'else'"); + source_position_t const *const pos = &true_stmt->base.source_position; + warningf(WARN_PARENTHESES, pos, "suggest explicit braces to avoid ambiguous 'else'"); } - POP_PARENT; + POP_PARENT(); return statement; } @@ -10039,7 +9303,10 @@ end_error: * * @param statement the switch statement to check */ -static void check_enum_cases(const switch_statement_t *statement) { +static void check_enum_cases(const switch_statement_t *statement) +{ + if (!is_warn_on(WARN_SWITCH_ENUM)) + return; const type_t *type = skip_typeref(statement->expression->base.type); if (! is_type_enum(type)) return; @@ -10056,7 +9323,7 @@ static void check_enum_cases(const switch_statement_t *statement) { for (; entry != NULL && entry->kind == ENTITY_ENUM_VALUE; entry = entry->base.next) { const expression_t *expression = entry->enum_value.value; - long value = expression != NULL ? fold_constant(expression) : last_value + 1; + long value = expression != NULL ? fold_constant_to_int(expression) : last_value + 1; bool found = false; for (const case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) { if (l->expression == NULL) @@ -10066,10 +9333,9 @@ static void check_enum_cases(const switch_statement_t *statement) { break; } } - if (! found) { - warningf(&statement->base.source_position, - "enumeration value '%Y' not handled in switch", - entry->base.symbol); + if (!found) { + source_position_t const *const pos = &statement->base.source_position; + warningf(WARN_SWITCH_ENUM, pos, "'%N' not handled in switch", entry); } last_value = value; } @@ -10093,12 +9359,8 @@ static statement_t *parse_switch(void) type_t * type = skip_typeref(expr->base.type); if (is_type_integer(type)) { type = promote_integer(type); - if (warning.traditional) { - if (get_rank(type) >= get_akind_rank(ATOMIC_TYPE_LONG)) { - warningf(&expr->base.source_position, - "'%T' switch expression not converted to '%T' in ISO C", - type, type_int); - } + if (get_akind_rank(get_akind(type)) >= get_akind_rank(ATOMIC_TYPE_LONG)) { + warningf(WARN_TRADITIONAL, &expr->base.source_position, "'%T' switch expression not converted to '%T' in ISO C", type, type_int); } } else if (is_type_valid(type)) { errorf(&expr->base.source_position, @@ -10111,21 +9373,19 @@ static statement_t *parse_switch(void) switch_statement_t *rem = current_switch; current_switch = &statement->switchs; - statement->switchs.body = parse_statement(); + statement->switchs.body = parse_inner_statement(); current_switch = rem; - if (warning.switch_default && - statement->switchs.default_label == NULL) { - warningf(&statement->base.source_position, "switch has no default case"); + if (statement->switchs.default_label == NULL) { + warningf(WARN_SWITCH_DEFAULT, &statement->base.source_position, "switch has no default case"); } - if (warning.switch_enum) - check_enum_cases(&statement->switchs); + check_enum_cases(&statement->switchs); - POP_PARENT; + POP_PARENT(); return statement; end_error: - POP_PARENT; - return create_invalid_statement(); + POP_PARENT(); + return create_error_statement(); } static statement_t *parse_loop_body(statement_t *const loop) @@ -10133,7 +9393,7 @@ 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(); + statement_t *const body = parse_inner_statement(); current_loop = rem; return body; @@ -10163,11 +9423,11 @@ static statement_t *parse_while(void) statement->whiles.body = parse_loop_body(statement); - POP_PARENT; + POP_PARENT(); return statement; end_error: - POP_PARENT; - return create_invalid_statement(); + POP_PARENT(); + return create_error_statement(); } /** @@ -10198,11 +9458,11 @@ static statement_t *parse_do(void) expect(')', end_error); expect(';', end_error); - POP_PARENT; + POP_PARENT(); return statement; end_error: - POP_PARENT; - return create_invalid_statement(); + POP_PARENT(); + return create_error_statement(); } /** @@ -10218,28 +9478,28 @@ static statement_t *parse_for(void) add_anchor_token(')'); PUSH_PARENT(statement); + PUSH_SCOPE(&statement->fors.scope); - size_t const top = environment_top(); - scope_t *old_scope = scope_push(&statement->fors.scope); + PUSH_EXTENSION(); - if (token.type == ';') { - next_token(); - } else if (is_declaration_specifier(&token, false)) { + if (next_if(';')) { + } else if (is_declaration_specifier(&token)) { parse_declaration(record_entity, DECL_FLAGS_NONE); } else { add_anchor_token(';'); expression_t *const init = parse_expression(); statement->fors.initialisation = init; mark_vars_read(init, ENT_ANY); - if (warning.unused_value && !expression_has_effect(init)) { - warningf(&init->base.source_position, - "initialisation of 'for'-statement has no effect"); + if (!expression_has_effect(init)) { + warningf(WARN_UNUSED_VALUE, &init->base.source_position, "initialisation of 'for'-statement has no effect"); } rem_anchor_token(';'); expect(';', end_error2); } - if (token.type != ';') { + POP_EXTENSION(); + + if (token.kind != ';') { add_anchor_token(';'); expression_t *const cond = parse_expression(); statement->fors.condition = cond; @@ -10250,36 +9510,30 @@ static statement_t *parse_for(void) rem_anchor_token(';'); } expect(';', end_error2); - if (token.type != ')') { + if (token.kind != ')') { expression_t *const step = parse_expression(); statement->fors.step = step; mark_vars_read(step, ENT_ANY); - if (warning.unused_value && !expression_has_effect(step)) { - warningf(&step->base.source_position, - "step of 'for'-statement has no effect"); + if (!expression_has_effect(step)) { + warningf(WARN_UNUSED_VALUE, &step->base.source_position, "step of 'for'-statement has no effect"); } } expect(')', end_error2); rem_anchor_token(')'); statement->fors.body = parse_loop_body(statement); - assert(current_scope == &statement->fors.scope); - scope_pop(old_scope); - environment_pop_to(top); - - POP_PARENT; + POP_SCOPE(); + POP_PARENT(); return statement; end_error2: - POP_PARENT; + POP_PARENT(); rem_anchor_token(')'); - assert(current_scope == &statement->fors.scope); - scope_pop(old_scope); - environment_pop_to(top); + POP_SCOPE(); /* fallthrough */ end_error1: - return create_invalid_statement(); + return create_error_statement(); } /** @@ -10290,8 +9544,7 @@ static statement_t *parse_goto(void) statement_t *statement = allocate_statement_zero(STATEMENT_GOTO); eat(T_goto); - if (GNU_MODE && token.type == '*') { - next_token(); + if (GNU_MODE && next_if('*')) { expression_t *expression = parse_expression(); mark_vars_read(expression, NULL); @@ -10303,27 +9556,24 @@ static statement_t *parse_goto(void) if (!is_type_pointer(type) && !is_type_integer(type)) { errorf(&expression->base.source_position, "cannot convert to a pointer type"); - } else if (warning.other && type != type_void_ptr) { - warningf(&expression->base.source_position, - "type of computed goto expression should be 'void*' not '%T'", type); + } else if (type != type_void_ptr) { + warningf(WARN_OTHER, &expression->base.source_position, "type of computed goto expression should be 'void*' not '%T'", type); } expression = create_implicit_cast(expression, type_void_ptr); } statement->gotos.expression = expression; + } else if (token.kind == T_IDENTIFIER) { + label_t *const label = get_label(); + label->used = true; + statement->gotos.label = label; } else { - if (token.type != T_IDENTIFIER) { - if (GNU_MODE) - parse_error_expected("while parsing goto", T_IDENTIFIER, '*', NULL); - else - parse_error_expected("while parsing goto", T_IDENTIFIER, NULL); - eat_until_anchor(); - goto end_error; - } - symbol_t *symbol = token.v.symbol; - next_token(); - - statement->gotos.label = get_label(symbol); + if (GNU_MODE) + parse_error_expected("while parsing goto", T_IDENTIFIER, '*', NULL); + else + parse_error_expected("while parsing goto", T_IDENTIFIER, NULL); + eat_until_anchor(); + return create_error_statement(); } /* remember the goto's in a list for later checking */ @@ -10332,9 +9582,8 @@ static statement_t *parse_goto(void) expect(';', end_error); - return statement; end_error: - return create_invalid_statement(); + return statement; } /** @@ -10447,12 +9696,11 @@ entity_t *expression_is_variable(const expression_t *expression) */ static statement_t *parse_return(void) { - eat(T_return); - statement_t *statement = allocate_statement_zero(STATEMENT_RETURN); + eat(T_return); expression_t *return_value = NULL; - if (token.type != ';') { + if (token.kind != ';') { return_value = parse_expression(); mark_vars_read(return_value, NULL); } @@ -10472,42 +9720,38 @@ static statement_t *parse_return(void) if (c_mode & _CXX || strict_mode) { errorf(pos, "'return' with a value, in function returning 'void'"); - } else if (warning.other) { - warningf(pos, - "'return' with a value, in function returning 'void'"); + } else { + warningf(WARN_OTHER, pos, "'return' with a value, in function returning 'void'"); } } else if (!(c_mode & _CXX)) { /* ISO/IEC 14882:1998(E) §6.6.3:3 */ /* Only warn in C mode, because GCC does the same */ if (strict_mode) { errorf(pos, - "'return' with expression in function return 'void'"); - } else if (warning.other) { - warningf(pos, - "'return' with expression in function return 'void'"); + "'return' with expression in function returning 'void'"); + } else { + warningf(WARN_OTHER, pos, "'return' with expression in function returning 'void'"); } } } else { assign_error_t error = semantic_assign(return_type, return_value); - report_assign_error(error, return_type, return_value, "'return'", - pos); + report_assign_error(error, return_type, return_value, "'return'", + pos); } return_value = create_implicit_cast(return_value, return_type); /* check for returning address of a local var */ - if (warning.other && return_value != NULL - && return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) { + if (return_value != NULL && return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) { const expression_t *expression = return_value->unary.value; if (expression_is_local_variable(expression)) { - warningf(pos, "function returns address of local variable"); + warningf(WARN_OTHER, pos, "function returns address of local variable"); } } - } else if (warning.other && !is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { + } else if (!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { /* ISO/IEC 14882:1998(E) §6.6.3:3 */ if (c_mode & _CXX || strict_mode) { errorf(pos, - "'return' without value, in function returning non-void"); + "'return' without value, in function returning non-void"); } else { - warningf(pos, - "'return' without value, in function returning non-void"); + warningf(WARN_OTHER, pos, "'return' without value, in function returning non-void"); } } statement->returns.value = return_value; @@ -10532,12 +9776,11 @@ static statement_t *parse_declaration_statement(void) parse_declaration(record_entity, DECL_FLAGS_NONE); } - if (before == NULL) { - statement->declaration.declarations_begin = current_scope->entities; - } else { - statement->declaration.declarations_begin = before->base.next; - } - statement->declaration.declarations_end = current_scope->last_entity; + declaration_statement_t *const decl = &statement->declaration; + entity_t *const begin = + before != NULL ? before->base.next : current_scope->entities; + decl->declarations_begin = begin; + decl->declarations_end = begin != NULL ? current_scope->last_entity : NULL; return statement; } @@ -10575,10 +9818,9 @@ static statement_t *parse_ms_try_statment(void) statement->ms_try.try_statement = parse_compound_statement(false); current_try = rem; - POP_PARENT; + POP_PARENT(); - if (token.type == T___except) { - eat(T___except); + if (next_if(T___except)) { expect('(', end_error); add_anchor_token(')'); expression_t *const expr = parse_expression(); @@ -10595,23 +9837,20 @@ static statement_t *parse_ms_try_statment(void) rem_anchor_token(')'); expect(')', end_error); statement->ms_try.final_statement = parse_compound_statement(false); - } else if (token.type == T__finally) { - eat(T___finally); + } else if (next_if(T__finally)) { statement->ms_try.final_statement = parse_compound_statement(false); } else { parse_error_expected("while parsing __try statement", T___except, T___finally, NULL); - return create_invalid_statement(); + return create_error_statement(); } return statement; end_error: - return create_invalid_statement(); + return create_error_statement(); } static statement_t *parse_empty_statement(void) { - if (warning.empty_statement) { - warningf(HERE, "statement is empty"); - } + warningf(WARN_EMPTY_STATEMENT, HERE, "statement is empty"); statement_t *const statement = create_empty_statement(); eat(';'); return statement; @@ -10623,42 +9862,34 @@ static statement_t *parse_local_label_declaration(void) eat(T___label__); - entity_t *begin = NULL, *end = NULL; - - while (true) { - if (token.type != T_IDENTIFIER) { + entity_t *begin = NULL; + entity_t *end = NULL; + entity_t **anchor = &begin; + do { + if (token.kind != T_IDENTIFIER) { parse_error_expected("while parsing local label declaration", T_IDENTIFIER, NULL); goto end_error; } - symbol_t *symbol = token.v.symbol; + symbol_t *symbol = token.identifier.symbol; entity_t *entity = get_entity(symbol, NAMESPACE_LABEL); if (entity != NULL && entity->base.parent_scope == current_scope) { - errorf(HERE, "multiple definitions of '__label__ %Y' (previous definition %P)", - symbol, &entity->base.source_position); + source_position_t const *const ppos = &entity->base.source_position; + errorf(HERE, "multiple definitions of '%N' (previous definition %P)", entity, ppos); } else { - entity = allocate_entity_zero(ENTITY_LOCAL_LABEL); - + entity = allocate_entity_zero(ENTITY_LOCAL_LABEL, NAMESPACE_LABEL, symbol); entity->base.parent_scope = current_scope; - entity->base.namespc = NAMESPACE_LABEL; - entity->base.source_position = token.source_position; - entity->base.symbol = symbol; + entity->base.source_position = token.base.source_position; - if (end != NULL) - end->base.next = entity; - end = entity; - if (begin == NULL) - begin = entity; + *anchor = entity; + anchor = &entity->base.next; + end = entity; environment_push(entity); } next_token(); - - if (token.type != ',') - break; - next_token(); - } - eat(';'); + } while (next_if(',')); + expect(';', end_error); end_error: statement->declaration.declarations_begin = begin; statement->declaration.declarations_end = end; @@ -10672,28 +9903,29 @@ static void parse_namespace_definition(void) entity_t *entity = NULL; symbol_t *symbol = NULL; - if (token.type == T_IDENTIFIER) { - symbol = token.v.symbol; + if (token.kind == T_IDENTIFIER) { + symbol = token.identifier.symbol; next_token(); entity = get_entity(symbol, NAMESPACE_NORMAL); - if (entity != NULL && entity->kind != ENTITY_NAMESPACE + if (entity != NULL + && entity->kind != ENTITY_NAMESPACE && entity->base.parent_scope == current_scope) { - error_redefined_as_different_kind(&token.source_position, - entity, ENTITY_NAMESPACE); + if (is_entity_valid(entity)) { + error_redefined_as_different_kind(&token.base.source_position, + entity, ENTITY_NAMESPACE); + } entity = NULL; } } if (entity == NULL) { - entity = allocate_entity_zero(ENTITY_NAMESPACE); - entity->base.symbol = symbol; - entity->base.source_position = token.source_position; - entity->base.namespc = NAMESPACE_NORMAL; + entity = allocate_entity_zero(ENTITY_NAMESPACE, NAMESPACE_NORMAL, symbol); + entity->base.source_position = token.base.source_position; entity->base.parent_scope = current_scope; } - if (token.type == '=') { + if (token.kind == '=') { /* TODO: parse namespace alias */ panic("namespace alias definition not supported yet"); } @@ -10701,17 +9933,19 @@ static void parse_namespace_definition(void) environment_push(entity); append_entity(current_scope, entity); - size_t const top = environment_top(); - scope_t *old_scope = scope_push(&entity->namespacee.members); + PUSH_SCOPE(&entity->namespacee.members); + + entity_t *old_current_entity = current_entity; + current_entity = entity; expect('{', end_error); parse_externals(); expect('}', end_error); end_error: - assert(current_scope == &entity->namespacee.members); - scope_pop(old_scope); - environment_pop_to(top); + assert(current_entity == entity); + current_entity = old_current_entity; + POP_SCOPE(); } /** @@ -10725,12 +9959,12 @@ static statement_t *intern_parse_statement(void) /* declaration or statement */ add_anchor_token(';'); - switch (token.type) { + switch (token.kind) { case T_IDENTIFIER: { - token_type_t la1_type = (token_type_t)look_ahead(1)->type; + token_kind_t la1_type = (token_kind_t)look_ahead(1)->kind; if (la1_type == ':') { statement = parse_label_statement(); - } else if (is_typedef_symbol(token.v.symbol)) { + } else if (is_typedef_symbol(token.identifier.symbol)) { statement = parse_declaration_statement(); } else { /* it's an identifier, the grammar says this must be an @@ -10740,35 +9974,28 @@ static statement_t *intern_parse_statement(void) switch (la1_type) { case '&': case '*': - if (get_entity(token.v.symbol, NAMESPACE_NORMAL) != NULL) - goto expression_statment; - /* FALLTHROUGH */ - + if (get_entity(token.identifier.symbol, NAMESPACE_NORMAL) != NULL) { + default: + statement = parse_expression_statement(); + } else { DECLARATION_START case T_IDENTIFIER: - statement = parse_declaration_statement(); - break; - - default: -expression_statment: - statement = parse_expression_statement(); + statement = parse_declaration_statement(); + } break; } } break; } - case T___extension__: + case T___extension__: { /* This can be a prefix to a declaration or an expression statement. * We simply eat it now and parse the rest with tail recursion. */ - do { - next_token(); - } while (token.type == T___extension__); - bool old_gcc_extension = in_gcc_extension; - in_gcc_extension = true; + PUSH_EXTENSION(); statement = intern_parse_statement(); - in_gcc_extension = old_gcc_extension; + POP_EXTENSION(); break; + } DECLARATION_START statement = parse_declaration_statement(); @@ -10801,7 +10028,7 @@ expression_statment: default: errorf(HERE, "unexpected token %K while parsing statement", &token); - statement = create_invalid_statement(); + statement = create_error_statement(); if (!at_anchor()) next_token(); break; @@ -10824,11 +10051,10 @@ static statement_t *parse_statement(void) { statement_t *statement = intern_parse_statement(); - if (statement->kind == STATEMENT_EXPRESSION && warning.unused_value) { + if (statement->kind == STATEMENT_EXPRESSION) { expression_t *expression = statement->expression.expression; if (!expression_has_effect(expression)) { - warningf(&expression->base.source_position, - "statement has no effect"); + warningf(WARN_UNUSED_VALUE, &expression->base.source_position, "statement has no effect"); } } @@ -10843,6 +10069,7 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) statement_t *statement = allocate_statement_zero(STATEMENT_COMPOUND); PUSH_PARENT(statement); + PUSH_SCOPE(&statement->compound.scope); eat('{'); add_anchor_token('}'); @@ -10935,32 +10162,27 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) add_anchor_token(T_wchar_t); add_anchor_token(T_while); - size_t const top = environment_top(); - scope_t *old_scope = scope_push(&statement->compound.scope); - statement_t **anchor = &statement->compound.statements; bool only_decls_so_far = true; - while (token.type != '}') { - if (token.type == T_EOF) { + while (token.kind != '}') { + if (token.kind == T_EOF) { errorf(&statement->base.source_position, "EOF while parsing compound statement"); break; } statement_t *sub_statement = intern_parse_statement(); - if (is_invalid_statement(sub_statement)) { + if (sub_statement->kind == STATEMENT_ERROR) { /* an error occurred. if we are at an anchor, return */ if (at_anchor()) goto end_error; continue; } - if (warning.declaration_after_statement) { - if (sub_statement->kind != STATEMENT_DECLARATION) { - only_decls_so_far = false; - } else if (!only_decls_so_far) { - warningf(&sub_statement->base.source_position, - "ISO C90 forbids mixed declarations and code"); - } + if (sub_statement->kind != STATEMENT_DECLARATION) { + only_decls_so_far = false; + } else if (!only_decls_so_far) { + source_position_t const *const pos = &sub_statement->base.source_position; + warningf(WARN_DECLARATION_AFTER_STATEMENT, pos, "ISO C90 forbids mixed declarations and code"); } *anchor = sub_statement; @@ -10973,7 +10195,7 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) next_token(); /* look over all statements again to produce no effect warnings */ - if (warning.unused_value) { + if (is_warn_on(WARN_UNUSED_VALUE)) { statement_t *sub_statement = statement->compound.statements; for (; sub_statement != NULL; sub_statement = sub_statement->base.next) { if (sub_statement->kind != STATEMENT_EXPRESSION) @@ -10985,8 +10207,7 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) expression_t *expression = sub_statement->expression.expression; if (!expression_has_effect(expression)) { - warningf(&expression->base.source_position, - "statement has no effect"); + warningf(WARN_UNUSED_VALUE, &expression->base.source_position, "statement has no effect"); } } } @@ -11079,11 +10300,9 @@ end_error: rem_anchor_token('&'); rem_anchor_token('!'); rem_anchor_token('}'); - assert(current_scope == &statement->compound.scope); - scope_pop(old_scope); - environment_pop_to(top); - POP_PARENT; + POP_SCOPE(); + POP_PARENT(); return statement; } @@ -11092,7 +10311,7 @@ end_error: */ static void check_unused_globals(void) { - if (!warning.unused_function && !warning.unused_variable) + if (!is_warn_on(WARN_UNUSED_FUNCTION) && !is_warn_on(WARN_UNUSED_VARIABLE)) return; for (const entity_t *entity = file_scope->entities; entity != NULL; @@ -11107,20 +10326,21 @@ static void check_unused_globals(void) declaration->storage_class != STORAGE_CLASS_STATIC) continue; - type_t *const type = declaration->type; - const char *s; + warning_t why; + char const *s; if (entity->kind == ENTITY_FUNCTION) { /* inhibit warning for static inline functions */ if (entity->function.is_inline) continue; - s = entity->function.statement != NULL ? "defined" : "declared"; + why = WARN_UNUSED_FUNCTION; + s = entity->function.statement != NULL ? "defined" : "declared"; } else { - s = "defined"; + why = WARN_UNUSED_VARIABLE; + s = "defined"; } - warningf(&declaration->base.source_position, "'%#T' %s but not used", - type, declaration->base.symbol, s); + warningf(why, &declaration->base.source_position, "'%#N' %s but not used", entity, s); } } @@ -11144,9 +10364,9 @@ end_error:; static void parse_linkage_specification(void) { eat(T_extern); - assert(token.type == T_STRING_LITERAL); - const char *linkage = parse_string_literals().begin; + source_position_t const pos = *HERE; + char const *const linkage = parse_string_literals().begin; linkage_kind_t old_linkage = current_linkage; linkage_kind_t new_linkage; @@ -11155,13 +10375,12 @@ static void parse_linkage_specification(void) } else if (strcmp(linkage, "C++") == 0) { new_linkage = LINKAGE_CXX; } else { - errorf(HERE, "linkage string \"%s\" not recognized", linkage); - new_linkage = LINKAGE_INVALID; + errorf(&pos, "linkage string \"%s\" not recognized", linkage); + new_linkage = LINKAGE_C; } current_linkage = new_linkage; - if (token.type == '{') { - next_token(); + if (next_if('{')) { parse_externals(); expect('}', end_error); } else { @@ -11175,23 +10394,22 @@ end_error: static void parse_external(void) { - switch (token.type) { + switch (token.kind) { + case T_extern: + if (look_ahead(1)->kind == T_STRING_LITERAL) { + parse_linkage_specification(); + } else { DECLARATION_START_NO_EXTERN case T_IDENTIFIER: case T___extension__: /* tokens below are for implicit int */ - case '&': /* & x; -> int& x; (and error later, because C++ has no - implicit int) */ - case '*': /* * x; -> int* x; */ - case '(': /* (x); -> int (x); */ - parse_external_declaration(); - return; - - case T_extern: - if (look_ahead(1)->type == T_STRING_LITERAL) { - parse_linkage_specification(); - } else { + case '&': /* & x; -> int& x; (and error later, because C++ has no + implicit int) */ + case '*': /* * x; -> int* x; */ + case '(': /* (x); -> int (x); */ + PUSH_EXTENSION(); parse_external_declaration(); + POP_EXTENSION(); } return; @@ -11205,8 +10423,7 @@ static void parse_external(void) case ';': if (!strict_mode) { - if (warning.other) - warningf(HERE, "stray ';' outside of function"); + warningf(WARN_STRAY_SEMICOLON, HERE, "stray ';' outside of function"); next_token(); return; } @@ -11214,8 +10431,8 @@ static void parse_external(void) default: errorf(HERE, "stray %K outside of function", &token); - if (token.type == '(' || token.type == '{' || token.type == '[') - eat_until_matching_token(token.type); + if (token.kind == '(' || token.kind == '{' || token.kind == '[') + eat_until_matching_token(token.kind); next_token(); return; } @@ -11227,27 +10444,24 @@ static void parse_externals(void) add_anchor_token(T_EOF); #ifndef NDEBUG - unsigned char token_anchor_copy[T_LAST_TOKEN]; + /* make a copy of the anchor set, so we can check if it is restored after parsing */ + unsigned short token_anchor_copy[T_LAST_TOKEN]; memcpy(token_anchor_copy, token_anchor_set, sizeof(token_anchor_copy)); #endif - while (token.type != T_EOF && token.type != '}') { + while (token.kind != T_EOF && token.kind != '}') { #ifndef NDEBUG - bool anchor_leak = false; - for (int i = 0; i != T_LAST_TOKEN; ++i) { - unsigned char count = token_anchor_set[i] - token_anchor_copy[i]; + for (int i = 0; i < T_LAST_TOKEN; ++i) { + unsigned short count = token_anchor_set[i] - token_anchor_copy[i]; if (count != 0) { - errorf(HERE, "Leaked anchor token %k %d times", i, count); - anchor_leak = true; + /* the anchor set and its copy differs */ + internal_errorf(HERE, "Leaked anchor token %k %d times", i, count); } } if (in_gcc_extension) { - errorf(HERE, "Leaked __extension__"); - anchor_leak = true; + /* an gcc extension scope was not closed */ + internal_errorf(HERE, "Leaked __extension__"); } - - if (anchor_leak) - abort(); #endif parse_external(); @@ -11267,16 +10481,21 @@ static void parse_translation_unit(void) while (true) { parse_externals(); - if (token.type == T_EOF) + if (token.kind == T_EOF) break; errorf(HERE, "stray %K outside of function", &token); - if (token.type == '(' || token.type == '{' || token.type == '[') - eat_until_matching_token(token.type); + if (token.kind == '(' || token.kind == '{' || token.kind == '[') + eat_until_matching_token(token.kind); next_token(); } } +void set_default_visibility(elf_visibility_tag_t visibility) +{ + default_visibility = visibility; +} + /** * Parse the input. * @@ -11290,8 +10509,7 @@ void start_parsing(void) error_count = 0; warning_count = 0; - type_set_output(stderr); - ast_set_output(stderr); + print_to_file(stderr); assert(unit == NULL); unit = allocate_ast_zero(sizeof(unit[0])); @@ -11301,6 +10519,10 @@ void start_parsing(void) assert(current_scope == NULL); scope_push(&unit->scope); + + create_gnu_builtins(); + if (c_mode & _MS) + create_microsoft_intrinsics(); } translation_unit_t *finish_parsing(void) @@ -11320,38 +10542,62 @@ translation_unit_t *finish_parsing(void) return result; } -/* GCC allows global arrays without size and assigns them a length of one, - * if no different declaration follows */ +/* §6.9.2:2 and §6.9.2:5: At the end of the translation incomplete arrays + * are given length one. */ static void complete_incomplete_arrays(void) { size_t n = ARR_LEN(incomplete_arrays); for (size_t i = 0; i != n; ++i) { - declaration_t *const decl = incomplete_arrays[i]; - type_t *const orig_type = decl->type; - type_t *const type = skip_typeref(orig_type); + declaration_t *const decl = incomplete_arrays[i]; + type_t *const type = skip_typeref(decl->type); if (!is_type_incomplete(type)) continue; - if (warning.other) { - warningf(&decl->base.source_position, - "array '%#T' assumed to have one element", - orig_type, decl->base.symbol); - } + source_position_t const *const pos = &decl->base.source_position; + warningf(WARN_OTHER, pos, "array '%#N' assumed to have one element", (entity_t const*)decl); type_t *const new_type = duplicate_type(type); new_type->array.size_constant = true; new_type->array.has_implicit_size = true; new_type->array.size = 1; - type_t *const result = typehash_insert(new_type); - if (type != result) - free_type(type); + type_t *const result = identify_new_type(new_type); decl->type = result; } } +void prepare_main_collect2(entity_t *entity) +{ + // create call to __main + symbol_t *symbol = symbol_table_insert("__main"); + entity_t *subsubmain_ent + = create_implicit_function(symbol, &builtin_source_position); + + expression_t *ref = allocate_expression_zero(EXPR_REFERENCE); + type_t *ftype = subsubmain_ent->declaration.type; + ref->base.source_position = builtin_source_position; + ref->base.type = make_pointer_type(ftype, TYPE_QUALIFIER_NONE); + ref->reference.entity = subsubmain_ent; + + expression_t *call = allocate_expression_zero(EXPR_CALL); + call->base.source_position = builtin_source_position; + call->base.type = type_void; + call->call.function = ref; + + statement_t *expr_statement = allocate_statement_zero(STATEMENT_EXPRESSION); + expr_statement->base.source_position = builtin_source_position; + expr_statement->expression.expression = call; + + statement_t *statement = entity->function.statement; + assert(statement->kind == STATEMENT_COMPOUND); + compound_statement_t *compounds = &statement->compound; + + expr_statement->base.next = compounds->statements; + compounds->statements = expr_statement; +} + void parse(void) { lookahead_bufpos = 0; @@ -11373,34 +10619,10 @@ void init_parser(void) { sym_anonymous = symbol_table_insert(""); - 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); - - symbol_t *const va_list_sym = symbol_table_insert("__builtin_va_list"); - type_valist = create_builtin_type(va_list_sym, type_void_ptr); } /**