X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=7e77c60099f3fcb279adba1eb5b26c5d3963e050;hb=900afec9b0ae74985195a125e8f8e7aa54460543;hp=df1a6b6050617ed98a63899b4ab63adbff5ea9c8;hpb=c607515c495c9c1a7d37eb3d967bda736a320cc8;p=cparser diff --git a/parser.c b/parser.c index df1a6b6..7e77c60 100644 --- a/parser.c +++ b/parser.c @@ -33,6 +33,7 @@ #include "type_t.h" #include "type_hash.h" #include "ast_t.h" +#include "entity_t.h" #include "lang_features.h" #include "walk_statements.h" #include "warning.h" @@ -40,21 +41,13 @@ #include "adt/error.h" #include "adt/array.h" -/** if wchar_t is equal to unsigned short. */ -bool opt_short_wchar_t = -#ifdef _WIN32 - true; -#else - false; -#endif - //#define PRINT_TOKENS #define MAX_LOOKAHEAD 2 typedef struct { - declaration_t *old_declaration; - symbol_t *symbol; - unsigned short namespc; + entity_t *old_entity; + symbol_t *symbol; + entity_namespace_t namespc; } stack_entry_t; typedef struct argument_list_t argument_list_t; @@ -81,10 +74,11 @@ struct gnu_attribute_t { typedef struct declaration_specifiers_t declaration_specifiers_t; struct declaration_specifiers_t { source_position_t source_position; - unsigned char declared_storage_class; + storage_class_t storage_class; unsigned char alignment; /**< Alignment, 0 if not set. */ - unsigned int is_inline : 1; - unsigned int deprecated : 1; + 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. */ @@ -97,47 +91,54 @@ struct declaration_specifiers_t { * An environment for parsing initializers (and compound literals). */ typedef struct parse_initializer_env_t { - type_t *type; /**< the type of the initializer. In case of an - array type with unspecified size this gets - adjusted to the actual size. */ - declaration_t *declaration; /**< the declaration that is initialized if any */ - bool must_be_constant; + type_t *type; /**< the type of the initializer. In case of an + array type with unspecified size this gets + adjusted to the actual size. */ + entity_t *entity; /**< the variable that is initialized if any */ + bool must_be_constant; } parse_initializer_env_t; -typedef declaration_t* (*parsed_declaration_func) (declaration_t *declaration, bool is_definition); +/** + * 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. */ -static token_t token; +static token_t token; /** The lookahead ring-buffer. */ -static token_t lookahead_buffer[MAX_LOOKAHEAD]; +static token_t lookahead_buffer[MAX_LOOKAHEAD]; /** Position of the next token in the lookahead buffer. */ -static int lookahead_bufpos; -static stack_entry_t *environment_stack = NULL; -static stack_entry_t *label_stack = NULL; -static stack_entry_t *local_label_stack = NULL; -/** The global file scope. */ -static scope_t *file_scope = NULL; -/** The current scope. */ -static scope_t *scope = NULL; -static declaration_t *last_declaration = NULL; +static int 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 declaration_t *current_function = NULL; -static declaration_t *current_init_decl = 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 goto_statement_t *goto_first = NULL; -static goto_statement_t *goto_last = NULL; -static label_statement_t *label_first = NULL; -static label_statement_t *label_last = NULL; +static function_t *current_function = NULL; +static entity_t *current_init_decl = 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 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; +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; +static bool in_type_prop = false; /** true in we are in a __extension__ context. */ -static bool in_gcc_extension = false; -static struct obstack temp_obst; +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) \ @@ -185,17 +186,31 @@ static statement_t *parse_statement(void); static expression_t *parse_sub_expression(precedence_t); static expression_t *parse_expression(void); static type_t *parse_typename(void); +static void parse_externals(void); +static void parse_external(void); + +static void parse_compound_type_entries(compound_t *compound_declaration); + +typedef enum declarator_flags_t { + DECL_FLAGS_NONE = 0, + DECL_MAY_BE_ABSTRACT = 1U << 0, + DECL_CREATE_COMPOUND_MEMBER = 1U << 1, + DECL_IS_PARAMETER = 1U << 2 +} declarator_flags_t; -static void parse_compound_type_entries(declaration_t *compound_declaration); -static declaration_t *parse_declarator( - const declaration_specifiers_t *specifiers, bool may_be_abstract); -static declaration_t *record_declaration(declaration_t *declaration, bool is_definition); +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 \ +#define STORAGE_CLASSES \ + STORAGE_CLASSES_NO_EXTERN \ + case T_extern: + +#define STORAGE_CLASSES_NO_EXTERN \ case T_typedef: \ - case T_extern: \ case T_static: \ case T_auto: \ case T_register: \ @@ -209,33 +224,29 @@ static void semantic_comparison(binary_expression_t *expression); case T__forceinline: \ case T___attribute__: -#ifdef PROVIDE_COMPLEX #define COMPLEX_SPECIFIERS \ case T__Complex: #define IMAGINARY_SPECIFIERS \ case T__Imaginary: -#else -#define COMPLEX_SPECIFIERS -#define IMAGINARY_SPECIFIERS -#endif #define TYPE_SPECIFIERS \ - case T_void: \ + case T__Bool: \ + case T___builtin_va_list: \ + case T___typeof__: \ + case T__declspec: \ + case T_bool: \ case T_char: \ - case T_short: \ + case T_double: \ + case T_enum: \ + case T_float: \ case T_int: \ case T_long: \ - case T_float: \ - case T_double: \ + case T_short: \ case T_signed: \ - case T_unsigned: \ - case T__Bool: \ case T_struct: \ case T_union: \ - case T_enum: \ - case T___typeof__: \ - case T___builtin_va_list: \ - case T__declspec: \ + case T_unsigned: \ + case T_void: \ COMPLEX_SPECIFIERS \ IMAGINARY_SPECIFIERS @@ -244,6 +255,11 @@ static void semantic_comparison(binary_expression_t *expression); TYPE_QUALIFIERS \ TYPE_SPECIFIERS +#define DECLARATION_START_NO_EXTERN \ + STORAGE_CLASSES_NO_EXTERN \ + TYPE_QUALIFIERS \ + TYPE_SPECIFIERS + #define TYPENAME_START \ TYPE_QUALIFIERS \ TYPE_SPECIFIERS @@ -295,9 +311,11 @@ static void semantic_comparison(binary_expression_t *expression); case T___func__: \ case T___noop: \ case T__assume: \ - case T_sizeof: \ case T_delete: \ - case T_throw: + case T_false: \ + case T_sizeof: \ + case T_throw: \ + case T_true: /** * Allocate an AST node with given size and @@ -310,12 +328,42 @@ static void *allocate_ast_zero(size_t size) return res; } -static declaration_t *allocate_declaration_zero(void) +/** + * 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) { - declaration_t *declaration = allocate_ast_zero(sizeof(declaration_t)); - declaration->type = type_error_type; - declaration->alignment = 0; - return declaration; + size_t size = get_entity_struct_size(kind); + entity_t *entity = allocate_ast_zero(size); + entity->kind = kind; + return entity; } /** @@ -331,6 +379,7 @@ static size_t get_statement_struct_size(statement_kind_t kind) [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), @@ -346,7 +395,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(kind < sizeof(sizes) / sizeof(sizes[0])); assert(sizes[kind] != 0); return sizes[kind]; } @@ -361,6 +410,7 @@ 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), @@ -392,14 +442,15 @@ 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(kind < sizeof(sizes) / sizeof(sizes[0])); assert(sizes[kind] != 0); return sizes[kind]; } /** * Allocate a statement node of given kind and initialize all - * fields with zero. + * fields with zero. Sets its source position to the position + * of the current token. */ static statement_t *allocate_statement_zero(statement_kind_t kind) { @@ -421,19 +472,19 @@ static expression_t *allocate_expression_zero(expression_kind_t kind) size_t size = get_expression_struct_size(kind); expression_t *res = allocate_ast_zero(size); - res->base.kind = kind; - res->base.type = type_error_type; + res->base.kind = kind; + res->base.type = type_error_type; + res->base.source_position = token.source_position; return res; } /** - * Creates a new invalid expression. + * Creates a new invalid expression at the source position + * of the current token. */ static expression_t *create_invalid_expression(void) { - expression_t *expression = allocate_expression_zero(EXPR_INVALID); - expression->base.source_position = token.source_position; - return expression; + return allocate_expression_zero(EXPR_INVALID); } /** @@ -551,14 +602,6 @@ static size_t label_top(void) return ARR_LEN(label_stack); } -/** - * Returns the index of the top element of the local label stack. - */ -static size_t local_label_top(void) -{ - return ARR_LEN(local_label_stack); -} - /** * Return the next token. */ @@ -587,7 +630,7 @@ static inline const token_t *look_ahead(int num) } /** - * Adds a token to the token anchor set (a multi-set). + * Adds a token type to the token type anchor set (a multi-set). */ static void add_anchor_token(int token_type) { @@ -595,6 +638,10 @@ static void add_anchor_token(int token_type) ++token_anchor_set[token_type]; } +/** + * 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) { assert(0 <= token_type && token_type < T_LAST_TOKEN); @@ -603,6 +650,9 @@ static int save_and_reset_anchor_state(int token_type) return count; } +/** + * Restore the number of token types to the given count. + */ static void restore_anchor_state(int token_type, int count) { assert(0 <= token_type && token_type < T_LAST_TOKEN); @@ -610,7 +660,7 @@ static void restore_anchor_state(int token_type, int count) } /** - * Remove a token from the token anchor set (a multi-set). + * Remove a token type from the token type anchor set (a multi-set). */ static void rem_anchor_token(int token_type) { @@ -619,6 +669,10 @@ static void rem_anchor_token(int token_type) --token_anchor_set[token_type]; } +/** + * Return true if the token type of the current token is + * in the anchor set. + */ static bool at_anchor(void) { if (token.type < 0) @@ -627,7 +681,7 @@ static bool at_anchor(void) } /** - * Eat tokens until a matching token is found. + * Eat tokens until a matching token type is found. */ static void eat_until_matching_token(int type) { @@ -692,6 +746,9 @@ static void eat_until_anchor(void) } } +/** + * Eat a whole block from input tokens. + */ static void eat_block(void) { eat_until_matching_token('{'); @@ -699,7 +756,7 @@ static void eat_block(void) next_token(); } -#define eat(token_type) do { assert(token.type == token_type); next_token(); } while (0) +#define eat(token_type) do { assert(token.type == (token_type)); next_token(); } while (0) /** * Report a parse error because an expected token was not found. @@ -719,15 +776,6 @@ void parse_error_expected(const char *message, ...) va_end(ap); } -/** - * Report a type error. - */ -static void type_error(const char *msg, const source_position_t *source_position, - type_t *type) -{ - errorf(source_position, "%s, but found type '%T'", msg, type); -} - /** * Report an incompatible type. */ @@ -739,11 +787,11 @@ static void type_error_incompatible(const char *msg, } /** - * Expect the the current token is the expected token. + * Expect the current token is the expected token. * If not, generate an error, eat the current statement, * and goto the end_error label. */ -#define expect(expected) \ +#define expect(expected, error_label) \ do { \ if (UNLIKELY(token.type != (expected))) { \ parse_error_expected(NULL, (expected), NULL); \ @@ -752,89 +800,91 @@ static void type_error_incompatible(const char *msg, if (token.type == expected) \ next_token(); \ rem_anchor_token(expected); \ - goto end_error; \ + goto error_label; \ } \ next_token(); \ } while (0) -static void scope_push(scope_t *new_scope) +/** + * Push a given scope on the scope stack and make it the + * current scope + */ +static scope_t *scope_push(scope_t *new_scope) { - if (scope != NULL) { - scope->last_declaration = last_declaration; - new_scope->depth = scope->depth + 1; + if (current_scope != NULL) { + new_scope->depth = current_scope->depth + 1; } - new_scope->parent = scope; - scope = new_scope; - last_declaration = new_scope->last_declaration; + scope_t *old_scope = current_scope; + current_scope = new_scope; + return old_scope; } -static void scope_pop(void) +/** + * Pop the current scope from the scope stack. + */ +static void scope_pop(scope_t *old_scope) { - scope->last_declaration = last_declaration; - scope = scope->parent; - last_declaration = scope->last_declaration; + current_scope = old_scope; } /** - * Search a symbol in a given namespace and returns its declaration or - * NULL if this symbol was not found. + * Search an entity by its symbol in a given namespace. */ -static declaration_t *get_declaration(const symbol_t *const symbol, - const namespace_t namespc) +static entity_t *get_entity(const symbol_t *const symbol, + namespace_tag_t namespc) { - declaration_t *declaration = symbol->declaration; - for( ; declaration != NULL; declaration = declaration->symbol_next) { - if (declaration->namespc == namespc) - return declaration; + entity_t *entity = symbol->entity; + for (; entity != NULL; entity = entity->base.symbol_next) { + if (entity->base.namespc == namespc) + return entity; } return NULL; } /** - * pushs an environment_entry on the environment stack and links the - * corresponding symbol to the new entry + * pushs an entity on the environment stack and links the corresponding symbol + * it. */ -static void stack_push(stack_entry_t **stack_ptr, declaration_t *declaration) +static void stack_push(stack_entry_t **stack_ptr, entity_t *entity) { - symbol_t *symbol = declaration->symbol; - namespace_t namespc = (namespace_t) declaration->namespc; + symbol_t *symbol = entity->base.symbol; + entity_namespace_t namespc = entity->base.namespc; + assert(namespc != NAMESPACE_INVALID); - /* replace/add declaration into declaration list of the symbol */ - declaration_t **anchor; - declaration_t *iter; - for (anchor = &symbol->declaration;; anchor = &iter->symbol_next) { + /* replace/add entity into entity list of the symbol */ + entity_t **anchor; + entity_t *iter; + for (anchor = &symbol->entity; ; anchor = &iter->base.symbol_next) { iter = *anchor; if (iter == NULL) break; /* replace an entry? */ - if (iter->namespc == namespc) { - declaration->symbol_next = iter->symbol_next; + if (iter->base.namespc == namespc) { + entity->base.symbol_next = iter->base.symbol_next; break; } } - *anchor = declaration; + *anchor = entity; /* remember old declaration */ stack_entry_t entry; - entry.symbol = symbol; - entry.old_declaration = iter; - entry.namespc = (unsigned short) namespc; + entry.symbol = symbol; + entry.old_entity = iter; + entry.namespc = namespc; ARR_APP1(stack_entry_t, *stack_ptr, entry); } /** - * Push a declaration on the environment stack. - * - * @param declaration the declaration + * Push an entity on the environment stack. */ -static void environment_push(declaration_t *declaration) +static void environment_push(entity_t *entity) { - assert(declaration->source_position.input_name != NULL); - assert(declaration->parent_scope != NULL); - stack_push(&environment_stack, declaration); + assert(entity->base.source_position.input_name != NULL); + assert(entity->base.parent_scope != NULL); + stack_push(&environment_stack, entity); } /** @@ -842,21 +892,11 @@ static void environment_push(declaration_t *declaration) * * @param declaration the declaration */ -static void label_push(declaration_t *declaration) -{ - declaration->parent_scope = ¤t_function->scope; - stack_push(&label_stack, declaration); -} - -/** - * Push a declaration of the local label stack. - * - * @param declaration the declaration - */ -static void local_label_push(declaration_t *declaration) +static void label_push(entity_t *label) { - assert(declaration->parent_scope != NULL); - stack_push(&local_label_stack, declaration); + /* we abuse the parameters scope as parent for the labels */ + label->base.parent_scope = ¤t_function->parameters; + stack_push(&label_stack, label); } /** @@ -872,31 +912,31 @@ static void stack_pop_to(stack_entry_t **stack_ptr, size_t new_top) if (new_top == top) return; - for(i = top; i > new_top; --i) { + for (i = top; i > new_top; --i) { stack_entry_t *entry = &stack[i - 1]; - declaration_t *old_declaration = entry->old_declaration; - symbol_t *symbol = entry->symbol; - namespace_t namespc = (namespace_t)entry->namespc; + entity_t *old_entity = entry->old_entity; + symbol_t *symbol = entry->symbol; + entity_namespace_t namespc = entry->namespc; - /* replace/remove declaration */ - declaration_t **anchor; - declaration_t *iter; - for (anchor = &symbol->declaration;; anchor = &iter->symbol_next) { + /* replace with old_entity/remove */ + entity_t **anchor; + entity_t *iter; + for (anchor = &symbol->entity; ; anchor = &iter->base.symbol_next) { iter = *anchor; assert(iter != NULL); /* replace an entry? */ - if (iter->namespc == namespc) + if (iter->base.namespc == namespc) break; } - /* Not all declarations adhere scopes (e.g. jump labels), so this - * correction is necessary */ - if (old_declaration != NULL) { - old_declaration->symbol_next = iter->symbol_next; - *anchor = old_declaration; + /* restore definition from outer scopes (if there was one) */ + if (old_entity != NULL) { + old_entity->base.symbol_next = iter->base.symbol_next; + *anchor = old_entity; } else { - *anchor = iter->symbol_next; + /* remove entry from list */ + *anchor = iter->base.symbol_next; } } @@ -925,23 +965,14 @@ static void label_pop_to(size_t new_top) stack_pop_to(&label_stack, new_top); } -/** - * Pop all entries from the local label stack until the new_top - * is reached. - * - * @param new_top the new stack top - */ -static void local_label_pop_to(size_t new_top) -{ - stack_pop_to(&local_label_stack, new_top); -} - - static int get_akind_rank(atomic_type_kind_t akind) { return (int) akind; } +/** + * Return the type rank for an atomic type. + */ static int get_rank(const type_t *type) { assert(!is_typeref(type)); @@ -957,6 +988,12 @@ static int get_rank(const type_t *type) return get_akind_rank(type->atomic.akind); } +/** + * 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) @@ -986,7 +1023,9 @@ static expression_t *create_cast_expression(expression_t *expression, } /** - * Check if a given expression represents the 0 pointer constant. + * Check if a given expression represents a null pointer constant. + * + * @param expression the expression to check */ static bool is_null_pointer_constant(const expression_t *expression) { @@ -1167,7 +1206,7 @@ static expression_t *parse_constant_expression(void) if (!is_constant_expression(result)) { errorf(&result->base.source_position, - "expression '%E' is not constant\n", result); + "expression '%E' is not constant", result); } return result; @@ -1178,27 +1217,6 @@ static expression_t *parse_assignment_expression(void) return parse_sub_expression(PREC_ASSIGNMENT); } -static type_t *make_global_typedef(const char *name, type_t *type) -{ - symbol_t *const symbol = symbol_table_insert(name); - - declaration_t *const declaration = allocate_declaration_zero(); - declaration->namespc = NAMESPACE_NORMAL; - declaration->storage_class = STORAGE_CLASS_TYPEDEF; - declaration->declared_storage_class = STORAGE_CLASS_TYPEDEF; - declaration->type = type; - declaration->symbol = symbol; - declaration->source_position = builtin_source_position; - declaration->implicit = true; - - record_declaration(declaration, false); - - type_t *typedef_type = allocate_type_zero(TYPE_TYPEDEF); - typedef_type->typedeft.declaration = declaration; - - return typedef_type; -} - static string_t parse_string_literals(void) { assert(token.type == T_STRING_LITERAL); @@ -1299,7 +1317,7 @@ static int strcmp_underscore(const char *s1, const char *s2) } /** - * Allocate a new gnu temporal attribute. + * Allocate a new gnu temporal attribute of given kind. */ static gnu_attribute_t *allocate_gnu_attribute(gnu_attribute_kind_t kind) { @@ -1313,7 +1331,7 @@ static gnu_attribute_t *allocate_gnu_attribute(gnu_attribute_kind_t kind) } /** - * parse one constant expression argument. + * Parse one constant expression argument of the given attribute. */ static void parse_gnu_attribute_const_arg(gnu_attribute_t *attribute) { @@ -1321,7 +1339,7 @@ static void parse_gnu_attribute_const_arg(gnu_attribute_t *attribute) add_anchor_token(')'); expression = parse_constant_expression(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); attribute->u.argument = fold_constant(expression); return; end_error: @@ -1329,7 +1347,7 @@ end_error: } /** - * parse a list of constant expressions arguments. + * Parse a list of constant expressions arguments of the given attribute. */ static void parse_gnu_attribute_const_arg_list(gnu_attribute_t *attribute) { @@ -1351,14 +1369,14 @@ static void parse_gnu_attribute_const_arg_list(gnu_attribute_t *attribute) } rem_anchor_token(','); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); return; end_error: attribute->invalid = true; } /** - * parse one string literal argument. + * Parse one string literal argument of the given attribute. */ static void parse_gnu_attribute_string_arg(gnu_attribute_t *attribute, string_t *string) @@ -1371,14 +1389,14 @@ static void parse_gnu_attribute_string_arg(gnu_attribute_t *attribute, } *string = parse_string_literals(); rem_anchor_token('('); - expect(')'); + expect(')', end_error); return; end_error: attribute->invalid = true; } /** - * parse one tls model. + * Parse one tls model of the given attribute. */ static void parse_gnu_attribute_tls_model_arg(gnu_attribute_t *attribute) { @@ -1391,7 +1409,7 @@ static void parse_gnu_attribute_tls_model_arg(gnu_attribute_t *attribute) string_t string = { NULL, 0 }; parse_gnu_attribute_string_arg(attribute, &string); if (string.begin != NULL) { - for(size_t i = 0; i < 4; ++i) { + for (size_t i = 0; i < 4; ++i) { if (strcmp(tls_models[i], string.begin) == 0) { attribute->u.value = i; return; @@ -1403,7 +1421,7 @@ static void parse_gnu_attribute_tls_model_arg(gnu_attribute_t *attribute) } /** - * parse one tls model. + * Parse one tls model of the given attribute. */ static void parse_gnu_attribute_visibility_arg(gnu_attribute_t *attribute) { @@ -1416,7 +1434,7 @@ static void parse_gnu_attribute_visibility_arg(gnu_attribute_t *attribute) string_t string = { NULL, 0 }; parse_gnu_attribute_string_arg(attribute, &string); if (string.begin != NULL) { - for(size_t i = 0; i < 4; ++i) { + for (size_t i = 0; i < 4; ++i) { if (strcmp(visibilities[i], string.begin) == 0) { attribute->u.value = i; return; @@ -1428,7 +1446,7 @@ static void parse_gnu_attribute_visibility_arg(gnu_attribute_t *attribute) } /** - * parse one (code) model. + * Parse one (code) model of the given attribute. */ static void parse_gnu_attribute_model_arg(gnu_attribute_t *attribute) { @@ -1440,7 +1458,7 @@ static void parse_gnu_attribute_model_arg(gnu_attribute_t *attribute) string_t string = { NULL, 0 }; parse_gnu_attribute_string_arg(attribute, &string); if (string.begin != NULL) { - for(int i = 0; i < 3; ++i) { + for (int i = 0; i < 3; ++i) { if (strcmp(visibilities[i], string.begin) == 0) { attribute->u.value = i; return; @@ -1451,6 +1469,9 @@ static void parse_gnu_attribute_model_arg(gnu_attribute_t *attribute) 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... */ @@ -1460,7 +1481,7 @@ static void parse_gnu_attribute_mode_arg(gnu_attribute_t *attribute) add_anchor_token(')'); if (token.type != T_IDENTIFIER) { - expect(T_IDENTIFIER); + expect(T_IDENTIFIER, end_error); } /* This isn't really correct, the backend should provide a list of machine @@ -1485,14 +1506,14 @@ static void parse_gnu_attribute_mode_arg(gnu_attribute_t *attribute) next_token(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); return; end_error: attribute->invalid = true; } /** - * parse one interrupt argument. + * Parse one interrupt argument of the given attribute. */ static void parse_gnu_attribute_interrupt_arg(gnu_attribute_t *attribute) { @@ -1506,7 +1527,7 @@ static void parse_gnu_attribute_interrupt_arg(gnu_attribute_t *attribute) string_t string = { NULL, 0 }; parse_gnu_attribute_string_arg(attribute, &string); if (string.begin != NULL) { - for(size_t i = 0; i < 5; ++i) { + for (size_t i = 0; i < 5; ++i) { if (strcmp(interrupts[i], string.begin) == 0) { attribute->u.value = i; return; @@ -1518,7 +1539,7 @@ static void parse_gnu_attribute_interrupt_arg(gnu_attribute_t *attribute) } /** - * parse ( identifier, const expression, const expression ) + * Parse ( identifier, const expression, const expression ) */ static void parse_gnu_attribute_format_args(gnu_attribute_t *attribute) { @@ -1535,7 +1556,7 @@ static void parse_gnu_attribute_format_args(gnu_attribute_t *attribute) goto end_error; } const char *name = token.v.symbol->string; - for(i = 0; i < 4; ++i) { + for (i = 0; i < 4; ++i) { if (strcmp_underscore(format_names[i], name) == 0) break; } @@ -1545,23 +1566,26 @@ static void parse_gnu_attribute_format_args(gnu_attribute_t *attribute) } next_token(); - expect(','); + expect(',', end_error); add_anchor_token(')'); add_anchor_token(','); parse_constant_expression(); rem_anchor_token(','); rem_anchor_token(')'); - expect(','); + expect(',', end_error); add_anchor_token(')'); parse_constant_expression(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); return; end_error: attribute->u.value = true; } +/** + * Check that a given GNU attribute has no arguments. + */ static void check_no_argument(gnu_attribute_t *attribute, const char *name) { if (!attribute->have_arguments) @@ -1659,8 +1683,8 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) gnu_attribute_t *attribute; eat(T___attribute__); - expect('('); - expect('('); + expect('(', end_error); + expect('(', end_error); if (token.type != ')') { /* find the end of the list */ @@ -1690,7 +1714,7 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) next_token(); int i; - for(i = 0; i < GNU_AK_LAST; ++i) { + for (i = 0; i < GNU_AK_LAST; ++i) { if (strcmp_underscore(gnu_attribute_names[i], name) == 0) break; } @@ -1717,7 +1741,7 @@ static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) attribute->have_arguments = true; } - switch(kind) { + switch (kind) { case GNU_AK_VOLATILE: case GNU_AK_NAKED: case GNU_AK_MALLOC: @@ -1876,8 +1900,8 @@ no_arg: next_token(); } } - expect(')'); - expect(')'); + expect(')', end_error); + expect(')', end_error); end_error: *attributes = head; @@ -1892,14 +1916,14 @@ static decl_modifiers_t parse_attributes(gnu_attribute_t **attributes) decl_modifiers_t modifiers = 0; while (true) { - switch(token.type) { + switch (token.type) { case T___attribute__: modifiers |= parse_gnu_attribute(attributes); continue; case T_asm: next_token(); - expect('('); + expect('(', end_error); if (token.type != T_STRING_LITERAL) { parse_error_expected("while parsing assembler attribute", T_STRING_LITERAL, NULL); @@ -1908,7 +1932,7 @@ static decl_modifiers_t parse_attributes(gnu_attribute_t **attributes) } else { parse_string_literals(); } - expect(')'); + expect(')', end_error); continue; case T_cdecl: modifiers |= DM_CDECL; break; @@ -1929,34 +1953,40 @@ end_error: } } -static void mark_decls_read(expression_t *expr, declaration_t *lhs_decl); +static void mark_vars_read(expression_t *expr, entity_t *lhs_ent); -static declaration_t *determine_lhs_decl(expression_t *const expr, declaration_t *lhs_decl) +static entity_t *determine_lhs_ent(expression_t *const expr, + entity_t *lhs_ent) { switch (expr->kind) { case EXPR_REFERENCE: { - declaration_t *const decl = expr->reference.declaration; - return decl; + entity_t *const entity = expr->reference.entity; + /* we should only find variables as lvalues... */ + if (entity->base.kind != ENTITY_VARIABLE + && entity->base.kind != ENTITY_PARAMETER) + return NULL; + + return entity; } case EXPR_ARRAY_ACCESS: { - expression_t *const ref = expr->array_access.array_ref; - declaration_t * decl = NULL; + expression_t *const ref = expr->array_access.array_ref; + entity_t * ent = NULL; if (is_type_array(skip_typeref(revert_automatic_type_conversion(ref)))) { - decl = determine_lhs_decl(ref, lhs_decl); - lhs_decl = decl; + ent = determine_lhs_ent(ref, lhs_ent); + lhs_ent = ent; } else { - mark_decls_read(expr->select.compound, lhs_decl); + mark_vars_read(expr->select.compound, lhs_ent); } - mark_decls_read(expr->array_access.index, lhs_decl); - return decl; + mark_vars_read(expr->array_access.index, lhs_ent); + return ent; } case EXPR_SELECT: { if (is_type_compound(skip_typeref(expr->base.type))) { - return determine_lhs_decl(expr->select.compound, lhs_decl); + return determine_lhs_ent(expr->select.compound, lhs_ent); } else { - mark_decls_read(expr->select.compound, lhs_decl); + mark_vars_read(expr->select.compound, lhs_ent); return NULL; } } @@ -1965,23 +1995,23 @@ static declaration_t *determine_lhs_decl(expression_t *const expr, declaration_t expression_t *const val = expr->unary.value; if (val->kind == EXPR_UNARY_TAKE_ADDRESS) { /* *&x is a NOP */ - return determine_lhs_decl(val->unary.value, lhs_decl); + return determine_lhs_ent(val->unary.value, lhs_ent); } else { - mark_decls_read(val, NULL); + mark_vars_read(val, NULL); return NULL; } } default: - mark_decls_read(expr, NULL); + mark_vars_read(expr, NULL); return NULL; } } -#define DECL_ANY ((declaration_t*)-1) +#define ENT_ANY ((entity_t*)-1) /** - * Mark declarations, which are read. This is used to deted variables, which + * Mark declarations, which are read. This is used to detect variables, which * are never read. * Example: * x = x + 1; @@ -1992,54 +2022,64 @@ static declaration_t *determine_lhs_decl(expression_t *const expr, declaration_t * x and y are not detected as "not read", because multiple variables are * involved. */ -static void mark_decls_read(expression_t *const expr, declaration_t *lhs_decl) +static void mark_vars_read(expression_t *const expr, entity_t *lhs_ent) { switch (expr->kind) { case EXPR_REFERENCE: { - declaration_t *const decl = expr->reference.declaration; - if (lhs_decl != decl && lhs_decl != DECL_ANY) - decl->read = true; + entity_t *const entity = expr->reference.entity; + if (entity->kind != ENTITY_VARIABLE + && entity->kind != ENTITY_PARAMETER) + return; + + if (lhs_ent != entity && lhs_ent != ENT_ANY) { + if (entity->kind == ENTITY_VARIABLE) { + entity->variable.read = true; + } else { + entity->parameter.read = true; + } + } return; } case EXPR_CALL: // TODO respect pure/const - mark_decls_read(expr->call.function, NULL); + mark_vars_read(expr->call.function, NULL); for (call_argument_t *arg = expr->call.arguments; arg != NULL; arg = arg->next) { - mark_decls_read(arg->expression, NULL); + mark_vars_read(arg->expression, NULL); } return; case EXPR_CONDITIONAL: // TODO lhs_decl should depend on whether true/false have an effect - mark_decls_read(expr->conditional.condition, NULL); + mark_vars_read(expr->conditional.condition, NULL); if (expr->conditional.true_expression != NULL) - mark_decls_read(expr->conditional.true_expression, lhs_decl); - mark_decls_read(expr->conditional.false_expression, lhs_decl); + mark_vars_read(expr->conditional.true_expression, lhs_ent); + mark_vars_read(expr->conditional.false_expression, lhs_ent); return; case EXPR_SELECT: - if (lhs_decl == DECL_ANY && !is_type_compound(skip_typeref(expr->base.type))) - lhs_decl = NULL; - mark_decls_read(expr->select.compound, lhs_decl); + if (lhs_ent == ENT_ANY + && !is_type_compound(skip_typeref(expr->base.type))) + lhs_ent = NULL; + mark_vars_read(expr->select.compound, lhs_ent); return; case EXPR_ARRAY_ACCESS: { expression_t *const ref = expr->array_access.array_ref; - mark_decls_read(ref, lhs_decl); - lhs_decl = determine_lhs_decl(ref, lhs_decl); - mark_decls_read(expr->array_access.index, lhs_decl); + mark_vars_read(ref, lhs_ent); + lhs_ent = determine_lhs_ent(ref, lhs_ent); + mark_vars_read(expr->array_access.index, lhs_ent); return; } case EXPR_VA_ARG: - mark_decls_read(expr->va_arge.ap, lhs_decl); + mark_vars_read(expr->va_arge.ap, 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)) - lhs_decl = NULL; + lhs_ent = NULL; goto unary; @@ -2050,8 +2090,8 @@ static void mark_decls_read(expression_t *const expr, declaration_t *lhs_decl) case EXPR_UNARY_DEREFERENCE: case EXPR_UNARY_DELETE: case EXPR_UNARY_DELETE_ARRAY: - if (lhs_decl == DECL_ANY) - lhs_decl = NULL; + if (lhs_ent == ENT_ANY) + lhs_ent = NULL; goto unary; case EXPR_UNARY_NEGATE: @@ -2066,7 +2106,7 @@ static void mark_decls_read(expression_t *const expr, declaration_t *lhs_decl) case EXPR_UNARY_CAST_IMPLICIT: case EXPR_UNARY_ASSUME: unary: - mark_decls_read(expr->unary.value, lhs_decl); + mark_vars_read(expr->unary.value, lhs_ent); return; case EXPR_BINARY_ADD: @@ -2094,8 +2134,8 @@ unary: case EXPR_BINARY_ISLESSEQUAL: case EXPR_BINARY_ISLESSGREATER: case EXPR_BINARY_ISUNORDERED: - mark_decls_read(expr->binary.left, lhs_decl); - mark_decls_read(expr->binary.right, lhs_decl); + mark_vars_read(expr->binary.left, lhs_ent); + mark_vars_read(expr->binary.right, lhs_ent); return; case EXPR_BINARY_ASSIGN: @@ -2109,15 +2149,15 @@ unary: case EXPR_BINARY_BITWISE_AND_ASSIGN: case EXPR_BINARY_BITWISE_XOR_ASSIGN: case EXPR_BINARY_BITWISE_OR_ASSIGN: { - if (lhs_decl == DECL_ANY) - lhs_decl = NULL; - lhs_decl = determine_lhs_decl(expr->binary.left, lhs_decl); - mark_decls_read(expr->binary.right, lhs_decl); + if (lhs_ent == ENT_ANY) + lhs_ent = NULL; + lhs_ent = determine_lhs_ent(expr->binary.left, lhs_ent); + mark_vars_read(expr->binary.right, lhs_ent); return; } case EXPR_VA_START: - determine_lhs_decl(expr->va_starte.ap, lhs_decl); + determine_lhs_ent(expr->va_starte.ap, lhs_ent); return; case EXPR_UNKNOWN: @@ -2138,7 +2178,7 @@ unary: case EXPR_OFFSETOF: case EXPR_STATEMENT: // TODO case EXPR_LABEL_ADDRESS: - case EXPR_BINARY_BUILTIN_EXPECT: + case EXPR_REFERENCE_ENUM_VALUE: return; } @@ -2152,7 +2192,7 @@ static designator_t *parse_designation(void) while (true) { designator_t *designator; - switch(token.type) { + switch (token.type) { case '[': designator = allocate_ast_zero(sizeof(designator[0])); designator->source_position = token.source_position; @@ -2160,7 +2200,7 @@ static designator_t *parse_designation(void) add_anchor_token(']'); designator->array_index = parse_constant_expression(); rem_anchor_token(']'); - expect(']'); + expect(']', end_error); break; case '.': designator = allocate_ast_zero(sizeof(designator[0])); @@ -2175,7 +2215,7 @@ static designator_t *parse_designation(void) next_token(); break; default: - expect('='); + expect('=', end_error); return result; } @@ -2303,10 +2343,10 @@ static initializer_t *parse_scalar_initializer(type_t *type, } expression_t *expression = parse_assignment_expression(); - mark_decls_read(expression, NULL); + mark_vars_read(expression, NULL); if (must_be_constant && !is_initializer_constant(expression)) { errorf(&expression->base.source_position, - "Initialisation expression '%E' is not constant\n", + "Initialisation expression '%E' is not constant", expression); } @@ -2368,7 +2408,7 @@ static __attribute__((unused)) void debug_print_type_path( { size_t len = ARR_LEN(path->path); - for(size_t i = 0; i < len; ++i) { + for (size_t i = 0; i < len; ++i) { const type_path_entry_t *entry = & path->path[i]; type_t *type = skip_typeref(entry->type); @@ -2378,9 +2418,10 @@ static __attribute__((unused)) void debug_print_type_path( assert(i == len-1); continue; } - fprintf(stderr, ".%s", entry->v.compound_entry->symbol->string); + fprintf(stderr, ".%s", + entry->v.compound_entry->base.symbol->string); } else if (is_type_array(type)) { - fprintf(stderr, "[%zu]", entry->v.index); + fprintf(stderr, "[%u]", (unsigned) entry->v.index); } else { fprintf(stderr, "-INVALID-"); } @@ -2417,8 +2458,7 @@ static type_path_entry_t *append_to_type_path(type_path_t *path) } /** - * Descending into a sub-type. Enter the scope of the current - * top_type. + * Descending into a sub-type. Enter the scope of the current top_type. */ static void descend_into_subtype(type_path_t *path) { @@ -2429,14 +2469,15 @@ static void descend_into_subtype(type_path_t *path) top->type = top_type; if (is_type_compound(top_type)) { - declaration_t *declaration = top_type->compound.declaration; - declaration_t *entry = declaration->scope.declarations; - top->v.compound_entry = entry; + compound_t *compound = top_type->compound.compound; + entity_t *entry = compound->members.entities; if (entry != NULL) { - path->top_type = entry->type; + assert(entry->kind == ENTITY_COMPOUND_MEMBER); + top->v.compound_entry = &entry->declaration; + path->top_type = entry->declaration.type; } else { - path->top_type = NULL; + path->top_type = NULL; } } else if (is_type_array(top_type)) { top->v.index = 0; @@ -2477,7 +2518,7 @@ static void ascend_to(type_path_t *path, size_t top_path_level) static bool walk_designator(type_path_t *path, const designator_t *designator, bool used_in_offsetof) { - for( ; designator != NULL; designator = designator->next) { + for (; designator != NULL; designator = designator->next) { type_path_entry_t *top = get_type_path_top(path); type_t *orig_type = top->type; @@ -2496,10 +2537,10 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, top->v.compound_entry = NULL; orig_type = type_error_type; } else { - declaration_t *declaration = type->compound.declaration; - declaration_t *iter = declaration->scope.declarations; - for( ; iter != NULL; iter = iter->next) { - if (iter->symbol == symbol) { + compound_t *compound = type->compound.compound; + entity_t *iter = compound->members.entities; + for (; iter != NULL; iter = iter->base.next) { + if (iter->base.symbol == symbol) { break; } } @@ -2508,8 +2549,9 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, "'%T' has no member named '%Y'", orig_type, symbol); goto failed; } + assert(iter->kind == ENTITY_COMPOUND_MEMBER); if (used_in_offsetof) { - type_t *real_type = skip_typeref(iter->type); + 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", @@ -2519,8 +2561,8 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, } top->type = orig_type; - top->v.compound_entry = iter; - orig_type = iter->type; + top->v.compound_entry = &iter->declaration; + orig_type = iter->declaration.type; } } else { expression_t *array_index = designator->array_index; @@ -2577,7 +2619,14 @@ static void advance_current_object(type_path_t *path, size_t top_path_level) } else if (is_type_struct(type)) { declaration_t *entry = top->v.compound_entry; - entry = entry->next; + entity_t *next_entity = entry->base.next; + if (next_entity != NULL) { + assert(is_declaration(next_entity)); + entry = &next_entity->declaration; + } else { + entry = NULL; + } + top->v.compound_entry = entry; if (entry != NULL) { path->top_type = entry->type; @@ -2707,9 +2756,10 @@ finish_designator: } else { eat('{'); if (type == NULL) { - if (env->declaration != NULL) { - errorf(HERE, "extra brace group at end of initializer for '%Y'", - env->declaration->symbol); + if (env->entity != NULL) { + errorf(HERE, + "extra brace group at end of initializer for '%Y'", + env->entity->base.symbol); } else { errorf(HERE, "extra brace group at end of initializer"); } @@ -2723,9 +2773,9 @@ finish_designator: if (type != NULL) { ascend_from_subtype(path); - expect('}'); + expect('}', end_error); } else { - expect('}'); + expect('}', end_error); goto error_parse_next; } } @@ -2735,7 +2785,7 @@ finish_designator: if (env->must_be_constant && !is_initializer_constant(expression)) { errorf(&expression->base.source_position, - "Initialisation expression '%E' is not constant\n", + "Initialisation expression '%E' is not constant", expression); } @@ -2743,7 +2793,7 @@ finish_designator: /* we are already outside, ... */ type_t *const outer_type_skip = skip_typeref(outer_type); if (is_type_compound(outer_type_skip) && - !outer_type_skip->compound.declaration->init.complete) { + !outer_type_skip->compound.compound->complete) { goto error_parse_next; } goto error_excess; @@ -2806,9 +2856,9 @@ finish_designator: } else { error_excess: if (warning.other) { - if (env->declaration != NULL) { + if (env->entity != NULL) { warningf(HERE, "excess elements in struct initializer for '%Y'", - env->declaration->symbol); + env->entity->base.symbol); } else { warningf(HERE, "excess elements in struct initializer"); } @@ -2819,7 +2869,7 @@ error_parse_next: if (token.type == '}') { break; } - expect(','); + expect(',', end_error); if (token.type == '}') { break; } @@ -2884,14 +2934,14 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env) max_index = path.max_index; DEL_ARR_F(path.path); - expect('}'); + expect('}', 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.5 (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) { @@ -2925,9 +2975,10 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env) type_t *new_type = duplicate_type(type); - new_type->array.size_expression = cnst; - new_type->array.size_constant = true; - new_type->array.size = size; + new_type->array.size_expression = cnst; + new_type->array.size_constant = true; + new_type->array.has_implicit_size = true; + new_type->array.size = size; env->type = new_type; } @@ -2936,9 +2987,18 @@ end_error: return NULL; } -static declaration_t *append_declaration(declaration_t *declaration); +static void append_entity(scope_t *scope, entity_t *entity) +{ + if (scope->last_entity != NULL) { + scope->last_entity->base.next = entity; + } else { + scope->entities = entity; + } + scope->last_entity = entity; +} + -static declaration_t *parse_compound_type_specifier(bool is_struct) +static compound_t *parse_compound_type_specifier(bool is_struct) { gnu_attribute_t *attributes = NULL; decl_modifiers_t modifiers = 0; @@ -2948,8 +3008,8 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) eat(T_union); } - symbol_t *symbol = NULL; - declaration_t *declaration = NULL; + symbol_t *symbol = NULL; + compound_t *compound = NULL; if (token.type == T___attribute__) { modifiers |= parse_attributes(&attributes); @@ -2959,20 +3019,24 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) symbol = token.v.symbol; next_token(); - namespace_t const namespc = + namespace_tag_t const namespc = is_struct ? NAMESPACE_STRUCT : NAMESPACE_UNION; - declaration = get_declaration(symbol, namespc); - if (declaration != NULL) { - if (declaration->parent_scope != scope && + 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 == ';')) { - declaration = NULL; - } else if (declaration->init.complete && - 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 at %P)", + errorf(HERE, "multiple definitions of '%s %Y' (previous definition %P)", is_struct ? "struct" : "union", symbol, - &declaration->source_position); - declaration->scope.declarations = NULL; + &compound->base.source_position); + /* clear members in the hope to avoid further errors */ + compound->members.entities = NULL; } } } else if (token.type != '{') { @@ -2987,28 +3051,34 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) return NULL; } - if (declaration == NULL) { - declaration = allocate_declaration_zero(); - declaration->namespc = + 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); - declaration->source_position = token.source_position; - declaration->symbol = symbol; - declaration->parent_scope = scope; + compound->base.source_position = token.source_position; + compound->base.symbol = symbol; + compound->base.parent_scope = current_scope; if (symbol != NULL) { - environment_push(declaration); + environment_push(entity); } - append_declaration(declaration); + append_entity(current_scope, entity); } if (token.type == '{') { - declaration->init.complete = true; - - parse_compound_type_entries(declaration); + parse_compound_type_entries(compound); modifiers |= parse_attributes(&attributes); + + if (symbol == NULL) { + assert(anonymous_entity == NULL); + anonymous_entity = (entity_t*)compound; + } } - declaration->modifiers |= modifiers; - return declaration; + compound->modifiers |= modifiers; + return compound; } static void parse_enum_entries(type_t *const enum_type) @@ -3016,8 +3086,8 @@ static void parse_enum_entries(type_t *const enum_type) eat('{'); if (token.type == '}') { - next_token(); errorf(HERE, "empty enum not allowed"); + next_token(); return; } @@ -3030,11 +3100,10 @@ static void parse_enum_entries(type_t *const enum_type) return; } - declaration_t *const entry = allocate_declaration_zero(); - entry->storage_class = STORAGE_CLASS_ENUM_ENTRY; - entry->type = enum_type; - entry->symbol = token.v.symbol; - entry->source_position = token.source_position; + entity_t *entity = allocate_entity_zero(ENTITY_ENUM_VALUE); + entity->enum_value.enum_type = enum_type; + entity->base.symbol = token.v.symbol; + entity->base.source_position = token.source_position; next_token(); if (token.type == '=') { @@ -3042,12 +3111,12 @@ static void parse_enum_entries(type_t *const enum_type) expression_t *value = parse_constant_expression(); value = create_implicit_cast(value, enum_type); - entry->init.enum_value = value; + entity->enum_value.value = value; /* TODO semantic */ } - record_declaration(entry, false); + record_entity(entity, false); if (token.type != ',') break; @@ -3055,7 +3124,7 @@ static void parse_enum_entries(type_t *const enum_type) } while (token.type != '}'); rem_anchor_token('}'); - expect('}'); + expect('}', end_error); end_error: ; @@ -3064,7 +3133,7 @@ end_error: static type_t *parse_enum_specifier(void) { gnu_attribute_t *attributes = NULL; - declaration_t *declaration; + entity_t *entity; symbol_t *symbol; eat(T_enum); @@ -3072,39 +3141,49 @@ static type_t *parse_enum_specifier(void) symbol = token.v.symbol; next_token(); - declaration = get_declaration(symbol, NAMESPACE_ENUM); + 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 { - declaration = NULL; - symbol = NULL; + entity = NULL; + symbol = NULL; } - if (declaration == NULL) { - declaration = allocate_declaration_zero(); - declaration->namespc = NAMESPACE_ENUM; - declaration->source_position = token.source_position; - declaration->symbol = symbol; - declaration->parent_scope = scope; + 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->base.parent_scope = current_scope; } - type_t *const type = allocate_type_zero(TYPE_ENUM); - type->enumt.declaration = declaration; + type_t *const type = allocate_type_zero(TYPE_ENUM); + type->enumt.enume = &entity->enume; if (token.type == '{') { - if (declaration->init.complete) { - errorf(HERE, "multiple definitions of enum %Y", symbol); + if (entity->enume.complete) { + errorf(HERE, "multiple definitions of 'enum %Y' (previous definition %P)", + symbol, &entity->base.source_position); } if (symbol != NULL) { - environment_push(declaration); + environment_push(entity); } - append_declaration(declaration); - declaration->init.complete = true; + append_entity(current_scope, entity); + entity->enume.complete = true; parse_enum_entries(type); parse_attributes(&attributes); + + 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); } return type; @@ -3115,11 +3194,8 @@ static type_t *parse_enum_specifier(void) */ static bool is_typedef_symbol(symbol_t *symbol) { - const declaration_t *const declaration = - get_declaration(symbol, NAMESPACE_NORMAL); - return - declaration != NULL && - declaration->storage_class == STORAGE_CLASS_TYPEDEF; + const entity_t *const entity = get_entity(symbol, NAMESPACE_NORMAL); + return entity != NULL && entity->kind == ENTITY_TYPEDEF; } static type_t *parse_typeof(void) @@ -3128,7 +3204,7 @@ static type_t *parse_typeof(void) type_t *type; - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *expression = NULL; @@ -3165,7 +3241,7 @@ static type_t *parse_typeof(void) in_gcc_extension = old_gcc_extension; rem_anchor_token(')'); - expect(')'); + expect(')', end_error); type_t *typeof_type = allocate_type_zero(TYPE_TYPEOF); typeof_type->typeoft.expression = expression; @@ -3214,13 +3290,12 @@ static type_t *create_builtin_type(symbol_t *const symbol, static type_t *get_typedef_type(symbol_t *symbol) { - declaration_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL); - if (declaration == NULL || - declaration->storage_class != STORAGE_CLASS_TYPEDEF) + entity_t *entity = get_entity(symbol, NAMESPACE_NORMAL); + if (entity == NULL || entity->kind != ENTITY_TYPEDEF) return NULL; - type_t *type = allocate_type_zero(TYPE_TYPEDEF); - type->typedeft.declaration = declaration; + type_t *type = allocate_type_zero(TYPE_TYPEDEF); + type->typedeft.typedefe = &entity->typedefe; return type; } @@ -3262,7 +3337,7 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe symbol_t *symbol = token.v.symbol; if (symbol == sym_align) { next_token(); - expect('('); + expect('(', end_error); if (token.type != T_INTEGER) goto end_error; if (check_alignment_value(token.v.intvalue)) { @@ -3271,14 +3346,14 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe specifiers->alignment = (unsigned char)token.v.intvalue; } next_token(); - expect(')'); + expect(')', end_error); } else if (symbol == sym_allocate) { next_token(); - expect('('); + expect('(', end_error); if (token.type != T_IDENTIFIER) goto end_error; (void)token.v.symbol; - expect(')'); + expect(')', end_error); } else if (symbol == sym_dllimport) { next_token(); DET_MOD(dllimport, DM_DLLIMPORT); @@ -3305,7 +3380,7 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe DET_MOD(novtable, DM_NOVTABLE); } else if (symbol == sym_property) { next_token(); - expect('('); + expect('(', end_error); for (;;) { bool is_get = false; if (token.type != T_IDENTIFIER) @@ -3318,7 +3393,7 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe goto end_error; } next_token(); - expect('='); + expect('=', end_error); if (token.type != T_IDENTIFIER) goto end_error; if (is_get) { @@ -3341,22 +3416,22 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe } break; } - expect(')'); + expect(')', end_error); } else if (symbol == sym_selectany) { next_token(); DET_MOD(selectany, DM_SELECTANY); } else if (symbol == sym_uuid) { next_token(); - expect('('); + expect('(', end_error); if (token.type != T_STRING_LITERAL) goto end_error; next_token(); - expect(')'); + 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 = 1; + specifiers->deprecated = true; if (token.type == '(') { next_token(); if (token.type == T_STRING_LITERAL) { @@ -3365,14 +3440,14 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe } else { errorf(HERE, "string literal expected"); } - expect(')'); + 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); + warningf(HERE, "Unknown modifier '%Y' ignored", token.v.symbol); next_token(); if (token.type == '(') skip_until(')'); @@ -3385,29 +3460,67 @@ end_error: return; } -static declaration_t *create_error_declaration(symbol_t *symbol, storage_class_tag_t storage_class) +static entity_t *create_error_entity(symbol_t *symbol, entity_kind_tag_t kind) +{ + entity_t *entity = allocate_entity_zero(kind); + entity->base.source_position = *HERE; + entity->base.symbol = symbol; + if (is_declaration(entity)) { + entity->declaration.type = type_error_type; + entity->declaration.implicit = true; + } else if (kind == ENTITY_TYPEDEF) { + entity->typedefe.type = type_error_type; + entity->typedefe.builtin = true; + } + record_entity(entity, false); + return entity; +} + +static void parse_microsoft_based(based_spec_t *based_spec) { - declaration_t *const decl = allocate_declaration_zero(); - decl->source_position = *HERE; - decl->declared_storage_class = storage_class; - decl->storage_class = - storage_class != STORAGE_CLASS_NONE || scope == file_scope ? - storage_class : STORAGE_CLASS_AUTO; - decl->symbol = symbol; - decl->implicit = true; - record_declaration(decl, false); - return decl; + 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) { - if (type->declaration == NULL) - return; - declaration_t *struct_decl = type->declaration; - if (! struct_decl->init.complete) +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; @@ -3415,12 +3528,12 @@ static void finish_struct_type(compound_type_t *type) { il_alignment_t alignment = 1; bool need_pad = false; - declaration_t *entry = struct_decl->scope.declarations; - for (; entry != NULL; entry = entry->next) { - if (entry->namespc != NAMESPACE_NORMAL) + 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->type); + type_t *m_type = skip_typeref(entry->declaration.type); if (! is_type_valid(m_type)) { /* simply ignore errors here */ continue; @@ -3433,7 +3546,7 @@ static void finish_struct_type(compound_type_t *type) { if (offset > size) need_pad = true; - entry->offset = offset; + entry->compound_member.offset = offset; size = offset + m_type->base.size; } if (type->base.alignment != 0) { @@ -3444,14 +3557,15 @@ static void finish_struct_type(compound_type_t *type) { if (offset > size) need_pad = true; - if (warning.padded && need_pad) { - warningf(&struct_decl->source_position, - "'%#T' needs padding", type, struct_decl->symbol); - } - if (warning.packed && !need_pad) { - warningf(&struct_decl->source_position, - "superfluous packed attribute on '%#T'", - type, struct_decl->symbol); + 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; @@ -3462,26 +3576,27 @@ static void finish_struct_type(compound_type_t *type) { * Finish the construction of an union type by calculating * its size and alignment. */ -static void finish_union_type(compound_type_t *type) { - if (type->declaration == NULL) - return; - declaration_t *union_decl = type->declaration; - if (! union_decl->init.complete) +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; - declaration_t *entry = union_decl->scope.declarations; - for (; entry != NULL; entry = entry->next) { - if (entry->namespc != NAMESPACE_NORMAL) + 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->type); + type_t *m_type = skip_typeref(entry->declaration.type); if (! is_type_valid(m_type)) continue; - entry->offset = 0; + entry->compound_member.offset = 0; if (m_type->base.size > size) size = m_type->base.size; if (m_type->base.alignment > alignment) @@ -3514,14 +3629,15 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; switch (token.type) { - /* storage class */ #define MATCH_STORAGE_CLASS(token, class) \ case token: \ - if (specifiers->declared_storage_class != STORAGE_CLASS_NONE) { \ + if (specifiers->storage_class != STORAGE_CLASS_NONE) { \ errorf(HERE, "multiple storage classes in declaration specifiers"); \ } \ - specifiers->declared_storage_class = class; \ + specifiers->storage_class = class; \ + if (specifiers->thread_local) \ + goto check_thread_storage_class; \ next_token(); \ break; @@ -3533,30 +3649,33 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) case T__declspec: next_token(); - expect('('); + expect('(', end_error); add_anchor_token(')'); parse_microsoft_extended_decl_modifier(specifiers); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); break; case T___thread: - switch (specifiers->declared_storage_class) { - case STORAGE_CLASS_NONE: - specifiers->declared_storage_class = STORAGE_CLASS_THREAD; - break; - - case STORAGE_CLASS_EXTERN: - specifiers->declared_storage_class = STORAGE_CLASS_THREAD_EXTERN; - break; - - case STORAGE_CLASS_STATIC: - specifiers->declared_storage_class = STORAGE_CLASS_THREAD_STATIC; - break; + if (specifiers->thread_local) { + errorf(HERE, "duplicate '__thread'"); + } else { + specifiers->thread_local = true; +check_thread_storage_class: + switch (specifiers->storage_class) { + case STORAGE_CLASS_EXTERN: + case STORAGE_CLASS_NONE: + case STORAGE_CLASS_STATIC: + break; - default: - errorf(HERE, "multiple storage classes in declaration specifiers"); - 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: + errorf(HERE, "'__thread' used with '%s'", wrong); + break; + } } next_token(); break; @@ -3585,30 +3704,31 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) /* type specifiers */ #define MATCH_SPECIFIER(token, specifier, name) \ case token: \ - next_token(); \ if (type_specifiers & specifier) { \ errorf(HERE, "multiple " name " type specifiers given"); \ } else { \ type_specifiers |= specifier; \ } \ + next_token(); \ break - MATCH_SPECIFIER(T_void, SPECIFIER_VOID, "void"); - MATCH_SPECIFIER(T_char, SPECIFIER_CHAR, "char"); - MATCH_SPECIFIER(T_short, SPECIFIER_SHORT, "short"); - MATCH_SPECIFIER(T_int, SPECIFIER_INT, "int"); - MATCH_SPECIFIER(T_float, SPECIFIER_FLOAT, "float"); - MATCH_SPECIFIER(T_double, SPECIFIER_DOUBLE, "double"); - MATCH_SPECIFIER(T_signed, SPECIFIER_SIGNED, "signed"); - MATCH_SPECIFIER(T_unsigned, SPECIFIER_UNSIGNED, "unsigned"); MATCH_SPECIFIER(T__Bool, SPECIFIER_BOOL, "_Bool"); - MATCH_SPECIFIER(T__int8, SPECIFIER_INT8, "_int8"); + MATCH_SPECIFIER(T__Complex, SPECIFIER_COMPLEX, "_Complex"); + MATCH_SPECIFIER(T__Imaginary, SPECIFIER_IMAGINARY, "_Imaginary"); + MATCH_SPECIFIER(T__int128, SPECIFIER_INT128, "_int128"); MATCH_SPECIFIER(T__int16, SPECIFIER_INT16, "_int16"); MATCH_SPECIFIER(T__int32, SPECIFIER_INT32, "_int32"); MATCH_SPECIFIER(T__int64, SPECIFIER_INT64, "_int64"); - MATCH_SPECIFIER(T__int128, SPECIFIER_INT128, "_int128"); - MATCH_SPECIFIER(T__Complex, SPECIFIER_COMPLEX, "_Complex"); - MATCH_SPECIFIER(T__Imaginary, SPECIFIER_IMAGINARY, "_Imaginary"); + MATCH_SPECIFIER(T__int8, SPECIFIER_INT8, "_int8"); + MATCH_SPECIFIER(T_bool, SPECIFIER_BOOL, "bool"); + MATCH_SPECIFIER(T_char, SPECIFIER_CHAR, "char"); + MATCH_SPECIFIER(T_double, SPECIFIER_DOUBLE, "double"); + MATCH_SPECIFIER(T_float, SPECIFIER_FLOAT, "float"); + MATCH_SPECIFIER(T_int, SPECIFIER_INT, "int"); + MATCH_SPECIFIER(T_short, SPECIFIER_SHORT, "short"); + MATCH_SPECIFIER(T_signed, SPECIFIER_SIGNED, "signed"); + MATCH_SPECIFIER(T_unsigned, SPECIFIER_UNSIGNED, "unsigned"); + MATCH_SPECIFIER(T_void, SPECIFIER_VOID, "void"); case T__forceinline: /* only in microsoft mode */ @@ -3621,7 +3741,6 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) break; case T_long: - next_token(); if (type_specifiers & SPECIFIER_LONG_LONG) { errorf(HERE, "multiple type specifiers given"); } else if (type_specifiers & SPECIFIER_LONG) { @@ -3629,19 +3748,20 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) } else { type_specifiers |= SPECIFIER_LONG; } + next_token(); break; case T_struct: { type = allocate_type_zero(TYPE_COMPOUND_STRUCT); - type->compound.declaration = parse_compound_type_specifier(true); + type->compound.compound = parse_compound_type_specifier(true); finish_struct_type(&type->compound); break; } case T_union: { type = allocate_type_zero(TYPE_COMPOUND_UNION); - type->compound.declaration = parse_compound_type_specifier(false); - if (type->compound.declaration->modifiers & DM_TRANSPARENT_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; @@ -3672,6 +3792,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) case T_inline: case T__forceinline: /* ^ DECLARATION_START except for __attribute__ */ case T_IDENTIFIER: + case '&': case '*': errorf(HERE, "discarding stray %K in declaration specifier", &token); next_token(); @@ -3691,18 +3812,19 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) switch (la1_type) { DECLARATION_START case T_IDENTIFIER: + case '&': case '*': { errorf(HERE, "%K does not name a type", &token); - declaration_t *const decl = - create_error_declaration(token.v.symbol, STORAGE_CLASS_TYPEDEF); + entity_t *entity = + create_error_entity(token.v.symbol, ENTITY_TYPEDEF); type = allocate_type_zero(TYPE_TYPEDEF); - type->typedeft.declaration = decl; + type->typedeft.typedefe = &entity->typedefe; next_token(); saw_error = true; - if (la1_type == '*') + if (la1_type == '&' || la1_type == '*') goto finish_specifiers; continue; } @@ -3730,7 +3852,7 @@ finish_specifiers: atomic_type_kind_t atomic_type; /* match valid basic types */ - switch(type_specifiers) { + switch (type_specifiers) { case SPECIFIER_VOID: atomic_type = ATOMIC_TYPE_VOID; break; @@ -3926,7 +4048,7 @@ static type_qualifiers_t parse_type_qualifiers(void) type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE; while (true) { - switch(token.type) { + switch (token.type) { /* type qualifiers */ MATCH_TYPE_QUALIFIER(T_const, TYPE_QUALIFIER_CONST); MATCH_TYPE_QUALIFIER(T_restrict, TYPE_QUALIFIER_RESTRICT); @@ -3945,98 +4067,62 @@ static type_qualifiers_t parse_type_qualifiers(void) } /** - * Parses an K&R identifier list and return a list of declarations. - * - * @param last points to the last declaration in the list - * @return the list of declarations + * Parses an K&R identifier list */ -static declaration_t *parse_identifier_list(declaration_t **last) +static void parse_identifier_list(scope_t *scope) { - declaration_t *declarations = NULL; - declaration_t *last_declaration = NULL; do { - declaration_t *const declaration = allocate_declaration_zero(); - declaration->type = NULL; /* a K&R parameter list has no types, yet */ - declaration->source_position = token.source_position; - declaration->symbol = token.v.symbol; + 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; + /* a K&R parameter has no type, yet */ next_token(); - if (last_declaration != NULL) { - last_declaration->next = declaration; - } else { - declarations = declaration; - } - last_declaration = declaration; + append_entity(scope, entity); if (token.type != ',') { break; } next_token(); } while (token.type == T_IDENTIFIER); - - *last = last_declaration; - return declarations; -} - -static type_t *automatic_type_conversion(type_t *orig_type); - -static void semantic_parameter(declaration_t *declaration) -{ - /* TODO: improve error messages */ - source_position_t const* const pos = &declaration->source_position; - - switch (declaration->declared_storage_class) { - case STORAGE_CLASS_TYPEDEF: - errorf(pos, "typedef not allowed in parameter list"); - break; - - /* Allowed storage classes */ - case STORAGE_CLASS_NONE: - case STORAGE_CLASS_REGISTER: - break; - - default: - errorf(pos, "parameter may only have none or register storage class"); - break; - } - - type_t *const orig_type = declaration->type; - /* §6.7.5.3(7): Array as last part of a parameter type is just syntactic - * sugar. Turn it into a pointer. - * §6.7.5.3(8): A declaration of a parameter as ``function returning type'' - * shall be adjusted to ``pointer to function returning type'', as in 6.3.2.1. - */ - type_t *const type = automatic_type_conversion(orig_type); - declaration->type = type; - - if (is_type_incomplete(skip_typeref(type))) { - errorf(pos, "parameter '%#T' is of incomplete type", - orig_type, declaration->symbol); - } } -static declaration_t *parse_parameter(void) +static entity_t *parse_parameter(void) { declaration_specifiers_t specifiers; memset(&specifiers, 0, sizeof(specifiers)); parse_declaration_specifiers(&specifiers); - declaration_t *declaration = parse_declarator(&specifiers, /*may_be_abstract=*/true); + entity_t *entity = parse_declarator(&specifiers, + DECL_MAY_BE_ABSTRACT | DECL_IS_PARAMETER); + anonymous_entity = NULL; + return entity; +} + +static void semantic_parameter_incomplete(const entity_t *entity) +{ + assert(entity->kind == ENTITY_PARAMETER); - return declaration; + /* §6.7.5.3:4 After adjustment, the parameters in a parameter type + * list in a function declarator that is part of a + * definition of that function shall not have + * 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); + } } /** - * Parses a function type parameter list and return a list of declarations. - * - * @param last point to the last element of the list - * @return the parameter list + * Parses function type parameters (and optionally creates variable_t entities + * for them in a scope) */ -static declaration_t *parse_parameters(function_type_t *type, declaration_t **last) +static void parse_parameters(function_type_t *type, scope_t *scope) { - declaration_t *declarations = NULL; - eat('('); add_anchor_token(')'); int saved_comma_state = save_and_reset_anchor_state(','); @@ -4046,7 +4132,7 @@ static declaration_t *parse_parameters(function_type_t *type, declaration_t **la token_type_t la1_type = (token_type_t)look_ahead(1)->type; if (la1_type == ',' || la1_type == ')') { type->kr_style_parameters = true; - declarations = parse_identifier_list(last); + parse_identifier_list(scope); goto parameters_finished; } } @@ -4054,50 +4140,57 @@ static declaration_t *parse_parameters(function_type_t *type, declaration_t **la if (token.type == ')') { /* ISO/IEC 14882:1998(E) §C.1.6:1 */ if (!(c_mode & _CXX)) - type->unspecified_parameters = 1; + type->unspecified_parameters = true; goto parameters_finished; } - declaration_t *declaration; - declaration_t *last_declaration = NULL; function_parameter_t *parameter; function_parameter_t *last_parameter = NULL; while (true) { - switch(token.type) { + switch (token.type) { case T_DOTDOTDOT: next_token(); - type->variadic = 1; + type->variadic = true; goto parameters_finished; case T_IDENTIFIER: case T___extension__: DECLARATION_START - declaration = parse_parameter(); + { + 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)); /* func(void) is not a parameter */ if (last_parameter == NULL && token.type == ')' - && declaration->symbol == NULL - && skip_typeref(declaration->type) == type_void) { + && entity->base.symbol == NULL + && skip_typeref(entity->declaration.type) == type_void) { goto parameters_finished; } - semantic_parameter(declaration); + semantic_parameter_incomplete(entity); - parameter = obstack_alloc(type_obst, sizeof(parameter[0])); + parameter = obstack_alloc(type_obst, sizeof(parameter[0])); memset(parameter, 0, sizeof(parameter[0])); - parameter->type = declaration->type; + parameter->type = entity->declaration.type; + + if (scope != NULL) { + append_entity(scope, entity); + } if (last_parameter != NULL) { - last_declaration->next = declaration; - last_parameter->next = parameter; + last_parameter->next = parameter; } else { type->parameters = parameter; - declarations = declaration; } last_parameter = parameter; - last_declaration = declaration; break; + } default: goto parameters_finished; @@ -4111,21 +4204,16 @@ static declaration_t *parse_parameters(function_type_t *type, declaration_t **la parameters_finished: rem_anchor_token(')'); - expect(')'); - - restore_anchor_state(',', saved_comma_state); - *last = last_declaration; - return declarations; + expect(')', end_error); end_error: restore_anchor_state(',', saved_comma_state); - *last = NULL; - return NULL; } typedef enum construct_type_kind_t { CONSTRUCT_INVALID, CONSTRUCT_POINTER, + CONSTRUCT_REFERENCE, CONSTRUCT_FUNCTION, CONSTRUCT_ARRAY } construct_type_kind_t; @@ -4140,6 +4228,12 @@ 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; @@ -4163,7 +4257,7 @@ struct construct_base_type_t { type_t *type; }; -static construct_type_t *parse_pointer_declarator(void) +static construct_type_t *parse_pointer_declarator(variable_t *base_variable) { eat('*'); @@ -4171,8 +4265,20 @@ static construct_type_t *parse_pointer_declarator(void) 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; +} + +static construct_type_t *parse_reference_declarator(void) +{ + eat('&'); + + parsed_reference_t *reference = obstack_alloc(&temp_obst, sizeof(reference[0])); + memset(reference, 0, sizeof(reference[0])); + reference->construct_type.kind = CONSTRUCT_REFERENCE; - return (construct_type_t*) pointer; + return (construct_type_t*)reference; } static construct_type_t *parse_array_declarator(void) @@ -4206,61 +4312,33 @@ static construct_type_t *parse_array_declarator(void) } rem_anchor_token(']'); - expect(']'); + expect(']', end_error); end_error: - return (construct_type_t*) array; + return &array->construct_type; } -static construct_type_t *parse_function_declarator(declaration_t *declaration) +static construct_type_t *parse_function_declarator(scope_t *scope, + decl_modifiers_t modifiers) { - type_t *type; - if (declaration != NULL) { - type = allocate_type_zero(TYPE_FUNCTION); + type_t *type = allocate_type_zero(TYPE_FUNCTION); + function_type_t *ftype = &type->function; - unsigned mask = declaration->modifiers & (DM_CDECL|DM_STDCALL|DM_FASTCALL|DM_THISCALL); + ftype->linkage = current_linkage; - if (mask & (mask-1)) { - const char *first = NULL, *second = NULL; + 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; - /* more than one calling convention set */ - if (declaration->modifiers & DM_CDECL) { - if (first == NULL) first = "cdecl"; - else if (second == NULL) second = "cdecl"; - } - if (declaration->modifiers & DM_STDCALL) { - if (first == NULL) first = "stdcall"; - else if (second == NULL) second = "stdcall"; - } - if (declaration->modifiers & DM_FASTCALL) { - if (first == NULL) first = "fastcall"; - else if (second == NULL) second = "fastcall"; - } - if (declaration->modifiers & DM_THISCALL) { - if (first == NULL) first = "thiscall"; - else if (second == NULL) second = "thiscall"; - } - errorf(&declaration->source_position, "%s and %s attributes are not compatible", first, second); - } - - if (declaration->modifiers & DM_CDECL) - type->function.calling_convention = CC_CDECL; - else if (declaration->modifiers & DM_STDCALL) - type->function.calling_convention = CC_STDCALL; - else if (declaration->modifiers & DM_FASTCALL) - type->function.calling_convention = CC_FASTCALL; - else if (declaration->modifiers & DM_THISCALL) - type->function.calling_convention = CC_THISCALL; - } else { - type = allocate_type_zero(TYPE_FUNCTION); + default: + errorf(HERE, "multiple calling conventions in declaration"); + break; } - declaration_t *last; - declaration_t *parameters = parse_parameters(&type->function, &last); - if (declaration != NULL) { - declaration->scope.declarations = parameters; - declaration->scope.last_declaration = last; - } + parse_parameters(ftype, scope); construct_function_type_t *construct_function_type = obstack_alloc(&temp_obst, sizeof(construct_function_type[0])); @@ -4271,42 +4349,61 @@ static construct_type_t *parse_function_declarator(declaration_t *declaration) return &construct_function_type->construct_type; } -static void fix_declaration_type(declaration_t *declaration) -{ - decl_modifiers_t declaration_modifiers = declaration->modifiers; - type_modifiers_t type_modifiers = declaration->type->base.modifiers; - - if (declaration_modifiers & DM_TRANSPARENT_UNION) - type_modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; - - if (declaration->type->base.modifiers == type_modifiers) - return; - - type_t *copy = duplicate_type(declaration->type); - copy->base.modifiers = type_modifiers; - - type_t *result = typehash_insert(copy); - if (result != copy) { - obstack_free(type_obst, copy); - } - - declaration->type = result; -} +typedef struct parse_declarator_env_t { + decl_modifiers_t modifiers; + symbol_t *symbol; + source_position_t source_position; + scope_t parameters; +} parse_declarator_env_t; -static construct_type_t *parse_inner_declarator(declaration_t *declaration, +static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env, bool may_be_abstract) { /* 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; + construct_type_t *first = NULL; + construct_type_t *last = NULL; gnu_attribute_t *attributes = NULL; decl_modifiers_t modifiers = parse_attributes(&attributes); - /* pointers */ - while (token.type == '*') { - construct_type_t *type = parse_pointer_declarator(); + /* MS __based extension */ + based_spec_t base_spec; + base_spec.base_variable = NULL; + + for (;;) { + construct_type_t *type; + switch (token.type) { + 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 '*': + type = parse_pointer_declarator(base_spec.base_variable); + /* consumed */ + base_spec.base_variable = NULL; + 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; @@ -4319,32 +4416,44 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration, /* 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 (declaration != NULL) - declaration->modifiers |= modifiers; + if (env != NULL) { + modifiers |= env->modifiers; + env->modifiers = modifiers; + } construct_type_t *inner_types = NULL; - switch(token.type) { + switch (token.type) { case T_IDENTIFIER: - if (declaration == NULL) { + if (env == NULL) { errorf(HERE, "no identifier expected in typename"); } else { - declaration->symbol = token.v.symbol; - declaration->source_position = token.source_position; + env->symbol = token.v.symbol; + env->source_position = token.source_position; } next_token(); break; case '(': - next_token(); - add_anchor_token(')'); - inner_types = parse_inner_declarator(declaration, may_be_abstract); - if (inner_types != NULL) { - /* All later declarators only modify the return type, not declaration */ - declaration = NULL; + /* §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); } - rem_anchor_token(')'); - expect(')'); break; default: if (may_be_abstract) @@ -4356,12 +4465,17 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration, construct_type_t *p = last; - while(true) { + while (true) { construct_type_t *type; - switch(token.type) { - case '(': - type = parse_function_declarator(declaration); + switch (token.type) { + case '(': { + scope_t *scope = NULL; + if (env != NULL) + scope = &env->parameters; + + type = parse_function_declarator(scope, modifiers); break; + } case '[': type = parse_array_declarator(); break; @@ -4397,28 +4511,35 @@ end_error: return NULL; } -static void parse_declaration_attributes(declaration_t *declaration) +static void parse_declaration_attributes(entity_t *entity) { gnu_attribute_t *attributes = NULL; decl_modifiers_t modifiers = parse_attributes(&attributes); - if (declaration == NULL) + if (entity == NULL) return; - declaration->modifiers |= modifiers; - /* check if we have these stupid mode attributes... */ - type_t *old_type = declaration->type; - if (old_type == NULL) + 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(old_type)) { - switch(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; @@ -4426,18 +4547,48 @@ static void parse_declaration_attributes(declaration_t *declaration) 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"); + } } - declaration->type - = make_atomic_type(akind, old_type->base.qualifiers); + + 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) { - switch(iter->kind) { + for (; iter != NULL; iter = iter->next) { + switch (iter->kind) { case CONSTRUCT_INVALID: internal_errorf(HERE, "invalid type construction found"); case CONSTRUCT_FUNCTION: { @@ -4466,12 +4617,25 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, } case CONSTRUCT_POINTER: { + if (is_type_reference(skip_typeref(type))) + errorf(HERE, "cannot declare a pointer to reference"); + parsed_pointer_t *parsed_pointer = (parsed_pointer_t*) iter; - type = make_pointer_type(type, parsed_pointer->type_qualifiers); + type = make_based_pointer_type(type, parsed_pointer->type_qualifiers, parsed_pointer->base_variable); continue; } + case CONSTRUCT_REFERENCE: + if (is_type_reference(skip_typeref(type))) + errorf(HERE, "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"); + parsed_array_t *parsed_array = (parsed_array_t*) iter; type_t *array_type = allocate_type_zero(TYPE_ARRAY); @@ -4523,43 +4687,168 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, return type; } -static declaration_t *parse_declarator( - const declaration_specifiers_t *specifiers, bool may_be_abstract) -{ - declaration_t *const declaration = allocate_declaration_zero(); - declaration->source_position = specifiers->source_position; - declaration->declared_storage_class = specifiers->declared_storage_class; - declaration->modifiers = specifiers->modifiers; - declaration->deprecated_string = specifiers->deprecated_string; - declaration->get_property_sym = specifiers->get_property_sym; - declaration->put_property_sym = specifiers->put_property_sym; - declaration->is_inline = specifiers->is_inline; +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) +{ + /* §6.7.5.3:7 A declaration of a parameter as ``array of type'' + * shall be adjusted to ``qualified pointer to type'', + * [...] + * §6.7.5.3:8 A declaration of a parameter as ``function returning + * type'' shall be adjusted to ``pointer to function + * returning type'', as in 6.3.2.1. */ + type = automatic_type_conversion(type); - declaration->storage_class = specifiers->declared_storage_class; - if (declaration->storage_class == STORAGE_CLASS_NONE && - scope != file_scope) { - declaration->storage_class = STORAGE_CLASS_AUTO; + if (specifiers->is_inline && is_type_valid(type)) { + errorf(pos, "parameter '%Y' declared 'inline'", symbol); } - if (specifiers->alignment != 0) { - /* TODO: add checks here */ - declaration->alignment = specifiers->alignment; + /* §6.9.1:6 The declarations in the declaration list shall contain + * no storage-class specifier other than register and no + * initializations. */ + if (specifiers->thread_local || ( + specifiers->storage_class != STORAGE_CLASS_NONE && + specifiers->storage_class != STORAGE_CLASS_REGISTER) + ) { + errorf(pos, "invalid storage class for parameter '%Y'", symbol); } - construct_type_t *construct_type - = parse_inner_declarator(declaration, may_be_abstract); - type_t *const type = specifiers->type; - declaration->type = construct_declarator_type(construct_type, type); + /* delay test for incomplete type, because we might have (void) + * which is legal but incomplete... */ + + return type; +} - parse_declaration_attributes(declaration); +static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, + declarator_flags_t flags) +{ + parse_declarator_env_t env; + memset(&env, 0, sizeof(env)); + env.modifiers = specifiers->modifiers; - fix_declaration_type(declaration); + construct_type_t *construct_type = + parse_inner_declarator(&env, (flags & DECL_MAY_BE_ABSTRACT) != 0); + type_t *orig_type = + construct_declarator_type(construct_type, specifiers->type); + type_t *type = skip_typeref(orig_type); if (construct_type != NULL) { obstack_free(&temp_obst, construct_type); } - return declaration; + entity_t *entity; + if (specifiers->storage_class == STORAGE_CLASS_TYPEDEF) { + entity = allocate_entity_zero(ENTITY_TYPEDEF); + entity->base.symbol = env.symbol; + entity->base.source_position = env.source_position; + entity->typedefe.type = orig_type; + + if (anonymous_entity != NULL) { + if (is_type_compound(type)) { + assert(anonymous_entity->compound.alias == NULL); + assert(anonymous_entity->kind == ENTITY_STRUCT || + anonymous_entity->kind == ENTITY_UNION); + anonymous_entity->compound.alias = entity; + anonymous_entity = NULL; + } else if (is_type_enum(type)) { + assert(anonymous_entity->enume.alias == NULL); + assert(anonymous_entity->kind == ENTITY_ENUM); + anonymous_entity->enume.alias = entity; + anonymous_entity = NULL; + } + } + } else { + /* create a declaration type entity */ + if (flags & DECL_CREATE_COMPOUND_MEMBER) { + entity = allocate_entity_zero(ENTITY_COMPOUND_MEMBER); + + 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); + } + } else if (flags & DECL_IS_PARAMETER) { + orig_type = semantic_parameter(&env.source_position, orig_type, + specifiers, env.symbol); + + entity = allocate_entity_zero(ENTITY_PARAMETER); + } 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); + } + } 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; + } + + 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; + + 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; + } + } + 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; + + 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) + storage_class = STORAGE_CLASS_AUTO; + entity->declaration.storage_class = storage_class; + } + + parse_declaration_attributes(entity); + + return entity; } static type_t *parse_abstract_declarator(type_t *base_type) @@ -4574,17 +4863,6 @@ static type_t *parse_abstract_declarator(type_t *base_type) return result; } -static declaration_t *append_declaration(declaration_t* const declaration) -{ - if (last_declaration != NULL) { - last_declaration->next = declaration; - } else { - scope->declarations = declaration; - } - last_declaration = declaration; - return declaration; -} - /** * Check if the declaration of main is suspicious. main should be a * function with external linkage, returning int, taking either zero @@ -4595,37 +4873,45 @@ static declaration_t *append_declaration(declaration_t* const declaration) * @param decl the declaration to check * @param type the function type of the declaration */ -static void check_type_of_main(const declaration_t *const decl, const function_type_t *const func_type) +static void check_type_of_main(const entity_t *entity) { - if (decl->storage_class == STORAGE_CLASS_STATIC) { - warningf(&decl->source_position, - "'main' is normally a non-static function"); + const source_position_t *pos = &entity->base.source_position; + if (entity->kind != ENTITY_FUNCTION) { + warningf(pos, "'main' is not a function"); + return; } + + if (entity->declaration.storage_class == STORAGE_CLASS_STATIC) { + warningf(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(&decl->source_position, - "return type of 'main' should be 'int', but is '%T'", + warningf(pos, "return type of 'main' should be 'int', but is '%T'", func_type->return_type); } const function_parameter_t *parm = func_type->parameters; if (parm != NULL) { type_t *const first_type = parm->type; if (!types_compatible(skip_typeref(first_type), type_int)) { - warningf(&decl->source_position, - "first argument of 'main' should be 'int', but is '%T'", first_type); + warningf(pos, + "first argument of 'main' should be 'int', but is '%T'", + first_type); } parm = parm->next; if (parm != NULL) { type_t *const second_type = parm->type; if (!types_compatible(skip_typeref(second_type), type_char_ptr_ptr)) { - warningf(&decl->source_position, - "second argument of 'main' should be 'char**', but is '%T'", second_type); + warningf(pos, "second argument of 'main' should be 'char**', but is '%T'", second_type); } parm = parm->next; if (parm != NULL) { type_t *const third_type = parm->type; if (!types_compatible(skip_typeref(third_type), type_char_ptr_ptr)) { - warningf(&decl->source_position, - "third argument of 'main' should be 'char**', but is '%T'", third_type); + warningf(pos, "third argument of 'main' should be 'char**', but is '%T'", third_type); } parm = parm->next; if (parm != NULL) @@ -4633,7 +4919,7 @@ static void check_type_of_main(const declaration_t *const decl, const function_t } } else { warn_arg_count: - warningf(&decl->source_position, "'main' takes only zero, two or three arguments"); + warningf(pos, "'main' takes only zero, two or three arguments"); } } } @@ -4646,94 +4932,142 @@ static bool is_sym_main(const symbol_t *const sym) return strcmp(sym->string, "main") == 0; } -static declaration_t *record_declaration( - declaration_t *const declaration, - const bool is_definition) +static void error_redefined_as_different_kind(const source_position_t *pos, + const entity_t *old, entity_kind_t new_kind) { - const symbol_t *const symbol = declaration->symbol; - const namespace_t namespc = (namespace_t)declaration->namespc; + 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); +} - assert(symbol != NULL); - declaration_t *previous_declaration = get_declaration(symbol, namespc); +/** + * 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) +{ + const symbol_t *const symbol = entity->base.symbol; + const namespace_tag_t namespc = (namespace_tag_t)entity->base.namespc; + const source_position_t *pos = &entity->base.source_position; - type_t *const orig_type = declaration->type; - type_t *const type = skip_typeref(orig_type); - if (is_type_function(type) && - type->function.unspecified_parameters && - warning.strict_prototypes && - previous_declaration == NULL) { - warningf(&declaration->source_position, - "function declaration '%#T' is not a prototype", - orig_type, symbol); - } - - if (warning.main && is_type_function(type) && is_sym_main(symbol)) { - check_type_of_main(declaration, &type->function); - } - - if (warning.nested_externs && - declaration->storage_class == STORAGE_CLASS_EXTERN && - scope != file_scope) { - warningf(&declaration->source_position, - "nested extern declaration of '%#T'", declaration->type, symbol); - } - - assert(declaration != previous_declaration); - if (previous_declaration != NULL && - previous_declaration->parent_scope == ¤t_function->scope && - scope->depth == previous_declaration->parent_scope->depth + 1) { - errorf(&declaration->source_position, - "declaration '%#T' redeclares the parameter '%#T' (declared %P)", - orig_type, symbol, previous_declaration->type, symbol, - &previous_declaration->source_position); + /* can happen in error cases */ + if (symbol == NULL) + return entity; + + entity_t *previous_entity = get_entity(symbol, namespc); + /* pushing the same entity twice will break the stack structure */ + assert(previous_entity != entity); + + if (entity->kind == ENTITY_FUNCTION) { + type_t *const orig_type = entity->declaration.type; + type_t *const type = skip_typeref(orig_type); + + 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); + } + + if (warning.main && current_scope == file_scope + && is_sym_main(symbol)) { + check_type_of_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 (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_declaration != NULL && - previous_declaration->parent_scope == scope) { - /* can happen for K&R style declarations */ - if (previous_declaration->type == NULL) { - previous_declaration->type = declaration->type; + + 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); + 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; + + /* 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; + } + + 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); - const type_t *prev_type = skip_typeref(previous_declaration->type); if (!types_compatible(type, prev_type)) { - errorf(&declaration->source_position, + errorf(pos, "declaration '%#T' is incompatible with '%#T' (declared %P)", - orig_type, symbol, previous_declaration->type, symbol, - &previous_declaration->source_position); + orig_type, symbol, prev_decl->type, symbol, + &previous_entity->base.source_position); } else { - unsigned old_storage_class = previous_declaration->storage_class; - if (old_storage_class == STORAGE_CLASS_ENUM_ENTRY) { - errorf(&declaration->source_position, - "redeclaration of enum entry '%Y' (declared %P)", - symbol, &previous_declaration->source_position); - return previous_declaration; - } - - if (warning.redundant_decls && - is_definition && - previous_declaration->storage_class == STORAGE_CLASS_STATIC && - !(previous_declaration->modifiers & DM_USED) && - !previous_declaration->used) { - warningf(&previous_declaration->source_position, + 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'", - previous_declaration->type, symbol); + prev_decl->type, symbol); } - unsigned new_storage_class = declaration->storage_class; - + unsigned new_storage_class = decl->storage_class; if (is_type_incomplete(prev_type)) { - previous_declaration->type = type; - prev_type = type; + prev_decl->type = type; + prev_type = type; } /* pretend no storage class means extern for function * declarations (except if the previous declaration is neither * none nor extern) */ - if (is_type_function(type)) { + if (entity->kind == ENTITY_FUNCTION) { if (prev_type->function.unspecified_parameters) { - previous_declaration->type = type; - prev_type = type; + prev_decl->type = type; + prev_type = type; } switch (old_storage_class) { @@ -4746,8 +5080,7 @@ static declaration_t *record_declaration( if (warning.missing_prototypes && prev_type->function.unspecified_parameters && !is_sym_main(symbol)) { - warningf(&declaration->source_position, - "no previous prototype for '%#T'", + warningf(pos, "no previous prototype for '%#T'", orig_type, symbol); } } else if (new_storage_class == STORAGE_CLASS_NONE) { @@ -4766,20 +5099,21 @@ warn_redundant_declaration: if (!is_definition && warning.redundant_decls && is_type_valid(prev_type) && - strcmp(previous_declaration->source_position.input_name, "") != 0) { - warningf(&declaration->source_position, + strcmp(previous_entity->base.source_position.input_name, + "") != 0) { + warningf(pos, "redundant declaration for '%Y' (declared %P)", - symbol, &previous_declaration->source_position); + 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(&declaration->source_position, + errorf(pos, "static declaration of '%Y' follows non-static declaration (declared %P)", - symbol, &previous_declaration->source_position); + symbol, &previous_entity->base.source_position); } else if (old_storage_class == STORAGE_CLASS_EXTERN) { - previous_declaration->storage_class = STORAGE_CLASS_NONE; - previous_declaration->declared_storage_class = STORAGE_CLASS_NONE; + 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) @@ -4789,57 +5123,61 @@ warn_redundant_declaration: } else if (is_type_valid(prev_type)) { if (old_storage_class == new_storage_class) { error_redeclaration: - errorf(&declaration->source_position, - "redeclaration of '%Y' (declared %P)", - symbol, &previous_declaration->source_position); + errorf(pos, "redeclaration of '%Y' (declared %P)", + symbol, &previous_entity->base.source_position); } else { - errorf(&declaration->source_position, + errorf(pos, "redeclaration of '%Y' with different linkage (declared %P)", - symbol, &previous_declaration->source_position); + symbol, &previous_entity->base.source_position); } } } - previous_declaration->modifiers |= declaration->modifiers; - previous_declaration->is_inline |= declaration->is_inline; - return previous_declaration; - } else if (is_type_function(type)) { + prev_decl->modifiers |= decl->modifiers; + if (entity->kind == ENTITY_FUNCTION) { + previous_entity->function.is_inline |= entity->function.is_inline; + } + return previous_entity; + } + + if (entity->kind == ENTITY_FUNCTION) { if (is_definition && - declaration->storage_class != STORAGE_CLASS_STATIC) { + entity->declaration.storage_class != STORAGE_CLASS_STATIC) { if (warning.missing_prototypes && !is_sym_main(symbol)) { - warningf(&declaration->source_position, - "no previous prototype for '%#T'", orig_type, symbol); + warningf(pos, "no previous prototype for '%#T'", + entity->declaration.type, symbol); } else if (warning.missing_declarations && !is_sym_main(symbol)) { - warningf(&declaration->source_position, - "no previous declaration for '%#T'", orig_type, - symbol); + warningf(pos, "no previous declaration for '%#T'", + entity->declaration.type, symbol); } } - } else { - if (warning.missing_declarations && - scope == file_scope && ( - declaration->storage_class == STORAGE_CLASS_NONE || - declaration->storage_class == STORAGE_CLASS_THREAD - )) { - warningf(&declaration->source_position, - "no previous declaration for '%#T'", orig_type, symbol); + } 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); } } + finish: - assert(declaration->parent_scope == NULL); - assert(scope != NULL); + assert(entity->base.parent_scope == NULL); + assert(current_scope != NULL); - declaration->parent_scope = scope; + entity->base.parent_scope = current_scope; + entity->base.namespc = NAMESPACE_NORMAL; + environment_push(entity); + append_entity(current_scope, entity); - environment_push(declaration); - return append_declaration(declaration); + return entity; } -static void parser_error_multiple_definition(declaration_t *declaration, +static void parser_error_multiple_definition(entity_t *entity, const source_position_t *source_position) { - errorf(source_position, "multiple definition of symbol '%Y' (declared %P)", - declaration->symbol, &declaration->source_position); + errorf(source_position, "multiple definition of '%Y' (declared %P)", + entity->base.symbol, &entity->base.source_position); } static bool is_declaration_specifier(const token_t *token, @@ -4861,44 +5199,48 @@ static bool is_declaration_specifier(const token_t *token, } } -static void parse_init_declarator_rest(declaration_t *declaration) +static void parse_init_declarator_rest(entity_t *entity) { + assert(is_declaration(entity)); + declaration_t *const declaration = &entity->declaration; + eat('='); type_t *orig_type = declaration->type; type_t *type = skip_typeref(orig_type); - if (declaration->init.initializer != NULL) { - parser_error_multiple_definition(declaration, HERE); + if (entity->kind == ENTITY_VARIABLE + && entity->variable.initializer != NULL) { + parser_error_multiple_definition(entity, HERE); } bool must_be_constant = false; - if (declaration->storage_class == STORAGE_CLASS_STATIC || - declaration->storage_class == STORAGE_CLASS_THREAD_STATIC || - declaration->parent_scope == file_scope) { + if (declaration->storage_class == STORAGE_CLASS_STATIC || + entity->base.parent_scope == file_scope) { must_be_constant = true; } if (is_type_function(type)) { - errorf(&declaration->source_position, + errorf(&entity->base.source_position, "function '%#T' is initialized like a variable", - orig_type, declaration->symbol); + orig_type, entity->base.symbol); orig_type = type_error_type; } parse_initializer_env_t env; env.type = orig_type; env.must_be_constant = must_be_constant; - env.declaration = current_init_decl = declaration; + env.entity = entity; + current_init_decl = entity; initializer_t *initializer = parse_initializer(&env); current_init_decl = NULL; - if (!is_type_function(type)) { - /* § 6.7.5 (22) array initializers for arrays with unknown size determine - * the array type size */ - declaration->type = env.type; - declaration->init.initializer = initializer; + if (entity->kind == ENTITY_VARIABLE) { + /* § 6.7.5 (22) array initializers for arrays with unknown size + * determine the array type size */ + declaration->type = env.type; + entity->variable.initializer = initializer; } } @@ -4907,9 +5249,11 @@ static void parse_anonymous_declaration_rest( const declaration_specifiers_t *specifiers) { eat(';'); + anonymous_entity = NULL; if (warning.other) { - if (specifiers->declared_storage_class != STORAGE_CLASS_NONE) { + if (specifiers->storage_class != STORAGE_CLASS_NONE || + specifiers->thread_local) { warningf(&specifiers->source_position, "useless storage class in empty declaration"); } @@ -4918,7 +5262,7 @@ static void parse_anonymous_declaration_rest( switch (type->kind) { case TYPE_COMPOUND_STRUCT: case TYPE_COMPOUND_UNION: { - if (type->compound.declaration->symbol == NULL) { + if (type->compound.compound->base.symbol == NULL) { warningf(&specifiers->source_position, "unnamed struct/union that defines no instances"); } @@ -4933,95 +5277,108 @@ static void parse_anonymous_declaration_rest( break; } } +} -#ifdef RECORD_EMPTY_DECLARATIONS - declaration_t *const declaration = allocate_declaration_zero(); - declaration->type = specifiers->type; - declaration->declared_storage_class = specifiers->declared_storage_class; - declaration->source_position = specifiers->source_position; - declaration->modifiers = specifiers->modifiers; - declaration->storage_class = STORAGE_CLASS_NONE; +static void check_variable_type_complete(entity_t *ent) +{ + if (ent->kind != ENTITY_VARIABLE) + return; - append_declaration(declaration); -#endif + /* §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) + return; + + type_t *const orig_type = decl->type; + type_t *const type = skip_typeref(orig_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) { + ARR_APP1(declaration_t*, incomplete_arrays, decl); + return; + } + + errorf(&ent->base.source_position, "variable '%#T' has incomplete type", + orig_type, ent->base.symbol); } -static void parse_declaration_rest(declaration_t *ndeclaration, + +static void parse_declaration_rest(entity_t *ndeclaration, const declaration_specifiers_t *specifiers, - parsed_declaration_func finished_declaration) + parsed_declaration_func finished_declaration, + declarator_flags_t flags) { add_anchor_token(';'); add_anchor_token(','); - while(true) { - declaration_t *declaration = - finished_declaration(ndeclaration, token.type == '='); - - type_t *orig_type = declaration->type; - type_t *type = skip_typeref(orig_type); - - if (warning.other && - type->kind != TYPE_FUNCTION && - declaration->is_inline && - is_type_valid(type)) { - warningf(&declaration->source_position, - "variable '%Y' declared 'inline'\n", declaration->symbol); - } + while (true) { + entity_t *entity = finished_declaration(ndeclaration, token.type == '='); if (token.type == '=') { - parse_init_declarator_rest(declaration); + 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 + * [...] where the extern specifier is explicitly used. */ + declaration_t *decl = &entity->declaration; + 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); + } + } } + check_variable_type_complete(entity); + if (token.type != ',') break; eat(','); add_anchor_token('='); - ndeclaration = parse_declarator(specifiers, /*may_be_abstract=*/false); + ndeclaration = parse_declarator(specifiers, flags); rem_anchor_token('='); } - expect(';'); + expect(';', end_error); end_error: + anonymous_entity = NULL; rem_anchor_token(';'); rem_anchor_token(','); } -static declaration_t *finished_kr_declaration(declaration_t *declaration, bool is_definition) +static entity_t *finished_kr_declaration(entity_t *entity, bool is_definition) { - symbol_t *symbol = declaration->symbol; + symbol_t *symbol = entity->base.symbol; if (symbol == NULL) { errorf(HERE, "anonymous declaration not valid as function parameter"); - return declaration; - } - namespace_t namespc = (namespace_t) declaration->namespc; - if (namespc != NAMESPACE_NORMAL) { - return record_declaration(declaration, false); + return entity; } - declaration_t *previous_declaration = get_declaration(symbol, namespc); - if (previous_declaration == NULL || - previous_declaration->parent_scope != scope) { + 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'", symbol); - return declaration; + return entity; } if (is_definition) { - errorf(HERE, "parameter %Y is initialised", declaration->symbol); + errorf(HERE, "parameter '%Y' is initialised", entity->base.symbol); } - if (previous_declaration->type == NULL) { - previous_declaration->type = declaration->type; - previous_declaration->declared_storage_class = declaration->declared_storage_class; - previous_declaration->storage_class = declaration->storage_class; - previous_declaration->parent_scope = scope; - return previous_declaration; - } else { - return record_declaration(declaration, false); - } + return record_entity(entity, false); } -static void parse_declaration(parsed_declaration_func finished_declaration) +static void parse_declaration(parsed_declaration_func finished_declaration, + declarator_flags_t flags) { declaration_specifiers_t specifiers; memset(&specifiers, 0, sizeof(specifiers)); @@ -5033,8 +5390,8 @@ static void parse_declaration(parsed_declaration_func finished_declaration) if (token.type == ';') { parse_anonymous_declaration_rest(&specifiers); } else { - declaration_t *declaration = parse_declarator(&specifiers, /*may_be_abstract=*/false); - parse_declaration_rest(declaration, &specifiers, finished_declaration); + entity_t *entity = parse_declarator(&specifiers, flags); + parse_declaration_rest(entity, &specifiers, finished_declaration, flags); } } @@ -5052,36 +5409,50 @@ static type_t *get_default_promoted_type(type_t *orig_type) return result; } -static void parse_kr_declaration_list(declaration_t *declaration) +static void parse_kr_declaration_list(entity_t *entity) { - type_t *type = skip_typeref(declaration->type); - if (!is_type_function(type)) + if (entity->kind != ENTITY_FUNCTION) return; + type_t *type = skip_typeref(entity->declaration.type); + assert(is_type_function(type)); if (!type->function.kr_style_parameters) return; + add_anchor_token('{'); /* push function parameters */ - size_t const top = environment_top(); - scope_push(&declaration->scope); + size_t const top = environment_top(); + scope_t *old_scope = scope_push(&entity->function.parameters); - declaration_t *parameter = declaration->scope.declarations; - for ( ; parameter != NULL; parameter = parameter->next) { - assert(parameter->parent_scope == NULL); - parameter->parent_scope = scope; + entity_t *parameter = entity->function.parameters.entities; + for ( ; parameter != NULL; parameter = parameter->base.next) { + assert(parameter->base.parent_scope == NULL); + parameter->base.parent_scope = current_scope; environment_push(parameter); } /* parse declaration list */ - while (is_declaration_specifier(&token, false)) { - parse_declaration(finished_kr_declaration); + for (;;) { + switch (token.type) { + 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. */ + case T_IDENTIFIER: + parse_declaration(finished_kr_declaration, DECL_IS_PARAMETER); + break; + default: + goto decl_list_end; + } } +decl_list_end: /* pop function parameters */ - assert(scope == &declaration->scope); - scope_pop(); + assert(current_scope == &entity->function.parameters); + scope_pop(old_scope); environment_pop_to(top); /* update function type */ @@ -5090,26 +5461,25 @@ static void parse_kr_declaration_list(declaration_t *declaration) function_parameter_t *parameters = NULL; function_parameter_t *last_parameter = NULL; - declaration_t *parameter_declaration = declaration->scope.declarations; - for( ; parameter_declaration != NULL; - parameter_declaration = parameter_declaration->next) { - type_t *parameter_type = parameter_declaration->type; + parameter = entity->function.parameters.entities; + for (; parameter != NULL; parameter = parameter->base.next) { + type_t *parameter_type = parameter->declaration.type; if (parameter_type == NULL) { if (strict_mode) { errorf(HERE, "no type specified for function parameter '%Y'", - parameter_declaration->symbol); + parameter->base.symbol); } else { if (warning.implicit_int) { warningf(HERE, "no type specified for function parameter '%Y', using 'int'", - parameter_declaration->symbol); + parameter->base.symbol); } parameter_type = type_int; - parameter_declaration->type = parameter_type; + parameter->declaration.type = parameter_type; } } - semantic_parameter(parameter_declaration); - parameter_type = parameter_declaration->type; + semantic_parameter_incomplete(parameter); + parameter_type = parameter->declaration.type; /* * we need the default promoted types for the function type @@ -5139,7 +5509,7 @@ static void parse_kr_declaration_list(declaration_t *declaration) obstack_free(type_obst, new_type); } - declaration->type = type; + entity->declaration.type = type; rem_anchor_token('{'); } @@ -5155,8 +5525,8 @@ static void print_in_function(void) if (first_err) { first_err = false; diagnosticf("%s: In function '%Y':\n", - current_function->source_position.input_name, - current_function->symbol); + current_function->base.base.source_position.input_name, + current_function->base.base.symbol); } } @@ -5173,48 +5543,54 @@ static void check_labels(void) if (goto_statement->expression != NULL) continue; - declaration_t *label = goto_statement->label; + label_t *label = goto_statement->label; label->used = true; - if (label->source_position.input_name == NULL) { + if (label->base.source_position.input_name == NULL) { print_in_function(); errorf(&goto_statement->base.source_position, - "label '%Y' used but not defined", label->symbol); + "label '%Y' used but not defined", label->base.symbol); } } - goto_first = goto_last = NULL; if (warning.unused_label) { for (const label_statement_t *label_statement = label_first; label_statement != NULL; label_statement = label_statement->next) { - const declaration_t *label = label_statement->label; + label_t *label = label_statement->label; if (! label->used) { print_in_function(); warningf(&label_statement->base.source_position, - "label '%Y' defined but not used", label->symbol); + "label '%Y' defined but not used", label->base.symbol); } } } - label_first = label_last = NULL; } -static void warn_unused_decl(declaration_t *decl, declaration_t *end, char const *const what) +static void warn_unused_entity(entity_t *entity, entity_t *end) { - for (; decl != NULL; decl = decl->next) { - if (decl->implicit) + for (; entity != NULL; entity = entity->base.next) { + if (!is_declaration(entity)) + continue; + + declaration_t *declaration = &entity->declaration; + if (declaration->implicit) continue; - if (!decl->used) { + if (!declaration->used) { print_in_function(); - warningf(&decl->source_position, "%s '%Y' is unused", what, decl->symbol); - } else if (!decl->read) { + const char *what = get_entity_kind_name(entity->kind); + warningf(&entity->base.source_position, "%s '%Y' is unused", + what, entity->base.symbol); + } else if (entity->kind == ENTITY_VARIABLE && !entity->variable.read) { print_in_function(); - warningf(&decl->source_position, "%s '%Y' is never read", what, decl->symbol); + const char *what = get_entity_kind_name(entity->kind); + warningf(&entity->base.source_position, "%s '%Y' is never read", + what, entity->base.symbol); } - if (decl == end) + if (entity == end) break; } } @@ -5226,12 +5602,13 @@ 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_decl(decls->declarations_begin, decls->declarations_end, "variable"); + warn_unused_entity(decls->declarations_begin, + decls->declarations_end); return; } case STATEMENT_FOR: - warn_unused_decl(stmt->fors.scope.declarations, NULL, "variable"); + warn_unused_entity(stmt->fors.scope.entities, NULL); return; default: @@ -5245,15 +5622,16 @@ static void check_unused_variables(statement_t *const stmt, void *const env) static void check_declarations(void) { if (warning.unused_parameter) { - const scope_t *scope = ¤t_function->scope; + const scope_t *scope = ¤t_function->parameters; /* do not issue unused warnings for main */ - if (!is_sym_main(current_function->symbol)) { - warn_unused_decl(scope->declarations, NULL, "parameter"); + if (!is_sym_main(current_function->base.base.symbol)) { + warn_unused_entity(scope->entities, NULL); } } if (warning.unused_variable) { - walk_statements(current_function->init.statement, check_unused_variables, NULL); + walk_statements(current_function->statement, check_unused_variables, + NULL); } } @@ -5265,14 +5643,17 @@ static int determine_truth(expression_t const* const cond) -1; } +static void check_reachable(statement_t *); + static bool expression_returns(expression_t const *const expr) { switch (expr->kind) { case EXPR_CALL: { expression_t const *const func = expr->call.function; if (func->kind == EXPR_REFERENCE) { - declaration_t const *const decl = func->reference.declaration; - if (decl != NULL && decl->modifiers & DM_NORETURN) + entity_t *entity = func->reference.entity; + if (entity->kind == ENTITY_FUNCTION + && entity->declaration.modifiers & DM_NORETURN) return false; } @@ -5288,6 +5669,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: @@ -5303,16 +5685,25 @@ static bool expression_returns(expression_t const *const expr) case EXPR_BUILTIN_CONSTANT_P: case EXPR_BUILTIN_PREFETCH: case EXPR_OFFSETOF: - case EXPR_STATEMENT: // TODO implement + case EXPR_INVALID: + return true; + + case EXPR_STATEMENT: + check_reachable(expr->statement.statement); + // TODO check if statement can be left return true; case EXPR_CONDITIONAL: // TODO handle constant expression - return - expression_returns(expr->conditional.condition) && ( - expression_returns(expr->conditional.true_expression) || - expression_returns(expr->conditional.false_expression) - ); + + if (!expression_returns(expr->conditional.condition)) + return false; + + if (expr->conditional.true_expression != NULL + && expression_returns(expr->conditional.true_expression)) + return true; + + return expression_returns(expr->conditional.false_expression); case EXPR_SELECT: return expression_returns(expr->select.compound); @@ -5341,13 +5732,37 @@ static bool expression_returns(expression_t const *const expr) expression_returns(expr->binary.right); case EXPR_UNKNOWN: - case EXPR_INVALID: break; } panic("unhandled expression"); } +static bool initializer_returns(initializer_t const *const init) +{ + switch (init->kind) { + case INITIALIZER_VALUE: + return expression_returns(init->value.value); + + case INITIALIZER_LIST: { + initializer_t * const* i = init->list.initializers; + initializer_t * const* const end = i + init->list.len; + bool returns = true; + for (; i != end; ++i) { + if (!initializer_returns(*i)) + returns = false; + } + return returns; + } + + case INITIALIZER_STRING: + case INITIALIZER_WIDE_STRING: + case INITIALIZER_DESIGNATOR: // designators have no payload + return true; + } + panic("unhandled initializer"); +} + static bool noreturn_candidate; static void check_reachable(statement_t *const stmt) @@ -5362,22 +5777,49 @@ static void check_reachable(statement_t *const stmt) switch (stmt->kind) { case STATEMENT_INVALID: case STATEMENT_EMPTY: - case STATEMENT_DECLARATION: + case STATEMENT_LOCAL_LABEL: case STATEMENT_ASM: next = stmt->base.next; break; + 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; + if (ent != NULL) { + for (;; ent = ent->base.next) { + if (ent->kind == ENTITY_VARIABLE && + ent->variable.initializer != NULL && + !initializer_returns(ent->variable.initializer)) { + return; + } + if (ent == last) + break; + } + } + next = stmt->base.next; + break; + } + case STATEMENT_COMPOUND: next = stmt->compound.statements; break; - case STATEMENT_RETURN: - noreturn_candidate = false; + case STATEMENT_RETURN: { + expression_t const *const val = stmt->returns.value; + if (val == NULL || expression_returns(val)) + noreturn_candidate = false; return; + } case STATEMENT_IF: { - if_statement_t const* const ifs = &stmt->ifs; - int const val = determine_truth(ifs->condition); + if_statement_t const *const ifs = &stmt->ifs; + expression_t const *const cond = ifs->condition; + + if (!expression_returns(cond)) + return; + + int const val = determine_truth(cond); if (val >= 0) check_reachable(ifs->true_statement); @@ -5398,6 +5840,9 @@ static void check_reachable(statement_t *const stmt) switch_statement_t const *const switchs = &stmt->switchs; expression_t const *const expr = switchs->expression; + if (!expression_returns(expr)) + return; + if (is_constant_expression(expr)) { long const val = fold_constant(expr); case_label_statement_t * defaults = NULL; @@ -5487,12 +5932,15 @@ found_break_parent: case STATEMENT_GOTO: if (stmt->gotos.expression) { + if (!expression_returns(stmt->gotos.expression)) + return; + statement_t *parent = stmt->base.parent; if (parent == NULL) /* top level goto */ return; next = parent; } else { - next = stmt->gotos.label->init.statement; + next = stmt->gotos.label->statement; if (next == NULL) /* missing label */ return; } @@ -5508,7 +5956,12 @@ found_break_parent: case STATEMENT_WHILE: { while_statement_t const *const whiles = &stmt->whiles; - int const val = determine_truth(whiles->condition); + expression_t const *const cond = whiles->condition; + + if (!expression_returns(cond)) + return; + + int const val = determine_truth(cond); if (val >= 0) check_reachable(whiles->body); @@ -5532,8 +5985,15 @@ found_break_parent: fors->condition_reachable = true; expression_t const *const cond = fors->condition; - int const val = - cond == NULL ? 1 : determine_truth(cond); + + int val; + if (cond == NULL) { + val = 1; + } else if (expression_returns(cond)) { + val = determine_truth(cond); + } else { + return; + } if (val >= 0) check_reachable(fors->body); @@ -5574,13 +6034,13 @@ found_break_parent: if (next == NULL) { noreturn_candidate = false; - type_t *const type = current_function->type; + type_t *const type = 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) && is_type_valid(ret) && - !is_sym_main(current_function->symbol)) { + !is_sym_main(current_function->base.base.symbol)) { warningf(&stmt->base.source_position, "control reaches end of non-void function"); } @@ -5591,6 +6051,7 @@ found_break_parent: case STATEMENT_INVALID: case STATEMENT_EMPTY: case STATEMENT_DECLARATION: + case STATEMENT_LOCAL_LABEL: case STATEMENT_EXPRESSION: case STATEMENT_ASM: case STATEMENT_RETURN: @@ -5616,7 +6077,12 @@ continue_while: next->base.reachable = true; while_statement_t const *const whiles = &next->whiles; - int const val = determine_truth(whiles->condition); + expression_t const *const cond = whiles->condition; + + if (!expression_returns(cond)) + return; + + int const val = determine_truth(cond); if (val >= 0) check_reachable(whiles->body); @@ -5635,8 +6101,13 @@ continue_do_while: return; next->base.reachable = true; - do_while_statement_t const *const dw = &next->do_while; - int const val = determine_truth(dw->condition); + do_while_statement_t const *const dw = &next->do_while; + expression_t const *const cond = dw->condition; + + if (!expression_returns(cond)) + return; + + int const val = determine_truth(cond); if (val >= 0) check_reachable(dw->body); @@ -5660,8 +6131,15 @@ continue_for:; fors->condition_reachable = true; expression_t const *const cond = fors->condition; - int const val = - cond == NULL ? 1 : determine_truth(cond); + + int val; + if (cond == NULL) { + val = 1; + } else if (expression_returns(cond)) { + val = determine_truth(cond); + } else { + return; + } if (val >= 0) check_reachable(fors->body); @@ -5727,9 +6205,26 @@ static void check_unreachable(statement_t* const stmt, void *const env) case STATEMENT_COMPOUND: if (stmt->compound.statements != NULL) return; - /* FALLTHROUGH*/ + goto warn_unreachable; + + case STATEMENT_DECLARATION: { + /* Only warn if there is at least one declarator with an initializer. + * This typically occurs in switch statements. */ + declaration_statement_t const *const decl = &stmt->declaration; + entity_t const * ent = decl->declarations_begin; + entity_t const *const last = decl->declarations_end; + for (;; ent = ent->base.next) { + if (ent->kind == ENTITY_VARIABLE && + ent->variable.initializer != NULL) { + goto warn_unreachable; + } + if (ent == last) + return; + } + } default: +warn_unreachable: if (!stmt->base.reachable) warningf(&stmt->base.source_position, "statement is unreachable"); return; @@ -5759,7 +6254,7 @@ static void parse_external_declaration(void) add_anchor_token('{'); /* declarator is common to both function-definitions and declarations */ - declaration_t *ndeclaration = parse_declarator(&specifiers, /*may_be_abstract=*/false); + entity_t *ndeclaration = parse_declarator(&specifiers, DECL_FLAGS_NONE); rem_anchor_token('{'); rem_anchor_token(';'); @@ -5771,7 +6266,8 @@ static void parse_external_declaration(void) case ',': case ';': case '=': - parse_declaration_rest(ndeclaration, &specifiers, record_declaration); + parse_declaration_rest(ndeclaration, &specifiers, record_entity, + DECL_FLAGS_NONE); return; } @@ -5784,14 +6280,13 @@ static void parse_external_declaration(void) return; } - type_t *type = ndeclaration->type; + assert(is_declaration(ndeclaration)); + type_t *type = skip_typeref(ndeclaration->declaration.type); - /* note that we don't skip typerefs: the standard doesn't allow them here - * (so we can't use is_type_function here) */ - if (type->kind != TYPE_FUNCTION) { + 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->symbol); + type, ndeclaration->base.symbol); } eat_block(); return; @@ -5800,15 +6295,15 @@ static void parse_external_declaration(void) if (warning.aggregate_return && is_type_compound(skip_typeref(type->function.return_type))) { warningf(HERE, "function '%Y' returns an aggregate", - ndeclaration->symbol); + ndeclaration->base.symbol); } if (warning.traditional && !type->function.unspecified_parameters) { warningf(HERE, "traditional C rejects ISO C style function definition of function '%Y'", - ndeclaration->symbol); + ndeclaration->base.symbol); } if (warning.old_style_definition && type->function.unspecified_parameters) { warningf(HERE, "old-style function definition '%Y'", - ndeclaration->symbol); + ndeclaration->base.symbol); } /* § 6.7.5.3 (14) a function definition with () means no @@ -5823,73 +6318,84 @@ static void parse_external_declaration(void) if (type != duplicate) { obstack_free(type_obst, duplicate); } - ndeclaration->type = type; + ndeclaration->declaration.type = type; } - declaration_t *const declaration = record_declaration(ndeclaration, true); - if (ndeclaration != declaration) { - declaration->scope = ndeclaration->scope; + entity_t *const entity = record_entity(ndeclaration, true); + assert(entity->kind == ENTITY_FUNCTION); + assert(ndeclaration->kind == ENTITY_FUNCTION); + + function_t *function = &entity->function; + if (ndeclaration != entity) { + function->parameters = ndeclaration->function.parameters; } - type = skip_typeref(declaration->type); + assert(is_declaration(entity)); + type = skip_typeref(entity->declaration.type); /* push function parameters and switch scope */ - size_t const top = environment_top(); - scope_push(&declaration->scope); - - declaration_t *parameter = declaration->scope.declarations; - for( ; parameter != NULL; parameter = parameter->next) { - if (parameter->parent_scope == &ndeclaration->scope) { - parameter->parent_scope = scope; - } - assert(parameter->parent_scope == NULL - || parameter->parent_scope == scope); - parameter->parent_scope = scope; - if (parameter->symbol == NULL) { - errorf(¶meter->source_position, "parameter name omitted"); + size_t const top = environment_top(); + scope_t *old_scope = scope_push(&function->parameters); + + entity_t *parameter = function->parameters.entities; + for (; parameter != NULL; parameter = parameter->base.next) { + if (parameter->base.parent_scope == &ndeclaration->function.parameters) { + parameter->base.parent_scope = current_scope; + } + assert(parameter->base.parent_scope == NULL + || parameter->base.parent_scope == current_scope); + parameter->base.parent_scope = current_scope; + if (parameter->base.symbol == NULL) { + errorf(¶meter->base.source_position, "parameter name omitted"); continue; } environment_push(parameter); } - if (declaration->init.statement != NULL) { - parser_error_multiple_definition(declaration, HERE); + if (function->statement != NULL) { + parser_error_multiple_definition(entity, HERE); eat_block(); } else { /* parse function body */ - int label_stack_top = label_top(); - declaration_t *old_current_function = current_function; - current_function = declaration; - current_parent = NULL; + int label_stack_top = label_top(); + function_t *old_current_function = current_function; + current_function = function; + current_parent = NULL; + + goto_first = NULL; + goto_anchor = &goto_first; + label_first = NULL; + label_anchor = &label_first; statement_t *const body = parse_compound_statement(false); - declaration->init.statement = body; + function->statement = body; first_err = true; check_labels(); check_declarations(); if (warning.return_type || warning.unreachable_code || - (warning.missing_noreturn && !(declaration->modifiers & DM_NORETURN))) { + (warning.missing_noreturn + && !(function->base.modifiers & DM_NORETURN))) { noreturn_candidate = true; check_reachable(body); if (warning.unreachable_code) walk_statements(body, check_unreachable, NULL); if (warning.missing_noreturn && noreturn_candidate && - !(declaration->modifiers & DM_NORETURN)) { + !(function->base.modifiers & DM_NORETURN)) { warningf(&body->base.source_position, "function '%#T' is candidate for attribute 'noreturn'", - type, declaration->symbol); + type, entity->base.symbol); } } assert(current_parent == NULL); - assert(current_function == declaration); + assert(current_function == function); current_function = old_current_function; label_pop_to(label_stack_top); } - assert(scope == &declaration->scope); - scope_pop(); + assert(current_scope == &function->parameters); + scope_pop(old_scope); environment_pop_to(top); } @@ -5916,14 +6422,11 @@ static type_t *make_bitfield_type(type_t *base_type, expression_t *size, long v = fold_constant(size); if (v < 0) { - errorf(source_position, "negative width in bit-field '%Y'", - symbol); + errorf(source_position, "negative width in bit-field '%Y'", symbol); } else if (v == 0) { - errorf(source_position, "zero width for bit-field '%Y'", - symbol); + 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); + errorf(source_position, "width of '%Y' exceeds its type", symbol); } else { type->bitfield.bit_size = v; } @@ -5932,45 +6435,35 @@ static type_t *make_bitfield_type(type_t *base_type, expression_t *size, return type; } -static declaration_t *find_compound_entry(declaration_t *compound_declaration, - symbol_t *symbol) +static entity_t *find_compound_entry(compound_t *compound, symbol_t *symbol) { - declaration_t *iter = compound_declaration->scope.declarations; - for( ; iter != NULL; iter = iter->next) { - if (iter->namespc != NAMESPACE_NORMAL) + entity_t *iter = compound->members.entities; + for (; iter != NULL; iter = iter->base.next) { + if (iter->kind != ENTITY_COMPOUND_MEMBER) continue; - if (iter->symbol == NULL) { - type_t *type = skip_typeref(iter->type); + 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)) { - declaration_t *result - = find_compound_entry(type->compound.declaration, symbol); + entity_t *result + = find_compound_entry(type->compound.compound, symbol); if (result != NULL) return result; } continue; } - - if (iter->symbol == symbol) { - return iter; - } } return NULL; } -static void parse_compound_declarators(declaration_t *struct_declaration, +static void parse_compound_declarators(compound_t *compound, const declaration_specifiers_t *specifiers) { - declaration_t *last_declaration = struct_declaration->scope.declarations; - if (last_declaration != NULL) { - while (last_declaration->next != NULL) { - last_declaration = last_declaration->next; - } - } - while (true) { - declaration_t *declaration; + entity_t *entity; if (token.type == ':') { source_position_t source_position = *HERE; @@ -5982,74 +6475,74 @@ static void parse_compound_declarators(declaration_t *struct_declaration, type_t *type = make_bitfield_type(base_type, size, &source_position, sym_anonymous); - declaration = allocate_declaration_zero(); - declaration->namespc = NAMESPACE_NORMAL; - declaration->declared_storage_class = STORAGE_CLASS_NONE; - declaration->storage_class = STORAGE_CLASS_NONE; - declaration->source_position = source_position; - declaration->modifiers = specifiers->modifiers; - declaration->type = type; + entity = allocate_entity_zero(ENTITY_COMPOUND_MEMBER); + entity->base.namespc = NAMESPACE_NORMAL; + entity->base.source_position = source_position; + 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 { - declaration = parse_declarator(specifiers,/*may_be_abstract=*/true); - - type_t *orig_type = declaration->type; - type_t *type = skip_typeref(orig_type); + 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(); - type_t *bitfield_type = make_bitfield_type(orig_type, size, - &source_position, declaration->symbol); - declaration->type = bitfield_type; - } else { - /* TODO we ignore arrays for now... what is missing is a check - * that they're at the end of the struct */ - if (is_type_incomplete(type) && !is_type_array(type)) { - errorf(HERE, - "compound member '%Y' has incomplete type '%T'", - declaration->symbol, orig_type); - } else if (is_type_function(type)) { - errorf(HERE, "compound member '%Y' must not have function type '%T'", - declaration->symbol, orig_type); - } + 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; } } /* make sure we don't define a symbol multiple times */ - symbol_t *symbol = declaration->symbol; + symbol_t *symbol = entity->base.symbol; if (symbol != NULL) { - declaration_t *prev_decl - = find_compound_entry(struct_declaration, symbol); + entity_t *prev = find_compound_entry(compound, symbol); - if (prev_decl != NULL) { - assert(prev_decl->symbol == symbol); - errorf(&declaration->source_position, + if (prev != NULL) { + errorf(&entity->base.source_position, "multiple declarations of symbol '%Y' (declared %P)", - symbol, &prev_decl->source_position); + symbol, &prev->base.source_position); } } - /* append declaration */ - if (last_declaration != NULL) { - last_declaration->next = declaration; - } else { - struct_declaration->scope.declarations = declaration; + append_entity(&compound->members, entity); + + 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); + } } - last_declaration = declaration; if (token.type != ',') break; next_token(); } - expect(';'); + expect(';', end_error); end_error: - ; + anonymous_entity = NULL; } -static void parse_compound_type_entries(declaration_t *compound_declaration) +static void parse_compound_type_entries(compound_t *compound) { eat('{'); add_anchor_token('}'); @@ -6063,10 +6556,13 @@ static void parse_compound_type_entries(declaration_t *compound_declaration) memset(&specifiers, 0, sizeof(specifiers)); parse_declaration_specifiers(&specifiers); - parse_compound_declarators(compound_declaration, &specifiers); + parse_compound_declarators(compound, &specifiers); } rem_anchor_token('}'); next_token(); + + /* §6.7.2.1:7 */ + compound->complete = true; } static type_t *parse_typename(void) @@ -6074,7 +6570,8 @@ static type_t *parse_typename(void) declaration_specifiers_t specifiers; memset(&specifiers, 0, sizeof(specifiers)); parse_declaration_specifiers(&specifiers); - if (specifiers.declared_storage_class != STORAGE_CLASS_NONE) { + if (specifiers.storage_class != STORAGE_CLASS_NONE || + specifiers.thread_local) { /* TODO: improve error message, user does probably not know what a * storage class is... */ @@ -6108,7 +6605,7 @@ static expression_t *expected_expression_error(void) { /* skip the error message if the error token was read */ if (token.type != T_ERROR) { - errorf(HERE, "expected expression, got token '%K'", &token); + errorf(HERE, "expected expression, got token %K", &token); } next_token(); @@ -6165,15 +6662,28 @@ static expression_t *parse_string_const(void) } } +/** + * Parse a boolean constant. + */ +static expression_t *parse_bool_const(bool value) +{ + expression_t *cnst = allocate_expression_zero(EXPR_CONST); + cnst->base.type = type_bool; + cnst->conste.v.int_value = value; + + next_token(); + + return cnst; +} + /** * Parse an integer constant. */ static expression_t *parse_int_const(void) { - expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->base.source_position = *HERE; - cnst->base.type = token.datatype; - cnst->conste.v.int_value = token.v.intvalue; + expression_t *cnst = allocate_expression_zero(EXPR_CONST); + cnst->base.type = token.datatype; + cnst->conste.v.int_value = token.v.intvalue; next_token(); @@ -6186,16 +6696,14 @@ static expression_t *parse_int_const(void) static expression_t *parse_character_constant(void) { expression_t *cnst = allocate_expression_zero(EXPR_CHARACTER_CONSTANT); - - cnst->base.source_position = *HERE; - cnst->base.type = token.datatype; - cnst->conste.v.character = token.v.string; + cnst->base.type = token.datatype; + cnst->conste.v.character = token.v.string; if (cnst->conste.v.character.size != 1) { - if (warning.multichar && GNU_MODE) { + if (!GNU_MODE) { + errorf(HERE, "more than 1 character in character constant"); + } else if (warning.multichar) { warningf(HERE, "multi-character character constant"); - } else { - errorf(HERE, "more than 1 characters in character constant"); } } next_token(); @@ -6209,16 +6717,14 @@ static expression_t *parse_character_constant(void) static expression_t *parse_wide_character_constant(void) { expression_t *cnst = allocate_expression_zero(EXPR_WIDE_CHARACTER_CONSTANT); - - cnst->base.source_position = *HERE; cnst->base.type = token.datatype; cnst->conste.v.wide_character = token.v.wide_string; if (cnst->conste.v.wide_character.size != 1) { - if (warning.multichar && GNU_MODE) { + if (!GNU_MODE) { + errorf(HERE, "more than 1 character in character constant"); + } else if (warning.multichar) { warningf(HERE, "multi-character character constant"); - } else { - errorf(HERE, "more than 1 characters in character constant"); } } next_token(); @@ -6240,7 +6746,7 @@ static expression_t *parse_float_const(void) return cnst; } -static declaration_t *create_implicit_function(symbol_t *symbol, +static entity_t *create_implicit_function(symbol_t *symbol, const source_position_t *source_position) { type_t *ntype = allocate_type_zero(TYPE_FUNCTION); @@ -6252,20 +6758,20 @@ static declaration_t *create_implicit_function(symbol_t *symbol, free_type(ntype); } - declaration_t *const declaration = allocate_declaration_zero(); - declaration->storage_class = STORAGE_CLASS_EXTERN; - declaration->declared_storage_class = STORAGE_CLASS_EXTERN; - declaration->type = type; - declaration->symbol = symbol; - declaration->source_position = *source_position; - declaration->implicit = true; + 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_declaration(declaration, false); + record_entity(entity, false); warning.strict_prototypes = strict_prototypes_old; - return declaration; + return entity; } /** @@ -6345,7 +6851,7 @@ static type_t *make_function_0_type(type_t *return_type) */ static type_t *get_builtin_symbol_type(symbol_t *symbol) { - switch(symbol->ID) { + switch (symbol->ID) { case T___builtin_alloca: return make_function_1_type(type_void_ptr, type_size_t); case T___builtin_huge_val: @@ -6367,7 +6873,7 @@ static type_t *get_builtin_symbol_type(symbol_t *symbol) case T___builtin_expect: return make_function_2_type(type_long, type_long, type_long); default: - internal_errorf(HERE, "not implemented builtin symbol found"); + internal_errorf(HERE, "not implemented builtin identifier found"); } } @@ -6401,11 +6907,24 @@ static type_t *automatic_type_conversion(type_t *orig_type) type_t *revert_automatic_type_conversion(const expression_t *expression) { switch (expression->kind) { - case EXPR_REFERENCE: return expression->reference.declaration->type; + 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: - return get_qualified_type(expression->select.compound_entry->type, + 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; @@ -6447,67 +6966,94 @@ type_t *revert_automatic_type_conversion(const expression_t *expression) static expression_t *parse_reference(void) { - expression_t *expression = allocate_expression_zero(EXPR_REFERENCE); - - reference_expression_t *ref = &expression->reference; symbol_t *const symbol = token.v.symbol; - declaration_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL); + entity_t *entity = get_entity(symbol, NAMESPACE_NORMAL); - if (declaration == NULL) { + if (entity == NULL) { if (!strict_mode && look_ahead(1)->type == '(') { /* an implicitly declared function */ - if (warning.implicit_function_declaration) { - warningf(HERE, "implicit declaration of function '%Y'", - symbol); + 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); } - declaration = create_implicit_function(symbol, HERE); + entity = create_implicit_function(symbol, HERE); } else { - errorf(HERE, "unknown symbol '%Y' found.", symbol); - declaration = create_error_declaration(symbol, STORAGE_CLASS_NONE); + errorf(HERE, "unknown identifier '%Y' found.", symbol); + entity = create_error_entity(symbol, ENTITY_VARIABLE); } } - type_t *orig_type = declaration->type; + 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"); + } /* we always do the auto-type conversions; the & and sizeof parser contains * code to revert this! */ type_t *type = automatic_type_conversion(orig_type); - ref->declaration = declaration; - ref->base.type = type; + expression_kind_t kind = EXPR_REFERENCE; + 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; /* this declaration is used */ - declaration->used = true; + if (is_declaration(entity)) { + entity->declaration.used = true; + } - if (declaration->parent_scope != file_scope && - declaration->parent_scope->depth < current_function->scope.depth && - is_type_valid(orig_type) && !is_type_function(orig_type)) { - /* access of a variable from an outer function */ - declaration->address_taken = true; + 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)) { + if (entity->kind == ENTITY_VARIABLE) { + /* access of a variable from an outer function */ + entity->variable.address_taken = true; + } else if (entity->kind == ENTITY_PARAMETER) { + entity->parameter.address_taken = true; + } current_function->need_closure = true; } /* check for deprecated functions */ - if (warning.deprecated_declarations && - declaration->modifiers & DM_DEPRECATED) { - char const *const prefix = is_type_function(declaration->type) ? + 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, declaration->symbol, &declaration->source_position, - declaration->deprecated_string); + prefix, entity->base.symbol, &entity->base.source_position, + declaration->deprecated_string); } else { warningf(HERE, "%s '%Y' is deprecated (declared %P)", prefix, - declaration->symbol, &declaration->source_position); + entity->base.symbol, &entity->base.source_position); } } - if (warning.init_self && declaration == current_init_decl && !in_type_prop) { + + 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", - declaration->type, declaration->symbol); + entity->declaration.type, entity->base.symbol); } next_token(); @@ -6568,7 +7114,7 @@ static expression_t *parse_compound_literal(type_t *type) parse_initializer_env_t env; env.type = type; - env.declaration = NULL; + env.entity = NULL; env.must_be_constant = false; initializer_t *initializer = parse_initializer(&env); type = env.type; @@ -6589,10 +7135,10 @@ static expression_t *parse_cast(void) source_position_t source_position = token.source_position; - type_t *type = parse_typename(); + type_t *type = parse_typename(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); if (token.type == '{') { return parse_compound_literal(type); @@ -6623,9 +7169,8 @@ static expression_t *parse_statement_expression(void) expression_t *expression = allocate_expression_zero(EXPR_STATEMENT); - statement_t *statement = parse_compound_statement(true); - expression->statement.statement = statement; - expression->base.source_position = statement->base.source_position; + statement_t *statement = parse_compound_statement(true); + expression->statement.statement = statement; /* find last statement and use its type */ type_t *type = type_void; @@ -6643,7 +7188,7 @@ static expression_t *parse_statement_expression(void) expression->base.type = type; rem_anchor_token(')'); - expect(')'); + expect(')', end_error); end_error: return expression; @@ -6656,7 +7201,7 @@ static expression_t *parse_parenthesized_expression(void) { eat('('); - switch(token.type) { + switch (token.type) { case '{': /* gcc extension: a statement expression */ return parse_statement_expression(); @@ -6673,7 +7218,7 @@ static expression_t *parse_parenthesized_expression(void) add_anchor_token(')'); expression_t *result = parse_expression(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); end_error: return result; @@ -6681,7 +7226,6 @@ end_error: static expression_t *parse_function_keyword(void) { - next_token(); /* TODO */ if (current_function == NULL) { @@ -6692,13 +7236,13 @@ static expression_t *parse_function_keyword(void) expression->base.type = type_char_ptr; expression->funcname.kind = FUNCNAME_FUNCTION; + next_token(); + return expression; } static expression_t *parse_pretty_function_keyword(void) { - eat(T___PRETTY_FUNCTION__); - if (current_function == NULL) { errorf(HERE, "'__PRETTY_FUNCTION__' used outside of a function"); } @@ -6707,13 +7251,13 @@ static expression_t *parse_pretty_function_keyword(void) expression->base.type = type_char_ptr; expression->funcname.kind = FUNCNAME_PRETTY_FUNCTION; + eat(T___PRETTY_FUNCTION__); + return expression; } static expression_t *parse_funcsig_keyword(void) { - eat(T___FUNCSIG__); - if (current_function == NULL) { errorf(HERE, "'__FUNCSIG__' used outside of a function"); } @@ -6722,13 +7266,13 @@ static expression_t *parse_funcsig_keyword(void) expression->base.type = type_char_ptr; expression->funcname.kind = FUNCNAME_FUNCSIG; + eat(T___FUNCSIG__); + return expression; } static expression_t *parse_funcdname_keyword(void) { - eat(T___FUNCDNAME__); - if (current_function == NULL) { errorf(HERE, "'__FUNCDNAME__' used outside of a function"); } @@ -6737,6 +7281,8 @@ static expression_t *parse_funcdname_keyword(void) expression->base.type = type_char_ptr; expression->funcname.kind = FUNCNAME_FUNCDNAME; + eat(T___FUNCDNAME__); + return expression; } @@ -6754,7 +7300,7 @@ static designator_t *parse_designator(void) next_token(); designator_t *last_designator = result; - while(true) { + while (true) { if (token.type == '.') { next_token(); if (token.type != T_IDENTIFIER) { @@ -6778,7 +7324,7 @@ static designator_t *parse_designator(void) designator->source_position = *HERE; designator->array_index = parse_expression(); rem_anchor_token(']'); - expect(']'); + expect(']', end_error); if (designator->array_index == NULL) { return NULL; } @@ -6800,20 +7346,20 @@ end_error: */ static expression_t *parse_offsetof(void) { - eat(T___builtin_offsetof); - expression_t *expression = allocate_expression_zero(EXPR_OFFSETOF); expression->base.type = type_size_t; - expect('('); + eat(T___builtin_offsetof); + + expect('(', end_error); add_anchor_token(','); type_t *type = parse_typename(); rem_anchor_token(','); - expect(','); + expect(',', end_error); add_anchor_token(')'); designator_t *designator = parse_designator(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); expression->offsetofe.type = type; expression->offsetofe.designator = designator; @@ -6841,27 +7387,30 @@ end_error: */ static expression_t *parse_va_start(void) { - eat(T___builtin_va_start); - expression_t *expression = allocate_expression_zero(EXPR_VA_START); - expect('('); + eat(T___builtin_va_start); + + expect('(', end_error); add_anchor_token(','); expression->va_starte.ap = parse_assignment_expression(); rem_anchor_token(','); - expect(','); + expect(',', end_error); expression_t *const expr = parse_assignment_expression(); if (expr->kind == EXPR_REFERENCE) { - declaration_t *const decl = expr->reference.declaration; - if (decl->parent_scope != ¤t_function->scope || decl->next != NULL) { + entity_t *const entity = expr->reference.entity; + 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 { + expression->va_starte.parameter = &entity->variable; } - expression->va_starte.parameter = decl; - expect(')'); + expect(')', end_error); return expression; } - expect(')'); + expect(')', end_error); end_error: return create_invalid_expression(); } @@ -6871,15 +7420,15 @@ end_error: */ static expression_t *parse_va_arg(void) { - eat(T___builtin_va_arg); - expression_t *expression = allocate_expression_zero(EXPR_VA_ARG); - expect('('); + eat(T___builtin_va_arg); + + expect('(', end_error); expression->va_arge.ap = parse_assignment_expression(); - expect(','); + expect(',', end_error); expression->base.type = parse_typename(); - expect(')'); + expect(')', end_error); return expression; end_error: @@ -6907,15 +7456,15 @@ static expression_t *parse_builtin_symbol(void) */ static expression_t *parse_builtin_constant(void) { - eat(T___builtin_constant_p); - expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_CONSTANT_P); - expect('('); + eat(T___builtin_constant_p); + + expect('(', end_error); add_anchor_token(')'); expression->builtin_constant.value = parse_assignment_expression(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); expression->base.type = type_int; return expression; @@ -6928,11 +7477,11 @@ end_error: */ static expression_t *parse_builtin_prefetch(void) { - eat(T___builtin_prefetch); - expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_PREFETCH); - expect('('); + eat(T___builtin_prefetch); + + expect('(', end_error); add_anchor_token(')'); expression->builtin_prefetch.adr = parse_assignment_expression(); if (token.type == ',') { @@ -6944,7 +7493,7 @@ static expression_t *parse_builtin_prefetch(void) expression->builtin_prefetch.locality = parse_assignment_expression(); } rem_anchor_token(')'); - expect(')'); + expect(')', end_error); expression->base.type = type_void; return expression; @@ -6959,7 +7508,7 @@ static expression_t *parse_compare_builtin(void) { expression_t *expression; - switch(token.type) { + switch (token.type) { case T___builtin_isgreater: expression = allocate_expression_zero(EXPR_BINARY_ISGREATER); break; @@ -6984,11 +7533,11 @@ static expression_t *parse_compare_builtin(void) expression->base.source_position = *HERE; next_token(); - expect('('); + expect('(', end_error); expression->binary.left = parse_assignment_expression(); - expect(','); + expect(',', end_error); expression->binary.right = parse_assignment_expression(); - expect(')'); + expect(')', end_error); type_t *const orig_type_left = expression->binary.left->base.type; type_t *const orig_type_right = expression->binary.right->base.type; @@ -7011,20 +7560,20 @@ end_error: #if 0 /** - * Parses a __builtin_expect() expression. + * Parses a __builtin_expect(, end_error) expression. */ -static expression_t *parse_builtin_expect(void) +static expression_t *parse_builtin_expect(void, end_error) { - eat(T___builtin_expect); - expression_t *expression = allocate_expression_zero(EXPR_BINARY_BUILTIN_EXPECT); - expect('('); + eat(T___builtin_expect); + + expect('(', end_error); expression->binary.left = parse_assignment_expression(); - expect(','); + expect(',', end_error); expression->binary.right = parse_constant_expression(); - expect(')'); + expect(')', end_error); expression->base.type = expression->binary.left->base.type; @@ -7039,16 +7588,15 @@ end_error: */ static expression_t *parse_assume(void) { - eat(T__assume); + expression_t *expression = allocate_expression_zero(EXPR_UNARY_ASSUME); - expression_t *expression - = allocate_expression_zero(EXPR_UNARY_ASSUME); + eat(T__assume); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression->unary.value = parse_assignment_expression(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); expression->base.type = type_void; return expression; @@ -7061,37 +7609,37 @@ end_error: * * @param symbol the symbol of the label */ -static declaration_t *get_label(symbol_t *symbol) +static label_t *get_label(symbol_t *symbol) { - declaration_t *candidate; + entity_t *label; assert(current_function != NULL); - candidate = get_declaration(symbol, NAMESPACE_LOCAL_LABEL); + label = get_entity(symbol, NAMESPACE_LABEL); /* if we found a local label, we already created the declaration */ - if (candidate != NULL) { - if (candidate->parent_scope != scope) { - assert(candidate->parent_scope->depth < scope->depth); + 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 candidate; + return &label->label; } - candidate = get_declaration(symbol, NAMESPACE_LABEL); + label = get_entity(symbol, NAMESPACE_LABEL); /* if we found a label in the same function, then we already created the * declaration */ - if (candidate != NULL - && candidate->parent_scope == ¤t_function->scope) { - return candidate; + if (label != NULL + && label->base.parent_scope == ¤t_function->parameters) { + return &label->label; } /* otherwise we need to create a new one */ - declaration_t *const declaration = allocate_declaration_zero(); - declaration->namespc = NAMESPACE_LABEL; - declaration->symbol = symbol; + label = allocate_entity_zero(ENTITY_LABEL); + label->base.namespc = NAMESPACE_LABEL; + label->base.symbol = symbol; - label_push(declaration); + label_push(label); - return declaration; + return &label->label; } /** @@ -7108,8 +7656,7 @@ static expression_t *parse_label_address(void) symbol_t *symbol = token.v.symbol; next_token(); - declaration_t *label = get_label(symbol); - + label_t *label = get_label(symbol); label->used = true; label->address_taken = true; @@ -7117,8 +7664,8 @@ static expression_t *parse_label_address(void) expression->base.source_position = source_position; /* label address is threaten as a void pointer */ - expression->base.type = type_void_ptr; - expression->label_address.declaration = label; + expression->base.type = type_void_ptr; + expression->label_address.label = label; return expression; end_error: return create_invalid_expression(); @@ -7129,7 +7676,12 @@ end_error: */ static expression_t *parse_noop_expression(void) { - source_position_t source_position = *HERE; + /* 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; + eat(T___noop); if (token.type == '(') { @@ -7139,7 +7691,7 @@ static expression_t *parse_noop_expression(void) add_anchor_token(','); if (token.type != ')') { - while(true) { + while (true) { (void)parse_assignment_expression(); if (token.type != ',') break; @@ -7149,19 +7701,10 @@ static expression_t *parse_noop_expression(void) } rem_anchor_token(','); rem_anchor_token(')'); - expect(')'); - - /* the result is a (int)0 */ - expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->base.source_position = source_position; - cnst->base.type = type_int; - cnst->conste.v.int_value = 0; - cnst->conste.is_ms_noop = true; - - return cnst; + expect(')', end_error); end_error: - return create_invalid_expression(); + return cnst; } /** @@ -7170,6 +7713,8 @@ 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(); @@ -7234,22 +7779,21 @@ static void check_for_char_index_type(const expression_t *expression) static expression_t *parse_array_expression(expression_t *left) { + expression_t *expression = allocate_expression_zero(EXPR_ARRAY_ACCESS); + eat('['); add_anchor_token(']'); expression_t *inside = parse_expression(); - expression_t *expression = allocate_expression_zero(EXPR_ARRAY_ACCESS); - - array_access_expression_t *array_access = &expression->array_access; - type_t *const orig_type_left = left->base.type; type_t *const orig_type_inside = inside->base.type; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_inside = skip_typeref(orig_type_inside); - type_t *return_type; + type_t *return_type; + array_access_expression_t *array_access = &expression->array_access; if (is_type_pointer(type_left)) { return_type = type_left->pointer.points_to; array_access->array_ref = left; @@ -7275,22 +7819,17 @@ static expression_t *parse_array_expression(expression_t *left) expression->base.type = automatic_type_conversion(return_type); rem_anchor_token(']'); - if (token.type == ']') { - next_token(); - } else { - parse_error_expected("Problem while parsing array access", ']', NULL); - } + expect(']', end_error); +end_error: return expression; } -static expression_t *parse_typeprop(expression_kind_t const kind, - source_position_t const pos) +static expression_t *parse_typeprop(expression_kind_t const kind) { expression_t *tp_expression = allocate_expression_zero(kind); - tp_expression->base.type = type_size_t; - tp_expression->base.source_position = pos; + tp_expression->base.type = type_size_t; - char const* const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof"; + eat(kind == EXPR_SIZEOF ? T_sizeof : T___alignof__); /* we only refer to a type property, mark this case */ bool old = in_type_prop; @@ -7303,7 +7842,7 @@ static expression_t *parse_typeprop(expression_kind_t const kind, add_anchor_token(')'); orig_type = parse_typename(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); if (token.type == '{') { /* It was not sizeof(type) after all. It is sizeof of an expression @@ -7329,7 +7868,9 @@ typeprop_expression: type->kind == TYPE_BITFIELD ? "bitfield" : NULL; if (wrong_type != NULL) { - errorf(&pos, "operand of %s expression must not be of %s type '%T'", + char const* const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof"; + errorf(&tp_expression->base.source_position, + "operand of %s expression must not be of %s type '%T'", what, wrong_type, orig_type); } @@ -7340,28 +7881,23 @@ end_error: static expression_t *parse_sizeof(void) { - source_position_t pos = *HERE; - eat(T_sizeof); - return parse_typeprop(EXPR_SIZEOF, pos); + return parse_typeprop(EXPR_SIZEOF); } static expression_t *parse_alignof(void) { - source_position_t pos = *HERE; - eat(T___alignof__); - return parse_typeprop(EXPR_ALIGNOF, pos); + return parse_typeprop(EXPR_ALIGNOF); } static expression_t *parse_select_expression(expression_t *compound) { - assert(token.type == '.' || token.type == T_MINUSGREATER); + 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); next_token(); - expression_t *select = allocate_expression_zero(EXPR_SELECT); - select->select.compound = compound; - if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing select", T_IDENTIFIER, NULL); return select; @@ -7390,18 +7926,18 @@ static expression_t *parse_select_expression(expression_t *compound) type_left = type; } - declaration_t *entry; + entity_t *entry; if (type_left->kind == TYPE_COMPOUND_STRUCT || type_left->kind == TYPE_COMPOUND_UNION) { - declaration_t *const declaration = type_left->compound.declaration; + compound_t *compound = type_left->compound.compound; - if (!declaration->init.complete) { + if (!compound->complete) { errorf(HERE, "request for member '%Y' of incomplete type '%T'", symbol, type_left); goto create_error_entry; } - entry = find_compound_entry(declaration, symbol); + entry = find_compound_entry(compound, symbol); if (entry == NULL) { errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol); goto create_error_entry; @@ -7413,14 +7949,15 @@ static expression_t *parse_select_expression(expression_t *compound) symbol, type_left); } create_error_entry: - entry = allocate_declaration_zero(); - entry->symbol = symbol; + entry = create_error_entity(symbol, ENTITY_COMPOUND_MEMBER); } + assert(is_declaration(entry)); select->select.compound_entry = entry; - type_t *const res_type = - get_qualified_type(entry->type, type_left->base.qualifiers); + type_t *entry_type = entry->declaration.type; + type_t *res_type + = get_qualified_type(entry_type, type_left->base.qualifiers); /* we always do the auto-type conversions; the & and sizeof parser contains * code to revert this! */ @@ -7447,12 +7984,12 @@ static void check_call_argument(const function_parameter_t *parameter, if (is_type_union(expected_type_skip) && (expected_type_skip->base.modifiers & TYPE_MODIFIER_TRANSPARENT_UNION)) { - declaration_t *union_decl = expected_type_skip->compound.declaration; - - declaration_t *declaration = union_decl->scope.declarations; - type_t *best_type = NULL; - for ( ; declaration != NULL; declaration = declaration->next) { - type_t *decl_type = declaration->type; + compound_t *union_decl = expected_type_skip->compound.compound; + type_t *best_type = NULL; + entity_t *entry = union_decl->members.entities; + for ( ; entry != NULL; entry = entry->base.next) { + assert(is_declaration(entry)); + type_t *decl_type = entry->declaration.type; error = semantic_assign(decl_type, arg_expr); if (error == ASSIGN_ERROR_INCOMPATIBLE || error == ASSIGN_ERROR_POINTER_QUALIFIER_MISSING) @@ -7500,11 +8037,9 @@ static void check_call_argument(const function_parameter_t *parameter, */ static expression_t *parse_call_expression(expression_t *expression) { - expression_t *result = allocate_expression_zero(EXPR_CALL); - result->base.source_position = expression->base.source_position; - - call_expression_t *call = &result->call; - call->function = expression; + expression_t *result = allocate_expression_zero(EXPR_CALL); + call_expression_t *call = &result->call; + call->function = expression; type_t *const orig_type = expression->base.type; type_t *const type = skip_typeref(orig_type); @@ -7549,7 +8084,7 @@ static expression_t *parse_call_expression(expression_t *expression) } rem_anchor_token(','); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); if (function_type == NULL) return result; @@ -7570,7 +8105,7 @@ static expression_t *parse_call_expression(expression_t *expression) } /* do default promotion */ - for( ; argument != NULL; argument = argument->next) { + for (; argument != NULL; argument = argument->next) { type_t *type = argument->expression->base.type; type = get_default_promoted_type(type); @@ -7598,7 +8133,61 @@ static bool same_compound_type(const type_t *type1, const type_t *type2) return is_type_compound(type1) && type1->kind == type2->kind && - type1->compound.declaration == type2->compound.declaration; + type1->compound.compound == type2->compound.compound; +} + +static expression_t const *get_reference_address(expression_t const *expr) +{ + bool regular_take_address = true; + for (;;) { + if (expr->kind == EXPR_UNARY_TAKE_ADDRESS) { + expr = expr->unary.value; + } else { + regular_take_address = false; + } + + if (expr->kind != EXPR_UNARY_DEREFERENCE) + break; + + expr = expr->unary.value; + } + + if (expr->kind != EXPR_REFERENCE) + return NULL; + + /* special case for functions which are automatically converted to a + * pointer to function without an extra TAKE_ADDRESS operation */ + if (!regular_take_address && + expr->reference.entity->kind != ENTITY_FUNCTION) { + return NULL; + } + + return 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); + } +} + +static void semantic_condition(expression_t const *const expr, + char const *const context) +{ + type_t *const type = skip_typeref(expr->base.type); + if (is_type_scalar(type)) { + warn_reference_address_as_bool(expr); + } else if (is_type_valid(type)) { + errorf(&expr->base.source_position, + "%s must have scalar type", context); + } } /** @@ -7611,28 +8200,23 @@ static expression_t *parse_conditional_expression(expression_t *expression) expression_t *result = allocate_expression_zero(EXPR_CONDITIONAL); conditional_expression_t *conditional = &result->conditional; - conditional->base.source_position = *HERE; - conditional->condition = expression; + conditional->condition = expression; eat('?'); add_anchor_token(':'); - /* 6.5.15.2 */ - type_t *const condition_type_orig = expression->base.type; - type_t *const condition_type = skip_typeref(condition_type_orig); - if (!is_type_scalar(condition_type) && is_type_valid(condition_type)) { - type_error("expected a scalar type in conditional condition", - &expression->base.source_position, condition_type_orig); - } + /* §6.5.15:2 The first operand shall have scalar type. */ + semantic_condition(expression, "condition of conditional operator"); expression_t *true_expression = expression; bool gnu_cond = false; if (GNU_MODE && token.type == ':') { gnu_cond = true; - } else + } else { true_expression = parse_expression(); + } rem_anchor_token(':'); - expect(':'); + expect(':', end_error); expression_t *false_expression = parse_sub_expression(c_mode & _CXX ? PREC_ASSIGNMENT : PREC_CONDITIONAL); @@ -7764,16 +8348,16 @@ static expression_t *parse_extension(void) */ static expression_t *parse_builtin_classify_type(void) { - eat(T___builtin_classify_type); - expression_t *result = allocate_expression_zero(EXPR_CLASSIFY_TYPE); result->base.type = type_int; - expect('('); + eat(T___builtin_classify_type); + + expect('(', end_error); add_anchor_token(')'); expression_t *expression = parse_expression(); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); result->classify_type.type_expression = expression; return result; @@ -7788,15 +8372,14 @@ end_error: static expression_t *parse_delete(void) { expression_t *const result = allocate_expression_zero(EXPR_UNARY_DELETE); - result->base.source_position = *HERE; - result->base.type = type_void; + result->base.type = type_void; eat(T_delete); if (token.type == '[') { next_token(); result->kind = EXPR_UNARY_DELETE_ARRAY; - expect(']'); + expect(']', end_error); end_error:; } @@ -7823,8 +8406,7 @@ end_error:; static expression_t *parse_throw(void) { expression_t *const result = allocate_expression_zero(EXPR_UNARY_THROW); - result->base.source_position = *HERE; - result->base.type = type_void; + result->base.type = type_void; eat(T_throw); @@ -7891,6 +8473,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) */ switch (expression->kind) { case EXPR_REFERENCE: case EXPR_ARRAY_ACCESS: @@ -7898,11 +8481,16 @@ static bool is_lvalue(const expression_t *expression) case EXPR_UNARY_DEREFERENCE: return true; - default: + 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. */ - return !is_type_valid(skip_typeref(expression->base.type)); + !is_type_valid(type); + } } } @@ -7921,89 +8509,42 @@ static void semantic_incdec(unary_expression_t *expression) "operation needs an arithmetic or pointer type"); return; } - if (!is_lvalue(expression->value)) { - /* TODO: improve error message */ - errorf(&expression->base.source_position, "lvalue required as operand"); - } - expression->base.type = orig_type; -} - -static void semantic_unexpr_arithmetic(unary_expression_t *expression) -{ - type_t *const orig_type = expression->value->base.type; - type_t *const type = skip_typeref(orig_type); - if (!is_type_arithmetic(type)) { - if (is_type_valid(type)) { - /* TODO: improve error message */ - errorf(&expression->base.source_position, - "operation needs an arithmetic type"); - } - return; - } - - 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"); -} - -static expression_t const *get_reference_address(expression_t const *expr) -{ - bool regular_take_address = true; - for (;;) { - if (expr->kind == EXPR_UNARY_TAKE_ADDRESS) { - expr = expr->unary.value; - } else { - regular_take_address = false; - } - - if (expr->kind != EXPR_UNARY_DEREFERENCE) - break; - - expr = expr->unary.value; + if (!is_lvalue(expression->value)) { + /* TODO: improve error message */ + errorf(&expression->base.source_position, "lvalue required as operand"); } + expression->base.type = orig_type; +} - if (expr->kind != EXPR_REFERENCE) - return NULL; - - if (!regular_take_address && - !is_type_function(skip_typeref(expr->reference.declaration->type))) { - return NULL; +static void semantic_unexpr_arithmetic(unary_expression_t *expression) +{ + type_t *const orig_type = expression->value->base.type; + type_t *const type = skip_typeref(orig_type); + if (!is_type_arithmetic(type)) { + if (is_type_valid(type)) { + /* TODO: improve error message */ + errorf(&expression->base.source_position, + "operation needs an arithmetic type"); + } + return; } - return expr; + expression->base.type = orig_type; } -static void warn_function_address_as_bool(expression_t const* expr) +static void semantic_unexpr_plus(unary_expression_t *expression) { - 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.declaration->symbol); - } + semantic_unexpr_arithmetic(expression); + if (warning.traditional) + warningf(&expression->base.source_position, + "traditional C rejects the unary plus operator"); } static void semantic_not(unary_expression_t *expression) { - type_t *const orig_type = expression->value->base.type; - type_t *const type = skip_typeref(orig_type); - if (!is_type_scalar(type) && is_type_valid(type)) { - errorf(&expression->base.source_position, - "operand of ! must be of scalar type"); - } - - warn_function_address_as_bool(expression->value); - - expression->base.type = type_int; + /* §6.5.3.3:1 The operand [...] of the ! operator, scalar type. */ + semantic_condition(expression->value, "operand of !"); + expression->base.type = c_mode & _CXX ? type_bool : type_int; } static void semantic_unexpr_integer(unary_expression_t *expression) @@ -8049,17 +8590,23 @@ static void set_address_taken(expression_t *expression, bool may_be_register) if (expression->kind != EXPR_REFERENCE) return; - declaration_t *const declaration = expression->reference.declaration; - /* happens for parse errors */ - if (declaration == NULL) + entity_t *const entity = expression->reference.entity; + + if (entity->kind != ENTITY_VARIABLE && entity->kind != ENTITY_PARAMETER) return; - if (declaration->storage_class == STORAGE_CLASS_REGISTER && !may_be_register) { + if (entity->declaration.storage_class == STORAGE_CLASS_REGISTER + && !may_be_register) { errorf(&expression->base.source_position, - "address of register variable '%Y' requested", - declaration->symbol); + "address of register %s '%Y' requested", + get_entity_kind_name(entity->kind), entity->base.symbol); + } + + if (entity->kind == ENTITY_VARIABLE) { + entity->variable.address_taken = true; } else { - declaration->address_taken = 1; + assert(entity->kind == ENTITY_PARAMETER); + entity->parameter.address_taken = true; } } @@ -8072,9 +8619,20 @@ static void semantic_take_addr(unary_expression_t *expression) value->base.type = revert_automatic_type_conversion(value); type_t *orig_type = value->base.type; - if (!is_type_valid(skip_typeref(orig_type))) + type_t *type = skip_typeref(orig_type); + if (!is_type_valid(type)) return; + /* §6.5.3.2 */ + if (!is_lvalue(value)) { + errorf(&expression->base.source_position, "'&' requires an lvalue"); + } + if (type->kind == TYPE_BITFIELD) { + errorf(&expression->base.source_position, + "'&' not allowed on object with bitfield type '%T'", + type); + } + set_address_taken(value, false); expression->base.type = make_pointer_type(orig_type, TYPE_QUALIFIER_NONE); @@ -8085,7 +8643,6 @@ static expression_t *parse_##unexpression_type(void) \ { \ expression_t *unary_expression \ = allocate_expression_zero(unexpression_type); \ - unary_expression->base.source_position = *HERE; \ eat(token_type); \ unary_expression->unary.value = parse_sub_expression(PREC_UNARY); \ \ @@ -8117,9 +8674,8 @@ static expression_t *parse_##unexpression_type(expression_t *left) \ { \ expression_t *unary_expression \ = allocate_expression_zero(unexpression_type); \ - unary_expression->base.source_position = *HERE; \ eat(token_type); \ - unary_expression->unary.value = left; \ + unary_expression->unary.value = left; \ \ sfunc(&unary_expression->unary); \ \ @@ -8380,15 +8936,15 @@ static void semantic_comparison(binary_expression_t *expression) 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.declaration->symbol); + "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.declaration->symbol); + "the address of '%Y' will never be NULL", + func_right->reference.entity->base.symbol); } } @@ -8451,7 +9007,7 @@ static void semantic_comparison(binary_expression_t *expression) &expression->base.source_position, type_left, type_right); } - expression->base.type = type_int; + expression->base.type = c_mode & _CXX ? type_bool : type_int; } /** @@ -8459,18 +9015,18 @@ static void semantic_comparison(binary_expression_t *expression) */ static bool has_const_fields(const compound_type_t *type) { - const scope_t *scope = &type->declaration->scope; - const declaration_t *declaration = scope->declarations; + compound_t *compound = type->compound; + entity_t *entry = compound->members.entities; - for (; declaration != NULL; declaration = declaration->next) { - if (declaration->namespc != NAMESPACE_NORMAL) + for (; entry != NULL; entry = entry->base.next) { + if (!is_declaration(entry)) continue; - const type_t *decl_type = skip_typeref(declaration->type); + const type_t *decl_type = skip_typeref(entry->declaration.type); if (decl_type->base.qualifiers & TYPE_QUALIFIER_CONST) return true; } - /* TODO */ + return false; } @@ -8485,8 +9041,14 @@ static bool is_valid_assignment_lhs(expression_t const* const left) return false; } + if (left->kind == EXPR_REFERENCE + && left->reference.entity->kind == ENTITY_FUNCTION) { + errorf(HERE, "cannot assign to function '%E'", left); + return false; + } + if (is_type_array(type_left)) { - errorf(HERE, "cannot assign to arrays ('%E')", left); + errorf(HERE, "cannot assign to array '%E'", left); return false; } if (type_left->base.qualifiers & TYPE_QUALIFIER_CONST) { @@ -8581,26 +9143,11 @@ static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression) */ static void semantic_logical_op(binary_expression_t *expression) { - expression_t *const left = expression->left; - expression_t *const right = expression->right; - type_t *const orig_type_left = left->base.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); - - warn_function_address_as_bool(left); - warn_function_address_as_bool(right); - - if (!is_type_scalar(type_left) || !is_type_scalar(type_right)) { - /* TODO: improve error message */ - if (is_type_valid(type_left) && is_type_valid(type_right)) { - errorf(&expression->base.source_position, - "operation needs scalar types"); - } - return; - } - - expression->base.type = type_int; + /* §6.5.13:2 Each of the operands shall have scalar type. + * §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"); + expression->base.type = c_mode & _CXX ? type_bool : type_int; } /** @@ -8639,6 +9186,7 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_UNKNOWN: break; case EXPR_INVALID: return true; /* do NOT warn */ case EXPR_REFERENCE: return false; + case EXPR_REFERENCE_ENUM_VALUE: return false; /* suppress the warning for microsoft __noop operations */ case EXPR_CONST: return expr->conste.is_ms_noop; case EXPR_CHARACTER_CONSTANT: return false; @@ -8745,7 +9293,6 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_BINARY_COMMA: return expression_has_effect(expr->binary.right); - case EXPR_BINARY_BUILTIN_EXPECT: return true; case EXPR_BINARY_ISGREATER: return false; case EXPR_BINARY_ISGREATEREQUAL: return false; case EXPR_BINARY_ISLESS: return false; @@ -8776,8 +9323,7 @@ static void semantic_comma(binary_expression_t *expression) static expression_t *parse_##binexpression_type(expression_t *left) \ { \ expression_t *binexpr = allocate_expression_zero(binexpression_type); \ - binexpr->base.source_position = *HERE; \ - binexpr->binary.left = left; \ + binexpr->binary.left = left; \ eat(token_type); \ \ expression_t *right = parse_sub_expression(prec_r); \ @@ -8839,7 +9385,7 @@ static expression_t *parse_sub_expression(precedence_t precedence) assert(left != NULL); left->base.source_position = source_position; - while(true) { + while (true) { if (token.type < 0) { return expected_expression_error(); } @@ -8973,8 +9519,8 @@ static void init_expression_parsers(void) */ static asm_argument_t *parse_asm_arguments(bool is_out) { - asm_argument_t *result = NULL; - asm_argument_t *last = NULL; + asm_argument_t *result = NULL; + asm_argument_t **anchor = &result; while (token.type == T_STRING_LITERAL || token.type == '[') { asm_argument_t *argument = allocate_ast_zero(sizeof(argument[0])); @@ -8989,11 +9535,11 @@ static asm_argument_t *parse_asm_arguments(bool is_out) } argument->symbol = token.v.symbol; - expect(']'); + expect(']', end_error); } argument->constraints = parse_string_literals(); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *expression = parse_expression(); rem_anchor_token(')'); @@ -9048,21 +9594,17 @@ static asm_argument_t *parse_asm_arguments(bool is_out) } if (argument->constraints.begin[0] == '+') - mark_decls_read(expression, NULL); + mark_vars_read(expression, NULL); } else { - mark_decls_read(expression, NULL); + mark_vars_read(expression, NULL); } argument->expression = expression; - expect(')'); + expect(')', end_error); set_address_taken(expression, true); - if (last != NULL) { - last->next = argument; - } else { - result = argument; - } - last = argument; + *anchor = argument; + anchor = &argument->next; if (token.type != ',') break; @@ -9082,7 +9624,7 @@ static asm_clobber_t *parse_asm_clobbers(void) asm_clobber_t *result = NULL; asm_clobber_t *last = NULL; - while(token.type == T_STRING_LITERAL) { + while (token.type == T_STRING_LITERAL) { asm_clobber_t *clobber = allocate_ast_zero(sizeof(clobber[0])); clobber->clobber = parse_string_literals(); @@ -9116,7 +9658,7 @@ static statement_t *parse_asm_statement(void) asm_statement->is_volatile = true; } - expect('('); + expect('(', end_error); add_anchor_token(')'); add_anchor_token(':'); asm_statement->asm_text = parse_string_literals(); @@ -9146,8 +9688,8 @@ static statement_t *parse_asm_statement(void) end_of_asm: rem_anchor_token(')'); - expect(')'); - expect(';'); + expect(')', end_error); + expect(';', end_error); if (asm_statement->outputs == NULL) { /* GCC: An 'asm' instruction without any output operands will be treated @@ -9213,7 +9755,8 @@ static statement_t *parse_case_statement(void) PUSH_PARENT(statement); - expect(':'); + expect(':', end_error); +end_error: if (current_switch != NULL) { if (! statement->case_label.is_bad) { @@ -9250,9 +9793,6 @@ static statement_t *parse_case_statement(void) POP_PARENT; return statement; -end_error: - POP_PARENT; - return create_invalid_statement(); } /** @@ -9266,7 +9806,7 @@ static statement_t *parse_default_statement(void) PUSH_PARENT(statement); - expect(':'); + expect(':', end_error); if (current_switch != NULL) { const case_label_statement_t *def_label = current_switch->default_label; if (def_label != NULL) { @@ -9307,8 +9847,8 @@ end_error: static statement_t *parse_label_statement(void) { assert(token.type == T_IDENTIFIER); - symbol_t *symbol = token.v.symbol; - declaration_t *label = get_label(symbol); + 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; @@ -9318,13 +9858,14 @@ static statement_t *parse_label_statement(void) 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 */ - if (label->init.statement != NULL) { + * otherwise it was just mentioned in a goto/local label declaration so far + */ + if (label->statement != NULL) { errorf(HERE, "duplicate label '%Y' (declared %P)", - symbol, &label->source_position); + symbol, &label->base.source_position); } else { - label->source_position = token.source_position; - label->init.statement = statement; + label->base.source_position = token.source_position; + label->statement = statement; } eat(':'); @@ -9353,12 +9894,8 @@ static statement_t *parse_label_statement(void) } /* remember the labels in a list for later checking */ - if (label_last == NULL) { - label_first = &statement->label; - } else { - label_last->next = &statement->label; - } - label_last = &statement->label; + *label_anchor = &statement->label; + label_anchor = &statement->label.next; POP_PARENT; return statement; @@ -9377,13 +9914,16 @@ static statement_t *parse_if(void) add_anchor_token('{'); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *const expr = parse_expression(); statement->ifs.condition = expr; - mark_decls_read(expr, NULL); + /* §6.8.4.1:1 The controlling expression of an if statement shall have + * scalar type. */ + semantic_condition(expr, "condition of 'if'-statment"); + mark_vars_read(expr, NULL); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); end_error: rem_anchor_token('{'); @@ -9417,12 +9957,12 @@ static void check_enum_cases(const switch_statement_t *statement) { return; /* FIXME: calculation of value should be done while parsing */ - const declaration_t *declaration; - long last_value = -1; - for (declaration = enumt->declaration->next; - declaration != NULL && declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY; - declaration = declaration->next) { - const expression_t *expression = declaration->init.enum_value; + /* TODO: quadratic algorithm here. Change to an n log n one */ + long last_value = -1; + const entity_t *entry = enumt->enume->base.next; + 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; bool found = false; for (const case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) { @@ -9435,7 +9975,8 @@ static void check_enum_cases(const switch_statement_t *statement) { } if (! found) { warningf(&statement->base.source_position, - "enumeration value '%Y' not handled in switch", declaration->symbol); + "enumeration value '%Y' not handled in switch", + entry->base.symbol); } last_value = value; } @@ -9452,10 +9993,10 @@ static statement_t *parse_switch(void) PUSH_PARENT(statement); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *const expr = parse_expression(); - mark_decls_read(expr, NULL); + mark_vars_read(expr, NULL); type_t * type = skip_typeref(expr->base.type); if (is_type_integer(type)) { type = promote_integer(type); @@ -9472,7 +10013,7 @@ static statement_t *parse_switch(void) type = type_error_type; } statement->switchs.expression = create_implicit_cast(expr, type); - expect(')'); + expect(')', end_error); rem_anchor_token(')'); switch_statement_t *rem = current_switch; @@ -9516,13 +10057,16 @@ static statement_t *parse_while(void) PUSH_PARENT(statement); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *const cond = parse_expression(); statement->whiles.condition = cond; - mark_decls_read(cond, NULL); + /* §6.8.5:2 The controlling expression of an iteration statement shall + * have scalar type. */ + semantic_condition(cond, "condition of 'while'-statement"); + mark_vars_read(cond, NULL); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); statement->whiles.body = parse_loop_body(statement); @@ -9548,15 +10092,18 @@ static statement_t *parse_do(void) statement->do_while.body = parse_loop_body(statement); rem_anchor_token(T_while); - expect(T_while); - expect('('); + expect(T_while, end_error); + expect('(', end_error); add_anchor_token(')'); expression_t *const cond = parse_expression(); statement->do_while.condition = cond; - mark_decls_read(cond, NULL); + /* §6.8.5:2 The controlling expression of an iteration statement shall + * have scalar type. */ + semantic_condition(cond, "condition of 'do-while'-statement"); + mark_vars_read(cond, NULL); rem_anchor_token(')'); - expect(')'); - expect(';'); + expect(')', end_error); + expect(';', end_error); POP_PARENT; return statement; @@ -9574,68 +10121,71 @@ static statement_t *parse_for(void) eat(T_for); - PUSH_PARENT(statement); + expect('(', end_error1); + add_anchor_token(')'); - size_t const top = environment_top(); - scope_push(&statement->fors.scope); + PUSH_PARENT(statement); - expect('('); - add_anchor_token(')'); + size_t const top = environment_top(); + scope_t *old_scope = scope_push(&statement->fors.scope); - if (token.type != ';') { - if (is_declaration_specifier(&token, false)) { - parse_declaration(record_declaration); - } else { - add_anchor_token(';'); - expression_t *const init = parse_expression(); - statement->fors.initialisation = init; - mark_decls_read(init, DECL_ANY); - if (warning.unused_value && !expression_has_effect(init)) { - warningf(&init->base.source_position, - "initialisation of 'for'-statement has no effect"); - } - rem_anchor_token(';'); - expect(';'); - } + if (token.type == ';') { + next_token(); + } else if (is_declaration_specifier(&token, false)) { + parse_declaration(record_entity, DECL_FLAGS_NONE); } else { - expect(';'); + 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"); + } + rem_anchor_token(';'); + expect(';', end_error2); } if (token.type != ';') { add_anchor_token(';'); expression_t *const cond = parse_expression(); statement->fors.condition = cond; - mark_decls_read(cond, NULL); + /* §6.8.5:2 The controlling expression of an iteration statement + * shall have scalar type. */ + semantic_condition(cond, "condition of 'for'-statement"); + mark_vars_read(cond, NULL); rem_anchor_token(';'); } - expect(';'); + expect(';', end_error2); if (token.type != ')') { expression_t *const step = parse_expression(); statement->fors.step = step; - mark_decls_read(step, DECL_ANY); + 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"); } } - expect(')'); + expect(')', end_error2); rem_anchor_token(')'); statement->fors.body = parse_loop_body(statement); - assert(scope == &statement->fors.scope); - scope_pop(); + assert(current_scope == &statement->fors.scope); + scope_pop(old_scope); environment_pop_to(top); POP_PARENT; return statement; -end_error: +end_error2: POP_PARENT; rem_anchor_token(')'); - assert(scope == &statement->fors.scope); - scope_pop(); + assert(current_scope == &statement->fors.scope); + scope_pop(old_scope); environment_pop_to(top); + /* fallthrough */ +end_error1: return create_invalid_statement(); } @@ -9650,10 +10200,10 @@ static statement_t *parse_goto(void) if (GNU_MODE && token.type == '*') { next_token(); expression_t *expression = parse_expression(); - mark_decls_read(expression, NULL); + mark_vars_read(expression, NULL); - /* Argh: although documentation say the expression must be of type void *, - * gcc excepts anything that can be casted into void * without error */ + /* Argh: although documentation says the expression must be of type void*, + * gcc accepts anything that can be casted into void* without error */ type_t *type = expression->base.type; if (type != type_error_type) { @@ -9684,14 +10234,10 @@ static statement_t *parse_goto(void) } /* remember the goto's in a list for later checking */ - if (goto_last == NULL) { - goto_first = &statement->gotos; - } else { - goto_last->next = &statement->gotos; - } - goto_last = &statement->gotos; + *goto_anchor = &statement->gotos; + goto_anchor = &statement->gotos.next; - expect(';'); + expect(';', end_error); return statement; end_error: @@ -9710,7 +10256,7 @@ static statement_t *parse_continue(void) statement_t *statement = allocate_statement_zero(STATEMENT_CONTINUE); eat(T_continue); - expect(';'); + expect(';', end_error); end_error: return statement; @@ -9728,7 +10274,7 @@ static statement_t *parse_break(void) statement_t *statement = allocate_statement_zero(STATEMENT_BREAK); eat(T_break); - expect(';'); + expect(';', end_error); end_error: return statement; @@ -9746,21 +10292,24 @@ static statement_t *parse_leave_statement(void) statement_t *statement = allocate_statement_zero(STATEMENT_LEAVE); eat(T___leave); - expect(';'); + expect(';', end_error); end_error: return statement; } /** - * Check if a given declaration represents a local variable. + * Check if a given entity represents a local variable. */ -static bool is_local_var_declaration(const declaration_t *declaration) +static bool is_local_variable(const entity_t *entity) { - switch ((storage_class_tag_t) declaration->storage_class) { + if (entity->kind != ENTITY_VARIABLE) + return false; + + switch ((storage_class_tag_t) entity->declaration.storage_class) { case STORAGE_CLASS_AUTO: case STORAGE_CLASS_REGISTER: { - const type_t *type = skip_typeref(declaration->type); + const type_t *type = skip_typeref(entity->declaration.type); if (is_type_function(type)) { return false; } else { @@ -9772,43 +10321,32 @@ static bool is_local_var_declaration(const declaration_t *declaration) } } -/** - * Check if a given declaration represents a variable. - */ -static bool is_var_declaration(const declaration_t *declaration) -{ - if (declaration->storage_class == STORAGE_CLASS_TYPEDEF) - return false; - - const type_t *type = skip_typeref(declaration->type); - return !is_type_function(type); -} - /** * Check if a given expression represents a local variable. */ -static bool is_local_variable(const expression_t *expression) +static bool expression_is_local_variable(const expression_t *expression) { if (expression->base.kind != EXPR_REFERENCE) { return false; } - const declaration_t *declaration = expression->reference.declaration; - return is_local_var_declaration(declaration); + const entity_t *entity = expression->reference.entity; + return is_local_variable(entity); } /** * Check if a given expression represents a local variable and * return its declaration then, else return NULL. */ -declaration_t *expr_is_variable(const expression_t *expression) +entity_t *expression_is_variable(const expression_t *expression) { if (expression->base.kind != EXPR_REFERENCE) { return NULL; } - declaration_t *declaration = expression->reference.declaration; - if (is_var_declaration(declaration)) - return declaration; - return NULL; + entity_t *entity = expression->reference.entity; + if (entity->kind != ENTITY_VARIABLE) + return NULL; + + return entity; } /** @@ -9823,10 +10361,10 @@ static statement_t *parse_return(void) expression_t *return_value = NULL; if (token.type != ';') { return_value = parse_expression(); - mark_decls_read(return_value, NULL); + mark_vars_read(return_value, NULL); } - const type_t *const func_type = current_function->type; + const type_t *const func_type = skip_typeref(current_function->base.type); assert(is_type_function(func_type)); type_t *const return_type = skip_typeref(func_type->function.return_type); @@ -9847,11 +10385,10 @@ static statement_t *parse_return(void) 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 (warning.other && return_value != NULL + && return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) { const expression_t *expression = return_value->unary.value; - if (is_local_variable(expression)) { + if (expression_is_local_variable(expression)) { warningf(&statement->base.source_position, "function returns address of local variable"); } @@ -9862,7 +10399,7 @@ static statement_t *parse_return(void) } statement->returns.value = return_value; - expect(';'); + expect(';', end_error); end_error: return statement; @@ -9875,18 +10412,19 @@ static statement_t *parse_declaration_statement(void) { statement_t *statement = allocate_statement_zero(STATEMENT_DECLARATION); - declaration_t *before = last_declaration; - if (GNU_MODE) + entity_t *before = current_scope->last_entity; + if (GNU_MODE) { parse_external_declaration(); - else - parse_declaration(record_declaration); + } else { + parse_declaration(record_entity, DECL_FLAGS_NONE); + } if (before == NULL) { - statement->declaration.declarations_begin = scope->declarations; + statement->declaration.declarations_begin = current_scope->entities; } else { - statement->declaration.declarations_begin = before->next; + statement->declaration.declarations_begin = before->base.next; } - statement->declaration.declarations_end = last_declaration; + statement->declaration.declarations_end = current_scope->last_entity; return statement; } @@ -9900,9 +10438,9 @@ static statement_t *parse_expression_statement(void) expression_t *const expr = parse_expression(); statement->expression.expression = expr; - mark_decls_read(expr, DECL_ANY); + mark_vars_read(expr, ENT_ANY); - expect(';'); + expect(';', end_error); end_error: return statement; @@ -9928,10 +10466,10 @@ static statement_t *parse_ms_try_statment(void) if (token.type == T___except) { eat(T___except); - expect('('); + expect('(', end_error); add_anchor_token(')'); expression_t *const expr = parse_expression(); - mark_decls_read(expr, NULL); + mark_vars_read(expr, NULL); type_t * type = skip_typeref(expr->base.type); if (is_type_integer(type)) { type = promote_integer(type); @@ -9942,7 +10480,7 @@ static statement_t *parse_ms_try_statment(void) } statement->ms_try.except_expression = create_implicit_cast(expr, type); rem_anchor_token(')'); - expect(')'); + expect(')', end_error); statement->ms_try.final_statement = parse_compound_statement(false); } else if (token.type == T__finally) { eat(T___finally); @@ -9966,12 +10504,13 @@ static statement_t *parse_empty_statement(void) return statement; } -static statement_t *parse_local_label_declaration(void) { +static statement_t *parse_local_label_declaration(void) +{ statement_t *statement = allocate_statement_zero(STATEMENT_DECLARATION); eat(T___label__); - declaration_t *begin = NULL, *end = NULL; + entity_t *begin = NULL, *end = NULL; while (true) { if (token.type != T_IDENTIFIER) { @@ -9979,26 +10518,26 @@ static statement_t *parse_local_label_declaration(void) { T_IDENTIFIER, NULL); goto end_error; } - symbol_t *symbol = token.v.symbol; - declaration_t *declaration = get_declaration(symbol, NAMESPACE_LOCAL_LABEL); - if (declaration != NULL) { - errorf(HERE, "multiple definitions of '__label__ %Y' (previous definition at %P)", - symbol, &declaration->source_position); + symbol_t *symbol = token.v.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); } else { - declaration = allocate_declaration_zero(); - declaration->namespc = NAMESPACE_LOCAL_LABEL; - declaration->source_position = token.source_position; - declaration->symbol = symbol; - declaration->parent_scope = scope; - declaration->init.statement = NULL; + entity = allocate_entity_zero(ENTITY_LOCAL_LABEL); + + entity->base.parent_scope = current_scope; + entity->base.namespc = NAMESPACE_LABEL; + entity->base.source_position = token.source_position; + entity->base.symbol = symbol; if (end != NULL) - end->next = declaration; - end = declaration; + end->base.next = entity; + end = entity; if (begin == NULL) - begin = declaration; + begin = entity; - local_label_push(declaration); + environment_push(entity); } next_token(); @@ -10013,6 +10552,55 @@ end_error: return statement; } +static void parse_namespace_definition(void) +{ + eat(T_namespace); + + entity_t *entity = NULL; + symbol_t *symbol = NULL; + + if (token.type == T_IDENTIFIER) { + symbol = token.v.symbol; + next_token(); + + entity = get_entity(symbol, NAMESPACE_NORMAL); + if (entity != NULL && entity->kind != ENTITY_NAMESPACE + && entity->base.parent_scope == current_scope) { + error_redefined_as_different_kind(&token.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->base.parent_scope = current_scope; + } + + if (token.type == '=') { + /* TODO: parse namespace alias */ + panic("namespace alias definition not supported yet"); + } + + environment_push(entity); + append_entity(current_scope, entity); + + size_t const top = environment_top(); + scope_t *old_scope = scope_push(&entity->namespacee.members); + + expect('{', end_error); + parse_externals(); + expect('}', end_error); + +end_error: + assert(current_scope == &entity->namespacee.members); + scope_pop(old_scope); + environment_pop_to(top); +} + /** * Parse a statement. * There's also parse_statement() which additionally checks for @@ -10031,9 +10619,15 @@ static statement_t *intern_parse_statement(void) statement = parse_label_statement(); } else if (is_typedef_symbol(token.v.symbol)) { statement = parse_declaration_statement(); - } else switch (la1_type) { + } else { + /* it's an identifier, the grammar says this must be an + * expression statement. However it is common that users mistype + * declaration types, so we guess a bit here to improve robustness + * for incorrect programs */ + switch (la1_type) { + case '&': case '*': - if (get_declaration(token.v.symbol, NAMESPACE_NORMAL) != NULL) + if (get_entity(token.v.symbol, NAMESPACE_NORMAL) != NULL) goto expression_statment; /* FALLTHROUGH */ @@ -10046,6 +10640,7 @@ static statement_t *intern_parse_statement(void) expression_statment: statement = parse_expression_statement(); break; + } } break; } @@ -10058,7 +10653,7 @@ expression_statment: } while (token.type == T___extension__); bool old_gcc_extension = in_gcc_extension; in_gcc_extension = true; - statement = parse_statement(); + statement = intern_parse_statement(); in_gcc_extension = old_gcc_extension; break; @@ -10070,22 +10665,22 @@ expression_statment: statement = parse_local_label_declaration(); break; - case ';': statement = parse_empty_statement(); break; - case '{': statement = parse_compound_statement(false); break; - case T___leave: statement = parse_leave_statement(); break; - case T___try: statement = parse_ms_try_statment(); break; - case T_asm: statement = parse_asm_statement(); break; - case T_break: statement = parse_break(); break; - case T_case: statement = parse_case_statement(); break; - case T_continue: statement = parse_continue(); break; - case T_default: statement = parse_default_statement(); break; - case T_do: statement = parse_do(); break; - case T_for: statement = parse_for(); break; - case T_goto: statement = parse_goto(); break; - case T_if: statement = parse_if(); break; - case T_return: statement = parse_return(); break; - case T_switch: statement = parse_switch(); break; - case T_while: statement = parse_while(); break; + case ';': statement = parse_empty_statement(); break; + case '{': statement = parse_compound_statement(false); break; + case T___leave: statement = parse_leave_statement(); break; + case T___try: statement = parse_ms_try_statment(); break; + case T_asm: statement = parse_asm_statement(); break; + case T_break: statement = parse_break(); break; + case T_case: statement = parse_case_statement(); break; + case T_continue: statement = parse_continue(); break; + case T_default: statement = parse_default_statement(); break; + case T_do: statement = parse_do(); break; + case T_for: statement = parse_for(); break; + case T_goto: statement = parse_goto(); break; + case T_if: statement = parse_if(); break; + case T_return: statement = parse_return(); break; + case T_switch: statement = parse_switch(); break; + case T_while: statement = parse_while(); break; EXPRESSION_START statement = parse_expression_statement(); @@ -10138,10 +10733,97 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) eat('{'); add_anchor_token('}'); + /* tokens, which can start a statement */ + /* TODO MS, __builtin_FOO */ + add_anchor_token('!'); + add_anchor_token('&'); + add_anchor_token('('); + add_anchor_token('*'); + add_anchor_token('+'); + add_anchor_token('-'); + add_anchor_token('{'); + add_anchor_token('~'); + add_anchor_token(T_CHARACTER_CONSTANT); + add_anchor_token(T_COLONCOLON); + add_anchor_token(T_FLOATINGPOINT); + add_anchor_token(T_IDENTIFIER); + add_anchor_token(T_INTEGER); + add_anchor_token(T_MINUSMINUS); + add_anchor_token(T_PLUSPLUS); + add_anchor_token(T_STRING_LITERAL); + add_anchor_token(T_WIDE_CHARACTER_CONSTANT); + add_anchor_token(T_WIDE_STRING_LITERAL); + add_anchor_token(T__Bool); + add_anchor_token(T__Complex); + add_anchor_token(T__Imaginary); + add_anchor_token(T___FUNCTION__); + add_anchor_token(T___PRETTY_FUNCTION__); + add_anchor_token(T___alignof__); + add_anchor_token(T___attribute__); + add_anchor_token(T___builtin_va_start); + add_anchor_token(T___extension__); + add_anchor_token(T___func__); + add_anchor_token(T___imag__); + add_anchor_token(T___label__); + add_anchor_token(T___real__); + add_anchor_token(T___thread); + add_anchor_token(T_asm); + add_anchor_token(T_auto); + add_anchor_token(T_bool); + add_anchor_token(T_break); + add_anchor_token(T_case); + add_anchor_token(T_char); + add_anchor_token(T_class); + add_anchor_token(T_const); + add_anchor_token(T_const_cast); + add_anchor_token(T_continue); + add_anchor_token(T_default); + add_anchor_token(T_delete); + add_anchor_token(T_double); + add_anchor_token(T_do); + add_anchor_token(T_dynamic_cast); + add_anchor_token(T_enum); + add_anchor_token(T_extern); + add_anchor_token(T_false); + add_anchor_token(T_float); + add_anchor_token(T_for); + add_anchor_token(T_goto); + add_anchor_token(T_if); + add_anchor_token(T_inline); + add_anchor_token(T_int); + add_anchor_token(T_long); + add_anchor_token(T_new); + add_anchor_token(T_operator); + add_anchor_token(T_register); + add_anchor_token(T_reinterpret_cast); + add_anchor_token(T_restrict); + add_anchor_token(T_return); + add_anchor_token(T_short); + add_anchor_token(T_signed); + add_anchor_token(T_sizeof); + add_anchor_token(T_static); + add_anchor_token(T_static_cast); + add_anchor_token(T_struct); + add_anchor_token(T_switch); + add_anchor_token(T_template); + add_anchor_token(T_this); + add_anchor_token(T_throw); + add_anchor_token(T_true); + add_anchor_token(T_try); + add_anchor_token(T_typedef); + add_anchor_token(T_typeid); + add_anchor_token(T_typename); + add_anchor_token(T_typeof); + add_anchor_token(T_union); + add_anchor_token(T_unsigned); + add_anchor_token(T_using); + add_anchor_token(T_void); + add_anchor_token(T_volatile); + add_anchor_token(T_wchar_t); + add_anchor_token(T_while); - size_t const top = environment_top(); - size_t const top_local = local_label_top(); - scope_push(&statement->compound.scope); + 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; @@ -10180,7 +10862,7 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) /* look over all statements again to produce no effect warnings */ if (warning.unused_value) { statement_t *sub_statement = statement->compound.statements; - for( ; sub_statement != NULL; sub_statement = sub_statement->base.next) { + for (; sub_statement != NULL; sub_statement = sub_statement->base.next) { if (sub_statement->kind != STATEMENT_EXPRESSION) continue; /* don't emit a warning for the last expression in an expression @@ -10197,43 +10879,101 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) } end_error: + rem_anchor_token(T_while); + rem_anchor_token(T_wchar_t); + rem_anchor_token(T_volatile); + rem_anchor_token(T_void); + rem_anchor_token(T_using); + rem_anchor_token(T_unsigned); + rem_anchor_token(T_union); + rem_anchor_token(T_typeof); + rem_anchor_token(T_typename); + rem_anchor_token(T_typeid); + rem_anchor_token(T_typedef); + rem_anchor_token(T_try); + rem_anchor_token(T_true); + rem_anchor_token(T_throw); + rem_anchor_token(T_this); + rem_anchor_token(T_template); + rem_anchor_token(T_switch); + rem_anchor_token(T_struct); + rem_anchor_token(T_static_cast); + rem_anchor_token(T_static); + rem_anchor_token(T_sizeof); + rem_anchor_token(T_signed); + rem_anchor_token(T_short); + rem_anchor_token(T_return); + rem_anchor_token(T_restrict); + rem_anchor_token(T_reinterpret_cast); + rem_anchor_token(T_register); + rem_anchor_token(T_operator); + rem_anchor_token(T_new); + rem_anchor_token(T_long); + rem_anchor_token(T_int); + rem_anchor_token(T_inline); + rem_anchor_token(T_if); + rem_anchor_token(T_goto); + rem_anchor_token(T_for); + rem_anchor_token(T_float); + rem_anchor_token(T_false); + rem_anchor_token(T_extern); + rem_anchor_token(T_enum); + rem_anchor_token(T_dynamic_cast); + rem_anchor_token(T_do); + rem_anchor_token(T_double); + rem_anchor_token(T_delete); + rem_anchor_token(T_default); + rem_anchor_token(T_continue); + rem_anchor_token(T_const_cast); + rem_anchor_token(T_const); + rem_anchor_token(T_class); + rem_anchor_token(T_char); + rem_anchor_token(T_case); + rem_anchor_token(T_break); + rem_anchor_token(T_bool); + rem_anchor_token(T_auto); + rem_anchor_token(T_asm); + rem_anchor_token(T___thread); + rem_anchor_token(T___real__); + rem_anchor_token(T___label__); + rem_anchor_token(T___imag__); + rem_anchor_token(T___func__); + rem_anchor_token(T___extension__); + rem_anchor_token(T___builtin_va_start); + rem_anchor_token(T___attribute__); + rem_anchor_token(T___alignof__); + rem_anchor_token(T___PRETTY_FUNCTION__); + rem_anchor_token(T___FUNCTION__); + rem_anchor_token(T__Imaginary); + rem_anchor_token(T__Complex); + rem_anchor_token(T__Bool); + rem_anchor_token(T_WIDE_STRING_LITERAL); + rem_anchor_token(T_WIDE_CHARACTER_CONSTANT); + rem_anchor_token(T_STRING_LITERAL); + rem_anchor_token(T_PLUSPLUS); + rem_anchor_token(T_MINUSMINUS); + rem_anchor_token(T_INTEGER); + rem_anchor_token(T_IDENTIFIER); + rem_anchor_token(T_FLOATINGPOINT); + rem_anchor_token(T_COLONCOLON); + rem_anchor_token(T_CHARACTER_CONSTANT); + rem_anchor_token('~'); + rem_anchor_token('{'); + rem_anchor_token('-'); + rem_anchor_token('+'); + rem_anchor_token('*'); + rem_anchor_token('('); + rem_anchor_token('&'); + rem_anchor_token('!'); rem_anchor_token('}'); - assert(scope == &statement->compound.scope); - scope_pop(); + assert(current_scope == &statement->compound.scope); + scope_pop(old_scope); environment_pop_to(top); - local_label_pop_to(top_local); POP_PARENT; return statement; } -/** - * Initialize builtin types. - */ -static void initialize_builtin_types(void) -{ - type_intmax_t = make_global_typedef("__intmax_t__", type_long_long); - type_size_t = make_global_typedef("__SIZE_TYPE__", type_unsigned_long); - type_ssize_t = make_global_typedef("__SSIZE_TYPE__", type_long); - type_ptrdiff_t = make_global_typedef("__PTRDIFF_TYPE__", type_long); - type_uintmax_t = make_global_typedef("__uintmax_t__", type_unsigned_long_long); - type_uptrdiff_t = make_global_typedef("__UPTRDIFF_TYPE__", type_unsigned_long); - type_wchar_t = make_global_typedef("__WCHAR_TYPE__", opt_short_wchar_t ? type_unsigned_short : type_int); - type_wint_t = make_global_typedef("__WINT_TYPE__", type_int); - - type_intmax_t_ptr = make_pointer_type(type_intmax_t, TYPE_QUALIFIER_NONE); - type_ptrdiff_t_ptr = make_pointer_type(type_ptrdiff_t, TYPE_QUALIFIER_NONE); - type_ssize_t_ptr = make_pointer_type(type_ssize_t, TYPE_QUALIFIER_NONE); - type_wchar_t_ptr = make_pointer_type(type_wchar_t, TYPE_QUALIFIER_NONE); - - /* const version of wchar_t */ - type_const_wchar_t = allocate_type_zero(TYPE_TYPEDEF); - type_const_wchar_t->typedeft.declaration = type_wchar_t->typedeft.declaration; - type_const_wchar_t->base.qualifiers |= TYPE_QUALIFIER_CONST; - - type_const_wchar_t_ptr = make_pointer_type(type_const_wchar_t, TYPE_QUALIFIER_NONE); -} - /** * Check for unused global static functions and variables */ @@ -10242,29 +10982,32 @@ static void check_unused_globals(void) if (!warning.unused_function && !warning.unused_variable) return; - for (const declaration_t *decl = file_scope->declarations; decl != NULL; decl = decl->next) { - if (decl->used || - decl->modifiers & DM_UNUSED || - decl->modifiers & DM_USED || - decl->storage_class != STORAGE_CLASS_STATIC) + for (const entity_t *entity = file_scope->entities; entity != NULL; + entity = entity->base.next) { + if (!is_declaration(entity)) + continue; + + const declaration_t *declaration = &entity->declaration; + if (declaration->used || + declaration->modifiers & DM_UNUSED || + declaration->modifiers & DM_USED || + declaration->storage_class != STORAGE_CLASS_STATIC) continue; - type_t *const type = decl->type; + type_t *const type = declaration->type; const char *s; - if (is_type_function(skip_typeref(type))) { - if (!warning.unused_function || decl->is_inline) + if (entity->kind == ENTITY_FUNCTION) { + /* inhibit warning for static inline functions */ + if (entity->function.is_inline) continue; - s = (decl->init.statement != NULL ? "defined" : "declared"); + s = entity->function.statement != NULL ? "defined" : "declared"; } else { - if (!warning.unused_variable) - continue; - s = "defined"; } - warningf(&decl->source_position, "'%#T' %s but not used", - type, decl->symbol, s); + warningf(&declaration->base.source_position, "'%#T' %s but not used", + type, declaration->base.symbol, s); } } @@ -10273,30 +11016,109 @@ static void parse_global_asm(void) statement_t *statement = allocate_statement_zero(STATEMENT_ASM); eat(T_asm); - expect('('); + expect('(', end_error); statement->asms.asm_text = parse_string_literals(); statement->base.next = unit->global_asm; unit->global_asm = statement; - expect(')'); - expect(';'); + expect(')', end_error); + expect(';', end_error); end_error:; } -/** - * Parse a translation unit. - */ -static void parse_translation_unit(void) +static void parse_linkage_specification(void) +{ + eat(T_extern); + assert(token.type == T_STRING_LITERAL); + + const char *linkage = parse_string_literals().begin; + + linkage_kind_t old_linkage = current_linkage; + linkage_kind_t new_linkage; + if (strcmp(linkage, "C") == 0) { + new_linkage = LINKAGE_C; + } else if (strcmp(linkage, "C++") == 0) { + new_linkage = LINKAGE_CXX; + } else { + errorf(HERE, "linkage string \"%s\" not recognized", linkage); + new_linkage = LINKAGE_INVALID; + } + current_linkage = new_linkage; + + if (token.type == '{') { + next_token(); + parse_externals(); + expect('}', end_error); + } else { + parse_external(); + } + +end_error: + assert(current_linkage == new_linkage); + current_linkage = old_linkage; +} + +static void parse_external(void) +{ + switch (token.type) { + 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 { + parse_external_declaration(); + } + return; + + case T_asm: + parse_global_asm(); + return; + + case T_namespace: + parse_namespace_definition(); + return; + + case ';': + if (!strict_mode) { + if (warning.other) + warningf(HERE, "stray ';' outside of function"); + next_token(); + return; + } + /* FALLTHROUGH */ + + default: + errorf(HERE, "stray %K outside of function", &token); + if (token.type == '(' || token.type == '{' || token.type == '[') + eat_until_matching_token(token.type); + next_token(); + return; + } +} + +static void parse_externals(void) { + add_anchor_token('}'); add_anchor_token(T_EOF); #ifndef NDEBUG unsigned char token_anchor_copy[T_LAST_TOKEN]; memcpy(token_anchor_copy, token_anchor_set, sizeof(token_anchor_copy)); #endif - for (;;) { + + while (token.type != T_EOF && token.type != '}') { #ifndef NDEBUG bool anchor_leak = false; for (int i = 0; i != T_LAST_TOKEN; ++i) { @@ -10315,37 +11137,30 @@ static void parse_translation_unit(void) abort(); #endif - switch (token.type) { - DECLARATION_START - case T_IDENTIFIER: - case T___extension__: - parse_external_declaration(); - break; + parse_external(); + } - case T_asm: - parse_global_asm(); - break; + rem_anchor_token(T_EOF); + rem_anchor_token('}'); +} - case T_EOF: - rem_anchor_token(T_EOF); - return; +/** + * Parse a translation unit. + */ +static void parse_translation_unit(void) +{ + add_anchor_token(T_EOF); - case ';': - if (!strict_mode) { - if (warning.other) - warningf(HERE, "stray ';' outside of function"); - next_token(); - break; - } - /* FALLTHROUGH */ + while (true) { + parse_externals(); - default: - errorf(HERE, "stray %K outside of function", &token); - if (token.type == '(' || token.type == '{' || token.type == '[') - eat_until_matching_token(token.type); - next_token(); - break; - } + if (token.type == T_EOF) + break; + + errorf(HERE, "stray %K outside of function", &token); + if (token.type == '(' || token.type == '{' || token.type == '[') + eat_until_matching_token(token.type); + next_token(); } } @@ -10358,7 +11173,6 @@ void start_parsing(void) { environment_stack = NEW_ARR_F(stack_entry_t, 0); label_stack = NEW_ARR_F(stack_entry_t, 0); - local_label_stack = NEW_ARR_F(stack_entry_t, 0); diagnostic_count = 0; error_count = 0; warning_count = 0; @@ -10372,18 +11186,14 @@ void start_parsing(void) assert(file_scope == NULL); file_scope = &unit->scope; - assert(scope == NULL); + assert(current_scope == NULL); scope_push(&unit->scope); - - initialize_builtin_types(); } translation_unit_t *finish_parsing(void) { - /* do NOT use scope_pop() here, this will crash, will it by hand */ - assert(scope == &unit->scope); - scope = NULL; - last_declaration = NULL; + assert(current_scope == &unit->scope); + scope_pop(NULL); assert(file_scope == &unit->scope); check_unused_globals(); @@ -10391,20 +11201,56 @@ translation_unit_t *finish_parsing(void) DEL_ARR_F(environment_stack); DEL_ARR_F(label_stack); - DEL_ARR_F(local_label_stack); translation_unit_t *result = unit; unit = NULL; return result; } +/* GCC allows global arrays without size and assigns them a length of one, + * if no different declaration follows */ +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); + + 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); + } + + 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); + + decl->type = result; + } +} + void parse(void) { lookahead_bufpos = 0; for (int i = 0; i < MAX_LOOKAHEAD + 2; ++i) { next_token(); } + current_linkage = c_mode & _CXX ? LINKAGE_CXX : LINKAGE_C; + incomplete_arrays = NEW_ARR_F(declaration_t*, 0); parse_translation_unit(); + complete_incomplete_arrays(); + DEL_ARR_F(incomplete_arrays); + incomplete_arrays = NULL; } /**