X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=parser.c;h=a7b334bf6a33ae726d23ebcd6b6f9928b31bf276;hb=975933a9f57835385489ecdeda04a65894705eca;hp=91aba28db5ade3ce5e414409cbd9327ce54c25ae;hpb=3bc60b6a59aa640ba89ffaed8fb64247d977cbcc;p=cparser diff --git a/parser.c b/parser.c index 91aba28..a7b334b 100644 --- a/parser.c +++ b/parser.c @@ -25,6 +25,16 @@ typedef struct { unsigned short namespc; } stack_entry_t; +typedef struct declaration_specifiers_t declaration_specifiers_t; +struct declaration_specifiers_t { + source_position_t source_position; + unsigned char storage_class; + bool is_inline; + type_t *type; +}; + +typedef declaration_t* (*parsed_declaration_func) (declaration_t *declaration); + static token_t token; static token_t lookahead_buffer[MAX_LOOKAHEAD]; static int lookahead_bufpos; @@ -38,16 +48,18 @@ static struct obstack temp_obst; static bool found_error; static type_t *type_int = NULL; -static type_t *type_uint = NULL; static type_t *type_long_double = NULL; static type_t *type_double = NULL; static type_t *type_float = NULL; -static type_t *type_const_char = NULL; +static type_t *type_char = NULL; static type_t *type_string = NULL; static type_t *type_void = NULL; static type_t *type_void_ptr = NULL; -static type_t *type_size_t = NULL; -static type_t *type_ptrdiff_t = NULL; + +type_t *type_size_t = NULL; +type_t *type_ptrdiff_t = NULL; +type_t *type_wchar_t = NULL; +type_t *type_wchar_t_ptr = NULL; static statement_t *parse_compound_statement(void); static statement_t *parse_statement(void); @@ -56,6 +68,11 @@ static expression_t *parse_sub_expression(unsigned precedence); static expression_t *parse_expression(void); static type_t *parse_typename(void); +static void parse_compound_type_entries(void); +static declaration_t *parse_declarator( + const declaration_specifiers_t *specifiers, bool may_be_abstract); +static declaration_t *record_declaration(declaration_t *declaration); + #define STORAGE_CLASSES \ case T_typedef: \ case T_extern: \ @@ -106,21 +123,137 @@ static type_t *parse_typename(void); TYPE_QUALIFIERS \ TYPE_SPECIFIERS -static inline void *allocate_ast_zero(size_t size) +static void *allocate_ast_zero(size_t size) { void *res = allocate_ast(size); memset(res, 0, size); return res; } -static inline void *allocate_type_zero(size_t size) +static size_t get_statement_struct_size(statement_type_t type) +{ + static const size_t sizes[] = { + [STATEMENT_COMPOUND] = sizeof(compound_statement_t), + [STATEMENT_RETURN] = sizeof(return_statement_t), + [STATEMENT_DECLARATION] = sizeof(declaration_statement_t), + [STATEMENT_IF] = sizeof(if_statement_t), + [STATEMENT_SWITCH] = sizeof(switch_statement_t), + [STATEMENT_EXPRESSION] = sizeof(expression_statement_t), + [STATEMENT_CONTINUE] = sizeof(statement_base_t), + [STATEMENT_BREAK] = sizeof(statement_base_t), + [STATEMENT_GOTO] = sizeof(goto_statement_t), + [STATEMENT_LABEL] = sizeof(label_statement_t), + [STATEMENT_CASE_LABEL] = sizeof(case_label_statement_t), + [STATEMENT_WHILE] = sizeof(while_statement_t), + [STATEMENT_DO_WHILE] = sizeof(do_while_statement_t), + [STATEMENT_FOR] = sizeof(for_statement_t), + [STATEMENT_ASM] = sizeof(asm_statement_t) + }; + assert(sizeof(sizes) / sizeof(sizes[0]) == STATEMENT_ASM + 1); + assert(type <= STATEMENT_ASM); + assert(sizes[type] != 0); + return sizes[type]; +} + +static statement_t *allocate_statement_zero(statement_type_t type) +{ + size_t size = get_statement_struct_size(type); + statement_t *res = allocate_ast_zero(size); + + res->base.type = type; + return res; +} + + +static size_t get_expression_struct_size(expression_type_t type) +{ + static const size_t sizes[] = { + [EXPR_INVALID] = sizeof(expression_base_t), + [EXPR_REFERENCE] = sizeof(reference_expression_t), + [EXPR_CONST] = sizeof(const_expression_t), + [EXPR_STRING_LITERAL] = sizeof(string_literal_expression_t), + [EXPR_WIDE_STRING_LITERAL] = sizeof(wide_string_literal_expression_t), + [EXPR_CALL] = sizeof(call_expression_t), + [EXPR_UNARY] = sizeof(unary_expression_t), + [EXPR_BINARY] = sizeof(binary_expression_t), + [EXPR_CONDITIONAL] = sizeof(conditional_expression_t), + [EXPR_SELECT] = sizeof(select_expression_t), + [EXPR_ARRAY_ACCESS] = sizeof(array_access_expression_t), + [EXPR_SIZEOF] = sizeof(sizeof_expression_t), + [EXPR_CLASSIFY_TYPE] = sizeof(classify_type_expression_t), + [EXPR_FUNCTION] = sizeof(string_literal_expression_t), + [EXPR_PRETTY_FUNCTION] = sizeof(string_literal_expression_t), + [EXPR_BUILTIN_SYMBOL] = sizeof(builtin_symbol_expression_t), + [EXPR_OFFSETOF] = sizeof(offsetof_expression_t), + [EXPR_VA_ARG] = sizeof(va_arg_expression_t), + [EXPR_STATEMENT] = sizeof(statement_expression_t) + }; + assert(sizeof(sizes) / sizeof(sizes[0]) == EXPR_STATEMENT + 1); + assert(type <= EXPR_STATEMENT); + assert(sizes[type] != 0); + return sizes[type]; +} + +static expression_t *allocate_expression_zero(expression_type_t type) +{ + size_t size = get_expression_struct_size(type); + expression_t *res = allocate_ast_zero(size); + + res->base.type = type; + return res; +} + +static size_t get_type_struct_size(type_type_t type) +{ + static const size_t sizes[] = { + [TYPE_ATOMIC] = sizeof(atomic_type_t), + [TYPE_COMPOUND_STRUCT] = sizeof(compound_type_t), + [TYPE_COMPOUND_UNION] = sizeof(compound_type_t), + [TYPE_ENUM] = sizeof(enum_type_t), + [TYPE_FUNCTION] = sizeof(function_type_t), + [TYPE_POINTER] = sizeof(pointer_type_t), + [TYPE_ARRAY] = sizeof(array_type_t), + [TYPE_BUILTIN] = sizeof(builtin_type_t), + [TYPE_TYPEDEF] = sizeof(typedef_type_t), + [TYPE_TYPEOF] = sizeof(typeof_type_t), + }; + assert(sizeof(sizes) / sizeof(sizes[0]) == (int) TYPE_TYPEOF + 1); + assert(type <= TYPE_TYPEOF); + assert(sizes[type] != 0); + return sizes[type]; +} + +static type_t *allocate_type_zero(type_type_t type) { - void *res = obstack_alloc(type_obst, size); + size_t size = get_type_struct_size(type); + type_t *res = obstack_alloc(type_obst, size); memset(res, 0, size); + + res->base.type = type; return res; } -static inline void free_type(void *type) +static size_t get_initializer_size(initializer_type_t type) +{ + static const size_t sizes[] = { + [INITIALIZER_VALUE] = sizeof(initializer_value_t), + [INITIALIZER_STRING] = sizeof(initializer_string_t), + [INITIALIZER_LIST] = sizeof(initializer_list_t) + }; + assert(type < INITIALIZER_COUNT); + assert(sizes[type] != 0); + return sizes[type]; +} + +static initializer_t *allocate_initializer(initializer_type_t type) +{ + initializer_t *result = allocate_ast_zero(get_initializer_size(type)); + result->type = type; + + return result; +} + +static void free_type(void *type) { obstack_free(type_obst, type); } @@ -128,12 +261,12 @@ static inline void free_type(void *type) /** * returns the top element of the environment stack */ -static inline size_t environment_top(void) +static size_t environment_top(void) { return ARR_LEN(environment_stack); } -static inline size_t label_top(void) +static size_t label_top(void) { return ARR_LEN(label_stack); } @@ -158,7 +291,7 @@ static inline const token_t *look_ahead(int num) { assert(num > 0 && num <= MAX_LOOKAHEAD); int pos = (lookahead_bufpos+num-1) % MAX_LOOKAHEAD; - return & lookahead_buffer[pos]; + return &lookahead_buffer[pos]; } #define eat(token_type) do { assert(token.type == token_type); next_token(); } while(0) @@ -175,7 +308,7 @@ static void parser_print_prefix_pos(const source_position_t source_position) { fputs(source_position.input_name, stderr); fputc(':', stderr); - fprintf(stderr, "%d", source_position.linenr); + fprintf(stderr, "%u", source_position.linenr); fputs(": ", stderr); } @@ -205,6 +338,11 @@ static void parser_print_warning_prefix_pos( fputs("warning: ", stderr); } +static void parser_print_warning_prefix(void) +{ + parser_print_warning_prefix_pos(token.source_position); +} + static void parse_warning_pos(const source_position_t source_position, const char *const message) { @@ -370,9 +508,26 @@ static void set_context(context_t *new_context) * called when we find a 2nd declarator for an identifier we already have a * declarator for */ -static bool is_compatible_declaration (declaration_t *declaration, +static bool is_compatible_declaration(declaration_t *declaration, declaration_t *previous) { + /* happens for K&R style function parameters */ + if(previous->type == NULL) { + previous->type = declaration->type; + return true; + } + + if (declaration->type->type == TYPE_FUNCTION && + previous->type->type == TYPE_FUNCTION && + previous->type->function.unspecified_parameters) { + function_type_t* const prev_func = &previous->type->function; + function_type_t* const decl_func = &declaration->type->function; + if (prev_func->unspecified_parameters && + prev_func->result_type == decl_func->result_type) { + declaration->type = previous->type; + return true; + } + } /* TODO: not correct yet */ return declaration->type == previous->type; } @@ -417,7 +572,6 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr, namespace_t namespc = (namespace_t)declaration->namespc; /* a declaration should be only pushed once */ - assert(declaration->parent_context == NULL); declaration->parent_context = parent_context; declaration_t *previous_declaration = get_declaration(symbol, namespc); @@ -437,11 +591,11 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr, print_type_quoted(previous_declaration->type); fputc('\n', stderr); } else { - const storage_class_t old_storage = (storage_class_t)previous_declaration->storage_class; - const storage_class_t new_storage = (storage_class_t)declaration->storage_class; + unsigned old_storage_class = previous_declaration->storage_class; + unsigned new_storage_class = declaration->storage_class; if (current_function == NULL) { - if (old_storage != STORAGE_CLASS_STATIC && - new_storage == STORAGE_CLASS_STATIC) { + if (old_storage_class != STORAGE_CLASS_STATIC && + new_storage_class == STORAGE_CLASS_STATIC) { parser_print_error_prefix_pos(declaration->source_position); fprintf(stderr, "static declaration of '%s' follows non-static declaration\n", @@ -450,8 +604,8 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr, fprintf(stderr, "previous declaration of '%s' was here\n", symbol->string); } else { - if (old_storage == STORAGE_CLASS_EXTERN) { - if (new_storage == STORAGE_CLASS_NONE) { + if (old_storage_class == STORAGE_CLASS_EXTERN) { + if (new_storage_class == STORAGE_CLASS_NONE) { previous_declaration->storage_class = STORAGE_CLASS_NONE; } } else { @@ -464,8 +618,8 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr, } } } else { - if (old_storage == STORAGE_CLASS_EXTERN && - new_storage == STORAGE_CLASS_EXTERN) { + if (old_storage_class == STORAGE_CLASS_EXTERN && + new_storage_class == STORAGE_CLASS_EXTERN) { parser_print_warning_prefix_pos(declaration->source_position); fprintf(stderr, "redundant extern declaration for '%s'\n", symbol->string); @@ -474,7 +628,7 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr, symbol->string); } else { parser_print_error_prefix_pos(declaration->source_position); - if (old_storage == new_storage) { + if (old_storage_class == new_storage_class) { fprintf(stderr, "redeclaration of '%s'\n", symbol->string); } else { fprintf(stderr, "redeclaration of '%s' with different linkage\n", symbol->string); @@ -492,7 +646,7 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr, stack_entry_t entry; entry.symbol = symbol; entry.old_declaration = symbol->declaration; - entry.namespc = namespc; + entry.namespc = (unsigned short) namespc; ARR_APP1(stack_entry_t, *stack_ptr, entry); /* replace/add declaration into declaration list of the symbol */ @@ -547,7 +701,7 @@ static void stack_pop_to(stack_entry_t **stack_ptr, size_t new_top) return; for(i = top; i > new_top; --i) { - stack_entry_t *entry = & stack[i - 1]; + stack_entry_t *entry = &stack[i - 1]; declaration_t *old_declaration = entry->old_declaration; symbol_t *symbol = entry->symbol; @@ -603,8 +757,8 @@ static int get_rank(const type_t *type) return ATOMIC_TYPE_INT; assert(type->type == TYPE_ATOMIC); - atomic_type_t *atomic_type = (atomic_type_t*) type; - atomic_type_type_t atype = atomic_type->atype; + const atomic_type_t *atomic_type = &type->atomic; + atomic_type_type_t atype = atomic_type->atype; return atype; } @@ -619,31 +773,42 @@ static type_t *promote_integer(type_t *type) static expression_t *create_cast_expression(expression_t *expression, type_t *dest_type) { - unary_expression_t *cast = allocate_ast_zero(sizeof(cast[0])); + expression_t *cast = allocate_expression_zero(EXPR_UNARY); - cast->expression.type = EXPR_UNARY; - cast->type = UNEXPR_CAST; - cast->value = expression; - cast->expression.datatype = dest_type; + cast->unary.type = UNEXPR_CAST_IMPLICIT; + cast->unary.value = expression; + cast->base.datatype = dest_type; - return (expression_t*) cast; + return cast; } -static bool is_null_expression(const expression_t *const expr) +static bool is_null_pointer_constant(const expression_t *expression) { - if (expr->type != EXPR_CONST) return false; + /* skip void* cast */ + if(expression->type == EXPR_UNARY) { + const unary_expression_t *unary = &expression->unary; + if(unary->type == UNEXPR_CAST + && expression->base.datatype == type_void_ptr) { + expression = unary->value; + } + } + + /* TODO: not correct yet, should be any constant integer expression + * which evaluates to 0 */ + if (expression->type != EXPR_CONST) + return false; - type_t *const type = skip_typeref(expr->datatype); - if (!is_type_integer(type)) return false; + type_t *const type = skip_typeref(expression->base.datatype); + if (!is_type_integer(type)) + return false; - const const_t *const const_expr = (const const_t*)expr; - return const_expr->v.int_value == 0; + return expression->conste.v.int_value == 0; } static expression_t *create_implicit_cast(expression_t *expression, type_t *dest_type) { - type_t *source_type = expression->datatype; + type_t *source_type = expression->base.datatype; if(source_type == NULL) return expression; @@ -654,82 +819,66 @@ static expression_t *create_implicit_cast(expression_t *expression, if(source_type == dest_type) return expression; - if(dest_type->type == TYPE_ATOMIC) { - if(source_type->type != TYPE_ATOMIC) - panic("casting of non-atomic types not implemented yet"); - - if(is_type_floating(dest_type) && !is_type_scalar(source_type)) { - type_error_incompatible("can't cast types", - expression->source_position, - source_type, dest_type); - return expression; - } - - return create_cast_expression(expression, dest_type); - } - if(dest_type->type == TYPE_POINTER) { - pointer_type_t *pointer_type - = (pointer_type_t*) dest_type; - switch (source_type->type) { - case TYPE_ATOMIC: - if (is_null_expression(expression)) { - return create_cast_expression(expression, dest_type); - } - break; - - case TYPE_POINTER: - if (pointers_compatible(source_type, dest_type)) { - return create_cast_expression(expression, dest_type); - } - break; + switch (dest_type->type) { + case TYPE_ENUM: + /* TODO warning for implicitly converting to enum */ + case TYPE_ATOMIC: + if (source_type->type != TYPE_ATOMIC && + source_type->type != TYPE_ENUM) { + panic("casting of non-atomic types not implemented yet"); + } - case TYPE_ARRAY: { - array_type_t *const array_type = (array_type_t*) source_type; - if (types_compatible(array_type->element_type, - pointer_type->points_to)) { - return create_cast_expression(expression, dest_type); - } - break; + if(is_type_floating(dest_type) && !is_type_scalar(source_type)) { + type_error_incompatible("can't cast types", + expression->base.source_position, source_type, + dest_type); + return expression; } - default: - panic("casting of non-atomic types not implemented yet"); - } + return create_cast_expression(expression, dest_type); - type_error_incompatible("can't implicitly cast types", - expression->source_position, - source_type, dest_type); - return expression; - } + case TYPE_POINTER: + switch (source_type->type) { + case TYPE_ATOMIC: + if (is_null_pointer_constant(expression)) { + return create_cast_expression(expression, dest_type); + } + break; - panic("casting of non-atomic types not implemented yet"); -} + case TYPE_POINTER: + if (pointers_compatible(source_type, dest_type)) { + return create_cast_expression(expression, dest_type); + } + break; -static bool is_atomic_type(const type_t *type, atomic_type_type_t atype) -{ - if(type->type != TYPE_ATOMIC) - return false; - const atomic_type_t *atomic_type = (const atomic_type_t*) type; + case TYPE_ARRAY: { + array_type_t *array_type = &source_type->array; + pointer_type_t *pointer_type = &dest_type->pointer; + if (types_compatible(array_type->element_type, + pointer_type->points_to)) { + return create_cast_expression(expression, dest_type); + } + break; + } - return atomic_type->atype == atype; -} + default: + panic("casting of non-atomic types not implemented yet"); + } -static bool is_pointer(const type_t *type) -{ - return type->type == TYPE_POINTER; -} + type_error_incompatible("can't implicitly cast types", + expression->base.source_position, source_type, dest_type); + return expression; -static bool is_compound_type(const type_t *type) -{ - return type->type == TYPE_COMPOUND_STRUCT - || type->type == TYPE_COMPOUND_UNION; + default: + panic("casting of non-atomic types not implemented yet"); + } } /** Implements the rules from § 6.5.16.1 */ static void semantic_assign(type_t *orig_type_left, expression_t **right, const char *context) { - type_t *orig_type_right = (*right)->datatype; + type_t *orig_type_right = (*right)->base.datatype; if(orig_type_right == NULL) return; @@ -738,28 +887,31 @@ static void semantic_assign(type_t *orig_type_left, expression_t **right, type_t *const type_right = skip_typeref(orig_type_right); if ((is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) || - (is_pointer(type_left) && is_null_expression(*right)) || - (is_atomic_type(type_left, ATOMIC_TYPE_BOOL) - && is_pointer(type_right))) { + (is_type_pointer(type_left) && is_null_pointer_constant(*right)) || + (is_type_atomic(type_left, ATOMIC_TYPE_BOOL) + && is_type_pointer(type_right))) { *right = create_implicit_cast(*right, type_left); return; } - if (is_pointer(type_left) && is_pointer(type_right)) { - pointer_type_t *pointer_type_left = (pointer_type_t*) type_left; - pointer_type_t *pointer_type_right = (pointer_type_t*) type_right; + if (is_type_pointer(type_left) && is_type_pointer(type_right)) { + pointer_type_t *pointer_type_left = &type_left->pointer; + pointer_type_t *pointer_type_right = &type_right->pointer; type_t *points_to_left = pointer_type_left->points_to; type_t *points_to_right = pointer_type_right->points_to; - if(!is_atomic_type(points_to_left, ATOMIC_TYPE_VOID) - && !is_atomic_type(points_to_right, ATOMIC_TYPE_VOID) + points_to_left = skip_typeref(points_to_left); + points_to_right = skip_typeref(points_to_right); + + if(!is_type_atomic(points_to_left, ATOMIC_TYPE_VOID) + && !is_type_atomic(points_to_right, ATOMIC_TYPE_VOID) && !types_compatible(points_to_left, points_to_right)) { goto incompatible_assign_types; } /* the left type has all qualifiers from the right type */ unsigned missing_qualifiers - = points_to_right->qualifiers & ~points_to_left->qualifiers; + = points_to_right->base.qualifiers & ~points_to_left->base.qualifiers; if(missing_qualifiers != 0) { parser_print_error_prefix(); fprintf(stderr, "destination type "); @@ -776,7 +928,7 @@ static void semantic_assign(type_t *orig_type_left, expression_t **right, return; } - if (is_compound_type(type_left) + if (is_type_compound(type_left) && types_compatible(type_left, type_right)) { *right = create_implicit_cast(*right, type_left); return; @@ -787,9 +939,9 @@ incompatible_assign_types: parser_print_error_prefix(); fprintf(stderr, "incompatible types in %s\n", context); parser_print_error_prefix(); - print_type_quoted(type_left); + print_type_quoted(orig_type_left); fputs(" <- ", stderr); - print_type_quoted(type_right); + print_type_quoted(orig_type_right); fputs("\n", stderr); } @@ -805,18 +957,24 @@ static expression_t *parse_assignment_expression(void) return parse_sub_expression(2); } -typedef struct declaration_specifiers_t declaration_specifiers_t; -struct declaration_specifiers_t { - storage_class_t storage_class; - bool is_inline; - type_t *type; -}; +static type_t *make_global_typedef(const char *name, type_t *type) +{ + symbol_t *symbol = symbol_table_insert(name); -static void parse_compound_type_entries(void); -static declaration_t *parse_declarator( - const declaration_specifiers_t *specifiers, type_t *type, - bool may_be_abstract); -static declaration_t *record_declaration(declaration_t *declaration); + declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); + declaration->namespc = NAMESPACE_NORMAL; + declaration->storage_class = STORAGE_CLASS_TYPEDEF; + declaration->type = type; + declaration->symbol = symbol; + declaration->source_position = builtin_source_position; + + record_declaration(declaration); + + type_t *typedef_type = allocate_type_zero(TYPE_TYPEDEF); + typedef_type->typedeft.declaration = declaration; + + return typedef_type; +} static const char *parse_string_literals(void) { @@ -837,11 +995,12 @@ static void parse_attributes(void) { while(true) { switch(token.type) { - case T___attribute__: + case T___attribute__: { next_token(); expect_void('('); - for (int depth = 1; depth > 0;) { + int depth = 1; + while(depth > 0) { switch(token.type) { case T_EOF: parse_error("EOF while parsing attribute"); @@ -859,6 +1018,7 @@ static void parse_attributes(void) } } break; + } case T_asm: next_token(); expect_void('('); @@ -932,11 +1092,8 @@ static initializer_t *initializer_from_string(array_type_t *type, /* TODO: check len vs. size of array type */ (void) type; - initializer_t *initializer - = allocate_ast_zero(sizeof(initializer[0])); - - initializer->type = INITIALIZER_STRING; - initializer->v.string = string; + initializer_t *initializer = allocate_initializer(INITIALIZER_STRING); + initializer->string.string = string; return initializer; } @@ -944,16 +1101,15 @@ static initializer_t *initializer_from_string(array_type_t *type, static initializer_t *initializer_from_expression(type_t *type, expression_t *expression) { - /* TODO check that expression is a constant expression */ /* § 6.7.8.14/15 char array may be initialized by string literals */ if(type->type == TYPE_ARRAY && expression->type == EXPR_STRING_LITERAL) { - array_type_t *array_type = (array_type_t*) type; + array_type_t *array_type = &type->array; type_t *element_type = array_type->element_type; if(element_type->type == TYPE_ATOMIC) { - atomic_type_t *atomic_type = (atomic_type_t*) element_type; + atomic_type_t *atomic_type = &element_type->atomic; atomic_type_type_t atype = atomic_type->atype; /* TODO handle wide strings */ @@ -961,7 +1117,7 @@ static initializer_t *initializer_from_expression(type_t *type, || atype == ATOMIC_TYPE_SCHAR || atype == ATOMIC_TYPE_UCHAR) { - string_literal_t *literal = (string_literal_t*) expression; + string_literal_expression_t *literal = &expression->string; return initializer_from_string(array_type, literal->value); } } @@ -969,9 +1125,8 @@ static initializer_t *initializer_from_expression(type_t *type, semantic_assign(type, &expression, "initializer"); - initializer_t *result = allocate_ast_zero(sizeof(result[0])); - result->type = INITIALIZER_VALUE; - result->v.value = expression; + initializer_t *result = allocate_initializer(INITIALIZER_VALUE); + result->value.value = expression; return result; } @@ -987,7 +1142,7 @@ static initializer_t *parse_sub_initializer_elem(type_t *type) } expression_t *expression = parse_assignment_expression(); - type_t *expression_type = skip_typeref(expression->datatype); + type_t *expression_type = skip_typeref(expression->base.datatype); return parse_sub_initializer(type, expression, expression_type); } @@ -1024,13 +1179,12 @@ static initializer_t *parse_sub_initializer(type_t *type, /* TODO: ignore qualifiers, comparing pointers is probably * not correct */ if(expression != NULL && expression_type == type) { - initializer_t *result = allocate_ast_zero(sizeof(result[0])); - result->type = INITIALIZER_VALUE; + initializer_t *result = allocate_initializer(INITIALIZER_VALUE); if(type != NULL) { semantic_assign(type, &expression, "initializer"); } - result->v.value = expression; + result->value.value = expression; return result; } @@ -1045,7 +1199,7 @@ static initializer_t *parse_sub_initializer(type_t *type, initializer_t *result = NULL; initializer_t **elems; if(type->type == TYPE_ARRAY) { - array_type_t *array_type = (array_type_t*) type; + array_type_t *array_type = &type->array; type_t *element_type = array_type->element_type; element_type = skip_typeref(element_type); @@ -1074,8 +1228,7 @@ static initializer_t *parse_sub_initializer(type_t *type, if(token.type == '}') break; - initializer_t *sub - = parse_sub_initializer(element_type, NULL, NULL); + sub = parse_sub_initializer(element_type, NULL, NULL); if(sub == NULL) { /* TODO error, do nicer cleanup */ parse_error("member initializer didn't match"); @@ -1087,8 +1240,8 @@ static initializer_t *parse_sub_initializer(type_t *type, } else { assert(type->type == TYPE_COMPOUND_STRUCT || type->type == TYPE_COMPOUND_UNION); - compound_type_t *compound_type = (compound_type_t*) type; - context_t *context = & compound_type->declaration->context; + compound_type_t *compound_type = &type->compound; + context_t *context = &compound_type->declaration->context; declaration_t *first = context->declarations; if(first == NULL) @@ -1123,11 +1276,13 @@ static initializer_t *parse_sub_initializer(type_t *type, if(token.type == '}') break; expect_block(','); + if(token.type == '}') + break; type_t *iter_type = iter->type; iter_type = skip_typeref(iter_type); - initializer_t *sub = parse_sub_initializer(iter_type, NULL, NULL); + sub = parse_sub_initializer(iter_type, NULL, NULL); if(sub == NULL) { /* TODO error, do nicer cleanup*/ parse_error("member initializer didn't match"); @@ -1141,14 +1296,14 @@ static initializer_t *parse_sub_initializer(type_t *type, int len = ARR_LEN(elems); size_t elems_size = sizeof(initializer_t*) * len; - initializer_t *init = allocate_ast_zero(sizeof(init[0]) + elems_size); + initializer_list_t *init = allocate_ast_zero(sizeof(init[0]) + elems_size); - init->type = INITIALIZER_LIST; - init->v.list.len = len; - memcpy(init->v.list.initializers, elems, elems_size); + init->initializer.type = INITIALIZER_LIST; + init->len = len; + memcpy(init->initializers, elems, elems_size); DEL_ARR_F(elems); - result = init; + result = (initializer_t*) init; if(read_paren) { if(token.type == ',') @@ -1228,7 +1383,7 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) } if(declaration == NULL) { - declaration = allocate_type_zero(sizeof(declaration[0])); + declaration = allocate_ast_zero(sizeof(declaration[0])); if(is_struct) { declaration->namespc = NAMESPACE_STRUCT; @@ -1252,12 +1407,12 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) int top = environment_top(); context_t *last_context = context; - set_context(& declaration->context); + set_context(&declaration->context); parse_compound_type_entries(); parse_attributes(); - assert(context == & declaration->context); + assert(context == &declaration->context); set_context(last_context); environment_pop_to(top); } @@ -1265,7 +1420,7 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) return declaration; } -static void parse_enum_entries(type_t *enum_type) +static void parse_enum_entries(enum_type_t *const enum_type) { eat('{'); @@ -1284,7 +1439,7 @@ static void parse_enum_entries(type_t *enum_type) return; } entry->storage_class = STORAGE_CLASS_ENUM_ENTRY; - entry->type = enum_type; + entry->type = (type_t*) enum_type; entry->symbol = token.v.symbol; entry->source_position = token.source_position; next_token(); @@ -1306,7 +1461,7 @@ static void parse_enum_entries(type_t *enum_type) expect_void('}'); } -static declaration_t *parse_enum_specifier(void) +static type_t *parse_enum_specifier(void) { eat(T_enum); @@ -1328,13 +1483,16 @@ static declaration_t *parse_enum_specifier(void) } if(declaration == NULL) { - declaration = allocate_type_zero(sizeof(declaration[0])); + declaration = allocate_ast_zero(sizeof(declaration[0])); declaration->namespc = NAMESPACE_ENUM; declaration->source_position = token.source_position; declaration->symbol = symbol; } + type_t *const type = allocate_type_zero(TYPE_ENUM); + type->enumt.declaration = declaration; + if(token.type == '{') { if(declaration->init.is_defined) { parser_print_error_prefix(); @@ -1344,11 +1502,11 @@ static declaration_t *parse_enum_specifier(void) record_declaration(declaration); declaration->init.is_defined = 1; - parse_enum_entries(NULL); + parse_enum_entries(&type->enumt); parse_attributes(); } - return declaration; + return type; } /** @@ -1388,7 +1546,7 @@ restart: type = parse_typename(); } else { expression = parse_expression(); - type = expression->datatype; + type = expression->base.datatype; } break; @@ -1398,18 +1556,17 @@ restart: default: expression = parse_expression(); - type = expression->datatype; + type = expression->base.datatype; break; } expect(')'); - typeof_type_t *typeof = allocate_type_zero(sizeof(typeof[0])); - typeof->type.type = TYPE_TYPEOF; - typeof->expression = expression; - typeof->typeof_type = type; + type_t *typeof_type = allocate_type_zero(TYPE_TYPEOF); + typeof_type->typeoft.expression = expression; + typeof_type->typeoft.typeof_type = type; - return (type_t*) typeof; + return typeof_type; } typedef enum { @@ -1432,13 +1589,12 @@ typedef enum { static type_t *create_builtin_type(symbol_t *symbol) { - builtin_type_t *type = allocate_type_zero(sizeof(type[0])); - type->type.type = TYPE_BUILTIN; - type->symbol = symbol; + type_t *type = allocate_type_zero(TYPE_BUILTIN); + type->builtin.symbol = symbol; /* TODO... */ - type->real_type = type_int; + type->builtin.real_type = type_int; - return (type_t*) type; + return type; } static type_t *get_typedef_type(symbol_t *symbol) @@ -1448,19 +1604,20 @@ static type_t *get_typedef_type(symbol_t *symbol) || declaration->storage_class != STORAGE_CLASS_TYPEDEF) return NULL; - typedef_type_t *typedef_type = allocate_type_zero(sizeof(typedef_type[0])); - typedef_type->type.type = TYPE_TYPEDEF; - typedef_type->declaration = declaration; + type_t *type = allocate_type_zero(TYPE_TYPEDEF); + type->typedeft.declaration = declaration; - return (type_t*) typedef_type; + return type; } static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) { - type_t *type = NULL; - unsigned type_qualifiers = 0; - unsigned type_specifiers = 0; - int newtype = 0; + type_t *type = NULL; + unsigned type_qualifiers = 0; + unsigned type_specifiers = 0; + int newtype = 0; + + specifiers->source_position = token.source_position; while(true) { switch(token.type) { @@ -1482,6 +1639,27 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) MATCH_STORAGE_CLASS(T_auto, STORAGE_CLASS_AUTO) MATCH_STORAGE_CLASS(T_register, STORAGE_CLASS_REGISTER) + case T___thread: + switch (specifiers->storage_class) { + case STORAGE_CLASS_NONE: + specifiers->storage_class = STORAGE_CLASS_THREAD; + break; + + case STORAGE_CLASS_EXTERN: + specifiers->storage_class = STORAGE_CLASS_THREAD_EXTERN; + break; + + case STORAGE_CLASS_STATIC: + specifiers->storage_class = STORAGE_CLASS_THREAD_STATIC; + break; + + default: + parse_error("multiple storage classes in declaration specifiers"); + break; + } + next_token(); + break; + /* type qualifiers */ #define MATCH_TYPE_QUALIFIER(token, qualifier) \ case token: \ @@ -1541,31 +1719,20 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) /* TODO: if type != NULL for the following rules should issue * an error */ case T_struct: { - compound_type_t *compound_type - = allocate_type_zero(sizeof(compound_type[0])); - compound_type->type.type = TYPE_COMPOUND_STRUCT; - compound_type->declaration = parse_compound_type_specifier(true); + type = allocate_type_zero(TYPE_COMPOUND_STRUCT); - type = (type_t*) compound_type; + type->compound.declaration = parse_compound_type_specifier(true); break; } case T_union: { - compound_type_t *compound_type - = allocate_type_zero(sizeof(compound_type[0])); - compound_type->type.type = TYPE_COMPOUND_UNION; - compound_type->declaration = parse_compound_type_specifier(false); + type = allocate_type_zero(TYPE_COMPOUND_STRUCT); - type = (type_t*) compound_type; + type->compound.declaration = parse_compound_type_specifier(false); break; } - case T_enum: { - enum_type_t *enum_type = allocate_type_zero(sizeof(enum_type[0])); - enum_type->type.type = TYPE_ENUM; - enum_type->declaration = parse_enum_specifier(); - - type = (type_t*) enum_type; + case T_enum: + type = parse_enum_specifier(); break; - } case T___typeof__: type = parse_typeof(); break; @@ -1692,7 +1859,7 @@ finish_specifiers: /* invalid specifier combination, give an error message */ if(type_specifiers == 0) { #ifndef STRICT_C99 - parse_warning("no type specifiers in declaration (using int)"); + parse_warning("no type specifiers in declaration, using int"); atomic_type = ATOMIC_TYPE_INT; break; #else @@ -1709,22 +1876,19 @@ finish_specifiers: atomic_type = ATOMIC_TYPE_INVALID; } - atomic_type_t *atype = allocate_type_zero(sizeof(atype[0])); - atype->type.type = TYPE_ATOMIC; - atype->atype = atomic_type; - newtype = 1; - - type = (type_t*) atype; + type = allocate_type_zero(TYPE_ATOMIC); + type->atomic.atype = atomic_type; + newtype = 1; } else { if(type_specifiers != 0) { parse_error("multiple datatypes in declaration"); } } - type->qualifiers = (type_qualifier_t)type_qualifiers; + type->base.qualifiers = type_qualifiers; type_t *result = typehash_insert(type); - if(newtype && result != (type_t*) type) { + if(newtype && result != type) { free_type(type); } @@ -1748,19 +1912,30 @@ static type_qualifiers_t parse_type_qualifiers(void) } } -static void parse_identifier_list(void) +static declaration_t *parse_identifier_list(void) { - while(true) { - if(token.type != T_IDENTIFIER) { - parse_error_expected("while parsing parameter identifier list", - T_IDENTIFIER, 0); - return; - } + declaration_t *declarations = NULL; + declaration_t *last_declaration = NULL; + do { + declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); + + declaration->source_position = token.source_position; + declaration->symbol = token.v.symbol; next_token(); + + if(last_declaration != NULL) { + last_declaration->next = declaration; + } else { + declarations = declaration; + } + last_declaration = declaration; + if(token.type != ',') break; next_token(); - } + } while(token.type == T_IDENTIFIER); + + return declarations; } static declaration_t *parse_parameter(void) @@ -1770,8 +1945,7 @@ static declaration_t *parse_parameter(void) parse_declaration_specifiers(&specifiers); - declaration_t *declaration - = parse_declarator(&specifiers, specifiers.type, true); + declaration_t *declaration = parse_declarator(&specifiers, true); /* TODO check declaration constraints for parameters */ if(declaration->storage_class == STORAGE_CLASS_TYPEDEF) { @@ -1781,10 +1955,9 @@ static declaration_t *parse_parameter(void) /* Array as last part of a paramter type is just syntactic sugar. Turn it * into a pointer */ if (declaration->type->type == TYPE_ARRAY) { - const array_type_t *const arr_type = - (const array_type_t*)declaration->type; - declaration->type = - make_pointer_type(arr_type->element_type, TYPE_QUALIFIER_NONE); + const array_type_t *const arr_type = &declaration->type->array; + type_t *element_type = arr_type->element_type; + declaration->type = make_pointer_type(element_type, TYPE_QUALIFIER_NONE); } return declaration; @@ -1793,11 +1966,10 @@ static declaration_t *parse_parameter(void) static declaration_t *parse_parameters(function_type_t *type) { if(token.type == T_IDENTIFIER) { - symbol_t *symbol = token.v.symbol; + symbol_t *symbol = token.v.symbol; if(!is_typedef_symbol(symbol)) { - /* TODO: K&R style C parameters */ - parse_identifier_list(); - return NULL; + type->kr_style_parameters = true; + return parse_identifier_list(); } } @@ -1828,7 +2000,8 @@ static declaration_t *parse_parameters(function_type_t *type) DECLARATION_START declaration = parse_parameter(); - parameter = allocate_type_zero(sizeof(parameter[0])); + parameter = obstack_alloc(type_obst, sizeof(parameter[0])); + memset(parameter, 0, sizeof(parameter[0])); parameter->type = declaration->type; if(last_parameter != NULL) { @@ -1872,8 +2045,8 @@ struct parsed_pointer_t { typedef struct construct_function_type_t construct_function_type_t; struct construct_function_type_t { - construct_type_t construct_type; - function_type_t *function_type; + construct_type_t construct_type; + type_t *function_type; }; typedef struct parsed_array_t parsed_array_t; @@ -1941,10 +2114,9 @@ static construct_type_t *parse_function_declarator(declaration_t *declaration) { eat('('); - function_type_t *type = allocate_type_zero(sizeof(type[0])); - type->type.type = TYPE_FUNCTION; + type_t *type = allocate_type_zero(TYPE_FUNCTION); - declaration_t *parameters = parse_parameters(type); + declaration_t *parameters = parse_parameters(&type->function); if(declaration != NULL) { declaration->context.declarations = parameters; } @@ -2063,49 +2235,47 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, { construct_type_t *iter = construct_list; for( ; iter != NULL; iter = iter->next) { - parsed_pointer_t *parsed_pointer; - parsed_array_t *parsed_array; - construct_function_type_t *construct_function_type; - function_type_t *function_type; - pointer_type_t *pointer_type; - array_type_t *array_type; - switch(iter->type) { case CONSTRUCT_INVALID: panic("invalid type construction found"); - case CONSTRUCT_FUNCTION: - construct_function_type = (construct_function_type_t*) iter; - function_type = construct_function_type->function_type; + case CONSTRUCT_FUNCTION: { + construct_function_type_t *construct_function_type + = (construct_function_type_t*) iter; + + type_t *function_type = construct_function_type->function_type; - function_type->result_type = type; - type = (type_t*) function_type; + function_type->function.result_type = type; + + type = function_type; break; + } - case CONSTRUCT_POINTER: - parsed_pointer = (parsed_pointer_t*) iter; - pointer_type = allocate_type_zero(sizeof(pointer_type[0])); + case CONSTRUCT_POINTER: { + parsed_pointer_t *parsed_pointer = (parsed_pointer_t*) iter; + type_t *pointer_type = allocate_type_zero(TYPE_POINTER); + pointer_type->pointer.points_to = type; + pointer_type->base.qualifiers = parsed_pointer->type_qualifiers; - pointer_type->type.type = TYPE_POINTER; - pointer_type->points_to = type; - pointer_type->type.qualifiers = parsed_pointer->type_qualifiers; - type = (type_t*) pointer_type; + type = pointer_type; break; + } + + case CONSTRUCT_ARRAY: { + parsed_array_t *parsed_array = (parsed_array_t*) iter; + type_t *array_type = allocate_type_zero(TYPE_ARRAY); - case CONSTRUCT_ARRAY: - parsed_array = (parsed_array_t*) iter; - array_type = allocate_type_zero(sizeof(array_type[0])); - - array_type->type.type = TYPE_ARRAY; - array_type->element_type = type; - array_type->type.qualifiers = parsed_array->type_qualifiers; - array_type->is_static = parsed_array->is_static; - array_type->is_variable = parsed_array->is_variable; - array_type->size = parsed_array->size; - type = (type_t*) array_type; + array_type->base.qualifiers = parsed_array->type_qualifiers; + array_type->array.element_type = type; + array_type->array.is_static = parsed_array->is_static; + array_type->array.is_variable = parsed_array->is_variable; + array_type->array.size = parsed_array->size; + + type = array_type; break; } + } - type_t *hashed_type = typehash_insert((type_t*) type); + type_t *hashed_type = typehash_insert(type); if(hashed_type != type) { /* the function type was constructed earlier freeing it here will * destroy other types... */ @@ -2120,9 +2290,9 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, } static declaration_t *parse_declarator( - const declaration_specifiers_t *specifiers, - type_t *type, bool may_be_abstract) + const declaration_specifiers_t *specifiers, bool may_be_abstract) { + type_t *type = specifiers->type; declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); declaration->storage_class = specifiers->storage_class; declaration->is_inline = specifiers->is_inline; @@ -2152,6 +2322,7 @@ static type_t *parse_abstract_declarator(type_t *base_type) static declaration_t *record_declaration(declaration_t *declaration) { + assert(declaration->parent_context == NULL); assert(context != NULL); symbol_t *symbol = declaration->symbol; @@ -2173,207 +2344,402 @@ static declaration_t *record_declaration(declaration_t *declaration) return declaration; } -static void parser_error_multiple_definition(declaration_t *previous, - declaration_t *declaration) +static void parser_error_multiple_definition(declaration_t *declaration, + const source_position_t source_position) { - parser_print_error_prefix_pos(declaration->source_position); + parser_print_error_prefix_pos(source_position); fprintf(stderr, "multiple definition of symbol '%s'\n", declaration->symbol->string); - parser_print_error_prefix_pos(previous->source_position); + parser_print_error_prefix_pos(declaration->source_position); fprintf(stderr, "this is the location of the previous definition.\n"); } -static void parse_init_declarators(const declaration_specifiers_t *specifiers) +static bool is_declaration_specifier(const token_t *token, + bool only_type_specifiers) { - while(true) { - declaration_t *ndeclaration - = parse_declarator(specifiers, specifiers->type, false); - - declaration_t *declaration = record_declaration(ndeclaration); - - type_t *orig_type = declaration->type; - type_t *type = skip_typeref(orig_type); - if(type->type != TYPE_FUNCTION && declaration->is_inline) { - parser_print_warning_prefix_pos(declaration->source_position); - fprintf(stderr, "variable '%s' declared 'inline'\n", - declaration->symbol->string); - } - - if(token.type == '=') { - next_token(); - - /* TODO: check that this is an allowed type (no function type) */ + switch(token->type) { + TYPE_SPECIFIERS + return true; + case T_IDENTIFIER: + return is_typedef_symbol(token->v.symbol); - if(declaration->init.initializer != NULL) { - parser_error_multiple_definition(declaration, ndeclaration); - } + case T___extension__: + STORAGE_CLASSES + TYPE_QUALIFIERS + return !only_type_specifiers; - initializer_t *initializer = parse_initializer(type); + default: + return false; + } +} - if(type->type == TYPE_ARRAY && initializer != NULL) { - array_type_t *array_type = (array_type_t*) type; +static void parse_init_declarator_rest(declaration_t *declaration) +{ + eat('='); - if(array_type->size == NULL) { - const_t *cnst = allocate_ast_zero(sizeof(cnst[0])); + type_t *orig_type = declaration->type; + type_t *type = NULL; + if(orig_type != NULL) + type = skip_typeref(orig_type); - cnst->expression.type = EXPR_CONST; - cnst->expression.datatype = type_size_t; + if(declaration->init.initializer != NULL) { + parser_error_multiple_definition(declaration, token.source_position); + } - if(initializer->type == INITIALIZER_LIST) { - cnst->v.int_value = initializer->v.list.len; - } else { - assert(initializer->type == INITIALIZER_STRING); - cnst->v.int_value = strlen(initializer->v.string) + 1; - } + initializer_t *initializer = parse_initializer(type); - array_type->size = (expression_t*) cnst; - } - } + /* § 6.7.5 (22) array intializers for arrays with unknown size determine + * the array type size */ + if(type != NULL && type->type == TYPE_ARRAY && initializer != NULL) { + array_type_t *array_type = &type->array; + if(array_type->size == NULL) { + expression_t *cnst = allocate_expression_zero(EXPR_CONST); - ndeclaration->init.initializer = initializer; - } else if(token.type == '{') { - if(type->type != TYPE_FUNCTION) { - parser_print_error_prefix(); - fprintf(stderr, "declarator '"); - print_type_ext(orig_type, declaration->symbol, NULL); - fprintf(stderr, "' has a body but is not a function type.\n"); - eat_block(); - continue; - } + cnst->base.datatype = type_size_t; - if(declaration->init.statement != NULL) { - parser_error_multiple_definition(declaration, ndeclaration); - } - if(ndeclaration != declaration) { - memcpy(&declaration->context, &ndeclaration->context, - sizeof(declaration->context)); + if(initializer->type == INITIALIZER_LIST) { + initializer_list_t *list = &initializer->list; + cnst->conste.v.int_value = list->len; + } else { + assert(initializer->type == INITIALIZER_STRING); + initializer_string_t *string = &initializer->string; + cnst->conste.v.int_value = strlen(string->string) + 1; } - int top = environment_top(); - context_t *last_context = context; - set_context(&declaration->context); + array_type->size = cnst; + } + } - /* push function parameters */ - declaration_t *parameter = declaration->context.declarations; - for( ; parameter != NULL; parameter = parameter->next) { - environment_push(parameter); - } + if(type != NULL && type->type == TYPE_FUNCTION) { + parser_print_error_prefix_pos(declaration->source_position); + fprintf(stderr, "initializers not allowed for function types at " + "declator '%s' (type ", declaration->symbol->string); + print_type_quoted(orig_type); + fprintf(stderr, ")\n"); + } else { + declaration->init.initializer = initializer; + } +} - int label_stack_top = label_top(); - declaration_t *old_current_function = current_function; - current_function = declaration; +/* parse rest of a declaration without any declarator */ +static void parse_anonymous_declaration_rest( + const declaration_specifiers_t *specifiers, + parsed_declaration_func finished_declaration) +{ + eat(';'); - statement_t *statement = parse_compound_statement(); + declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); - assert(current_function == declaration); - current_function = old_current_function; - label_pop_to(label_stack_top); + declaration->type = specifiers->type; + declaration->storage_class = specifiers->storage_class; + declaration->source_position = specifiers->source_position; - assert(context == &declaration->context); - set_context(last_context); - environment_pop_to(top); + if (declaration->storage_class != STORAGE_CLASS_NONE) { + parse_warning_pos(declaration->source_position, + "useless storage class in empty declaration"); + } - declaration->init.statement = statement; - return; + type_t *type = declaration->type; + switch (type->type) { + case TYPE_COMPOUND_STRUCT: + case TYPE_COMPOUND_UNION: { + const compound_type_t *compound_type = &type->compound; + if (compound_type->declaration->symbol == NULL) { + parse_warning_pos(declaration->source_position, + "unnamed struct/union that defines no instances"); + } + break; } - if(token.type != ',') + case TYPE_ENUM: + break; + + default: + parse_warning_pos(declaration->source_position, + "empty declaration"); break; - next_token(); } - expect_void(';'); + + finished_declaration(declaration); } -static void parse_struct_declarators(const declaration_specifiers_t *specifiers) +static void parse_declaration_rest(declaration_t *ndeclaration, + const declaration_specifiers_t *specifiers, + parsed_declaration_func finished_declaration) { - while(1) { - if(token.type == ':') { - next_token(); - parse_constant_expression(); - /* TODO (bitfields) */ - } else { - declaration_t *declaration - = parse_declarator(specifiers, specifiers->type, true); + while(true) { + declaration_t *declaration = finished_declaration(ndeclaration); - /* TODO: check constraints for struct declarations */ - /* TODO: check for doubled fields */ - record_declaration(declaration); + type_t *orig_type = declaration->type; + type_t *type = skip_typeref(orig_type); - if(token.type == ':') { - next_token(); - parse_constant_expression(); - /* TODO (bitfields) */ - } + if(type->type != TYPE_FUNCTION && declaration->is_inline) { + parser_print_warning_prefix_pos(declaration->source_position); + fprintf(stderr, "variable '%s' declared 'inline'\n", + declaration->symbol->string); + } + + if(token.type == '=') { + parse_init_declarator_rest(declaration); } if(token.type != ',') break; - next_token(); + eat(','); + + ndeclaration = parse_declarator(specifiers, false); } expect_void(';'); } -static void parse_compound_type_entries(void) +static declaration_t *finished_kr_declaration(declaration_t *declaration) { - eat('{'); + /* TODO: check that it was actually a parameter that gets a type */ - while(token.type != '}' && token.type != T_EOF) { - declaration_specifiers_t specifiers; - memset(&specifiers, 0, sizeof(specifiers)); - parse_declaration_specifiers(&specifiers); - - parse_struct_declarators(&specifiers); - } - if(token.type == T_EOF) { - parse_error("unexpected error while parsing struct"); - } - next_token(); + /* we should have a declaration for the parameter in the current + * scope */ + return record_declaration(declaration); } -static void parse_declaration(void) +static void parse_declaration(parsed_declaration_func finished_declaration) { - source_position_t source_position = token.source_position; - declaration_specifiers_t specifiers; memset(&specifiers, 0, sizeof(specifiers)); parse_declaration_specifiers(&specifiers); if(token.type == ';') { - if (specifiers.storage_class != STORAGE_CLASS_NONE) { - parse_warning_pos(source_position, - "useless keyword in empty declaration"); - } - switch (specifiers.type->type) { - case TYPE_COMPOUND_STRUCT: - case TYPE_COMPOUND_UNION: { - const compound_type_t *const comp_type = - (const compound_type_t*)specifiers.type; - if (comp_type->declaration->symbol == NULL) { - parse_warning_pos(source_position, - "unnamed struct/union that defines no instances"); - } - break; - } + parse_anonymous_declaration_rest(&specifiers, finished_declaration); + } else { + declaration_t *declaration = parse_declarator(&specifiers, false); + parse_declaration_rest(declaration, &specifiers, finished_declaration); + } +} - case TYPE_ENUM: break; +static void parse_kr_declaration_list(declaration_t *declaration) +{ + type_t *type = skip_typeref(declaration->type); + assert(type->type == TYPE_FUNCTION); - default: - parse_warning_pos(source_position, "empty declaration"); - break; + if(!type->function.kr_style_parameters) + return; + + /* push function parameters */ + int top = environment_top(); + context_t *last_context = context; + set_context(&declaration->context); + + declaration_t *parameter = declaration->context.declarations; + for( ; parameter != NULL; parameter = parameter->next) { + environment_push(parameter); + } + + /* parse declaration list */ + while(is_declaration_specifier(&token, false)) { + parse_declaration(finished_kr_declaration); + } + + /* pop function parameters */ + assert(context == &declaration->context); + set_context(last_context); + environment_pop_to(top); + + /* update function type */ + type_t *new_type = duplicate_type(type); + new_type->function.kr_style_parameters = false; + + function_parameter_t *parameters = NULL; + function_parameter_t *last_parameter = NULL; + + declaration_t *parameter_declaration = declaration->context.declarations; + for( ; parameter_declaration != NULL; + parameter_declaration = parameter_declaration->next) { + type_t *parameter_type = parameter_declaration->type; + if(parameter_type == NULL) { +#ifdef STRICT_C99 + parser_print_error_prefix(); + fprintf(stderr, "no type specified for function parameter '%s'\n", + parameter_declaration->symbol->string); +#else + parser_print_warning_prefix(); + fprintf(stderr, "no type specified for function parameter '%s', " + "using int\n", parameter_declaration->symbol->string); + parameter_type = type_int; + parameter_declaration->type = parameter_type; +#endif } - next_token(); + function_parameter_t *function_parameter + = obstack_alloc(type_obst, sizeof(function_parameter[0])); + memset(function_parameter, 0, sizeof(function_parameter[0])); - declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); + function_parameter->type = parameter_type; + if(last_parameter != NULL) { + last_parameter->next = function_parameter; + } else { + parameters = function_parameter; + } + last_parameter = function_parameter; + } + new_type->function.parameters = parameters; - declaration->type = specifiers.type; - declaration->storage_class = specifiers.storage_class; - declaration->source_position = source_position; - record_declaration(declaration); + type = typehash_insert(new_type); + if(type != new_type) { + obstack_free(type_obst, new_type); + } + + declaration->type = type; +} + +static void parse_external_declaration(void) +{ + /* function-definitions and declarations both start with declaration + * specifiers */ + declaration_specifiers_t specifiers; + memset(&specifiers, 0, sizeof(specifiers)); + parse_declaration_specifiers(&specifiers); + + /* must be a declaration */ + if(token.type == ';') { + parse_anonymous_declaration_rest(&specifiers, record_declaration); + return; + } + + /* declarator is common to both function-definitions and declarations */ + declaration_t *ndeclaration = parse_declarator(&specifiers, false); + + /* must be a declaration */ + if(token.type == ',' || token.type == '=' || token.type == ';') { + parse_declaration_rest(ndeclaration, &specifiers, record_declaration); return; } - parse_init_declarators(&specifiers); + + /* must be a function definition */ + parse_kr_declaration_list(ndeclaration); + + declaration_t *declaration = record_declaration(ndeclaration); + if(ndeclaration != declaration) { + memcpy(&declaration->context, &ndeclaration->context, + sizeof(declaration->context)); + } + + /* push function parameters and switch context */ + int top = environment_top(); + context_t *last_context = context; + set_context(&declaration->context); + + declaration_t *parameter = declaration->context.declarations; + for( ; parameter != NULL; parameter = parameter->next) { + environment_push(parameter); + } + + type_t *orig_type; + type_t *type; + + if(token.type != '{') { + parse_error_expected("while parsing function definition", '{', 0); + eat_statement(); + goto end_of_parse_external_declaration; + } + + orig_type = declaration->type; + if(orig_type == NULL) { + eat_block(); + goto end_of_parse_external_declaration; + } + + type = skip_typeref(orig_type); + + if(type->type != TYPE_FUNCTION) { + parser_print_error_prefix(); + fprintf(stderr, "declarator '"); + print_type_ext(orig_type, declaration->symbol, NULL); + fprintf(stderr, "' has a body but is not a function type.\n"); + eat_block(); + goto end_of_parse_external_declaration; + } + + /* § 6.7.5.3 (14) a function definition with () means no + * parameters (and not unspecified parameters) */ + if(type->function.unspecified_parameters) { + type_t *duplicate = duplicate_type(type); + duplicate->function.unspecified_parameters = false; + + type = typehash_insert(duplicate); + if(type != duplicate) { + obstack_free(type_obst, duplicate); + } + declaration->type = type; + } + + if(declaration->init.statement != NULL) { + parser_error_multiple_definition(declaration, token.source_position); + eat_block(); + goto end_of_parse_external_declaration; + } + + /* parse function body */ + { + int label_stack_top = label_top(); + declaration_t *old_current_function = current_function; + current_function = declaration; + + declaration->init.statement = parse_compound_statement(); + + assert(current_function == declaration); + current_function = old_current_function; + label_pop_to(label_stack_top); + } + +end_of_parse_external_declaration: + assert(context == &declaration->context); + set_context(last_context); + environment_pop_to(top); +} + +static void parse_struct_declarators(const declaration_specifiers_t *specifiers) +{ + while(1) { + if(token.type == ':') { + next_token(); + parse_constant_expression(); + /* TODO (bitfields) */ + } else { + declaration_t *declaration = parse_declarator(specifiers, true); + + /* TODO: check constraints for struct declarations */ + /* TODO: check for doubled fields */ + record_declaration(declaration); + + if(token.type == ':') { + next_token(); + parse_constant_expression(); + /* TODO (bitfields) */ + } + } + + if(token.type != ',') + break; + next_token(); + } + expect_void(';'); +} + +static void parse_compound_type_entries(void) +{ + eat('{'); + + while(token.type != '}' && token.type != T_EOF) { + declaration_specifiers_t specifiers; + memset(&specifiers, 0, sizeof(specifiers)); + parse_declaration_specifiers(&specifiers); + + parse_struct_declarators(&specifiers); + } + if(token.type == T_EOF) { + parse_error("EOF while parsing struct"); + } + next_token(); } static type_t *parse_typename(void) @@ -2412,9 +2778,8 @@ expression_parser_function_t expression_parsers[T_LAST_TOKEN]; static expression_t *make_invalid_expression(void) { - expression_t *expression = allocate_ast_zero(sizeof(expression[0])); - expression->type = EXPR_INVALID; - expression->source_position = token.source_position; + expression_t *expression = allocate_expression_zero(EXPR_INVALID); + expression->base.source_position = token.source_position; return expression; } @@ -2422,7 +2787,7 @@ static expression_t *expected_expression_error(void) { parser_print_error_prefix(); fprintf(stderr, "expected expression, got token "); - print_token(stderr, & token); + print_token(stderr, &token); fprintf(stderr, "\n"); next_token(); @@ -2432,54 +2797,54 @@ static expression_t *expected_expression_error(void) static expression_t *parse_string_const(void) { - string_literal_t *cnst = allocate_ast_zero(sizeof(cnst[0])); + expression_t *cnst = allocate_expression_zero(EXPR_STRING_LITERAL); + cnst->base.datatype = type_string; + cnst->string.value = parse_string_literals(); - cnst->expression.type = EXPR_STRING_LITERAL; - cnst->expression.datatype = type_string; - cnst->value = parse_string_literals(); + return cnst; +} - return (expression_t*) cnst; +static expression_t *parse_wide_string_const(void) +{ + expression_t *const cnst = allocate_expression_zero(EXPR_WIDE_STRING_LITERAL); + cnst->base.datatype = type_wchar_t_ptr; + cnst->wide_string.value = token.v.wide_string; /* TODO concatenate */ + next_token(); + return cnst; } static expression_t *parse_int_const(void) { - const_t *cnst = allocate_ast_zero(sizeof(cnst[0])); - - cnst->expression.type = EXPR_CONST; - cnst->expression.datatype = token.datatype; - cnst->v.int_value = token.v.intvalue; + expression_t *cnst = allocate_expression_zero(EXPR_CONST); + cnst->base.datatype = token.datatype; + cnst->conste.v.int_value = token.v.intvalue; next_token(); - return (expression_t*) cnst; + return cnst; } static expression_t *parse_float_const(void) { - const_t *cnst = allocate_ast_zero(sizeof(cnst[0])); - - cnst->expression.type = EXPR_CONST; - cnst->expression.datatype = token.datatype; - cnst->v.float_value = token.v.floatvalue; + expression_t *cnst = allocate_expression_zero(EXPR_CONST); + cnst->base.datatype = token.datatype; + cnst->conste.v.float_value = token.v.floatvalue; next_token(); - return (expression_t*) cnst; + return cnst; } static declaration_t *create_implicit_function(symbol_t *symbol, const source_position_t source_position) { - function_type_t *function_type - = allocate_type_zero(sizeof(function_type[0])); - - function_type->type.type = TYPE_FUNCTION; - function_type->result_type = type_int; - function_type->unspecified_parameters = true; + type_t *ntype = allocate_type_zero(TYPE_FUNCTION); + ntype->function.result_type = type_int; + ntype->function.unspecified_parameters = true; - type_t *type = typehash_insert((type_t*) function_type); - if(type != (type_t*) function_type) { - free_type(function_type); + type_t *type = typehash_insert(ntype); + if(type != ntype) { + free_type(ntype); } declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); @@ -2506,12 +2871,121 @@ static declaration_t *create_implicit_function(symbol_t *symbol, return declaration; } +static type_t *make_function_1_type(type_t *result_type, type_t *argument_type) +{ + function_parameter_t *parameter + = obstack_alloc(type_obst, sizeof(parameter[0])); + memset(parameter, 0, sizeof(parameter[0])); + parameter->type = argument_type; + + type_t *type = allocate_type_zero(TYPE_FUNCTION); + type->function.result_type = result_type; + type->function.parameters = parameter; + + type_t *result = typehash_insert(type); + if(result != type) { + free_type(type); + } + + return result; +} + +static type_t *get_builtin_symbol_type(symbol_t *symbol) +{ + switch(symbol->ID) { + case T___builtin_alloca: + return make_function_1_type(type_void_ptr, type_size_t); + case T___builtin_nan: + return make_function_1_type(type_double, type_string); + case T___builtin_nanf: + return make_function_1_type(type_float, type_string); + case T___builtin_nand: + return make_function_1_type(type_long_double, type_string); + default: + panic("not implemented builtin symbol found"); + } +} + +/** + * performs automatic type cast as described in § 6.3.2.1 + */ +static type_t *automatic_type_conversion(type_t *type) +{ + if(type == NULL) + return NULL; + + if(type->type == TYPE_ARRAY) { + array_type_t *array_type = &type->array; + type_t *element_type = array_type->element_type; + unsigned qualifiers = array_type->type.qualifiers; + + return make_pointer_type(element_type, qualifiers); + } + + if(type->type == TYPE_FUNCTION) { + return make_pointer_type(type, TYPE_QUALIFIER_NONE); + } + + return type; +} + +/** + * reverts the automatic casts of array to pointer types and function + * to function-pointer types as defined § 6.3.2.1 + */ +type_t *revert_automatic_type_conversion(const expression_t *expression) +{ + if(expression->base.datatype == NULL) + return NULL; + + switch(expression->type) { + case EXPR_REFERENCE: { + const reference_expression_t *ref = &expression->reference; + return ref->declaration->type; + } + case EXPR_SELECT: { + const select_expression_t *select = &expression->select; + return select->compound_entry->type; + } + case EXPR_UNARY: { + const unary_expression_t *unary = &expression->unary; + if(unary->type == UNEXPR_DEREFERENCE) { + expression_t *value = unary->value; + type_t *type = skip_typeref(value->base.datatype); + pointer_type_t *pointer_type = &type->pointer; + + return pointer_type->points_to; + } + break; + } + case EXPR_BUILTIN_SYMBOL: { + const builtin_symbol_expression_t *builtin + = &expression->builtin_symbol; + return get_builtin_symbol_type(builtin->symbol); + } + case EXPR_ARRAY_ACCESS: { + const array_access_expression_t *array_access + = &expression->array_access; + const expression_t *array_ref = array_access->array_ref; + type_t *type_left = skip_typeref(array_ref->base.datatype); + assert(is_type_pointer(type_left)); + pointer_type_t *pointer_type = &type_left->pointer; + return pointer_type->points_to; + } + + default: + break; + } + + return expression->base.datatype; +} + static expression_t *parse_reference(void) { - reference_expression_t *ref = allocate_ast_zero(sizeof(ref[0])); + expression_t *expression = allocate_expression_zero(EXPR_REFERENCE); - ref->expression.type = EXPR_REFERENCE; - ref->symbol = token.v.symbol; + reference_expression_t *ref = &expression->reference; + ref->symbol = token.v.symbol; declaration_t *declaration = get_declaration(ref->symbol, NAMESPACE_NORMAL); @@ -2533,14 +3007,19 @@ static expression_t *parse_reference(void) { parser_print_error_prefix(); fprintf(stderr, "unknown symbol '%s' found.\n", ref->symbol->string); - return (expression_t*) ref; + return expression; } } + type_t *type = declaration->type; + /* we always do the auto-type conversions; the & and sizeof parser contains + * code to revert this! */ + type = automatic_type_conversion(type); + ref->declaration = declaration; - ref->expression.datatype = declaration->type; + ref->expression.datatype = type; - return (expression_t*) ref; + return expression; } static void check_cast_allowed(expression_t *expression, type_t *dest_type) @@ -2552,11 +3031,10 @@ static void check_cast_allowed(expression_t *expression, type_t *dest_type) static expression_t *parse_cast(void) { - unary_expression_t *cast = allocate_ast_zero(sizeof(cast[0])); + expression_t *cast = allocate_expression_zero(EXPR_UNARY); - cast->expression.type = EXPR_UNARY; - cast->type = UNEXPR_CAST; - cast->expression.source_position = token.source_position; + cast->unary.type = UNEXPR_CAST; + cast->base.source_position = token.source_position; type_t *type = parse_typename(); @@ -2565,44 +3043,45 @@ static expression_t *parse_cast(void) check_cast_allowed(value, type); - cast->expression.datatype = type; - cast->value = value; + cast->base.datatype = type; + cast->unary.value = value; - return (expression_t*) cast; + return cast; } static expression_t *parse_statement_expression(void) { - statement_expression_t *expression - = allocate_ast_zero(sizeof(expression[0])); - expression->expression.type = EXPR_STATEMENT; + expression_t *expression = allocate_expression_zero(EXPR_STATEMENT); - statement_t *statement = parse_compound_statement(); - expression->statement = statement; + statement_t *statement = parse_compound_statement(); + expression->statement.statement = statement; if(statement == NULL) { expect(')'); return NULL; } assert(statement->type == STATEMENT_COMPOUND); + compound_statement_t *compound_statement = &statement->compound; /* find last statement and use it's type */ const statement_t *last_statement = NULL; - const statement_t *iter = statement->v.compound_stmt.statements; - for( ; iter != NULL; iter = iter->next) { + const statement_t *iter = compound_statement->statements; + for( ; iter != NULL; iter = iter->base.next) { last_statement = iter; } if(last_statement->type == STATEMENT_EXPRESSION) { - expression->expression.datatype - = last_statement->v.expression->datatype; + const expression_statement_t *expression_statement + = &last_statement->expression; + expression->base.datatype + = expression_statement->expression->base.datatype; } else { - expression->expression.datatype = type_void; + expression->base.datatype = type_void; } expect(')'); - return (expression_t*) expression; + return expression; } static expression_t *parse_brace_expression(void) @@ -2638,7 +3117,9 @@ static expression_t *parse_function_keyword(void) parse_error("'__func__' used outside of a function"); } - string_literal_t *expression = allocate_ast_zero(sizeof(expression[0])); + string_literal_expression_t *expression + = allocate_ast_zero(sizeof(expression[0])); + expression->expression.type = EXPR_FUNCTION; expression->expression.datatype = type_string; expression->value = "TODO: FUNCTION"; @@ -2651,7 +3132,9 @@ static expression_t *parse_pretty_function_keyword(void) eat(T___PRETTY_FUNCTION__); /* TODO */ - string_literal_t *expression = allocate_ast_zero(sizeof(expression[0])); + string_literal_expression_t *expression + = allocate_ast_zero(sizeof(expression[0])); + expression->expression.type = EXPR_PRETTY_FUNCTION; expression->expression.datatype = type_string; expression->value = "TODO: PRETTY FUNCTION"; @@ -2714,73 +3197,47 @@ static expression_t *parse_offsetof(void) { eat(T___builtin_offsetof); - offsetof_expression_t *expression - = allocate_ast_zero(sizeof(expression[0])); - expression->expression.type = EXPR_OFFSETOF; - expression->expression.datatype = type_size_t; + expression_t *expression = allocate_expression_zero(EXPR_OFFSETOF); + expression->base.datatype = type_size_t; expect('('); - expression->type = parse_typename(); + expression->offsetofe.type = parse_typename(); expect(','); - expression->designator = parse_designator(); + expression->offsetofe.designator = parse_designator(); expect(')'); - return (expression_t*) expression; + return expression; } static expression_t *parse_va_arg(void) { eat(T___builtin_va_arg); - va_arg_expression_t *expression = allocate_ast_zero(sizeof(expression[0])); - expression->expression.type = EXPR_VA_ARG; + expression_t *expression = allocate_expression_zero(EXPR_VA_ARG); expect('('); - expression->arg = parse_assignment_expression(); + expression->va_arge.arg = parse_assignment_expression(); expect(','); - expression->expression.datatype = parse_typename(); + expression->base.datatype = parse_typename(); expect(')'); - return (expression_t*) expression; -} - -static type_t *make_function_1_type(type_t *result_type, type_t *argument_type) -{ - function_parameter_t *parameter = allocate_type_zero(sizeof(parameter[0])); - parameter->type = argument_type; - - function_type_t *type = allocate_type_zero(sizeof(type[0])); - type->type.type = TYPE_FUNCTION; - type->result_type = result_type; - type->parameters = parameter; - - type_t *result = typehash_insert((type_t*) type); - if(result != (type_t*) type) { - free_type(type); - } - - return result; + return expression; } static expression_t *parse_builtin_symbol(void) { - builtin_symbol_expression_t *expression - = allocate_ast_zero(sizeof(expression[0])); - expression->expression.type = EXPR_BUILTIN_SYMBOL; + expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_SYMBOL); - expression->symbol = token.v.symbol; - - type_t *type; - switch(token.type) { - case T___builtin_alloca: - type = make_function_1_type(type_void_ptr, type_size_t); - break; - } + symbol_t *symbol = token.v.symbol; + expression->builtin_symbol.symbol = symbol; next_token(); - expression->expression.datatype = type; - return (expression_t*) expression; + type_t *type = get_builtin_symbol_type(symbol); + type = automatic_type_conversion(type); + + expression->base.datatype = type; + return expression; } static expression_t *parse_primary_expression(void) @@ -2790,8 +3247,10 @@ static expression_t *parse_primary_expression(void) return parse_int_const(); case T_FLOATINGPOINT: return parse_float_const(); - case T_STRING_LITERAL: + case T_STRING_LITERAL: /* TODO merge */ return parse_string_const(); + case T_WIDE_STRING_LITERAL: + return parse_wide_string_const(); case T_IDENTIFIER: return parse_reference(); case T___FUNCTION__: @@ -2803,6 +3262,7 @@ static expression_t *parse_primary_expression(void) return parse_offsetof(); case T___builtin_va_arg: return parse_va_arg(); + case T___builtin_nanf: case T___builtin_alloca: case T___builtin_expect: case T___builtin_va_start: @@ -2823,45 +3283,49 @@ static expression_t *parse_primary_expression(void) } static expression_t *parse_array_expression(unsigned precedence, - expression_t *array_ref) + expression_t *left) { (void) precedence; eat('['); - expression_t *index = parse_expression(); + expression_t *inside = parse_expression(); array_access_expression_t *array_access = allocate_ast_zero(sizeof(array_access[0])); array_access->expression.type = EXPR_ARRAY_ACCESS; - array_access->array_ref = array_ref; - array_access->index = index; - - type_t *type_left = skip_typeref(array_ref->datatype); - type_t *type_right = skip_typeref(index->datatype); - - if(type_left != NULL && type_right != NULL) { - if(type_left->type == TYPE_POINTER) { - pointer_type_t *pointer = (pointer_type_t*) type_left; - array_access->expression.datatype = pointer->points_to; - } else if(type_left->type == TYPE_ARRAY) { - array_type_t *array_type = (array_type_t*) type_left; - array_access->expression.datatype = array_type->element_type; - } else if(type_right->type == TYPE_POINTER) { - pointer_type_t *pointer = (pointer_type_t*) type_right; - array_access->expression.datatype = pointer->points_to; - } else if(type_right->type == TYPE_ARRAY) { - array_type_t *array_type = (array_type_t*) type_right; - array_access->expression.datatype = array_type->element_type; + + type_t *type_left = left->base.datatype; + type_t *type_inside = inside->base.datatype; + type_t *result_type = NULL; + + if(type_left != NULL && type_inside != NULL) { + type_left = skip_typeref(type_left); + type_inside = skip_typeref(type_inside); + + if(is_type_pointer(type_left)) { + pointer_type_t *pointer = &type_left->pointer; + result_type = pointer->points_to; + array_access->array_ref = left; + array_access->index = inside; + } else if(is_type_pointer(type_inside)) { + pointer_type_t *pointer = &type_inside->pointer; + result_type = pointer->points_to; + array_access->array_ref = inside; + array_access->index = left; + array_access->flipped = true; } else { parser_print_error_prefix(); fprintf(stderr, "array access on object with non-pointer types "); print_type_quoted(type_left); fprintf(stderr, ", "); - print_type_quoted(type_right); + print_type_quoted(type_inside); fprintf(stderr, "\n"); } + } else { + array_access->array_ref = left; + array_access->index = inside; } if(token.type != ']') { @@ -2870,26 +3334,10 @@ static expression_t *parse_array_expression(unsigned precedence, } next_token(); - return (expression_t*) array_access; -} - -static bool is_declaration_specifier(const token_t *token, - bool only_type_specifiers) -{ - switch(token->type) { - TYPE_SPECIFIERS - return 1; - case T_IDENTIFIER: - return is_typedef_symbol(token->v.symbol); - STORAGE_CLASSES - TYPE_QUALIFIERS - if(only_type_specifiers) - return 0; - return 1; + result_type = automatic_type_conversion(result_type); + array_access->expression.datatype = result_type; - default: - return 0; - } + return (expression_t*) array_access; } static expression_t *parse_sizeof(unsigned precedence) @@ -2906,8 +3354,10 @@ static expression_t *parse_sizeof(unsigned precedence) sizeof_expression->type = parse_typename(); expect(')'); } else { - expression_t *expression = parse_sub_expression(precedence); - sizeof_expression->type = expression->datatype; + expression_t *expression = parse_sub_expression(precedence); + expression->base.datatype = revert_automatic_type_conversion(expression); + + sizeof_expression->type = expression->base.datatype; sizeof_expression->size_expression = expression; } @@ -2923,20 +3373,18 @@ static expression_t *parse_select_expression(unsigned precedence, bool is_pointer = (token.type == T_MINUSGREATER); next_token(); - select_expression_t *select = allocate_ast_zero(sizeof(select[0])); - - select->expression.type = EXPR_SELECT; - select->compound = compound; + 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, 0); - return (expression_t*) select; + return select; } - symbol_t *symbol = token.v.symbol; - select->symbol = symbol; + symbol_t *symbol = token.v.symbol; + select->select.symbol = symbol; next_token(); - type_t *orig_type = compound->datatype; + type_t *orig_type = compound->base.datatype; if(orig_type == NULL) return make_invalid_expression(); @@ -2951,7 +3399,7 @@ static expression_t *parse_select_expression(unsigned precedence, fputc('\n', stderr); return make_invalid_expression(); } - pointer_type_t *pointer_type = (pointer_type_t*) type; + pointer_type_t *pointer_type = &type->pointer; type_left = pointer_type->points_to; } type_left = skip_typeref(type_left); @@ -2966,7 +3414,7 @@ static expression_t *parse_select_expression(unsigned precedence, return make_invalid_expression(); } - compound_type_t *compound_type = (compound_type_t*) type_left; + compound_type_t *compound_type = &type_left->compound; declaration_t *declaration = compound_type->declaration; if(!declaration->init.is_defined) { @@ -2991,41 +3439,50 @@ static expression_t *parse_select_expression(unsigned precedence, return make_invalid_expression(); } - select->compound_entry = iter; - select->expression.datatype = iter->type; - return (expression_t*) select; + /* we always do the auto-type conversions; the & and sizeof parser contains + * code to revert this! */ + type_t *expression_type = automatic_type_conversion(iter->type); + + select->select.compound_entry = iter; + select->base.datatype = expression_type; + return select; } static expression_t *parse_call_expression(unsigned precedence, expression_t *expression) { (void) precedence; - call_expression_t *call = allocate_ast_zero(sizeof(call[0])); - call->expression.type = EXPR_CALL; - call->function = expression; + expression_t *result = allocate_expression_zero(EXPR_CALL); - function_type_t *function_type; - type_t *orig_type = expression->datatype; - type_t *type = skip_typeref(orig_type); + call_expression_t *call = &result->call; + call->function = expression; - if(type->type == TYPE_POINTER) { - pointer_type_t *pointer_type = (pointer_type_t*) type; + function_type_t *function_type = NULL; + type_t *orig_type = expression->base.datatype; + if(orig_type != NULL) { + type_t *type = skip_typeref(orig_type); - type = skip_typeref(pointer_type->points_to); - } - if (type->type == TYPE_FUNCTION) { - function_type = (function_type_t*) type; - call->expression.datatype = function_type->result_type; - } else { - parser_print_error_prefix(); - fputs("called object '", stderr); - print_expression(expression); - fputs("' (type ", stderr); - print_type_quoted(orig_type); - fputs(") is not a function\n", stderr); + if(is_type_pointer(type)) { + pointer_type_t *pointer_type = &type->pointer; + + type = skip_typeref(pointer_type->points_to); + + if (type->type == TYPE_FUNCTION) { + function_type = &type->function; + call->expression.datatype = function_type->result_type; + } + } + if(function_type == NULL) { + parser_print_error_prefix(); + fputs("called object '", stderr); + print_expression(expression); + fputs("' (type ", stderr); + print_type_quoted(orig_type); + fputs(") is not a pointer to a function\n", stderr); - function_type = NULL; - call->expression.datatype = NULL; + function_type = NULL; + call->expression.datatype = NULL; + } } /* parse arguments */ @@ -3079,16 +3536,18 @@ static expression_t *parse_call_expression(unsigned precedence, } else { /* do default promotion */ for( ; argument != NULL; argument = argument->next) { - type_t *type = argument->expression->datatype; + type_t *type = argument->expression->base.datatype; if(type == NULL) continue; + type = skip_typeref(type); if(is_type_integer(type)) { type = promote_integer(type); } else if(type == type_float) { type = type_double; } + argument->expression = create_implicit_cast(argument->expression, type); } @@ -3096,75 +3555,88 @@ static expression_t *parse_call_expression(unsigned precedence, } } - return (expression_t*) call; + return result; } static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right); +static bool same_compound_type(const type_t *type1, const type_t *type2) +{ + if(!is_type_compound(type1)) + return false; + if(type1->type != type2->type) + return false; + + const compound_type_t *compound1 = &type1->compound; + const compound_type_t *compound2 = &type2->compound; + + return compound1->declaration == compound2->declaration; +} + static expression_t *parse_conditional_expression(unsigned precedence, expression_t *expression) { eat('?'); - conditional_expression_t *conditional - = allocate_ast_zero(sizeof(conditional[0])); - conditional->expression.type = EXPR_CONDITIONAL; - conditional->condition = expression; + expression_t *result = allocate_expression_zero(EXPR_CONDITIONAL); + + conditional_expression_t *conditional = &result->conditional; + conditional->condition = expression; /* 6.5.15.2 */ - type_t *condition_type_orig = conditional->condition->datatype; + type_t *condition_type_orig = expression->base.datatype; if(condition_type_orig != NULL) { - type_t *condition_type = skip_typeref(condition_type_orig); + type_t *condition_type = skip_typeref(condition_type_orig); if(condition_type != NULL && !is_type_scalar(condition_type)) { - type_error("expected a scalar type", expression->source_position, - condition_type_orig); + type_error("expected a scalar type in conditional condition", + expression->base.source_position, condition_type_orig); } } - expression_t *const t_expr = parse_expression(); - conditional->true_expression = t_expr; + expression_t *true_expression = parse_expression(); expect(':'); - expression_t *const f_expr = parse_sub_expression(precedence); - conditional->false_expression = f_expr; + expression_t *false_expression = parse_sub_expression(precedence); + + conditional->true_expression = true_expression; + conditional->false_expression = false_expression; - type_t *const true_type = t_expr->datatype; - if(true_type == NULL) - return (expression_t*) conditional; - type_t *const false_type = f_expr->datatype; - if(false_type == NULL) - return (expression_t*) conditional; + type_t *orig_true_type = true_expression->base.datatype; + type_t *orig_false_type = false_expression->base.datatype; + if(orig_true_type == NULL || orig_false_type == NULL) + return result; - type_t *const skipped_true_type = skip_typeref(true_type); - type_t *const skipped_false_type = skip_typeref(false_type); + type_t *true_type = skip_typeref(orig_true_type); + type_t *false_type = skip_typeref(orig_false_type); /* 6.5.15.3 */ - if (skipped_true_type == skipped_false_type) { - conditional->expression.datatype = skipped_true_type; - } else if (is_type_arithmetic(skipped_true_type) && - is_type_arithmetic(skipped_false_type)) { - type_t *const result = semantic_arithmetic(skipped_true_type, - skipped_false_type); - conditional->true_expression = create_implicit_cast(t_expr, result); - conditional->false_expression = create_implicit_cast(f_expr, result); - conditional->expression.datatype = result; - } else if (skipped_true_type->type == TYPE_POINTER && - skipped_false_type->type == TYPE_POINTER && - true /* TODO compatible points_to types */) { - /* TODO */ - } else if(/* (is_null_ptr_const(skipped_true_type) && - skipped_false_type->type == TYPE_POINTER) - || (is_null_ptr_const(skipped_false_type) && - skipped_true_type->type == TYPE_POINTER) TODO*/ false) { - /* TODO */ - } else if(/* 1 is pointer to object type, other is void* */ false) { - /* TODO */ + type_t *result_type = NULL; + if (is_type_arithmetic(true_type) && is_type_arithmetic(false_type)) { + result_type = semantic_arithmetic(true_type, false_type); + + true_expression = create_implicit_cast(true_expression, result_type); + false_expression = create_implicit_cast(false_expression, result_type); + + conditional->true_expression = true_expression; + conditional->false_expression = false_expression; + conditional->expression.datatype = result_type; + } else if (same_compound_type(true_type, false_type) + || (is_type_atomic(true_type, ATOMIC_TYPE_VOID) && + is_type_atomic(false_type, ATOMIC_TYPE_VOID))) { + /* just take 1 of the 2 types */ + result_type = true_type; + } else if (is_type_pointer(true_type) && is_type_pointer(false_type) + && pointers_compatible(true_type, false_type)) { + /* ok */ + result_type = true_type; } else { + /* TODO */ type_error_incompatible("while parsing conditional", - expression->source_position, true_type, - skipped_false_type); + expression->base.source_position, true_type, + false_type); } - return (expression_t*) conditional; + conditional->expression.datatype = result_type; + return result; } static expression_t *parse_extension(unsigned precedence) @@ -3180,22 +3652,20 @@ static expression_t *parse_builtin_classify_type(const unsigned precedence) { eat(T___builtin_classify_type); - classify_type_expression_t *const classify_type_expr = - allocate_ast_zero(sizeof(classify_type_expr[0])); - classify_type_expr->expression.type = EXPR_CLASSIFY_TYPE; - classify_type_expr->expression.datatype = type_int; + expression_t *result = allocate_expression_zero(EXPR_CLASSIFY_TYPE); + result->base.datatype = type_int; expect('('); - expression_t *const expression = parse_sub_expression(precedence); + expression_t *expression = parse_sub_expression(precedence); expect(')'); - classify_type_expr->type_expression = expression; + result->classify_type.type_expression = expression; - return (expression_t*)classify_type_expr; + return result; } static void semantic_incdec(unary_expression_t *expression) { - type_t *orig_type = expression->value->datatype; + type_t *orig_type = expression->value->base.datatype; if(orig_type == NULL) return; @@ -3212,7 +3682,7 @@ static void semantic_incdec(unary_expression_t *expression) static void semantic_unexpr_arithmetic(unary_expression_t *expression) { - type_t *orig_type = expression->value->datatype; + type_t *orig_type = expression->value->base.datatype; if(orig_type == NULL) return; @@ -3229,7 +3699,7 @@ static void semantic_unexpr_arithmetic(unary_expression_t *expression) static void semantic_unexpr_scalar(unary_expression_t *expression) { - type_t *orig_type = expression->value->datatype; + type_t *orig_type = expression->value->base.datatype; if(orig_type == NULL) return; @@ -3244,7 +3714,7 @@ static void semantic_unexpr_scalar(unary_expression_t *expression) static void semantic_unexpr_integer(unary_expression_t *expression) { - type_t *orig_type = expression->value->datatype; + type_t *orig_type = expression->value->base.datatype; if(orig_type == NULL) return; @@ -3259,40 +3729,35 @@ static void semantic_unexpr_integer(unary_expression_t *expression) static void semantic_dereference(unary_expression_t *expression) { - type_t *orig_type = expression->value->datatype; + type_t *orig_type = expression->value->base.datatype; if(orig_type == NULL) return; type_t *type = skip_typeref(orig_type); - switch (type->type) { - case TYPE_ARRAY: { - array_type_t *const array_type = (array_type_t*)type; - expression->expression.datatype = array_type->element_type; - break; - } + if(!is_type_pointer(type)) { + parser_print_error_prefix(); + fputs("Unary '*' needs pointer or arrray type, but type ", stderr); + print_type_quoted(orig_type); + fputs(" given.\n", stderr); + return; + } - case TYPE_POINTER: { - pointer_type_t *pointer_type = (pointer_type_t*)type; - expression->expression.datatype = pointer_type->points_to; - break; - } + pointer_type_t *pointer_type = &type->pointer; + type_t *result_type = pointer_type->points_to; - default: - parser_print_error_prefix(); - fputs("'Unary *' needs pointer or arrray type, but type ", stderr); - print_type_quoted(orig_type); - fputs(" given.\n", stderr); - return; - } + result_type = automatic_type_conversion(result_type); + expression->expression.datatype = result_type; } static void semantic_take_addr(unary_expression_t *expression) { - type_t *orig_type = expression->value->datatype; + expression_t *value = expression->value; + value->base.datatype = revert_automatic_type_conversion(value); + + type_t *orig_type = value->base.datatype; if(orig_type == NULL) return; - expression_t *value = expression->value; if(value->type == EXPR_REFERENCE) { reference_expression_t *reference = (reference_expression_t*) value; declaration_t *declaration = reference->declaration; @@ -3377,7 +3842,9 @@ static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right) bool signed_left = is_type_signed(type_left); bool signed_right = is_type_signed(type_right); - if(get_rank(type_left) < get_rank(type_right)) { + int rank_left = get_rank(type_left); + int rank_right = get_rank(type_right); + if(rank_left < rank_right) { if(signed_left == signed_right || !signed_right) { return type_right; } else { @@ -3396,8 +3863,8 @@ static void semantic_binexpr_arithmetic(binary_expression_t *expression) { expression_t *left = expression->left; expression_t *right = expression->right; - type_t *orig_type_left = left->datatype; - type_t *orig_type_right = right->datatype; + type_t *orig_type_left = left->base.datatype; + type_t *orig_type_right = right->base.datatype; if(orig_type_left == NULL || orig_type_right == NULL) return; @@ -3422,8 +3889,8 @@ static void semantic_shift_op(binary_expression_t *expression) { expression_t *left = expression->left; expression_t *right = expression->right; - type_t *orig_type_left = left->datatype; - type_t *orig_type_right = right->datatype; + type_t *orig_type_left = left->base.datatype; + type_t *orig_type_right = right->base.datatype; if(orig_type_left == NULL || orig_type_right == NULL) return; @@ -3450,8 +3917,8 @@ static void semantic_add(binary_expression_t *expression) { expression_t *left = expression->left; expression_t *right = expression->right; - type_t *orig_type_left = left->datatype; - type_t *orig_type_right = right->datatype; + type_t *orig_type_left = left->base.datatype; + type_t *orig_type_right = right->base.datatype; if(orig_type_left == NULL || orig_type_right == NULL) return; @@ -3466,18 +3933,10 @@ static void semantic_add(binary_expression_t *expression) expression->right = create_implicit_cast(right, arithmetic_type); expression->expression.datatype = arithmetic_type; return; - } else if(type_left->type == TYPE_POINTER && is_type_integer(type_right)) { + } else if(is_type_pointer(type_left) && is_type_integer(type_right)) { expression->expression.datatype = type_left; - } else if(type_right->type == TYPE_POINTER && is_type_integer(type_left)) { + } else if(is_type_pointer(type_right) && is_type_integer(type_left)) { expression->expression.datatype = type_right; - } else if (type_left->type == TYPE_ARRAY && is_type_integer(type_right)) { - const array_type_t *const arr_type = (const array_type_t*)type_left; - expression->expression.datatype = - make_pointer_type(arr_type->element_type, TYPE_QUALIFIER_NONE); - } else if (type_right->type == TYPE_ARRAY && is_type_integer(type_left)) { - const array_type_t *const arr_type = (const array_type_t*)type_right; - expression->expression.datatype = - make_pointer_type(arr_type->element_type, TYPE_QUALIFIER_NONE); } else { parser_print_error_prefix(); fprintf(stderr, "invalid operands to binary + ("); @@ -3492,8 +3951,8 @@ static void semantic_sub(binary_expression_t *expression) { expression_t *left = expression->left; expression_t *right = expression->right; - type_t *orig_type_left = left->datatype; - type_t *orig_type_right = right->datatype; + type_t *orig_type_left = left->base.datatype; + type_t *orig_type_right = right->base.datatype; if(orig_type_left == NULL || orig_type_right == NULL) return; @@ -3536,8 +3995,8 @@ static void semantic_comparison(binary_expression_t *expression) { expression_t *left = expression->left; expression_t *right = expression->right; - type_t *orig_type_left = left->datatype; - type_t *orig_type_right = right->datatype; + type_t *orig_type_left = left->base.datatype; + type_t *orig_type_right = right->base.datatype; if(orig_type_left == NULL || orig_type_right == NULL) return; @@ -3569,8 +4028,8 @@ static void semantic_arithmetic_assign(binary_expression_t *expression) { expression_t *left = expression->left; expression_t *right = expression->right; - type_t *orig_type_left = left->datatype; - type_t *orig_type_right = right->datatype; + type_t *orig_type_left = left->base.datatype; + type_t *orig_type_right = right->base.datatype; if(orig_type_left == NULL || orig_type_right == NULL) return; @@ -3598,8 +4057,8 @@ static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression) { expression_t *left = expression->left; expression_t *right = expression->right; - type_t *orig_type_left = left->datatype; - type_t *orig_type_right = right->datatype; + type_t *orig_type_left = left->base.datatype; + type_t *orig_type_right = right->base.datatype; if(orig_type_left == NULL || orig_type_right == NULL) return; @@ -3632,8 +4091,8 @@ static void semantic_logical_op(binary_expression_t *expression) { expression_t *left = expression->left; expression_t *right = expression->right; - type_t *orig_type_left = left->datatype; - type_t *orig_type_right = right->datatype; + type_t *orig_type_left = left->base.datatype; + type_t *orig_type_right = right->base.datatype; if(orig_type_left == NULL || orig_type_right == NULL) return; @@ -3651,28 +4110,58 @@ static void semantic_logical_op(binary_expression_t *expression) expression->expression.datatype = type_int; } +static bool has_const_fields(type_t *type) +{ + (void) type; + /* TODO */ + return false; +} + static void semantic_binexpr_assign(binary_expression_t *expression) { expression_t *left = expression->left; - type_t *orig_type_left = left->datatype; + type_t *orig_type_left = left->base.datatype; if(orig_type_left == NULL) return; - type_t *type_left = skip_typeref(orig_type_left); + type_t *type_left = revert_automatic_type_conversion(left); + type_left = skip_typeref(orig_type_left); + /* must be a modifiable lvalue */ if (type_left->type == TYPE_ARRAY) { - parse_error("Cannot assign to arrays."); + parser_print_error_prefix(); + fprintf(stderr, "Cannot assign to arrays ('"); + print_expression(left); + fprintf(stderr, "')\n"); return; } - - if(type_left->qualifiers & TYPE_QUALIFIER_CONST) { + if(type_left->base.qualifiers & TYPE_QUALIFIER_CONST) { parser_print_error_prefix(); fprintf(stderr, "assignment to readonly location '"); print_expression(left); fprintf(stderr, "' (type "); print_type_quoted(orig_type_left); fprintf(stderr, ")\n"); + return; + } + if(is_type_incomplete(type_left)) { + parser_print_error_prefix(); + fprintf(stderr, "left-hand side of assignment '"); + print_expression(left); + fprintf(stderr, "' has incomplete type "); + print_type_quoted(orig_type_left); + fprintf(stderr, "\n"); + return; + } + if(is_type_compound(type_left) && has_const_fields(type_left)) { + parser_print_error_prefix(); + fprintf(stderr, "can't assign to '"); + print_expression(left); + fprintf(stderr, "' because compound type "); + print_type_quoted(orig_type_left); + fprintf(stderr, " has readonly fields\n"); + return; } semantic_assign(orig_type_left, &expression->right, "assignment"); @@ -3682,7 +4171,7 @@ static void semantic_binexpr_assign(binary_expression_t *expression) static void semantic_comma(binary_expression_t *expression) { - expression->expression.datatype = expression->right->datatype; + expression->expression.datatype = expression->right->base.datatype; } #define CREATE_BINEXPR_PARSER(token_type, binexpression_type, sfunc, lr) \ @@ -3766,7 +4255,7 @@ static expression_t *parse_sub_expression(unsigned precedence) left = parse_primary_expression(); } assert(left != NULL); - left->source_position = source_position; + left->base.source_position = source_position; while(true) { if(token.type < 0) { @@ -3783,7 +4272,7 @@ static expression_t *parse_sub_expression(unsigned precedence) assert(left != NULL); assert(left->type != EXPR_UNKNOWN); - left->source_position = source_position; + left->base.source_position = source_position; } return left; @@ -3803,7 +4292,7 @@ static void register_expression_parser(parse_expression_function parser, if(entry->parser != NULL) { fprintf(stderr, "for token "); - print_token_type(stderr, token_type); + print_token_type(stderr, (token_type_t) token_type); fprintf(stderr, "\n"); panic("trying to register multiple expression parsers for a token"); } @@ -3819,7 +4308,7 @@ static void register_expression_infix_parser( if(entry->infix_parser != NULL) { fprintf(stderr, "for token "); - print_token_type(stderr, token_type); + print_token_type(stderr, (token_type_t) token_type); fprintf(stderr, "\n"); panic("trying to register multiple infix expression parsers for a " "token"); @@ -3899,34 +4388,137 @@ static void init_expression_parsers(void) T___builtin_classify_type, 25); } +static asm_constraint_t *parse_asm_constraints(void) +{ + asm_constraint_t *result = NULL; + asm_constraint_t *last = NULL; + + while(token.type == T_STRING_LITERAL || token.type == '[') { + asm_constraint_t *constraint = allocate_ast_zero(sizeof(constraint[0])); + memset(constraint, 0, sizeof(constraint[0])); + + if(token.type == '[') { + eat('['); + if(token.type != T_IDENTIFIER) { + parse_error_expected("while parsing asm constraint", + T_IDENTIFIER, 0); + return NULL; + } + constraint->symbol = token.v.symbol; + + expect(']'); + } + + constraint->constraints = parse_string_literals(); + expect('('); + constraint->expression = parse_expression(); + expect(')'); + + if(last != NULL) { + last->next = constraint; + } else { + result = constraint; + } + last = constraint; + + if(token.type != ',') + break; + eat(','); + } + + return result; +} + +static asm_clobber_t *parse_asm_clobbers(void) +{ + asm_clobber_t *result = NULL; + asm_clobber_t *last = NULL; + + while(token.type == T_STRING_LITERAL) { + asm_clobber_t *clobber = allocate_ast_zero(sizeof(clobber[0])); + clobber->clobber = parse_string_literals(); + + if(last != NULL) { + last->next = clobber; + } else { + result = clobber; + } + last = clobber; + + if(token.type != ',') + break; + eat(','); + } + + return result; +} + +static statement_t *parse_asm_statement(void) +{ + eat(T_asm); + + statement_t *statement = allocate_statement_zero(STATEMENT_ASM); + statement->base.source_position = token.source_position; + + asm_statement_t *asm_statement = &statement->asms; + + if(token.type == T_volatile) { + next_token(); + asm_statement->is_volatile = true; + } + + expect('('); + asm_statement->asm_text = parse_string_literals(); + + if(token.type != ':') + goto end_of_asm; + eat(':'); + + asm_statement->inputs = parse_asm_constraints(); + if(token.type != ':') + goto end_of_asm; + eat(':'); + + asm_statement->outputs = parse_asm_constraints(); + if(token.type != ':') + goto end_of_asm; + eat(':'); + + asm_statement->clobbers = parse_asm_clobbers(); + +end_of_asm: + expect(')'); + expect(';'); + return statement; +} static statement_t *parse_case_statement(void) { eat(T_case); - statement_t *label = allocate_ast_zero(sizeof(label[0])); - label->type = STATEMENT_CASE_LABEL; - label->source_position = token.source_position; - label->v.case_label_stmt.expression = parse_expression(); + statement_t *statement = allocate_statement_zero(STATEMENT_CASE_LABEL); + + statement->base.source_position = token.source_position; + statement->case_label.expression = parse_expression(); expect(':'); - label->v.case_label_stmt.label_statement = parse_statement(); + statement->case_label.label_statement = parse_statement(); - return label; + return statement; } static statement_t *parse_default_statement(void) { eat(T_default); - statement_t *label = allocate_ast_zero(sizeof(label[0])); - label->type = STATEMENT_CASE_LABEL; - label->source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_CASE_LABEL); + + statement->base.source_position = token.source_position; expect(':'); - label->v.case_label_stmt.label_statement = parse_statement(); + statement->label.label_statement = parse_statement(); - return (statement_t*) label; + return statement; } static declaration_t *get_label(symbol_t *symbol) @@ -3942,7 +4534,7 @@ static declaration_t *get_label(symbol_t *symbol) /* otherwise we need to create a new one */ declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); - declaration->namespc = NAMESPACE_LABEL; + declaration->namespc = NAMESPACE_LABEL; declaration->symbol = symbol; label_push(declaration); @@ -3970,11 +4562,11 @@ static statement_t *parse_label_statement(void) label->source_position = token.source_position; } - statement_t *label_statement = allocate_ast_zero(sizeof(label[0])); + label_statement_t *label_statement = allocate_ast_zero(sizeof(label[0])); - label_statement->type = STATEMENT_LABEL; - label_statement->source_position = token.source_position; - label_statement->v.label_stmt.label = label; + label_statement->statement.type = STATEMENT_LABEL; + label_statement->statement.source_position = token.source_position; + label_statement->label = label; expect(':'); @@ -3982,102 +4574,102 @@ static statement_t *parse_label_statement(void) parse_error("label at end of compound statement"); return (statement_t*) label_statement; } else { - label_statement->v.label_stmt.label_statement = parse_statement(); + label_statement->label_statement = parse_statement(); } - return label_statement; + return (statement_t*) label_statement; } static statement_t *parse_if(void) { eat(T_if); - statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->type = STATEMENT_IF; - statement->source_position = token.source_position; + if_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); + statement->statement.type = STATEMENT_IF; + statement->statement.source_position = token.source_position; expect('('); - statement->v.if_stmt.condition = parse_expression(); + statement->condition = parse_expression(); expect(')'); - statement->v.if_stmt.true_statement = parse_statement(); + statement->true_statement = parse_statement(); if(token.type == T_else) { next_token(); - statement->v.if_stmt.false_statement = parse_statement(); + statement->false_statement = parse_statement(); } - return statement; + return (statement_t*) statement; } static statement_t *parse_switch(void) { eat(T_switch); - statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->type = STATEMENT_SWITCH; - statement->source_position = token.source_position; + switch_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); + statement->statement.type = STATEMENT_SWITCH; + statement->statement.source_position = token.source_position; expect('('); - statement->v.switch_stmt.expression = parse_expression(); + statement->expression = parse_expression(); expect(')'); - statement->v.switch_stmt.body = parse_statement(); + statement->body = parse_statement(); - return statement; + return (statement_t*) statement; } static statement_t *parse_while(void) { eat(T_while); - statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->type = STATEMENT_WHILE; - statement->source_position = token.source_position; + while_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); + statement->statement.type = STATEMENT_WHILE; + statement->statement.source_position = token.source_position; expect('('); - statement->v.while_stmt.condition = parse_expression(); + statement->condition = parse_expression(); expect(')'); - statement->v.while_stmt.body = parse_statement(); + statement->body = parse_statement(); - return statement; + return (statement_t*) statement; } static statement_t *parse_do(void) { eat(T_do); - statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->type = STATEMENT_DO_WHILE; - statement->source_position = token.source_position; + do_while_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); + statement->statement.type = STATEMENT_DO_WHILE; + statement->statement.source_position = token.source_position; - statement->v.while_stmt.body = parse_statement(); + statement->body = parse_statement(); expect(T_while); expect('('); - statement->v.while_stmt.condition = parse_expression(); + statement->condition = parse_expression(); expect(')'); expect(';'); - return statement; + return (statement_t*) statement; } static statement_t *parse_for(void) { eat(T_for); - statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->type = STATEMENT_FOR; - statement->source_position = token.source_position; + for_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); + statement->statement.type = STATEMENT_FOR; + statement->statement.source_position = token.source_position; expect('('); int top = environment_top(); context_t *last_context = context; - set_context(&statement->v.for_stmt.context); + set_context(&statement->context); if(token.type != ';') { if(is_declaration_specifier(&token, false)) { - parse_declaration(); + parse_declaration(record_declaration); } else { - statement->v.for_stmt.initialisation = parse_expression(); + statement->initialisation = parse_expression(); expect(';'); } } else { @@ -4085,20 +4677,20 @@ static statement_t *parse_for(void) } if(token.type != ';') { - statement->v.for_stmt.condition = parse_expression(); + statement->condition = parse_expression(); } expect(';'); if(token.type != ')') { - statement->v.for_stmt.step = parse_expression(); + statement->step = parse_expression(); } expect(')'); - statement->v.for_stmt.body = parse_statement(); + statement->body = parse_statement(); - assert(context == &statement->v.for_stmt.context); + assert(context == &statement->context); set_context(last_context); environment_pop_to(top); - return statement; + return (statement_t*) statement; } static statement_t *parse_goto(void) @@ -4115,16 +4707,16 @@ static statement_t *parse_goto(void) declaration_t *label = get_label(symbol); - statement_t *statement = allocate_ast_zero(sizeof(statement[0])); + goto_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->type = STATEMENT_GOTO; - statement->source_position = token.source_position; + statement->statement.type = STATEMENT_GOTO; + statement->statement.source_position = token.source_position; - statement->v.goto_label = label; + statement->label = label; expect(';'); - return statement; + return (statement_t*) statement; } static statement_t *parse_continue(void) @@ -4132,9 +4724,9 @@ static statement_t *parse_continue(void) eat(T_continue); expect(';'); - statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->type = STATEMENT_CONTINUE; - statement->source_position = token.source_position; + statement_t *statement = allocate_ast_zero(sizeof(statement[0])); + statement->type = STATEMENT_CONTINUE; + statement->base.source_position = token.source_position; return statement; } @@ -4144,9 +4736,9 @@ static statement_t *parse_break(void) eat(T_break); expect(';'); - statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->type = STATEMENT_BREAK; - statement->source_position = token.source_position; + statement_t *statement = allocate_ast_zero(sizeof(statement[0])); + statement->type = STATEMENT_BREAK; + statement->base.source_position = token.source_position; return statement; } @@ -4155,20 +4747,31 @@ static statement_t *parse_return(void) { eat(T_return); - statement_t *statement = allocate_ast_zero(sizeof(statement[0])); + return_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->type = STATEMENT_RETURN; - statement->source_position = token.source_position; + statement->statement.type = STATEMENT_RETURN; + statement->statement.source_position = token.source_position; assert(current_function->type->type == TYPE_FUNCTION); - function_type_t *function_type = (function_type_t*) current_function->type; + function_type_t *function_type = ¤t_function->type->function; type_t *return_type = function_type->result_type; - expression_t *return_value; + expression_t *return_value = NULL; if(token.type != ';') { return_value = parse_expression(); + } + expect(';'); + + if(return_type == NULL) + return (statement_t*) statement; + + return_type = skip_typeref(return_type); + + if(return_value != NULL) { + type_t *return_value_type = skip_typeref(return_value->base.datatype); - if(return_type == type_void && return_value->datatype != type_void) { + if(is_type_atomic(return_type, ATOMIC_TYPE_VOID) + && !is_type_atomic(return_value_type, ATOMIC_TYPE_VOID)) { parse_warning("'return' with a value, in function returning void"); return_value = NULL; } else { @@ -4177,55 +4780,41 @@ static statement_t *parse_return(void) } } } else { - return_value = NULL; - if(return_type != type_void) { + if(!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) { parse_warning("'return' without value, in function returning " "non-void"); } } - statement->v.return_value = return_value; + statement->return_value = return_value; - expect(';'); - - return statement; + return (statement_t*) statement; } static statement_t *parse_declaration_statement(void) { - declaration_t *before = last_declaration; - - statement_t *statement - = allocate_ast_zero(sizeof(statement[0])); - statement->type = STATEMENT_DECLARATION; - statement->source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_DECLARATION); - declaration_specifiers_t specifiers; - memset(&specifiers, 0, sizeof(specifiers)); - parse_declaration_specifiers(&specifiers); + statement->base.source_position = token.source_position; - if(token.type == ';') { - eat(';'); - } else { - parse_init_declarators(&specifiers); - } + declaration_t *before = last_declaration; + parse_declaration(record_declaration); if(before == NULL) { - statement->v.declaration_stmt.begin = context->declarations; + statement->declaration.declarations_begin = context->declarations; } else { - statement->v.declaration_stmt.begin = before->next; + statement->declaration.declarations_begin = before->next; } - statement->v.declaration_stmt.end = last_declaration; + statement->declaration.declarations_end = last_declaration; return statement; } static statement_t *parse_expression_statement(void) { - statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->type = STATEMENT_EXPRESSION; - statement->source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_EXPRESSION); - statement->v.expression = parse_expression(); + statement->base.source_position = token.source_position; + statement->expression.expression = parse_expression(); expect(';'); @@ -4238,6 +4827,10 @@ static statement_t *parse_statement(void) /* declaration or statement */ switch(token.type) { + case T_asm: + statement = parse_asm_statement(); + break; + case T_case: statement = parse_case_statement(); break; @@ -4323,23 +4916,24 @@ static statement_t *parse_statement(void) break; } - assert(statement == NULL || statement->source_position.input_name != NULL); + assert(statement == NULL + || statement->base.source_position.input_name != NULL); return statement; } static statement_t *parse_compound_statement(void) { - statement_t *compound_statement + compound_statement_t *compound_statement = allocate_ast_zero(sizeof(compound_statement[0])); - compound_statement->type = STATEMENT_COMPOUND; - compound_statement->source_position = token.source_position; + compound_statement->statement.type = STATEMENT_COMPOUND; + compound_statement->statement.source_position = token.source_position; eat('{'); int top = environment_top(); context_t *last_context = context; - set_context(&compound_statement->v.compound_stmt.context); + set_context(&compound_statement->context); statement_t *last_statement = NULL; @@ -4349,29 +4943,39 @@ static statement_t *parse_compound_statement(void) continue; if(last_statement != NULL) { - last_statement->next = statement; + last_statement->base.next = statement; } else { - compound_statement->v.compound_stmt.statements = statement; + compound_statement->statements = statement; } - while(statement->next != NULL) - statement = statement->next; + while(statement->base.next != NULL) + statement = statement->base.next; last_statement = statement; } if(token.type != '}') { parser_print_error_prefix_pos( - compound_statement->source_position); + compound_statement->statement.source_position); fprintf(stderr, "end of file while looking for closing '}'\n"); } next_token(); - assert(context == &compound_statement->v.compound_stmt.context); + assert(context == &compound_statement->context); set_context(last_context); environment_pop_to(top); - return compound_statement; + return (statement_t*) compound_statement; +} + +static void initialize_builtins(void) +{ + type_wchar_t = make_global_typedef("__WCHAR_TYPE__", type_int); + type_wchar_t_ptr = make_pointer_type(type_wchar_t, TYPE_QUALIFIER_NONE); + type_size_t = make_global_typedef("__SIZE_TYPE__", + make_atomic_type(ATOMIC_TYPE_ULONG, TYPE_QUALIFIER_NONE)); + type_ptrdiff_t = make_global_typedef("__PTRDIFF_TYPE__", + make_atomic_type(ATOMIC_TYPE_LONG, TYPE_QUALIFIER_NONE)); } static translation_unit_t *parse_translation_unit(void) @@ -4384,8 +4988,10 @@ static translation_unit_t *parse_translation_unit(void) assert(context == NULL); set_context(&unit->context); + initialize_builtins(); + while(token.type != T_EOF) { - parse_declaration(); + parse_external_declaration(); } assert(context == &unit->context); @@ -4428,16 +5034,15 @@ void init_parser(void) obstack_init(&temp_obst); type_int = make_atomic_type(ATOMIC_TYPE_INT, TYPE_QUALIFIER_NONE); - type_uint = make_atomic_type(ATOMIC_TYPE_UINT, TYPE_QUALIFIER_NONE); - type_long_double = make_atomic_type(ATOMIC_TYPE_LONG_DOUBLE, TYPE_QUALIFIER_NONE); - type_double = make_atomic_type(ATOMIC_TYPE_DOUBLE, TYPE_QUALIFIER_NONE); + type_long_double = make_atomic_type(ATOMIC_TYPE_LONG_DOUBLE, + TYPE_QUALIFIER_NONE); + type_double = make_atomic_type(ATOMIC_TYPE_DOUBLE, + TYPE_QUALIFIER_NONE); type_float = make_atomic_type(ATOMIC_TYPE_FLOAT, TYPE_QUALIFIER_NONE); - type_size_t = make_atomic_type(ATOMIC_TYPE_ULONG, TYPE_QUALIFIER_NONE); - type_ptrdiff_t = make_atomic_type(ATOMIC_TYPE_LONG, TYPE_QUALIFIER_NONE); - type_const_char = make_atomic_type(ATOMIC_TYPE_CHAR, TYPE_QUALIFIER_CONST); + type_char = make_atomic_type(ATOMIC_TYPE_CHAR, TYPE_QUALIFIER_NONE); type_void = make_atomic_type(ATOMIC_TYPE_VOID, TYPE_QUALIFIER_NONE); type_void_ptr = make_pointer_type(type_void, TYPE_QUALIFIER_NONE); - type_string = make_pointer_type(type_const_char, TYPE_QUALIFIER_NONE); + type_string = make_pointer_type(type_char, TYPE_QUALIFIER_NONE); } void exit_parser(void)