X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=0325addd50a462ff1d8d0f35c77dfad761ec57f5;hb=b7aee7a7ddee373437c04479c6ec00f14639d4da;hp=904fc636854e9e2771f85cc35213f5e21101b3b6;hpb=2ffc005e4c8ecf02c65246d439b68195e0d0471d;p=cparser diff --git a/parser.c b/parser.c index 904fc63..0325add 100644 --- a/parser.c +++ b/parser.c @@ -41,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 { - entity_t *old_entity; - symbol_t *symbol; - namespace_t namespc; + entity_t *old_entity; + symbol_t *symbol; + entity_namespace_t namespc; } stack_entry_t; typedef struct argument_list_t argument_list_t; @@ -92,6 +84,7 @@ struct declaration_specifiers_t { symbol_t *get_property_sym; /**< the name of the get property if set. */ symbol_t *put_property_sym; /**< the name of the put property if set. */ type_t *type; + variable_t *based_variable; /**< Microsoft __based variable. */ }; /** @@ -108,36 +101,35 @@ typedef struct parse_initializer_env_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 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 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 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; #define PUSH_PARENT(stmt) \ @@ -185,6 +177,8 @@ 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); static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, @@ -202,6 +196,13 @@ static void semantic_comparison(binary_expression_t *expression); case T_register: \ case T___thread: +#define STORAGE_CLASSES_NO_EXTERN \ + case T_typedef: \ + case T_static: \ + case T_auto: \ + case T_register: \ + case T___thread: + #define TYPE_QUALIFIERS \ case T_const: \ case T_restrict: \ @@ -210,33 +211,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 @@ -245,6 +242,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 @@ -296,9 +298,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 @@ -323,9 +327,10 @@ static size_t get_entity_struct_size(entity_kind_t kind) [ENTITY_ENUM] = sizeof(enum_t), [ENTITY_ENUM_VALUE] = sizeof(enum_value_t), [ENTITY_LABEL] = sizeof(label_t), - [ENTITY_LOCAL_LABEL] = sizeof(label_t) + [ENTITY_LOCAL_LABEL] = sizeof(label_t), + [ENTITY_NAMESPACE] = sizeof(namespace_t) }; - assert(kind <= sizeof(sizes) / sizeof(sizes[0])); + assert(kind < sizeof(sizes) / sizeof(sizes[0])); assert(sizes[kind] != 0); return sizes[kind]; } @@ -367,7 +372,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]; } @@ -414,7 +419,7 @@ static size_t get_expression_struct_size(expression_kind_t kind) if (kind >= EXPR_BINARY_FIRST && kind <= EXPR_BINARY_LAST) { return sizes[EXPR_BINARY_FIRST]; } - assert(kind <= sizeof(sizes) / sizeof(sizes[0])); + assert(kind < sizeof(sizes) / sizeof(sizes[0])); assert(sizes[kind] != 0); return sizes[kind]; } @@ -443,8 +448,9 @@ 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; } @@ -453,9 +459,7 @@ static expression_t *allocate_expression_zero(expression_kind_t kind) */ 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); } /** @@ -573,14 +577,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. */ @@ -721,7 +717,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. @@ -781,25 +777,26 @@ static void type_error_incompatible(const char *msg, static void scope_push(scope_t *new_scope) { - if (scope != NULL) { - new_scope->depth = scope->depth + 1; + if (current_scope != NULL) { + new_scope->depth = current_scope->depth + 1; } - new_scope->parent = scope; - scope = new_scope; + new_scope->parent = current_scope; + current_scope = new_scope; } static void scope_pop(void) { - scope = scope->parent; + current_scope = current_scope->parent; } /** * Search an entity by its symbol in a given namespace. */ -static entity_t *get_entity(const symbol_t *const symbol, namespace_t namespc) +static entity_t *get_entity(const symbol_t *const symbol, + namespace_tag_t namespc) { entity_t *entity = symbol->entity; - for( ; entity != NULL; entity = entity->base.symbol_next) { + for (; entity != NULL; entity = entity->base.symbol_next) { if (entity->base.namespc == namespc) return entity; } @@ -813,8 +810,8 @@ static entity_t *get_entity(const symbol_t *const symbol, namespace_t namespc) */ static void stack_push(stack_entry_t **stack_ptr, entity_t *entity) { - symbol_t *symbol = entity->base.symbol; - namespace_t namespc = entity->base.namespc; + symbol_t *symbol = entity->base.symbol; + entity_namespace_t namespc = entity->base.namespc; assert(namespc != NAMESPACE_INVALID); /* replace/add entity into entity list of the symbol */ @@ -863,18 +860,6 @@ static void label_push(entity_t *label) stack_push(&label_stack, label); } -/** - * Push a declaration of the local label stack. - * - * @param declaration the declaration - */ -static void local_label_push(entity_t *label) -{ - assert(label->base.parent_scope != NULL); - label->base.parent_scope = scope; - stack_push(&local_label_stack, label); -} - /** * pops symbols from the environment stack until @p new_top is the top element */ @@ -888,12 +873,12 @@ 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]; - entity_t *old_entity = entry->old_entity; - symbol_t *symbol = entry->symbol; - namespace_t namespc = entry->namespc; + entity_t *old_entity = entry->old_entity; + symbol_t *symbol = entry->symbol; + entity_namespace_t namespc = entry->namespc; /* replace with old_entity/remove */ entity_t **anchor; @@ -941,18 +926,6 @@ 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; @@ -1194,25 +1167,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); - - entity_t *const entity = allocate_entity_zero(ENTITY_TYPEDEF); - entity->base.symbol = symbol; - entity->base.source_position = builtin_source_position; - entity->base.namespc = NAMESPACE_NORMAL; - entity->typedefe.type = type; - entity->typedefe.builtin = true; - - record_entity(entity, false); - - type_t *typedef_type = allocate_type_zero(TYPE_TYPEDEF); - typedef_type->typedeft.typedefe = &entity->typedefe; - - return typedef_type; -} - static string_t parse_string_literals(void) { assert(token.type == T_STRING_LITERAL); @@ -1405,7 +1359,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; @@ -1430,7 +1384,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; @@ -1454,7 +1408,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; @@ -1520,7 +1474,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; @@ -1549,7 +1503,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; } @@ -1704,7 +1658,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; } @@ -2393,7 +2347,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); @@ -2406,7 +2360,7 @@ static __attribute__((unused)) void debug_print_type_path( 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-"); } @@ -2503,7 +2457,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; @@ -2524,7 +2478,7 @@ static bool walk_designator(type_path_t *path, const designator_t *designator, } else { compound_t *compound = type->compound.compound; entity_t *iter = compound->members.entities; - for( ; iter != NULL; iter = iter->base.next) { + for (; iter != NULL; iter = iter->base.next) { if (iter->base.symbol == symbol) { break; } @@ -2926,7 +2880,7 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env) 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) { @@ -2993,7 +2947,7 @@ static compound_t *parse_compound_type_specifier(bool is_struct) eat(T_union); } - symbol_t *symbol = NULL; + symbol_t *symbol = NULL; compound_t *compound = NULL; if (token.type == T___attribute__) { @@ -3004,13 +2958,13 @@ static compound_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; 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 != scope && + if (compound->base.parent_scope != current_scope && (token.type == '{' || token.type == ';')) { /* we're in an inner scope and have a definition. Override existing definition in outer scope */ @@ -3045,18 +2999,21 @@ static compound_t *parse_compound_type_specifier(bool is_struct) (is_struct ? NAMESPACE_STRUCT : NAMESPACE_UNION); compound->base.source_position = token.source_position; compound->base.symbol = symbol; - compound->base.parent_scope = scope; + compound->base.parent_scope = current_scope; if (symbol != NULL) { environment_push(entity); } - append_entity(scope, entity); + append_entity(current_scope, entity); } if (token.type == '{') { - compound->complete = true; - parse_compound_type_entries(compound); modifiers |= parse_attributes(&attributes); + + if (symbol == NULL) { + assert(anonymous_entity == NULL); + anonymous_entity = (entity_t*)compound; + } } compound->modifiers |= modifiers; @@ -3068,8 +3025,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; } @@ -3139,7 +3096,7 @@ static type_t *parse_enum_specifier(void) entity->base.namespc = NAMESPACE_ENUM; entity->base.source_position = token.source_position; entity->base.symbol = symbol; - entity->base.parent_scope = scope; + entity->base.parent_scope = current_scope; } type_t *const type = allocate_type_zero(TYPE_ENUM); @@ -3153,12 +3110,17 @@ static type_t *parse_enum_specifier(void) if (symbol != NULL) { environment_push(entity); } - append_entity(scope, entity); + append_entity(current_scope, entity); entity->enume.complete = true; parse_enum_entries(type); parse_attributes(&attributes); - } else if(!entity->enume.complete && !(c_mode & _GNUC)) { + + 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 enumes are a GNU extension)", symbol); } @@ -3443,12 +3405,49 @@ static entity_t *create_error_entity(symbol_t *symbol, entity_kind_tag_t 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; } record_entity(entity, false); return entity; } +static void parse_microsoft_based(declaration_specifiers_t *specifiers) +{ + 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 (specifiers->based_variable != NULL) { + errorf(HERE, "__based type qualifier specified more than once"); + } + specifiers->based_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. @@ -3592,6 +3591,15 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) expect(')'); break; + case T__based: + next_token(); + expect('('); + add_anchor_token(')'); + parse_microsoft_based(specifiers); + rem_anchor_token(')'); + expect(')'); + break; + case T___thread: switch (specifiers->storage_class) { case STORAGE_CLASS_NONE: @@ -3637,30 +3645,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 */ @@ -3673,7 +3682,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) { @@ -3681,6 +3689,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) } else { type_specifiers |= SPECIFIER_LONG; } + next_token(); break; case T_struct: { @@ -4060,6 +4069,7 @@ static entity_t *parse_parameter(void) parse_declaration_specifiers(&specifiers); entity_t *entity = parse_declarator(&specifiers, true, false); + anonymous_entity = NULL; return entity; } @@ -4245,51 +4255,27 @@ end_error: return (construct_type_t*) array; } -static construct_type_t *parse_function_declarator(scope_t *scope) +static construct_type_t *parse_function_declarator(scope_t *scope, + decl_modifiers_t modifiers) { - type_t *type = allocate_type_zero(TYPE_FUNCTION); - - /* TODO: revive this... once we know exactly how to do it */ -#if 0 - decl_modifiers_t modifiers = entity->declaration.modifiers; + type_t *type = allocate_type_zero(TYPE_FUNCTION); + function_type_t *ftype = &type->function; - unsigned mask = 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 (modifiers & DM_CDECL) { - if (first == NULL) first = "cdecl"; - else if (second == NULL) second = "cdecl"; - } - if (modifiers & DM_STDCALL) { - if (first == NULL) first = "stdcall"; - else if (second == NULL) second = "stdcall"; - } - if (modifiers & DM_FASTCALL) { - if (first == NULL) first = "fastcall"; - else if (second == NULL) second = "fastcall"; - } - if (modifiers & DM_THISCALL) { - if (first == NULL) first = "thiscall"; - else if (second == NULL) second = "thiscall"; - } - errorf(&entity->base.source_position, - "%s and %s attributes are not compatible", first, second); + default: + errorf(HERE, "multiple calling conventions in declaration"); + break; } - if (modifiers & DM_CDECL) - type->function.calling_convention = CC_CDECL; - else if (modifiers & DM_STDCALL) - type->function.calling_convention = CC_STDCALL; - else if (modifiers & DM_FASTCALL) - type->function.calling_convention = CC_FASTCALL; - else if (modifiers & DM_THISCALL) - type->function.calling_convention = CC_THISCALL; -#endif - - parse_parameters(&type->function, scope); + parse_parameters(ftype, scope); construct_function_type_t *construct_function_type = obstack_alloc(&temp_obst, sizeof(construct_function_type[0])); @@ -4334,8 +4320,10 @@ static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env, modifiers |= parse_attributes(&attributes); } - if (env != NULL) - env->modifiers |= modifiers; + if (env != NULL) { + modifiers |= env->modifiers; + env->modifiers = modifiers; + } construct_type_t *inner_types = NULL; @@ -4370,7 +4358,7 @@ static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env, construct_type_t *p = last; - while(true) { + while (true) { construct_type_t *type; switch (token.type) { case '(': { @@ -4378,7 +4366,7 @@ static construct_type_t *parse_inner_declarator(parse_declarator_env_t *env, if (env != NULL) scope = &env->parameters; - type = parse_function_declarator(scope); + type = parse_function_declarator(scope, modifiers); break; } case '[': @@ -4490,10 +4478,10 @@ static void parse_declaration_attributes(entity_t *entity) } static type_t *construct_declarator_type(construct_type_t *construct_list, - type_t *type) + type_t *type, variable_t *variable) { construct_type_t *iter = construct_list; - for( ; iter != NULL; iter = iter->next) { + for (; iter != NULL; iter = iter->next) { switch (iter->kind) { case CONSTRUCT_INVALID: internal_errorf(HERE, "invalid type construction found"); @@ -4524,7 +4512,7 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, case CONSTRUCT_POINTER: { parsed_pointer_t *parsed_pointer = (parsed_pointer_t*) iter; - type = make_pointer_type(type, parsed_pointer->type_qualifiers); + type = make_based_pointer_type(type, parsed_pointer->type_qualifiers, variable); continue; } @@ -4586,10 +4574,11 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, { parse_declarator_env_t env; memset(&env, 0, sizeof(env)); + env.modifiers = specifiers->modifiers; construct_type_t *construct_type = parse_inner_declarator(&env, may_be_abstract); - type_t *type = construct_declarator_type(construct_type, specifiers->type); + type_t *type = construct_declarator_type(construct_type, specifiers->type, specifiers->based_variable); if (construct_type != NULL) { obstack_free(&temp_obst, construct_type); @@ -4601,6 +4590,21 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, entity->base.symbol = env.symbol; entity->base.source_position = env.source_position; entity->typedefe.type = 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 { if (create_compound_member) { entity = allocate_entity_zero(ENTITY_COMPOUND_MEMBER); @@ -4625,17 +4629,18 @@ static entity_t *parse_declarator(const declaration_specifiers_t *specifiers, } } - entity->base.source_position = env.source_position; - entity->base.symbol = env.symbol; - entity->base.namespc = NAMESPACE_NORMAL; - entity->declaration.type = type; - entity->declaration.modifiers = env.modifiers | specifiers->modifiers; + entity->base.source_position = env.source_position; + entity->base.symbol = env.symbol; + entity->base.namespc = NAMESPACE_NORMAL; + entity->declaration.type = 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 && scope != file_scope) { + if (storage_class == STORAGE_CLASS_NONE + && current_scope != file_scope) { storage_class = STORAGE_CLASS_AUTO; } entity->declaration.storage_class = storage_class; @@ -4650,7 +4655,7 @@ static type_t *parse_abstract_declarator(type_t *base_type) { construct_type_t *construct_type = parse_inner_declarator(NULL, 1); - type_t *result = construct_declarator_type(construct_type, base_type); + type_t *result = construct_declarator_type(construct_type, base_type, NULL); if (construct_type != NULL) { obstack_free(&temp_obst, construct_type); } @@ -4727,6 +4732,34 @@ static bool is_sym_main(const symbol_t *const sym) return strcmp(sym->string, "main") == 0; } +static const char *get_entity_kind_name(entity_kind_t kind) +{ + switch ((entity_kind_tag_t) kind) { + case ENTITY_FUNCTION: return "function"; + case ENTITY_VARIABLE: return "variable"; + case ENTITY_COMPOUND_MEMBER: return "compound type member"; + case ENTITY_STRUCT: return "struct"; + case ENTITY_UNION: return "union"; + case ENTITY_ENUM: return "enum"; + case ENTITY_ENUM_VALUE: return "enum value"; + case ENTITY_LABEL: return "label"; + case ENTITY_LOCAL_LABEL: return "local label"; + case ENTITY_TYPEDEF: return "typedef"; + case ENTITY_NAMESPACE: return "namespace"; + case ENTITY_INVALID: break; + } + + panic("Invalid entity kind encountered in get_entity_kind_name"); +} + +static void error_redefined_as_different_kind(const source_position_t *pos, + const entity_t *old, entity_kind_t new_kind) +{ + errorf(pos, "redeclaration of %s '%Y' as %s (declared %P)", + get_entity_kind_name(old->kind), old->base.symbol, + get_entity_kind_name(new_kind), &old->base.source_position); +} + /** * record entities for the NAMESPACE_NORMAL, and produce error messages/warnings * for various problems that occur for multiple definitions @@ -4734,7 +4767,7 @@ static bool is_sym_main(const symbol_t *const sym) static entity_t *record_entity(entity_t *entity, const bool is_definition) { const symbol_t *const symbol = entity->base.symbol; - const namespace_t namespc = entity->base.namespc; + const namespace_tag_t namespc = (namespace_tag_t)entity->base.namespc; const source_position_t *pos = &entity->base.source_position; assert(symbol != NULL); @@ -4754,7 +4787,8 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition) orig_type, symbol); } - if (warning.main && scope == file_scope && is_sym_main(symbol)) { + if (warning.main && current_scope == file_scope + && is_sym_main(symbol)) { check_type_of_main(entity); } } @@ -4762,7 +4796,7 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition) if (is_declaration(entity)) { if (warning.nested_externs && entity->declaration.storage_class == STORAGE_CLASS_EXTERN - && scope != file_scope) { + && current_scope != file_scope) { warningf(pos, "nested extern declaration of '%#T'", entity->declaration.type, symbol); } @@ -4770,7 +4804,7 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition) if (previous_entity != NULL && previous_entity->base.parent_scope == ¤t_function->parameters - && scope->depth == previous_entity->base.parent_scope->depth + 1) { + && current_scope->depth == previous_entity->base.parent_scope->depth+1){ assert(previous_entity->kind == ENTITY_VARIABLE); errorf(pos, @@ -4782,12 +4816,11 @@ static entity_t *record_entity(entity_t *entity, const bool is_definition) } if (previous_entity != NULL - && previous_entity->base.parent_scope == scope) { + && previous_entity->base.parent_scope == current_scope) { if (previous_entity->kind != entity->kind) { - errorf(pos, - "redeclaration of '%Y' as different kind of symbol (declared %P)", - symbol, &previous_entity->base.source_position); + error_redefined_as_different_kind(pos, previous_entity, + entity->kind); goto finish; } if (previous_entity->kind == ENTITY_ENUM_VALUE) { @@ -4944,7 +4977,7 @@ error_redeclaration: } } else if (warning.missing_declarations && entity->kind == ENTITY_VARIABLE - && scope == file_scope) { + && current_scope == file_scope) { declaration_t *declaration = &entity->declaration; if (declaration->storage_class == STORAGE_CLASS_NONE || declaration->storage_class == STORAGE_CLASS_THREAD) { @@ -4955,12 +4988,12 @@ error_redeclaration: finish: assert(entity->base.parent_scope == NULL); - assert(scope != NULL); + assert(current_scope != NULL); - entity->base.parent_scope = scope; + entity->base.parent_scope = current_scope; entity->base.namespc = NAMESPACE_NORMAL; environment_push(entity); - append_entity(scope, entity); + append_entity(current_scope, entity); return entity; } @@ -5076,7 +5109,7 @@ static void parse_declaration_rest(entity_t *ndeclaration, { add_anchor_token(';'); add_anchor_token(','); - while(true) { + while (true) { entity_t *entity = finished_declaration(ndeclaration, token.type == '='); if (token.type == '=') { @@ -5094,6 +5127,7 @@ static void parse_declaration_rest(entity_t *ndeclaration, expect(';'); end_error: + anonymous_entity = NULL; rem_anchor_token(';'); rem_anchor_token(','); } @@ -5109,7 +5143,7 @@ static entity_t *finished_kr_declaration(entity_t *entity, bool is_definition) assert(entity->base.namespc == NAMESPACE_NORMAL); entity_t *previous_entity = get_entity(symbol, NAMESPACE_NORMAL); if (previous_entity == NULL - || previous_entity->base.parent_scope != scope) { + || previous_entity->base.parent_scope != current_scope) { errorf(HERE, "expected declaration of a function parameter, found '%Y'", symbol); return entity; @@ -5173,7 +5207,7 @@ static void parse_kr_declaration_list(entity_t *entity) entity_t *parameter = entity->function.parameters.entities; for ( ; parameter != NULL; parameter = parameter->base.next) { assert(parameter->base.parent_scope == NULL); - parameter->base.parent_scope = scope; + parameter->base.parent_scope = current_scope; environment_push(parameter); } @@ -5183,7 +5217,7 @@ static void parse_kr_declaration_list(entity_t *entity) } /* pop function parameters */ - assert(scope == &entity->function.parameters); + assert(current_scope == &entity->function.parameters); scope_pop(); environment_pop_to(top); @@ -5194,7 +5228,7 @@ static void parse_kr_declaration_list(entity_t *entity) function_parameter_t *last_parameter = NULL; entity_t *parameter_declaration = entity->function.parameters.entities; - for( ; parameter_declaration != NULL; + for (; parameter_declaration != NULL; parameter_declaration = parameter_declaration->base.next) { type_t *parameter_type = parameter_declaration->declaration.type; if (parameter_type == NULL) { @@ -5285,8 +5319,6 @@ static void check_labels(void) "label '%Y' used but not defined", label->base.symbol); } } - goto_first = NULL; - goto_last = NULL; if (warning.unused_label) { for (const label_statement_t *label_statement = label_first; @@ -5301,7 +5333,6 @@ static void check_labels(void) } } } - label_first = label_last = NULL; } static void warn_unused_decl(entity_t *entity, entity_t *end, @@ -5418,6 +5449,7 @@ static bool expression_returns(expression_t const *const expr) case EXPR_BUILTIN_CONSTANT_P: case EXPR_BUILTIN_PREFETCH: case EXPR_OFFSETOF: + case EXPR_INVALID: case EXPR_STATEMENT: // TODO implement return true; @@ -5456,7 +5488,6 @@ static bool expression_returns(expression_t const *const expr) expression_returns(expr->binary.right); case EXPR_UNKNOWN: - case EXPR_INVALID: break; } @@ -5902,11 +5933,9 @@ static void parse_external_declaration(void) } assert(is_declaration(ndeclaration)); - type_t *type = ndeclaration->declaration.type; + 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->base.symbol); @@ -5960,13 +5989,13 @@ static void parse_external_declaration(void) scope_push(&function->parameters); entity_t *parameter = function->parameters.entities; - for( ; parameter != NULL; parameter = parameter->base.next) { + for (; parameter != NULL; parameter = parameter->base.next) { if (parameter->base.parent_scope == &ndeclaration->function.parameters) { - parameter->base.parent_scope = scope; + parameter->base.parent_scope = current_scope; } assert(parameter->base.parent_scope == NULL - || parameter->base.parent_scope == scope); - parameter->base.parent_scope = scope; + || 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; @@ -5984,7 +6013,12 @@ static void parse_external_declaration(void) current_function = function; current_parent = NULL; - statement_t *const body = parse_compound_statement(false); + goto_first = NULL; + goto_anchor = &goto_first; + label_first = NULL; + label_anchor = &label_first; + + statement_t *const body = parse_compound_statement(false); function->statement = body; first_err = true; check_labels(); @@ -6012,7 +6046,7 @@ static void parse_external_declaration(void) label_pop_to(label_stack_top); } - assert(scope == &function->parameters); + assert(current_scope == &function->parameters); scope_pop(); environment_pop_to(top); } @@ -6040,14 +6074,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; } @@ -6059,11 +6090,13 @@ static type_t *make_bitfield_type(type_t *base_type, expression_t *size, static entity_t *find_compound_entry(compound_t *compound, symbol_t *symbol) { entity_t *iter = compound->members.entities; - for( ; iter != NULL; iter = iter->base.next) { + for (; iter != NULL; iter = iter->base.next) { if (iter->kind != ENTITY_COMPOUND_MEMBER) continue; - if (iter->base.symbol == NULL) { + if (iter->base.symbol == symbol) { + return iter; + } else if (iter->base.symbol == NULL) { type_t *type = skip_typeref(iter->declaration.type); if (is_type_compound(type)) { entity_t *result @@ -6073,10 +6106,6 @@ static entity_t *find_compound_entry(compound_t *compound, symbol_t *symbol) } continue; } - - if (iter->base.symbol == symbol) { - return iter; - } } return NULL; @@ -6107,30 +6136,17 @@ static void parse_compound_declarators(compound_t *compound, entity->declaration.type = type; } else { entity = parse_declarator(specifiers,/*may_be_abstract=*/true, true); - - assert(is_declaration(entity)); - type_t *orig_type = entity->declaration.type; - type_t *type = skip_typeref(orig_type); + 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, + 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; - } 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'", - entity->base.symbol, orig_type); - } else if (is_type_function(type)) { - errorf(HERE, "compound member '%Y' must not have function type '%T'", - entity->base.symbol, orig_type); - } } } @@ -6140,7 +6156,6 @@ static void parse_compound_declarators(compound_t *compound, entity_t *prev = find_compound_entry(compound, symbol); if (prev != NULL) { - assert(prev->base.symbol == symbol); errorf(&entity->base.source_position, "multiple declarations of symbol '%Y' (declared %P)", symbol, &prev->base.source_position); @@ -6149,6 +6164,25 @@ static void parse_compound_declarators(compound_t *compound, 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); + } + } + if (token.type != ',') break; next_token(); @@ -6156,7 +6190,7 @@ static void parse_compound_declarators(compound_t *compound, expect(';'); end_error: - ; + anonymous_entity = NULL; } static void parse_compound_type_entries(compound_t *compound) @@ -6177,6 +6211,9 @@ static void parse_compound_type_entries(compound_t *compound) } rem_anchor_token('}'); next_token(); + + /* §6.7.2.1:7 */ + compound->complete = true; } static type_t *parse_typename(void) @@ -6275,15 +6312,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(); @@ -6296,16 +6346,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(); @@ -6319,16 +6367,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(); @@ -6595,6 +6641,11 @@ static expression_t *parse_reference(void) 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"); } @@ -6731,7 +6782,7 @@ 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(')'); @@ -6765,9 +6816,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; @@ -6823,7 +6873,6 @@ end_error: static expression_t *parse_function_keyword(void) { - next_token(); /* TODO */ if (current_function == NULL) { @@ -6834,13 +6883,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"); } @@ -6849,13 +6898,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"); } @@ -6864,13 +6913,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"); } @@ -6879,6 +6928,8 @@ static expression_t *parse_funcdname_keyword(void) expression->base.type = type_char_ptr; expression->funcname.kind = FUNCNAME_FUNCDNAME; + eat(T___FUNCDNAME__); + return expression; } @@ -6896,7 +6947,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) { @@ -6942,11 +6993,11 @@ 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; + eat(T___builtin_offsetof); + expect('('); add_anchor_token(','); type_t *type = parse_typename(); @@ -6983,10 +7034,10 @@ end_error: */ static expression_t *parse_va_start(void) { - eat(T___builtin_va_start); - expression_t *expression = allocate_expression_zero(EXPR_VA_START); + eat(T___builtin_va_start); + expect('('); add_anchor_token(','); expression->va_starte.ap = parse_assignment_expression(); @@ -7016,10 +7067,10 @@ end_error: */ static expression_t *parse_va_arg(void) { - eat(T___builtin_va_arg); - expression_t *expression = allocate_expression_zero(EXPR_VA_ARG); + eat(T___builtin_va_arg); + expect('('); expression->va_arge.ap = parse_assignment_expression(); expect(','); @@ -7052,10 +7103,10 @@ 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); + eat(T___builtin_constant_p); + expect('('); add_anchor_token(')'); expression->builtin_constant.value = parse_assignment_expression(); @@ -7073,10 +7124,10 @@ end_error: */ static expression_t *parse_builtin_prefetch(void) { - eat(T___builtin_prefetch); - expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_PREFETCH); + eat(T___builtin_prefetch); + expect('('); add_anchor_token(')'); expression->builtin_prefetch.adr = parse_assignment_expression(); @@ -7160,11 +7211,11 @@ end_error: */ static expression_t *parse_builtin_expect(void) { - eat(T___builtin_expect); - expression_t *expression = allocate_expression_zero(EXPR_BINARY_BUILTIN_EXPECT); + eat(T___builtin_expect); + expect('('); expression->binary.left = parse_assignment_expression(); expect(','); @@ -7184,10 +7235,9 @@ 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('('); add_anchor_token(')'); @@ -7211,11 +7261,11 @@ static label_t *get_label(symbol_t *symbol) entity_t *label; assert(current_function != NULL); - label = get_entity(symbol, NAMESPACE_LOCAL_LABEL); + label = get_entity(symbol, NAMESPACE_LABEL); /* if we found a local label, we already created the declaration */ if (label != NULL && label->kind == ENTITY_LOCAL_LABEL) { - if (label->base.parent_scope != scope) { - assert(label->base.parent_scope->depth < scope->depth); + if (label->base.parent_scope != current_scope) { + assert(label->base.parent_scope->depth < current_scope->depth); current_function->goto_to_outer = true; } return &label->label; @@ -7273,7 +7323,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 == '(') { @@ -7283,7 +7338,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; @@ -7295,17 +7350,8 @@ static expression_t *parse_noop_expression(void) 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; - end_error: - return create_invalid_expression(); + return cnst; } /** @@ -7314,6 +7360,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(); @@ -7378,22 +7426,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; @@ -7419,22 +7466,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: 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; @@ -7473,7 +7515,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); } @@ -7484,28 +7528,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; @@ -7645,11 +7684,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); @@ -7715,7 +7752,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); @@ -7746,6 +7783,48 @@ static bool same_compound_type(const type_t *type1, const type_t *type2) 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); + } +} + /** * Parse a conditional expression, ie. 'expression ? ... : ...'. * @@ -7756,8 +7835,9 @@ 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; + + warn_reference_address_as_bool(expression); eat('?'); add_anchor_token(':'); @@ -7910,11 +7990,11 @@ 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; + eat(T___builtin_classify_type); + expect('('); add_anchor_token(')'); expression_t *expression = parse_expression(); @@ -7934,8 +8014,7 @@ 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); @@ -7969,8 +8048,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); @@ -8099,45 +8177,6 @@ static void semantic_unexpr_plus(unary_expression_t *expression) "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; - } - - /* special case for functions which are automatically converted to a - * pointer to function without an extra TAKE_ADDRESS operation */ - if (!regular_take_address && expr->kind == EXPR_REFERENCE - && expr->reference.entity->kind == ENTITY_FUNCTION) { - return expr; - } - - return NULL; -} - -static void warn_function_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_not(unary_expression_t *expression) { type_t *const orig_type = expression->value->base.type; @@ -8147,9 +8186,9 @@ static void semantic_not(unary_expression_t *expression) "operand of ! must be of scalar type"); } - warn_function_address_as_bool(expression->value); + warn_reference_address_as_bool(expression->value); - expression->base.type = type_int; + expression->base.type = c_mode & _CXX ? type_bool : type_int; } static void semantic_unexpr_integer(unary_expression_t *expression) @@ -8224,11 +8263,8 @@ static void semantic_take_addr(unary_expression_t *expression) return; /* §6.5.3.2 */ - if (value->kind != EXPR_ARRAY_ACCESS - && value->kind != EXPR_UNARY_DEREFERENCE - && !is_lvalue(value)) { - errorf(&expression->base.source_position, - "'&' requires an lvalue"); + if (!is_lvalue(value)) { + errorf(&expression->base.source_position, "'&' requires an lvalue"); } if (type->kind == TYPE_BITFIELD) { errorf(&expression->base.source_position, @@ -8246,7 +8282,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); \ \ @@ -8278,9 +8313,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); \ \ @@ -8612,7 +8646,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; } /** @@ -8749,8 +8783,8 @@ static void semantic_logical_op(binary_expression_t *expression) 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); + warn_reference_address_as_bool(left); + warn_reference_address_as_bool(right); if (!is_type_scalar(type_left) || !is_type_scalar(type_right)) { /* TODO: improve error message */ @@ -8761,7 +8795,7 @@ static void semantic_logical_op(binary_expression_t *expression) return; } - expression->base.type = type_int; + expression->base.type = c_mode & _CXX ? type_bool : type_int; } /** @@ -8938,8 +8972,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); \ @@ -9001,7 +9034,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(); } @@ -9135,8 +9168,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])); @@ -9219,12 +9252,8 @@ static asm_argument_t *parse_asm_arguments(bool is_out) 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; @@ -9244,7 +9273,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(); @@ -9516,12 +9545,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; @@ -9544,6 +9569,7 @@ static statement_t *parse_if(void) add_anchor_token(')'); expression_t *const expr = parse_expression(); statement->ifs.condition = expr; + warn_reference_address_as_bool(expr); mark_vars_read(expr, NULL); rem_anchor_token(')'); expect(')'); @@ -9684,6 +9710,7 @@ static statement_t *parse_while(void) add_anchor_token(')'); expression_t *const cond = parse_expression(); statement->whiles.condition = cond; + warn_reference_address_as_bool(cond); mark_vars_read(cond, NULL); rem_anchor_token(')'); expect(')'); @@ -9717,6 +9744,7 @@ static statement_t *parse_do(void) add_anchor_token(')'); expression_t *const cond = parse_expression(); statement->do_while.condition = cond; + warn_reference_address_as_bool(cond); mark_vars_read(cond, NULL); rem_anchor_token(')'); expect(')'); @@ -9769,6 +9797,7 @@ static statement_t *parse_for(void) add_anchor_token(';'); expression_t *const cond = parse_expression(); statement->fors.condition = cond; + warn_reference_address_as_bool(cond); mark_vars_read(cond, NULL); rem_anchor_token(';'); } @@ -9786,7 +9815,7 @@ static statement_t *parse_for(void) rem_anchor_token(')'); statement->fors.body = parse_loop_body(statement); - assert(scope == &statement->fors.scope); + assert(current_scope == &statement->fors.scope); scope_pop(); environment_pop_to(top); @@ -9796,7 +9825,7 @@ static statement_t *parse_for(void) end_error: POP_PARENT; rem_anchor_token(')'); - assert(scope == &statement->fors.scope); + assert(current_scope == &statement->fors.scope); scope_pop(); environment_pop_to(top); @@ -9816,8 +9845,8 @@ static statement_t *parse_goto(void) expression_t *expression = parse_expression(); 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) { @@ -9848,12 +9877,8 @@ 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(';'); @@ -9982,7 +10007,7 @@ static statement_t *parse_return(void) mark_vars_read(return_value, NULL); } - const type_t *const func_type = current_function->base.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); @@ -10030,18 +10055,18 @@ static statement_t *parse_declaration_statement(void) { statement_t *statement = allocate_statement_zero(STATEMENT_DECLARATION); - entity_t *before = scope->last_entity; + entity_t *before = current_scope->last_entity; if (GNU_MODE) parse_external_declaration(); else parse_declaration(record_entity); if (before == NULL) { - statement->declaration.declarations_begin = scope->entities; + statement->declaration.declarations_begin = current_scope->entities; } else { statement->declaration.declarations_begin = before->base.next; } - statement->declaration.declarations_end = scope->last_entity; + statement->declaration.declarations_end = current_scope->last_entity; return statement; } @@ -10136,15 +10161,15 @@ static statement_t *parse_local_label_declaration(void) goto end_error; } symbol_t *symbol = token.v.symbol; - entity_t *entity = get_entity(symbol, NAMESPACE_LOCAL_LABEL); - if (entity != NULL && entity->base.parent_scope == scope) { + 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 { entity = allocate_entity_zero(ENTITY_LOCAL_LABEL); - entity->base.parent_scope = scope; - entity->base.namespc = NAMESPACE_LOCAL_LABEL; + entity->base.parent_scope = current_scope; + entity->base.namespc = NAMESPACE_LABEL; entity->base.source_position = token.source_position; entity->base.symbol = symbol; @@ -10154,7 +10179,7 @@ static statement_t *parse_local_label_declaration(void) if (begin == NULL) begin = entity; - local_label_push(entity); + environment_push(entity); } next_token(); @@ -10169,6 +10194,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_push(&entity->namespacee.members); + + expect('{'); + parse_externals(); + expect('}'); + +end_error: + assert(current_scope == &entity->namespacee.members); + scope_pop(); + environment_pop_to(top); +} + /** * Parse a statement. * There's also parse_statement() which additionally checks for @@ -10232,22 +10306,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(); @@ -10301,8 +10375,7 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) eat('{'); add_anchor_token('}'); - size_t const top = environment_top(); - size_t const top_local = local_label_top(); + size_t const top = environment_top(); scope_push(&statement->compound.scope); statement_t **anchor = &statement->compound.statements; @@ -10342,7 +10415,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 @@ -10360,42 +10433,14 @@ static statement_t *parse_compound_statement(bool inside_expression_statement) end_error: rem_anchor_token('}'); - assert(scope == &statement->compound.scope); + assert(current_scope == &statement->compound.scope); scope_pop(); 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.typedefe = type_wchar_t->typedeft.typedefe; - 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 */ @@ -10450,18 +10495,94 @@ static void parse_global_asm(void) 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('}'); + } 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__: + case '(': /* for function declarations with implicit return type and + * parenthesized declarator, i.e. (f)(void); */ + 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) { @@ -10480,37 +10601,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(); } } @@ -10523,7 +10637,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; @@ -10537,17 +10650,15 @@ 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; + assert(current_scope == &unit->scope); + current_scope = NULL; assert(file_scope == &unit->scope); check_unused_globals(); @@ -10555,7 +10666,6 @@ 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; @@ -10568,6 +10678,7 @@ void parse(void) for (int i = 0; i < MAX_LOOKAHEAD + 2; ++i) { next_token(); } + current_linkage = c_mode & _CXX ? LINKAGE_CXX : LINKAGE_C; parse_translation_unit(); }