X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=db9482623d232ae1cf900bd65577b78bf1d7ecff;hb=9de06381987e3b71a9efea26cb9b596fd433191c;hp=ee5cfed19a36a4c3c54c83463c360559c1f84355;hpb=65fd450d888967cad7803e23356b375033cd9720;p=cparser diff --git a/parser.c b/parser.c index ee5cfed..db94826 100644 --- a/parser.c +++ b/parser.c @@ -38,7 +38,6 @@ 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; @@ -106,33 +105,93 @@ 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_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_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 size_t get_initializer_size(initializer_type_t type) +static size_t get_initializer_size(initializer_type_t type) { - static const size_t size[] = { + 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(size[type] != 0); - return size[type]; + assert(sizes[type] != 0); + return sizes[type]; } -static inline initializer_t *allocate_initializer(initializer_type_t type) +static initializer_t *allocate_initializer(initializer_type_t type) { initializer_t *result = allocate_ast_zero(get_initializer_size(type)); result->type = type; @@ -140,7 +199,7 @@ static inline initializer_t *allocate_initializer(initializer_type_t type) return result; } -static inline void free_type(void *type) +static void free_type(void *type) { obstack_free(type_obst, type); } @@ -148,12 +207,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); } @@ -195,7 +254,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); } @@ -393,6 +452,17 @@ static void set_context(context_t *new_context) static bool is_compatible_declaration (declaration_t *declaration, declaration_t *previous) { + 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; } @@ -457,11 +527,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 = previous_declaration->storage_class; - const storage_class_t new_storage = 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", @@ -470,8 +540,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 { @@ -484,8 +554,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); @@ -494,7 +564,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); @@ -512,7 +582,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 */ @@ -639,31 +709,31 @@ 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; + 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_expression(const expression_t *const expression) { - if (expr->type != EXPR_CONST) return false; + 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; @@ -685,7 +755,8 @@ static expression_t *create_implicit_cast(expression_t *expression, 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); + expression->base.source_position, source_type, + dest_type); return expression; } @@ -720,7 +791,7 @@ static expression_t *create_implicit_cast(expression_t *expression, } type_error_incompatible("can't implicitly cast types", - expression->source_position, source_type, dest_type); + expression->base.source_position, source_type, dest_type); return expression; default: @@ -732,7 +803,7 @@ static expression_t *create_implicit_cast(expression_t *expression, 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; @@ -749,8 +820,8 @@ static void semantic_assign(type_t *orig_type_left, expression_t **right, } if (is_type_pointer(type_left) && is_type_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; + 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; @@ -813,9 +884,9 @@ static expression_t *parse_assignment_expression(void) typedef struct declaration_specifiers_t declaration_specifiers_t; struct declaration_specifiers_t { - storage_class_t storage_class; - bool is_inline; - type_t *type; + unsigned char storage_class; + bool is_inline; + type_t *type; }; static void parse_compound_type_entries(void); @@ -843,7 +914,7 @@ static void parse_attributes(void) { while(true) { switch(token.type) { - case T___attribute__: + case T___attribute__: { next_token(); expect_void('('); @@ -866,6 +937,7 @@ static void parse_attributes(void) } } break; + } case T_asm: next_token(); expect_void('('); @@ -964,7 +1036,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); } } @@ -989,7 +1061,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); } @@ -1046,7 +1118,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); @@ -1075,8 +1147,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"); @@ -1088,7 +1159,7 @@ 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; + compound_type_t *compound_type = &type->compound; context_t *context = & compound_type->declaration->context; declaration_t *first = context->declarations; @@ -1130,7 +1201,7 @@ static initializer_t *parse_sub_initializer(type_t *type, 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"); @@ -1231,7 +1302,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; @@ -1331,16 +1402,15 @@ static type_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; } - enum_type_t *const enum_type = allocate_type_zero(sizeof(enum_type[0])); - enum_type->type.type = TYPE_ENUM; - enum_type->declaration = declaration; + type_t *const type = allocate_type_zero(TYPE_ENUM); + type->enumt.declaration = declaration; if(token.type == '{') { if(declaration->init.is_defined) { @@ -1351,11 +1421,11 @@ static type_t *parse_enum_specifier(void) record_declaration(declaration); declaration->init.is_defined = 1; - parse_enum_entries(enum_type); + parse_enum_entries(&type->enumt); parse_attributes(); } - return (type_t*) enum_type; + return type; } /** @@ -1395,7 +1465,7 @@ restart: type = parse_typename(); } else { expression = parse_expression(); - type = expression->datatype; + type = expression->base.datatype; } break; @@ -1405,18 +1475,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 { @@ -1439,13 +1508,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) @@ -1455,19 +1523,18 @@ 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; while(true) { switch(token.type) { @@ -1489,6 +1556,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: \ @@ -1548,19 +1636,15 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) /* TODO: if type != NULL for the following rules should issue * an error */ case T_struct: { - type = allocate_type_zero(sizeof(struct compound_type_t)); + type = allocate_type_zero(TYPE_COMPOUND_STRUCT); - compound_type_t *compound_type = (compound_type_t*) type; - compound_type->type.type = TYPE_COMPOUND_STRUCT; - compound_type->declaration = parse_compound_type_specifier(true); + type->compound.declaration = parse_compound_type_specifier(true); break; } case T_union: { - type = allocate_type_zero(sizeof(compound_type_t)); + type = allocate_type_zero(TYPE_COMPOUND_STRUCT); - compound_type_t *compound_type = (compound_type_t*) type; - compound_type->type.type = TYPE_COMPOUND_UNION; - compound_type->declaration = parse_compound_type_specifier(false); + type->compound.declaration = parse_compound_type_specifier(false); break; } case T_enum: @@ -1709,22 +1793,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->base.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); } @@ -1756,7 +1837,11 @@ static void parse_identifier_list(void) T_IDENTIFIER, 0); return; } + declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); + declaration->symbol = token.v.symbol; + next_token(); + if(token.type != ',') break; next_token(); @@ -1781,8 +1866,7 @@ 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; + 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); } @@ -1828,7 +1912,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 +1957,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 +2026,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 +2147,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); + + 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; - 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; + 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... */ @@ -2211,24 +2293,23 @@ static void parse_init_declarators(const declaration_specifiers_t *specifiers) initializer_t *initializer = parse_initializer(type); if(type->type == TYPE_ARRAY && initializer != NULL) { - array_type_t *array_type = (array_type_t*) type; + array_type_t *array_type = &type->array; if(array_type->size == NULL) { - const_t *cnst = allocate_ast_zero(sizeof(cnst[0])); + expression_t *cnst = allocate_expression_zero(EXPR_CONST); - cnst->expression.type = EXPR_CONST; - cnst->expression.datatype = type_size_t; + cnst->base.datatype = type_size_t; if(initializer->type == INITIALIZER_LIST) { initializer_list_t *list = &initializer->list; - cnst->v.int_value = list->len; + cnst->conste.v.int_value = list->len; } else { assert(initializer->type == INITIALIZER_STRING); initializer_string_t *string = &initializer->string; - cnst->v.int_value = strlen(string->string) + 1; + cnst->conste.v.int_value = strlen(string->string) + 1; } - array_type->size = (expression_t*) cnst; + array_type->size = cnst; } } @@ -2243,6 +2324,19 @@ static void parse_init_declarators(const declaration_specifiers_t *specifiers) eat_block(); continue; } + function_type_t *function_type = &type->function; + /* § 6.7.5.3 (14) a function definition with () means no + * parameters */ + if(function_type->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); + } + function_type = &type->function; + } if(declaration->init.statement != NULL) { parser_error_multiple_definition(declaration, ndeclaration); @@ -2349,8 +2443,8 @@ static void parse_declaration(void) 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; + const compound_type_t *const comp_type + = &specifiers.type->compound; if (comp_type->declaration->symbol == NULL) { parse_warning_pos(source_position, "unnamed struct/union that defines no instances"); @@ -2414,9 +2508,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; } @@ -2434,54 +2527,45 @@ 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 (expression_t*) cnst; + 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])); + type_t *ntype = allocate_type_zero(TYPE_FUNCTION); + ntype->function.result_type = type_int; + ntype->function.unspecified_parameters = true; - function_type->type.type = TYPE_FUNCTION; - function_type->result_type = type_int; - function_type->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])); @@ -2510,16 +2594,17 @@ static declaration_t *create_implicit_function(symbol_t *symbol, 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])); + function_parameter_t *parameter + = obstack_alloc(type_obst, sizeof(parameter[0])); + memset(parameter, 0, 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 *type = allocate_type_zero(TYPE_FUNCTION); + type->function.result_type = result_type; + type->function.parameters = parameter; - type_t *result = typehash_insert((type_t*) type); - if(result != (type_t*) type) { + type_t *result = typehash_insert(type); + if(result != type) { free_type(type); } @@ -2545,7 +2630,7 @@ static type_t *automatic_type_conversion(type_t *type) return NULL; 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; unsigned qualifiers = array_type->type.qualifiers; @@ -2565,27 +2650,24 @@ static type_t *automatic_type_conversion(type_t *type) */ type_t *revert_automatic_type_conversion(const expression_t *expression) { - if(expression->datatype == NULL) + if(expression->base.datatype == NULL) return NULL; switch(expression->type) { case EXPR_REFERENCE: { - const reference_expression_t *ref - = (const reference_expression_t*) expression; + const reference_expression_t *ref = &expression->reference; return ref->declaration->type; } case EXPR_SELECT: { - const select_expression_t *select - = (const select_expression_t*) expression; + const select_expression_t *select = &expression->select; return select->compound_entry->type; } case EXPR_UNARY: { - const unary_expression_t *unary - = (const unary_expression_t*) expression; + const unary_expression_t *unary = &expression->unary; if(unary->type == UNEXPR_DEREFERENCE) { expression_t *value = unary->value; - type_t *type = skip_typeref(value->datatype); - pointer_type_t *pointer_type = (pointer_type_t*) type; + type_t *type = skip_typeref(value->base.datatype); + pointer_type_t *pointer_type = &type->pointer; return pointer_type->points_to; } @@ -2593,15 +2675,16 @@ type_t *revert_automatic_type_conversion(const expression_t *expression) } case EXPR_BUILTIN_SYMBOL: { const builtin_symbol_expression_t *builtin - = (const builtin_symbol_expression_t*) expression; + = &expression->builtin_symbol; return get_builtin_symbol_type(builtin->symbol); } case EXPR_ARRAY_ACCESS: { const array_access_expression_t *array_access - = (const array_access_expression_t*) expression; - type_t *type_left = skip_typeref(array_access->array_ref->datatype); + = &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 = (pointer_type_t*) type_left; + pointer_type_t *pointer_type = &type_left->pointer; return pointer_type->points_to; } @@ -2609,15 +2692,15 @@ type_t *revert_automatic_type_conversion(const expression_t *expression) break; } - return expression->datatype; + 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); @@ -2639,7 +2722,7 @@ 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; } } @@ -2651,7 +2734,7 @@ static expression_t *parse_reference(void) ref->declaration = declaration; ref->expression.datatype = type; - return (expression_t*) ref; + return expression; } static void check_cast_allowed(expression_t *expression, type_t *dest_type) @@ -2663,11 +2746,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(); @@ -2676,48 +2758,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 - = (compound_statement_t*) statement; + 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 = compound_statement->statements; - for( ; iter != NULL; iter = iter->next) { + for( ; iter != NULL; iter = iter->base.next) { last_statement = iter; } if(last_statement->type == STATEMENT_EXPRESSION) { - const expression_statement_t *expression_statement = - (const expression_statement_t*) last_statement; - expression->expression.datatype - = expression_statement->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) @@ -2753,7 +2832,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"; @@ -2766,7 +2847,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"; @@ -2829,50 +2912,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; + 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); + + symbol_t *symbol = token.v.symbol; - expression->symbol = token.v.symbol; + expression->builtin_symbol.symbol = symbol; next_token(); - type_t *type = get_builtin_symbol_type(expression->symbol); + type_t *type = get_builtin_symbol_type(symbol); type = automatic_type_conversion(type); - expression->expression.datatype = type; - return (expression_t*) expression; + expression->base.datatype = type; + return expression; } static expression_t *parse_primary_expression(void) @@ -2928,18 +3008,21 @@ static expression_t *parse_array_expression(unsigned precedence, array_access->expression.type = EXPR_ARRAY_ACCESS; - type_t *type_left = skip_typeref(left->datatype); - type_t *type_inside = skip_typeref(inside->datatype); - type_t *result_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 = (pointer_type_t*) 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 = (pointer_type_t*) type_inside; + pointer_type_t *pointer = &type_inside->pointer; result_type = pointer->points_to; array_access->array_ref = inside; array_access->index = left; @@ -3002,10 +3085,10 @@ static expression_t *parse_sizeof(unsigned precedence) sizeof_expression->type = parse_typename(); expect(')'); } else { - expression_t *expression = parse_sub_expression(precedence); - expression->datatype = revert_automatic_type_conversion(expression); + expression_t *expression = parse_sub_expression(precedence); + expression->base.datatype = revert_automatic_type_conversion(expression); - sizeof_expression->type = expression->datatype; + sizeof_expression->type = expression->base.datatype; sizeof_expression->size_expression = expression; } @@ -3021,20 +3104,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(); @@ -3049,7 +3130,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); @@ -3064,7 +3145,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) { @@ -3093,32 +3174,32 @@ static expression_t *parse_select_expression(unsigned precedence, * code to revert this! */ type_t *expression_type = automatic_type_conversion(iter->type); - select->compound_entry = iter; - select->expression.datatype = expression_type; - return (expression_t*) select; + 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; + call_expression_t *call = &result->call; + call->function = expression; + + function_type_t *function_type = NULL; + type_t *orig_type = expression->base.datatype; if(orig_type != NULL) { - function_type = NULL; type_t *type = skip_typeref(orig_type); if(is_type_pointer(type)) { - pointer_type_t *pointer_type = (pointer_type_t*) type; + pointer_type_t *pointer_type = &type->pointer; type = skip_typeref(pointer_type->points_to); if (type->type == TYPE_FUNCTION) { - function_type = (function_type_t*) type; + function_type = &type->function; call->expression.datatype = function_type->result_type; } } @@ -3186,7 +3267,7 @@ 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; type = skip_typeref(type); if(type == NULL) @@ -3205,7 +3286,7 @@ 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); @@ -3221,12 +3302,12 @@ static expression_t *parse_conditional_expression(unsigned precedence, conditional->condition = expression; /* 6.5.15.2 */ - type_t *condition_type_orig = conditional->condition->datatype; + type_t *condition_type_orig = conditional->condition->base.datatype; if(condition_type_orig != NULL) { 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", + expression->base.source_position, condition_type_orig); } } @@ -3236,10 +3317,10 @@ static expression_t *parse_conditional_expression(unsigned precedence, expression_t *const f_expr = parse_sub_expression(precedence); conditional->false_expression = f_expr; - type_t *const true_type = t_expr->datatype; + type_t *const true_type = t_expr->base.datatype; if(true_type == NULL) return (expression_t*) conditional; - type_t *const false_type = f_expr->datatype; + type_t *const false_type = f_expr->base.datatype; if(false_type == NULL) return (expression_t*) conditional; @@ -3269,7 +3350,7 @@ static expression_t *parse_conditional_expression(unsigned precedence, /* TODO */ } else { type_error_incompatible("while parsing conditional", - expression->source_position, true_type, + expression->base.source_position, true_type, skipped_false_type); } @@ -3304,7 +3385,7 @@ static expression_t *parse_builtin_classify_type(const unsigned precedence) 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; @@ -3321,7 +3402,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; @@ -3338,7 +3419,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; @@ -3353,7 +3434,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; @@ -3368,20 +3449,20 @@ 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); if(!is_type_pointer(type)) { parser_print_error_prefix(); - fputs("'Unary *' needs pointer or arrray type, but type ", stderr); + fputs("Unary '*' needs pointer or arrray type, but type ", stderr); print_type_quoted(orig_type); fputs(" given.\n", stderr); return; } - pointer_type_t *pointer_type = (pointer_type_t*)type; + pointer_type_t *pointer_type = &type->pointer; type_t *result_type = pointer_type->points_to; result_type = automatic_type_conversion(result_type); @@ -3390,10 +3471,10 @@ static void semantic_dereference(unary_expression_t *expression) static void semantic_take_addr(unary_expression_t *expression) { - expression_t *value = expression->value; - value->datatype = revert_automatic_type_conversion(value); + expression_t *value = expression->value; + value->base.datatype = revert_automatic_type_conversion(value); - type_t *orig_type = value->datatype; + type_t *orig_type = value->base.datatype; if(orig_type == NULL) return; @@ -3481,7 +3562,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 { @@ -3500,8 +3583,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; @@ -3526,8 +3609,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; @@ -3554,8 +3637,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; @@ -3588,8 +3671,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; @@ -3632,8 +3715,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; @@ -3665,8 +3748,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; @@ -3694,8 +3777,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; @@ -3728,8 +3811,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; @@ -3757,7 +3840,7 @@ static bool has_const_fields(type_t *type) 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; @@ -3808,7 +3891,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) \ @@ -3892,7 +3975,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) { @@ -3909,7 +3992,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; @@ -3929,7 +4012,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"); } @@ -3945,7 +4028,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"); @@ -4258,9 +4341,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; } @@ -4270,9 +4353,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; } @@ -4287,14 +4370,25 @@ static statement_t *parse_return(void) 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 == type_void && return_value->datatype != type_void) { + 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(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 { @@ -4303,16 +4397,13 @@ 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->return_value = return_value; - expect(';'); - return (statement_t*) statement; } @@ -4449,7 +4540,8 @@ 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; } @@ -4475,13 +4567,13 @@ static statement_t *parse_compound_statement(void) continue; if(last_statement != NULL) { - last_statement->next = statement; + last_statement->base.next = statement; } else { compound_statement->statements = statement; } - while(statement->next != NULL) - statement = statement->next; + while(statement->base.next != NULL) + statement = statement->base.next; last_statement = statement; } @@ -4554,7 +4646,6 @@ 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_float = make_atomic_type(ATOMIC_TYPE_FLOAT, TYPE_QUALIFIER_NONE);