X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=f63c266191aa9d3044f7d4d149ca1931e74a4c8e;hb=92f3ee4c4e6f2709baa59bbf3ef1aae1d711f855;hp=c024adefbc589aeb2319541a2fcf128593bbb25b;hpb=eb232af6c629af00a9b29b3a05ac2acc55393cb4;p=cparser diff --git a/parser.c b/parser.c index c024ade..f63c266 100644 --- a/parser.c +++ b/parser.c @@ -22,9 +22,19 @@ typedef struct { declaration_t *old_declaration; symbol_t *symbol; - unsigned short namespace; + 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,15 +48,19 @@ 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_size_t = NULL; -static type_t *type_ptrdiff_t = NULL; +static type_t *type_void_ptr = NULL; +static type_t *type_valist = 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); @@ -55,6 +69,13 @@ 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); + +static void semantic_comparison(binary_expression_t *expression); + #define STORAGE_CLASSES \ case T_typedef: \ case T_extern: \ @@ -71,33 +92,30 @@ static type_t *parse_typename(void); #ifdef PROVIDE_COMPLEX #define COMPLEX_SPECIFIERS \ case T__Complex: -#else -#define COMPLEX_SPECIFIERS -#endif - -#ifdef PROVIDE_IMAGINARY #define IMAGINARY_SPECIFIERS \ case T__Imaginary: #else +#define COMPLEX_SPECIFIERS #define IMAGINARY_SPECIFIERS #endif -#define TYPE_SPECIFIERS \ - case T_void: \ - case T_char: \ - case T_short: \ - case T_int: \ - case T_long: \ - case T_float: \ - case T_double: \ - case T_signed: \ - case T_unsigned: \ - case T__Bool: \ - case T_struct: \ - case T_union: \ - case T_enum: \ - case T___typeof__: \ - COMPLEX_SPECIFIERS \ +#define TYPE_SPECIFIERS \ + case T_void: \ + case T_char: \ + case T_short: \ + case T_int: \ + case T_long: \ + case T_float: \ + case T_double: \ + case T_signed: \ + case T_unsigned: \ + case T__Bool: \ + case T_struct: \ + case T_union: \ + case T_enum: \ + case T___typeof__: \ + case T___builtin_va_list: \ + COMPLEX_SPECIFIERS \ IMAGINARY_SPECIFIERS #define DECLARATION_START \ @@ -109,21 +127,143 @@ 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(type <= sizeof(sizes) / sizeof(sizes[0])); + 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_FIRST] = sizeof(unary_expression_t), + [EXPR_BINARY_FIRST] = sizeof(binary_expression_t), + [EXPR_CONDITIONAL] = sizeof(conditional_expression_t), + [EXPR_SELECT] = sizeof(select_expression_t), + [EXPR_ARRAY_ACCESS] = sizeof(array_access_expression_t), + [EXPR_SIZEOF] = sizeof(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_START] = sizeof(va_start_expression_t), + [EXPR_VA_ARG] = sizeof(va_arg_expression_t), + [EXPR_STATEMENT] = sizeof(statement_expression_t), + }; + if(type >= EXPR_UNARY_FIRST && type <= EXPR_UNARY_LAST) { + return sizes[EXPR_UNARY_FIRST]; + } + if(type >= EXPR_BINARY_FIRST && type <= EXPR_BINARY_LAST) { + return sizes[EXPR_BINARY_FIRST]; + } + assert(type <= sizeof(sizes) / sizeof(sizes[0])); + 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_WIDE_STRING] = sizeof(initializer_wide_string_t), + [INITIALIZER_LIST] = sizeof(initializer_list_t) + }; + assert(type < sizeof(sizes) / sizeof(*sizes)); + 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); } @@ -131,12 +271,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); } @@ -161,7 +301,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) @@ -178,7 +318,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); } @@ -208,12 +348,23 @@ static void parser_print_warning_prefix_pos( fputs("warning: ", stderr); } -static void parse_warning(const char *message) +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) { - parser_print_prefix_pos(token.source_position); + parser_print_prefix_pos(source_position); fprintf(stderr, "warning: %s\n", message); } +static void parse_warning(const char *message) +{ + parse_warning_pos(token.source_position, message); +} + static void parse_error_expected(const char *message, ...) { va_list args; @@ -257,7 +408,6 @@ static void type_error(const char *msg, const source_position_t source_position, fprintf(stderr, "%s, but found type ", msg); print_type_quoted(type); fputc('\n', stderr); - error(); } static void type_error_incompatible(const char *msg, @@ -269,7 +419,6 @@ static void type_error_incompatible(const char *msg, fprintf(stderr, " - "); print_type_quoted(type2); fprintf(stderr, ")\n"); - error(); } static void eat_block(void) @@ -305,7 +454,7 @@ static void eat_statement(void) eat(';'); } -static void eat_brace(void) +static void eat_paren(void) { if(token.type == '(') next_token(); @@ -317,7 +466,7 @@ static void eat_brace(void) return; } if(token.type == '(') { - eat_brace(); + eat_paren(); continue; } if(token.type == '{') { @@ -337,6 +486,14 @@ static void eat_brace(void) } \ next_token(); +#define expect_block(expected) \ + if(UNLIKELY(token.type != (expected))) { \ + parse_error_expected(NULL, (expected), 0); \ + eat_block(); \ + return NULL; \ + } \ + next_token(); + #define expect_void(expected) \ if(UNLIKELY(token.type != (expected))) { \ parse_error_expected(NULL, (expected), 0); \ @@ -361,27 +518,35 @@ 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) { - /* TODO: not correct yet */ - return declaration->type == previous->type; + /* happens for K&R style function parameters */ + if(previous->type == NULL) { + previous->type = declaration->type; + return true; + } + + type_t *type1 = skip_typeref(declaration->type); + type_t *type2 = skip_typeref(previous->type); + + return types_compatible(type1, type2); } -static declaration_t *get_declaration(symbol_t *symbol, namespace_t namespace) +static declaration_t *get_declaration(symbol_t *symbol, namespace_t namespc) { declaration_t *declaration = symbol->declaration; for( ; declaration != NULL; declaration = declaration->symbol_next) { - if(declaration->namespace == namespace) + if(declaration->namespc == namespc) return declaration; } return NULL; } -static const char *get_namespace_prefix(namespace_t namespace) +static const char *get_namespace_prefix(namespace_t namespc) { - switch(namespace) { + switch(namespc) { case NAMESPACE_NORMAL: return ""; case NAMESPACE_UNION: @@ -405,21 +570,19 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr, context_t *parent_context) { symbol_t *symbol = declaration->symbol; - namespace_t namespace = declaration->namespace; + 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, namespace); + declaration_t *previous_declaration = get_declaration(symbol, namespc); assert(declaration != previous_declaration); if(previous_declaration != NULL && previous_declaration->parent_context == context) { if(!is_compatible_declaration(declaration, previous_declaration)) { parser_print_error_prefix_pos(declaration->source_position); - fprintf(stderr, "definition of symbol %s%s with type ", - get_namespace_prefix(namespace), symbol->string); - error(); + fprintf(stderr, "definition of symbol '%s%s' with type ", + get_namespace_prefix(namespc), symbol->string); print_type_quoted(declaration->type); fputc('\n', stderr); parser_print_error_prefix_pos( @@ -428,6 +591,54 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr, "of type "); print_type_quoted(previous_declaration->type); fputc('\n', stderr); + } else { + unsigned old_storage_class = previous_declaration->storage_class; + unsigned new_storage_class = declaration->storage_class; + if (current_function == NULL) { + 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", + symbol->string); + parser_print_error_prefix_pos(previous_declaration->source_position); + fprintf(stderr, "previous declaration of '%s' was here\n", + symbol->string); + } else { + if (old_storage_class == STORAGE_CLASS_EXTERN) { + if (new_storage_class == STORAGE_CLASS_NONE) { + previous_declaration->storage_class = STORAGE_CLASS_NONE; + } + } else { + parser_print_warning_prefix_pos(declaration->source_position); + fprintf(stderr, "redundant declaration for '%s'\n", + symbol->string); + parser_print_warning_prefix_pos(previous_declaration->source_position); + fprintf(stderr, "previous declaration of '%s' was here\n", + symbol->string); + } + } + } else { + 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); + parser_print_warning_prefix_pos(previous_declaration->source_position); + fprintf(stderr, "previous declaration of '%s' was here\n", + symbol->string); + } else { + parser_print_error_prefix_pos(declaration->source_position); + 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); + } + parser_print_error_prefix_pos(previous_declaration->source_position); + fprintf(stderr, "previous declaration of '%s' was here\n", + symbol->string); + } + } } return previous_declaration; } @@ -436,8 +647,8 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr, stack_entry_t entry; entry.symbol = symbol; entry.old_declaration = symbol->declaration; - entry.namespace = namespace; - ARR_APP1(*stack_ptr, entry); + entry.namespc = (unsigned short) namespc; + ARR_APP1(stack_entry_t, *stack_ptr, entry); /* replace/add declaration into declaration list of the symbol */ if(symbol->declaration == NULL) { @@ -447,7 +658,7 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr, declaration_t *iter = symbol->declaration; for( ; iter != NULL; iter_last = iter, iter = iter->symbol_next) { /* replace an entry? */ - if(iter->namespace == namespace) { + if(iter->namespc == namespc) { if(iter_last == NULL) { symbol->declaration = declaration; } else { @@ -491,33 +702,30 @@ 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; - namespace_t namespace = entry->namespace; + namespace_t namespc = (namespace_t)entry->namespc; /* replace/remove declaration */ declaration_t *declaration = symbol->declaration; assert(declaration != NULL); - if(declaration->namespace == namespace) { + if(declaration->namespc == namespc) { if(old_declaration == NULL) { symbol->declaration = declaration->symbol_next; } else { symbol->declaration = old_declaration; - assert(old_declaration->symbol_next == - declaration->symbol_next); } } else { declaration_t *iter_last = declaration; - declaration_t *iter = declaration->next; + declaration_t *iter = declaration->symbol_next; for( ; iter != NULL; iter_last = iter, iter = iter->symbol_next) { /* replace an entry? */ - if(iter->namespace == namespace) { + if(iter->namespc == namespc) { assert(iter_last != NULL); iter_last->symbol_next = old_declaration; - assert(old_declaration->symbol_next == - declaration->symbol_next); + old_declaration->symbol_next = iter->symbol_next; break; } } @@ -541,6 +749,7 @@ static void label_pop_to(size_t new_top) static int get_rank(const type_t *type) { + assert(!is_typeref(type)); /* The C-standard allows promoting to int or unsigned int (see § 7.2.2 * and esp. footnote 108). However we can't fold constants (yet), so we * can't decide wether unsigned int is possible, while int always works. @@ -550,8 +759,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; } @@ -566,20 +775,38 @@ 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_IMPLICIT); + + cast->unary.value = expression; + cast->base.datatype = dest_type; + + return cast; +} + +static bool is_null_pointer_constant(const expression_t *expression) +{ + /* skip void* cast */ + if(expression->type == EXPR_UNARY_CAST + || expression->type == EXPR_UNARY_CAST_IMPLICIT) { + expression = expression->unary.value; + } + + /* TODO: not correct yet, should be any constant integer expression + * which evaluates to 0 */ + if (expression->type != EXPR_CONST) + return false; - cast->expression.type = EXPR_UNARY; - cast->type = UNEXPR_CAST; - cast->value = expression; - cast->expression.datatype = dest_type; + type_t *const type = skip_typeref(expression->base.datatype); + if (!is_type_integer(type)) + return false; - return (expression_t*) cast; + 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; @@ -590,76 +817,133 @@ 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; - if(source_type->type == TYPE_POINTER) { - if(!pointers_compatible(source_type, dest_type)) { - type_error_incompatible("can't implicitely cast types", - expression->source_position, - source_type, dest_type); - return expression; - } else { - return create_cast_expression(expression, dest_type); + 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"); } - } else if(source_type->type == TYPE_ARRAY) { - array_type_t *array_type = (array_type_t*) source_type; - if(!types_compatible(array_type->element_type, - pointer_type->points_to)) { - type_error_incompatible("can't implicitely cast types", - expression->source_position, - source_type, dest_type); - return expression; + + 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; } + return create_cast_expression(expression, dest_type); - } - } - panic("casting of non-atomic types not implemented yet"); + case TYPE_POINTER: + switch (source_type->type) { + case TYPE_ATOMIC: + if (is_null_pointer_constant(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; + + 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; + } + + default: + panic("casting of non-atomic types not implemented yet"); + } + + type_error_incompatible("can't implicitly cast types", + expression->base.source_position, source_type, dest_type); + return expression; + + 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; - type_t *type_left = skip_typeref(orig_type_left); - type_t *type_right = skip_typeref(orig_type_right); + type_t *const type_left = skip_typeref(orig_type_left); + type_t *const type_right = skip_typeref(orig_type_right); - if(type_left == type_right) { - /* fine */ - } else if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { + if ((is_type_arithmetic(type_left) && is_type_arithmetic(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); - } else if(type_left->type == TYPE_POINTER - && type_right->type == TYPE_POINTER) { - /* TODO */ - } else { - /* TODO: improve error message */ - parser_print_error_prefix(); - fprintf(stderr, "incompatible types in %s\n", context); - parser_print_error_prefix(); - print_type_quoted(type_left); - fputs(" <- ", stderr); - print_type_quoted(type_right); - fputs("\n", stderr); + return; + } + + 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; + + points_to_left = skip_typeref(points_to_left); + points_to_right = skip_typeref(points_to_right); + + /* the left type has all qualifiers from the right type */ + unsigned missing_qualifiers + = points_to_right->base.qualifiers & ~points_to_left->base.qualifiers; + if(missing_qualifiers != 0) { + parser_print_error_prefix(); + fprintf(stderr, "destination type "); + print_type_quoted(type_left); + fprintf(stderr, " in %s from type ", context); + print_type_quoted(type_right); + fprintf(stderr, " lacks qualifiers '"); + print_type_qualifiers(missing_qualifiers); + fprintf(stderr, "' in pointed-to type\n"); + return; + } + + points_to_left = get_unqualified_type(points_to_left); + points_to_right = get_unqualified_type(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; + } + + *right = create_implicit_cast(*right, type_left); + return; + } + + if (is_type_compound(type_left) + && types_compatible(type_left, type_right)) { + *right = create_implicit_cast(*right, type_left); + return; } +incompatible_assign_types: + /* TODO: improve error message */ + parser_print_error_prefix(); + fprintf(stderr, "incompatible types in %s\n", context); + parser_print_error_prefix(); + print_type_quoted(orig_type_left); + fputs(" <- ", stderr); + print_type_quoted(orig_type_right); + fputs("\n", stderr); } static expression_t *parse_constant_expression(void) @@ -674,18 +958,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) { @@ -706,7 +996,7 @@ static void parse_attributes(void) { while(true) { switch(token.type) { - case T___attribute__: + case T___attribute__: { next_token(); expect_void('('); @@ -729,13 +1019,14 @@ static void parse_attributes(void) } } break; + } case T_asm: next_token(); expect_void('('); if(token.type != T_STRING_LITERAL) { parse_error_expected("while parsing assembler attribute", T_STRING_LITERAL); - eat_brace(); + eat_paren(); break; } else { parse_string_literals(); @@ -751,6 +1042,7 @@ attributes_finished: ; } +#if 0 static designator_t *parse_designation(void) { if(token.type != '[' && token.type != '.') @@ -793,140 +1085,372 @@ static designator_t *parse_designation(void) last = designator; } } +#endif -static initializer_t *parse_initializer_list(type_t *type); - -static initializer_t *parse_initializer(type_t *type) +static initializer_t *initializer_from_string(array_type_t *type, + const char *string) { - designator_t *designator = parse_designation(); + /* TODO: check len vs. size of array type */ + (void) type; - initializer_t *result; - if(token.type == '{') { - result = parse_initializer_list(type); - } else { - result = allocate_ast_zero(sizeof(result[0])); - result->type = INITIALIZER_VALUE; - result->v.value = parse_assignment_expression(); + initializer_t *initializer = allocate_initializer(INITIALIZER_STRING); + initializer->string.string = string; - if(type != NULL) { - semantic_assign(type, &result->v.value, "initializer"); - } - } - result->designator = designator; + return initializer; +} - return result; +static initializer_t *initializer_from_wide_string(array_type_t *const type, + wide_string_t *const string) +{ + /* TODO: check len vs. size of array type */ + (void) type; + + initializer_t *const initializer = + allocate_initializer(INITIALIZER_WIDE_STRING); + initializer->wide_string.string = *string; + + return initializer; } -static initializer_t *parse_initializer_list(type_t *type) +static initializer_t *initializer_from_expression(type_t *type, + expression_t *expression) { - eat('{'); + /* TODO check that expression is a constant expression */ - /* TODO: semantic */ - (void) type; + /* § 6.7.8.14/15 char array may be initialized by string literals */ + type_t *const expr_type = expression->base.datatype; + if (is_type_array(type) && expr_type->type == TYPE_POINTER) { + array_type_t *const array_type = &type->array; + type_t *const element_type = skip_typeref(array_type->element_type); - initializer_t *result = allocate_ast_zero(sizeof(result[0])); - result->type = INITIALIZER_LIST; + if (element_type->type == TYPE_ATOMIC) { + switch (expression->type) { + case EXPR_STRING_LITERAL: + if (element_type->atomic.atype == ATOMIC_TYPE_CHAR) { + return initializer_from_string(array_type, + expression->string.value); + } - initializer_t *last = NULL; - while(1) { - initializer_t *initializer = parse_initializer(NULL); - if(last != NULL) { - last->next = initializer; - } else { - result->v.list = initializer; + case EXPR_WIDE_STRING_LITERAL: { + type_t *bare_wchar_type = skip_typeref(type_wchar_t); + if (get_unqualified_type(element_type) == bare_wchar_type) { + return initializer_from_wide_string(array_type, + &expression->wide_string.value); + } + } + + default: break; + } } - last = initializer; + } - if(token.type == '}') - break; + type_t *expression_type = skip_typeref(expression->base.datatype); + if(is_type_scalar(type) || types_compatible(type, expression_type)) { + semantic_assign(type, &expression, "initializer"); - if(token.type != ',') { - parse_error_expected("while parsing initializer list", ',', '}', 0); - eat_block(); - return result; - } - eat(','); + initializer_t *result = allocate_initializer(INITIALIZER_VALUE); + result->value.value = expression; - if(token.type == '}') - break; + return result; } - expect('}'); - - return result; + return NULL; } -static declaration_t *parse_compound_type_specifier(bool is_struct) +static initializer_t *parse_sub_initializer(type_t *type, + expression_t *expression, + type_t *expression_type); + +static initializer_t *parse_sub_initializer_elem(type_t *type) { - if(is_struct) { - eat(T_struct); - } else { - eat(T_union); + if(token.type == '{') { + return parse_sub_initializer(type, NULL, NULL); } - symbol_t *symbol = NULL; - declaration_t *declaration = NULL; + expression_t *expression = parse_assignment_expression(); + type_t *expression_type = skip_typeref(expression->base.datatype); - if(token.type == T_IDENTIFIER) { - symbol = token.v.symbol; - next_token(); + return parse_sub_initializer(type, expression, expression_type); +} - if(is_struct) { - declaration = get_declaration(symbol, NAMESPACE_STRUCT); - } else { - declaration = get_declaration(symbol, NAMESPACE_UNION); +static bool had_initializer_brace_warning; + +static initializer_t *parse_sub_initializer(type_t *type, + expression_t *expression, + type_t *expression_type) +{ + if(is_type_scalar(type)) { + /* there might be extra {} hierarchies */ + if(token.type == '{') { + next_token(); + if(!had_initializer_brace_warning) { + parse_warning("braces around scalar initializer"); + had_initializer_brace_warning = true; + } + initializer_t *result = parse_sub_initializer(type, NULL, NULL); + if(token.type == ',') { + next_token(); + /* TODO: warn about excessive elements */ + } + expect_block('}'); + return result; } - } else if(token.type != '{') { - if(is_struct) { - parse_error_expected("while parsing struct type specifier", - T_IDENTIFIER, '{', 0); - } else { - parse_error_expected("while parsing union type specifier", - T_IDENTIFIER, '{', 0); + + if(expression == NULL) { + expression = parse_assignment_expression(); } + return initializer_from_expression(type, expression); + } - return NULL; + /* does the expression match the currently looked at object to initalize */ + if(expression != NULL) { + initializer_t *result = initializer_from_expression(type, expression); + if(result != NULL) + return result; } - if(declaration == NULL) { - declaration = allocate_type_zero(sizeof(declaration[0])); + bool read_paren = false; + if(token.type == '{') { + next_token(); + read_paren = true; + } - if(is_struct) { - declaration->namespace = NAMESPACE_STRUCT; + /* descend into subtype */ + initializer_t *result = NULL; + initializer_t **elems; + if(is_type_array(type)) { + array_type_t *array_type = &type->array; + type_t *element_type = array_type->element_type; + element_type = skip_typeref(element_type); + + initializer_t *sub; + had_initializer_brace_warning = false; + if(expression == NULL) { + sub = parse_sub_initializer_elem(element_type); } else { - declaration->namespace = NAMESPACE_UNION; + sub = parse_sub_initializer(element_type, expression, + expression_type); } - declaration->source_position = token.source_position; - declaration->symbol = symbol; - record_declaration(declaration); - } - if(token.type == '{') { - if(declaration->init.is_defined) { - assert(symbol != NULL); - parser_print_error_prefix(); - fprintf(stderr, "multiple definition of %s %s\n", - is_struct ? "struct" : "union", symbol->string); - declaration->context.declarations = NULL; + /* didn't match the subtypes -> try the parent type */ + if(sub == NULL) { + assert(!read_paren); + return NULL; } - declaration->init.is_defined = true; - int top = environment_top(); - context_t *last_context = context; - set_context(& declaration->context); + elems = NEW_ARR_F(initializer_t*, 0); + ARR_APP1(initializer_t*, elems, sub); - parse_compound_type_entries(); - parse_attributes(); + while(true) { + if(token.type == '}') + break; + expect_block(','); + if(token.type == '}') + break; - assert(context == & declaration->context); - set_context(last_context); - environment_pop_to(top); - } + sub = parse_sub_initializer_elem(element_type); + if(sub == NULL) { + /* TODO error, do nicer cleanup */ + parse_error("member initializer didn't match"); + DEL_ARR_F(elems); + return NULL; + } + ARR_APP1(initializer_t*, elems, sub); + } + } else { + assert(is_type_compound(type)); + compound_type_t *compound_type = &type->compound; + context_t *context = &compound_type->declaration->context; + + declaration_t *first = context->declarations; + if(first == NULL) + return NULL; + type_t *first_type = first->type; + first_type = skip_typeref(first_type); + + initializer_t *sub; + had_initializer_brace_warning = false; + if(expression == NULL) { + sub = parse_sub_initializer_elem(first_type); + } else { + sub = parse_sub_initializer(first_type, expression,expression_type); + } + + /* didn't match the subtypes -> try our parent type */ + if(sub == NULL) { + assert(!read_paren); + return NULL; + } + + elems = NEW_ARR_F(initializer_t*, 0); + ARR_APP1(initializer_t*, elems, sub); + + declaration_t *iter = first->next; + for( ; iter != NULL; iter = iter->next) { + if(iter->symbol == NULL) + continue; + if(iter->namespc != NAMESPACE_NORMAL) + continue; + + if(token.type == '}') + break; + expect_block(','); + if(token.type == '}') + break; + + type_t *iter_type = iter->type; + iter_type = skip_typeref(iter_type); + + sub = parse_sub_initializer_elem(iter_type); + if(sub == NULL) { + /* TODO error, do nicer cleanup*/ + parse_error("member initializer didn't match"); + DEL_ARR_F(elems); + return NULL; + } + ARR_APP1(initializer_t*, elems, sub); + } + } + + int len = ARR_LEN(elems); + size_t elems_size = sizeof(initializer_t*) * len; + + initializer_list_t *init = allocate_ast_zero(sizeof(init[0]) + elems_size); + + init->initializer.type = INITIALIZER_LIST; + init->len = len; + memcpy(init->initializers, elems, elems_size); + DEL_ARR_F(elems); + + result = (initializer_t*) init; + + if(read_paren) { + if(token.type == ',') + next_token(); + expect('}'); + } + return result; +} + +static initializer_t *parse_initializer(type_t *type) +{ + initializer_t *result; + + type = skip_typeref(type); + + if(token.type != '{') { + expression_t *expression = parse_assignment_expression(); + initializer_t *initializer = initializer_from_expression(type, expression); + if(initializer == NULL) { + parser_print_error_prefix(); + fprintf(stderr, "initializer expression '"); + print_expression(expression); + fprintf(stderr, "', type "); + print_type_quoted(expression->base.datatype); + fprintf(stderr, " is incompatible with type "); + print_type_quoted(type); + fprintf(stderr, "\n"); + } + return initializer; + } + + if(is_type_scalar(type)) { + /* § 6.7.8.11 */ + eat('{'); + + expression_t *expression = parse_assignment_expression(); + result = initializer_from_expression(type, expression); + + if(token.type == ',') + next_token(); + + expect('}'); + return result; + } else { + result = parse_sub_initializer(type, NULL, NULL); + } + + return result; +} + + + +static declaration_t *parse_compound_type_specifier(bool is_struct) +{ + if(is_struct) { + eat(T_struct); + } else { + eat(T_union); + } + + symbol_t *symbol = NULL; + declaration_t *declaration = NULL; + + if (token.type == T___attribute__) { + /* TODO */ + parse_attributes(); + } + + if(token.type == T_IDENTIFIER) { + symbol = token.v.symbol; + next_token(); + + if(is_struct) { + declaration = get_declaration(symbol, NAMESPACE_STRUCT); + } else { + declaration = get_declaration(symbol, NAMESPACE_UNION); + } + } else if(token.type != '{') { + if(is_struct) { + parse_error_expected("while parsing struct type specifier", + T_IDENTIFIER, '{', 0); + } else { + parse_error_expected("while parsing union type specifier", + T_IDENTIFIER, '{', 0); + } + + return NULL; + } + + if(declaration == NULL) { + declaration = allocate_ast_zero(sizeof(declaration[0])); + + if(is_struct) { + declaration->namespc = NAMESPACE_STRUCT; + } else { + declaration->namespc = NAMESPACE_UNION; + } + declaration->source_position = token.source_position; + declaration->symbol = symbol; + record_declaration(declaration); + } + + if(token.type == '{') { + if(declaration->init.is_defined) { + assert(symbol != NULL); + parser_print_error_prefix(); + fprintf(stderr, "multiple definition of %s %s\n", + is_struct ? "struct" : "union", symbol->string); + declaration->context.declarations = NULL; + } + declaration->init.is_defined = true; + + int top = environment_top(); + context_t *last_context = context; + set_context(&declaration->context); + + parse_compound_type_entries(); + parse_attributes(); + + assert(context == &declaration->context); + set_context(last_context); + environment_pop_to(top); + } return declaration; } -static void parse_enum_entries(void) +static void parse_enum_entries(enum_type_t *const enum_type) { eat('{'); @@ -945,13 +1469,16 @@ static void parse_enum_entries(void) return; } entry->storage_class = STORAGE_CLASS_ENUM_ENTRY; + entry->type = (type_t*) enum_type; entry->symbol = token.v.symbol; entry->source_position = token.source_position; next_token(); if(token.type == '=') { next_token(); - entry->init.initializer = parse_initializer(type_int); + entry->init.enum_value = parse_constant_expression(); + + /* TODO semantic */ } record_declaration(entry); @@ -964,7 +1491,7 @@ static void parse_enum_entries(void) expect_void('}'); } -static declaration_t *parse_enum_specifier(void) +static type_t *parse_enum_specifier(void) { eat(T_enum); @@ -986,13 +1513,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->namespace = NAMESPACE_ENUM; + 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(); @@ -1002,11 +1532,11 @@ static declaration_t *parse_enum_specifier(void) record_declaration(declaration); declaration->init.is_defined = 1; - parse_enum_entries(); + parse_enum_entries(&type->enumt); parse_attributes(); } - return declaration; + return type; } /** @@ -1014,12 +1544,11 @@ static declaration_t *parse_enum_specifier(void) */ static bool is_typedef_symbol(symbol_t *symbol) { - declaration_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL); - if(declaration == NULL - || declaration->storage_class != STORAGE_CLASS_TYPEDEF) - return false; - - return true; + const declaration_t *const declaration = + get_declaration(symbol, NAMESPACE_NORMAL); + return + declaration != NULL && + declaration->storage_class == STORAGE_CLASS_TYPEDEF; } static type_t *parse_typeof(void) @@ -1047,7 +1576,7 @@ restart: type = parse_typename(); } else { expression = parse_expression(); - type = expression->datatype; + type = expression->base.datatype; } break; @@ -1057,18 +1586,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 { @@ -1085,21 +1613,23 @@ typedef enum { SPECIFIER_VOID = 1 << 10, #ifdef PROVIDE_COMPLEX SPECIFIER_COMPLEX = 1 << 11, -#endif -#ifdef PROVIDE_IMAGINARY SPECIFIER_IMAGINARY = 1 << 12, #endif } specifiers_t; -static type_t *create_builtin_type(symbol_t *symbol) +static type_t *create_builtin_type(symbol_t *const symbol, + type_t *const real_type) { - builtin_type_t *type = allocate_type_zero(sizeof(type[0])); - type->type.type = TYPE_BUILTIN; - type->symbol = symbol; - /* TODO... */ - type->real_type = type_int; + type_t *type = allocate_type_zero(TYPE_BUILTIN); + type->builtin.symbol = symbol; + type->builtin.real_type = real_type; + + type_t *result = typehash_insert(type); + if (type != result) { + free_type(type); + } - return (type_t*) type; + return result; } static type_t *get_typedef_type(symbol_t *symbol) @@ -1109,19 +1639,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) { @@ -1143,6 +1674,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: \ @@ -1181,8 +1733,6 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) MATCH_SPECIFIER(T__Bool, SPECIFIER_BOOL, "_Bool") #ifdef PROVIDE_COMPLEX MATCH_SPECIFIER(T__Complex, SPECIFIER_COMPLEX, "_Complex") -#endif -#ifdef PROVIDE_IMAGINARY MATCH_SPECIFIER(T__Imaginary, SPECIFIER_IMAGINARY, "_Imaginary") #endif case T_inline: @@ -1204,36 +1754,25 @@ 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; case T___builtin_va_list: - type = create_builtin_type(token.v.symbol); + type = duplicate_type(type_valist); next_token(); break; @@ -1341,8 +1880,6 @@ finish_specifiers: case SPECIFIER_LONG | SPECIFIER_DOUBLE | SPECIFIER_COMPLEX: atomic_type = ATOMIC_TYPE_LONG_DOUBLE_COMPLEX; break; -#endif -#ifdef PROVIDE_IMAGINARY case SPECIFIER_FLOAT | SPECIFIER_IMAGINARY: atomic_type = ATOMIC_TYPE_FLOAT_IMAGINARY; break; @@ -1357,7 +1894,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 @@ -1374,31 +1911,28 @@ 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_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); } specifiers->type = result; } -static type_qualifier_t parse_type_qualifiers(void) +static type_qualifiers_t parse_type_qualifiers(void) { - type_qualifier_t type_qualifiers = 0; + type_qualifiers_t type_qualifiers = TYPE_QUALIFIER_NONE; while(true) { switch(token.type) { @@ -1413,18 +1947,65 @@ static type_qualifier_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 void semantic_parameter(declaration_t *declaration) +{ + /* TODO: improve error messages */ + + if(declaration->storage_class == STORAGE_CLASS_TYPEDEF) { + parse_error("typedef not allowed in parameter list"); + } else if(declaration->storage_class != STORAGE_CLASS_NONE + && declaration->storage_class != STORAGE_CLASS_REGISTER) { + parse_error("parameter may only have none or register storage class"); + } + + type_t *orig_type = declaration->type; + if(orig_type == NULL) + return; + type_t *type = skip_typeref(orig_type); + + /* Array as last part of a paramter type is just syntactic sugar. Turn it + * into a pointer. § 6.7.5.3 (7) */ + if (is_type_array(type)) { + const array_type_t *arr_type = &type->array; + type_t *element_type = arr_type->element_type; + + type = make_pointer_type(element_type, type->base.qualifiers); + + declaration->type = type; + } + + if(is_type_incomplete(type)) { + parser_print_error_prefix(); + fprintf(stderr, "incomplete type ("); + print_type_quoted(orig_type); + fprintf(stderr, ") not allowed for parameter '%s'\n", + declaration->symbol->string); } } @@ -1435,13 +2016,9 @@ 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) { - parse_error("typedef not allowed in parameter list"); - } + semantic_parameter(declaration); return declaration; } @@ -1449,11 +2026,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 */ - parse_identifier_list(); - return NULL; + type->kr_style_parameters = true; + return parse_identifier_list(); } } @@ -1484,7 +2060,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) { @@ -1523,19 +2100,19 @@ struct construct_type_t { typedef struct parsed_pointer_t parsed_pointer_t; struct parsed_pointer_t { construct_type_t construct_type; - type_qualifier_t type_qualifiers; + type_qualifiers_t type_qualifiers; }; 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; struct parsed_array_t { construct_type_t construct_type; - type_qualifier_t type_qualifiers; + type_qualifiers_t type_qualifiers; bool is_static; bool is_variable; expression_t *size; @@ -1572,7 +2149,7 @@ static construct_type_t *parse_array_declarator(void) next_token(); } - type_qualifier_t type_qualifiers = parse_type_qualifiers(); + type_qualifiers_t type_qualifiers = parse_type_qualifiers(); if(type_qualifiers != 0) { if(token.type == T_static) { array->is_static = true; @@ -1597,10 +2174,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; } @@ -1617,19 +2193,24 @@ static construct_type_t *parse_function_declarator(declaration_t *declaration) } static construct_type_t *parse_inner_declarator(declaration_t *declaration, - int may_be_abstract) + bool may_be_abstract) { - construct_type_t *result = NULL; - construct_type_t *last = NULL; + /* construct a single linked list of construct_type_t's which describe + * how to construct the final declarator type */ + construct_type_t *first = NULL; + construct_type_t *last = NULL; + /* pointers */ while(token.type == '*') { construct_type_t *type = parse_pointer_declarator(); - if(last != NULL) { - last->next = type; + + if(last == NULL) { + first = type; + last = type; } else { - result = type; + last->next = type; + last = type; } - last = type; } /* TODO: find out if this is correct */ @@ -1656,8 +2237,18 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration, if(may_be_abstract) break; parse_error_expected("while parsing declarator", T_IDENTIFIER, '(', 0); + /* avoid a loop in the outermost scope, because eat_statement doesn't + * eat '}' */ + if(token.type == '}' && current_function == NULL) { + next_token(); + } else { + eat_statement(); + } + return NULL; } + construct_type_t *p = last; + while(true) { construct_type_t *type; switch(token.type) { @@ -1671,27 +2262,32 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration, goto declarator_finished; } - if(last != NULL) { - last->next = type; + /* insert in the middle of the list (behind p) */ + if(p != NULL) { + type->next = p->next; + p->next = type; } else { - result = type; + type->next = first; + first = type; + } + if(last == p) { + last = type; } - last = type; } declarator_finished: parse_attributes(); - if(inner_types != NULL) { - if(last != NULL) { - last->next = inner_types; - } else { - result = inner_types; - } - last = inner_types; + /* append inner_types at the end of the list, we don't to set last anymore + * as it's not needed anymore */ + if(last == NULL) { + assert(first == NULL); + first = inner_types; + } else { + last->next = inner_types; } - return result; + return first; } static type_t *construct_declarator_type(construct_type_t *construct_list, @@ -1699,51 +2295,53 @@ 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; - function_type->result_type = type; - type = (type_t*) function_type; + type_t *function_type = construct_function_type->function_type; + + function_type->function.return_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 = (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; + 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; + + type = array_type; break; } + } - type_t *hashed_type = typehash_insert((type_t*) type); + type_t *hashed_type = typehash_insert(type); if(hashed_type != type) { - free_type(type); + /* the function type was constructed earlier freeing it here will + * destroy other types... */ + if(iter->type != CONSTRUCT_FUNCTION) { + free_type(type); + } type = hashed_type; } } @@ -1752,9 +2350,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; @@ -1784,6 +2382,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; @@ -1805,96 +2404,373 @@ 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); - fprintf(stderr, "this is the location of the previous " - "definition.\n"); - error(); + 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); + switch(token->type) { + TYPE_SPECIFIERS + return true; + case T_IDENTIFIER: + return is_typedef_symbol(token->v.symbol); - declaration_t *declaration = record_declaration(ndeclaration); + case T___extension__: + STORAGE_CLASSES + TYPE_QUALIFIERS + return !only_type_specifiers; - type_t *type = declaration->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); - } + default: + return false; + } +} - if(token.type == '=') { - next_token(); +static void parse_init_declarator_rest(declaration_t *declaration) +{ + eat('='); - /* TODO: check that this is an allowed type (no function type) */ + type_t *orig_type = declaration->type; + type_t *type = NULL; + if(orig_type != NULL) + type = skip_typeref(orig_type); - if(declaration->init.initializer != NULL) { - parser_error_multiple_definition(declaration, ndeclaration); - } + if(declaration->init.initializer != NULL) { + parser_error_multiple_definition(declaration, token.source_position); + } - ndeclaration->init.initializer = parse_initializer(declaration->type); - } else if(token.type == '{') { - if(declaration->type->type != TYPE_FUNCTION) { - parser_print_error_prefix(); - fprintf(stderr, "Declarator "); - print_type_ext(declaration->type, declaration->symbol, NULL); - fprintf(stderr, " has a body but is not a function type.\n"); - eat_block(); - continue; - } + initializer_t *initializer = parse_initializer(type); - if(declaration->init.statement != NULL) { - parser_error_multiple_definition(declaration, ndeclaration); - } - if(ndeclaration != declaration) { - memcpy(&declaration->context, &ndeclaration->context, - sizeof(declaration->context)); - } + /* § 6.7.5 (22) array intializers for arrays with unknown size determine + * the array type size */ + if(type != NULL && is_type_array(type) && initializer != NULL) { + array_type_t *array_type = &type->array; - int top = environment_top(); - context_t *last_context = context; - set_context(&declaration->context); + if(array_type->size == NULL) { + expression_t *cnst = allocate_expression_zero(EXPR_CONST); - /* push function parameters */ - declaration_t *parameter = declaration->context.declarations; - for( ; parameter != NULL; parameter = parameter->next) { - environment_push(parameter); - } + cnst->base.datatype = type_size_t; - int label_stack_top = label_top(); - declaration_t *old_current_function = current_function; - current_function = declaration; + switch (initializer->type) { + case INITIALIZER_LIST: { + initializer_list_t *const list = &initializer->list; + cnst->conste.v.int_value = list->len; + break; + } - statement_t *statement = parse_compound_statement(); + case INITIALIZER_STRING: { + initializer_string_t *const string = &initializer->string; + cnst->conste.v.int_value = strlen(string->string) + 1; + break; + } - assert(current_function == declaration); - current_function = old_current_function; - label_pop_to(label_stack_top); + case INITIALIZER_WIDE_STRING: { + initializer_wide_string_t *const string = &initializer->wide_string; + cnst->conste.v.int_value = string->string.size; + break; + } - assert(context == &declaration->context); - set_context(last_context); - environment_pop_to(top); + default: + panic("invalid initializer type"); + } - declaration->init.statement = statement; - return; + array_type->size = cnst; + } + } + + if(type != NULL && is_type_function(type)) { + 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; + } +} + +/* 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(';'); + + declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); + + declaration->type = specifiers->type; + declaration->storage_class = specifiers->storage_class; + declaration->source_position = specifiers->source_position; + + if (declaration->storage_class != STORAGE_CLASS_NONE) { + parse_warning_pos(declaration->source_position, + "useless storage class in empty declaration"); + } + + 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; + } + + case TYPE_ENUM: + break; + + default: + parse_warning_pos(declaration->source_position, + "empty declaration"); + break; + } + + finished_declaration(declaration); +} + +static void parse_declaration_rest(declaration_t *ndeclaration, + const declaration_specifiers_t *specifiers, + parsed_declaration_func finished_declaration) +{ + while(true) { + declaration_t *declaration = finished_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 == '=') { + parse_init_declarator_rest(declaration); } if(token.type != ',') break; - next_token(); + eat(','); + + ndeclaration = parse_declarator(specifiers, false); } expect_void(';'); } +static declaration_t *finished_kr_declaration(declaration_t *declaration) +{ + /* TODO: check that it was actually a parameter that gets a type */ + + /* we should have a declaration for the parameter in the current + * scope */ + return record_declaration(declaration); +} + +static void parse_declaration(parsed_declaration_func finished_declaration) +{ + declaration_specifiers_t specifiers; + memset(&specifiers, 0, sizeof(specifiers)); + parse_declaration_specifiers(&specifiers); + + if(token.type == ';') { + parse_anonymous_declaration_rest(&specifiers, finished_declaration); + } else { + declaration_t *declaration = parse_declarator(&specifiers, false); + parse_declaration_rest(declaration, &specifiers, finished_declaration); + } +} + +static void parse_kr_declaration_list(declaration_t *declaration) +{ + type_t *type = skip_typeref(declaration->type); + if(!is_type_function(type)) + return; + + 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 + } + + semantic_parameter(parameter_declaration); + parameter_type = parameter_declaration->type; + + function_parameter_t *function_parameter + = obstack_alloc(type_obst, sizeof(function_parameter[0])); + memset(function_parameter, 0, sizeof(function_parameter[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; + + 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; + } + + /* must be a function definition */ + parse_kr_declaration_list(ndeclaration); + + if(token.type != '{') { + parse_error_expected("while parsing function definition", '{', 0); + eat_statement(); + return; + } + + type_t *type = ndeclaration->type; + if(type == NULL) { + eat_block(); + return; + } + + /* note that we don't skip typerefs: the standard doesn't allow them here + * (so we can't use is_type_function here) */ + if(type->type != TYPE_FUNCTION) { + parser_print_error_prefix(); + fprintf(stderr, "declarator '"); + print_type_ext(type, ndeclaration->symbol, NULL); + fprintf(stderr, "' has a body but is not a function type.\n"); + eat_block(); + return; + } + + /* § 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); + } + ndeclaration->type = type; + } + + declaration_t *declaration = record_declaration(ndeclaration); + if(ndeclaration != declaration) { + memcpy(&declaration->context, &ndeclaration->context, + sizeof(declaration->context)); + } + type = skip_typeref(declaration->type); + + /* 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); + } + + if(declaration->init.statement != NULL) { + parser_error_multiple_definition(declaration, token.source_position); + eat_block(); + goto end_of_parse_external_declaration; + } else { + /* 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) { @@ -1903,8 +2779,7 @@ static void parse_struct_declarators(const declaration_specifiers_t *specifiers) parse_constant_expression(); /* TODO (bitfields) */ } else { - declaration_t *declaration - = parse_declarator(specifiers, specifiers->type, true); + declaration_t *declaration = parse_declarator(specifiers, true); /* TODO: check constraints for struct declarations */ /* TODO: check for doubled fields */ @@ -1936,33 +2811,11 @@ static void parse_compound_type_entries(void) parse_struct_declarators(&specifiers); } if(token.type == T_EOF) { - parse_error("unexpected error while parsing struct"); + parse_error("EOF while parsing struct"); } next_token(); } -static void parse_declaration(void) -{ - source_position_t source_position = token.source_position; - - declaration_specifiers_t specifiers; - memset(&specifiers, 0, sizeof(specifiers)); - parse_declaration_specifiers(&specifiers); - - if(token.type == ';') { - next_token(); - - declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); - - declaration->type = specifiers.type; - declaration->storage_class = specifiers.storage_class; - declaration->source_position = source_position; - record_declaration(declaration); - return; - } - parse_init_declarators(&specifiers); -} - static type_t *parse_typename(void) { declaration_specifiers_t specifiers; @@ -1997,11 +2850,10 @@ struct expression_parser_function_t { expression_parser_function_t expression_parsers[T_LAST_TOKEN]; -static expression_t *make_invalid_expression(void) +static expression_t *create_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; } @@ -2009,64 +2861,64 @@ 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(); - return make_invalid_expression(); + return create_invalid_expression(); } 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 = type_int; - 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 = type_double; - 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.return_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])); @@ -2093,12 +2945,120 @@ static declaration_t *create_implicit_function(symbol_t *symbol, return declaration; } +static type_t *make_function_1_type(type_t *return_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.return_type = return_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); + case T___builtin_va_end: + return make_function_1_type(type_void, type_valist); + 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 *orig_type) +{ + if(orig_type == NULL) + return NULL; + + type_t *type = skip_typeref(orig_type); + if(is_type_array(type)) { + 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(is_type_function(type)) { + return make_pointer_type(orig_type, TYPE_QUALIFIER_NONE); + } + + return orig_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_DEREFERENCE: { + expression_t *value = expression->unary.value; + type_t *type = skip_typeref(value->base.datatype); + pointer_type_t *pointer_type = &type->pointer; + + return pointer_type->points_to; + } + 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); @@ -2107,7 +3067,7 @@ static expression_t *parse_reference(void) if(declaration == NULL) { #ifndef STRICT_C99 - /* an implicitely defined function */ + /* an implicitly defined function */ if(token.type == '(') { parser_print_prefix_pos(token.source_position); fprintf(stderr, "warning: implicit declaration of function '%s'\n", @@ -2120,14 +3080,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) @@ -2139,11 +3104,9 @@ 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); - cast->expression.type = EXPR_UNARY; - cast->type = UNEXPR_CAST; - cast->expression.source_position = token.source_position; + cast->base.source_position = token.source_position; type_t *type = parse_typename(); @@ -2152,48 +3115,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) @@ -2222,10 +3182,16 @@ static expression_t *parse_brace_expression(void) static expression_t *parse_function_keyword(void) { - eat(T___FUNCTION__); + next_token(); /* TODO */ - string_literal_t *expression = allocate_ast_zero(sizeof(expression[0])); + if (current_function == NULL) { + parse_error("'__func__' used outside of a function"); + } + + 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"; @@ -2238,7 +3204,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"; @@ -2253,7 +3221,7 @@ static designator_t *parse_designator(void) if(token.type != T_IDENTIFIER) { parse_error_expected("while parsing member designator", T_IDENTIFIER, 0); - eat_brace(); + eat_paren(); return NULL; } result->symbol = token.v.symbol; @@ -2266,7 +3234,7 @@ static designator_t *parse_designator(void) if(token.type != T_IDENTIFIER) { parse_error_expected("while parsing member designator", T_IDENTIFIER, 0); - eat_brace(); + eat_paren(); return NULL; } designator_t *designator = allocate_ast_zero(sizeof(result[0])); @@ -2282,7 +3250,7 @@ static designator_t *parse_designator(void) designator_t *designator = allocate_ast_zero(sizeof(result[0])); designator->array_access = parse_expression(); if(designator->array_access == NULL) { - eat_brace(); + eat_paren(); return NULL; } expect(']'); @@ -2301,49 +3269,125 @@ 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_start(void) +{ + eat(T___builtin_va_start); + + expression_t *expression = allocate_expression_zero(EXPR_VA_START); + + expect('('); + expression->va_starte.ap = parse_assignment_expression(); + expect(','); + expression_t *const expr = parse_assignment_expression(); + if (expr->type == EXPR_REFERENCE) { + declaration_t *const decl = expr->reference.declaration; + if (decl->parent_context == ¤t_function->context && + decl->next == NULL) { + expression->va_starte.parameter = decl; + expect(')'); + return expression; + } + } + parser_print_error_prefix_pos(expr->base.source_position); + fprintf(stderr, "second argument of 'va_start' must be last parameter " + "of the current function\n"); + + return create_invalid_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.ap = 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->builtin_symbol.symbol = symbol; + next_token(); + + type_t *type = get_builtin_symbol_type(symbol); + type = automatic_type_conversion(type); + + expression->base.datatype = type; + return expression; +} + +static expression_t *parse_compare_builtin(void) +{ + expression_t *expression; + + switch(token.type) { + case T___builtin_isgreater: + expression = allocate_expression_zero(EXPR_BINARY_ISGREATER); + break; + case T___builtin_isgreaterequal: + expression = allocate_expression_zero(EXPR_BINARY_ISGREATEREQUAL); + break; + case T___builtin_isless: + expression = allocate_expression_zero(EXPR_BINARY_ISLESS); + break; + case T___builtin_islessequal: + expression = allocate_expression_zero(EXPR_BINARY_ISLESSEQUAL); + break; + case T___builtin_islessgreater: + expression = allocate_expression_zero(EXPR_BINARY_ISLESSGREATER); + break; + case T___builtin_isunordered: + expression = allocate_expression_zero(EXPR_BINARY_ISUNORDERED); + break; + default: + panic("invalid compare builtin found"); + break; + } + next_token(); - /* TODO: set datatype */ + expect('('); + expression->binary.left = parse_assignment_expression(); + expect(','); + expression->binary.right = parse_assignment_expression(); + expect(')'); - expression->symbol = token.v.symbol; + type_t *orig_type_left = expression->binary.left->base.datatype; + type_t *orig_type_right = expression->binary.right->base.datatype; + if(orig_type_left == NULL || orig_type_right == NULL) + return expression; - next_token(); + type_t *type_left = skip_typeref(orig_type_left); + type_t *type_right = skip_typeref(orig_type_right); + if(!is_type_floating(type_left) && !is_type_floating(type_right)) { + type_error_incompatible("invalid operands in comparison", + token.source_position, type_left, type_right); + } else { + semantic_comparison(&expression->binary); + } - return (expression_t*) expression; + return expression; } static expression_t *parse_primary_expression(void) @@ -2353,22 +3397,35 @@ 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__: + case T___func__: return parse_function_keyword(); case T___PRETTY_FUNCTION__: return parse_pretty_function_keyword(); case T___builtin_offsetof: return parse_offsetof(); + case T___builtin_va_start: + return parse_va_start(); case T___builtin_va_arg: return parse_va_arg(); + case T___builtin_nanf: + case T___builtin_alloca: case T___builtin_expect: - case T___builtin_va_start: case T___builtin_va_end: return parse_builtin_symbol(); + case T___builtin_isgreater: + case T___builtin_isgreaterequal: + case T___builtin_isless: + case T___builtin_islessequal: + case T___builtin_islessgreater: + case T___builtin_isunordered: + return parse_compare_builtin(); case '(': return parse_brace_expression(); @@ -2380,37 +3437,53 @@ static expression_t *parse_primary_expression(void) fprintf(stderr, "\n"); eat_statement(); - return make_invalid_expression(); + return create_invalid_expression(); } static expression_t *parse_array_expression(unsigned precedence, - expression_t *array_ref) + expression_t *left) { (void) precedence; eat('['); + 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 = parse_expression(); - - type_t *type = array_ref->datatype; - if(type != NULL) { - if(type->type == TYPE_POINTER) { - pointer_type_t *pointer = (pointer_type_t*) type; - array_access->expression.datatype = pointer->points_to; - } else if(type->type == TYPE_ARRAY) { - array_type_t *array_type = (array_type_t*) type; - array_access->expression.datatype = array_type->element_type; + array_access->expression.type = EXPR_ARRAY_ACCESS; + + type_t *type_left = left->base.datatype; + type_t *type_inside = inside->base.datatype; + type_t *return_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; + return_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; + return_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 type "); - print_type_quoted(type); + fprintf(stderr, "array access on object with non-pointer types "); + print_type_quoted(type_left); + fprintf(stderr, ", "); + print_type_quoted(type_inside); fprintf(stderr, "\n"); } + } else { + array_access->array_ref = left; + array_access->index = inside; } if(token.type != ']') { @@ -2419,26 +3492,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; + return_type = automatic_type_conversion(return_type); + array_access->expression.datatype = return_type; - default: - return 0; - } + return (expression_t*) array_access; } static expression_t *parse_sizeof(unsigned precedence) @@ -2455,8 +3512,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; } @@ -2472,33 +3531,33 @@ 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 *type = compound->datatype; - if(type == NULL) - return make_invalid_expression(); + type_t *orig_type = compound->base.datatype; + if(orig_type == NULL) + return create_invalid_expression(); + + type_t *type = skip_typeref(orig_type); type_t *type_left = type; if(is_pointer) { if(type->type != TYPE_POINTER) { parser_print_error_prefix(); fprintf(stderr, "left hand side of '->' is not a pointer, but "); - print_type_quoted(type); + print_type_quoted(orig_type); fputc('\n', stderr); - return make_invalid_expression(); + return create_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); @@ -2510,10 +3569,10 @@ static expression_t *parse_select_expression(unsigned precedence, "union, but ", symbol->string); print_type_quoted(type_left); fputc('\n', stderr); - return make_invalid_expression(); + return create_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) { @@ -2522,7 +3581,7 @@ static expression_t *parse_select_expression(unsigned precedence, symbol->string); print_type_quoted(type_left); fputc('\n', stderr); - return make_invalid_expression(); + return create_invalid_expression(); } declaration_t *iter = declaration->context.declarations; @@ -2534,39 +3593,54 @@ static expression_t *parse_select_expression(unsigned precedence, if(iter == NULL) { parser_print_error_prefix(); print_type_quoted(type_left); - fprintf(stderr, " has no memeber named '%s'\n", symbol->string); - return make_invalid_expression(); + fprintf(stderr, " has no member named '%s'\n", symbol->string); + return create_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 *type = expression->datatype; - if(type->type != TYPE_FUNCTION) { - /* TODO calling pointers to functions is ok */ - parser_print_error_prefix(); - fputs("called object '", stderr); - print_expression(expression); - fputs("' (type ", stderr); - print_type_quoted(type); - fputs("is not a function\n", stderr); - - function_type = NULL; - call->expression.datatype = NULL; - } else { - function_type = (function_type_t*) type; - call->expression.datatype = function_type->result_type; + 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) { + type_t *type = skip_typeref(orig_type); + + if(is_type_pointer(type)) { + pointer_type_t *pointer_type = &type->pointer; + + type = skip_typeref(pointer_type->points_to); + + if (is_type_function(type)) { + function_type = &type->function; + call->expression.datatype = function_type->return_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; + } } /* parse arguments */ @@ -2620,16 +3694,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); } @@ -2637,15 +3713,22 @@ static expression_t *parse_call_expression(unsigned precedence, } } - return (expression_t*) call; + return result; } -static type_t *get_type_after_conversion(const type_t *type1, - const type_t *type2) +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) { - /* TODO... */ - (void) type2; - return (type_t*) type1; + 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, @@ -2653,55 +3736,65 @@ static expression_t *parse_conditional_expression(unsigned precedence, { eat('?'); - conditional_expression_t *conditional - = allocate_ast_zero(sizeof(conditional[0])); - conditional->expression.type = EXPR_CONDITIONAL; + 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 = conditional->condition->datatype; - if(condition_type != NULL) { - if(!is_type_scalar(condition_type)) { - type_error("expected a scalar type", expression->source_position, - condition_type); + type_t *condition_type_orig = expression->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 in conditional condition", + expression->base.source_position, condition_type_orig); } } - conditional->true_expression = parse_expression(); + expression_t *true_expression = parse_expression(); expect(':'); - conditional->false_expression = parse_sub_expression(precedence); + expression_t *false_expression = parse_sub_expression(precedence); - type_t *true_type = conditional->true_expression->datatype; - if(true_type == NULL) - return (expression_t*) conditional; - type_t *false_type = conditional->false_expression->datatype; - if(false_type == NULL) - return (expression_t*) conditional; + conditional->true_expression = true_expression; + conditional->false_expression = false_expression; + + 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 *true_type = skip_typeref(orig_true_type); + type_t *false_type = skip_typeref(orig_false_type); /* 6.5.15.3 */ - if(true_type == false_type) { - conditional->expression.datatype = true_type; - } else if(is_type_arithmetic(true_type) && is_type_arithmetic(false_type)) { - type_t *result = get_type_after_conversion(true_type, false_type); - /* TODO: create implicit convs if necessary */ - conditional->expression.datatype = result; - } else if(true_type->type == TYPE_POINTER && - false_type->type == TYPE_POINTER && - true /* TODO compatible points_to types */) { - /* TODO */ - } else if(/* (is_null_ptr_const(true_type) && false_type->type == TYPE_POINTER) - || (is_null_ptr_const(false_type) && - 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, + 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) @@ -2713,9 +3806,24 @@ static expression_t *parse_extension(unsigned precedence) return parse_sub_expression(precedence); } +static expression_t *parse_builtin_classify_type(const unsigned precedence) +{ + eat(T___builtin_classify_type); + + expression_t *result = allocate_expression_zero(EXPR_CLASSIFY_TYPE); + result->base.datatype = type_int; + + expect('('); + expression_t *expression = parse_sub_expression(precedence); + expect(')'); + result->classify_type.type_expression = expression; + + 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; @@ -2732,7 +3840,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; @@ -2747,31 +3855,67 @@ static void semantic_unexpr_arithmetic(unary_expression_t *expression) expression->expression.datatype = orig_type; } +static void semantic_unexpr_scalar(unary_expression_t *expression) +{ + type_t *orig_type = expression->value->base.datatype; + if(orig_type == NULL) + return; + + type_t *type = skip_typeref(orig_type); + if (!is_type_scalar(type)) { + parse_error("operand of ! must be of scalar type\n"); + return; + } + + expression->expression.datatype = orig_type; +} + +static void semantic_unexpr_integer(unary_expression_t *expression) +{ + type_t *orig_type = expression->value->base.datatype; + if(orig_type == NULL) + return; + + type_t *type = skip_typeref(orig_type); + if (!is_type_integer(type)) { + parse_error("operand of ~ must be of integer type\n"); + return; + } + + expression->expression.datatype = orig_type; +} + 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(type->type != TYPE_POINTER) { - /* TODO: improve error message */ + if(!is_type_pointer(type)) { parser_print_error_prefix(); - fprintf(stderr, "operation needs a pointer type\n"); + 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; - expression->expression.datatype = pointer_type->points_to; + pointer_type_t *pointer_type = &type->pointer; + type_t *result_type = pointer_type->points_to; + + 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; @@ -2780,7 +3924,7 @@ static void semantic_take_addr(unary_expression_t *expression) } } - expression->expression.datatype = make_pointer_type(orig_type, 0); + expression->expression.datatype = make_pointer_type(orig_type, TYPE_QUALIFIER_NONE); } #define CREATE_UNARY_EXPRESSION_PARSER(token_type, unexpression_type, sfunc) \ @@ -2788,27 +3932,30 @@ static expression_t *parse_##unexpression_type(unsigned precedence) \ { \ eat(token_type); \ \ - unary_expression_t *unary_expression \ - = allocate_ast_zero(sizeof(unary_expression[0])); \ - unary_expression->expression.type = EXPR_UNARY; \ - unary_expression->type = unexpression_type; \ - unary_expression->value = parse_sub_expression(precedence); \ + expression_t *unary_expression \ + = allocate_expression_zero(unexpression_type); \ + unary_expression->unary.value = parse_sub_expression(precedence); \ \ - sfunc(unary_expression); \ + sfunc(&unary_expression->unary); \ \ - return (expression_t*) unary_expression; \ + return unary_expression; \ } -CREATE_UNARY_EXPRESSION_PARSER('-', UNEXPR_NEGATE, semantic_unexpr_arithmetic) -CREATE_UNARY_EXPRESSION_PARSER('+', UNEXPR_PLUS, semantic_unexpr_arithmetic) -CREATE_UNARY_EXPRESSION_PARSER('!', UNEXPR_NOT, semantic_unexpr_arithmetic) -CREATE_UNARY_EXPRESSION_PARSER('*', UNEXPR_DEREFERENCE, semantic_dereference) -CREATE_UNARY_EXPRESSION_PARSER('&', UNEXPR_TAKE_ADDRESS, semantic_take_addr) -CREATE_UNARY_EXPRESSION_PARSER('~', UNEXPR_BITWISE_NEGATE, +CREATE_UNARY_EXPRESSION_PARSER('-', EXPR_UNARY_NEGATE, + semantic_unexpr_arithmetic) +CREATE_UNARY_EXPRESSION_PARSER('+', EXPR_UNARY_PLUS, semantic_unexpr_arithmetic) -CREATE_UNARY_EXPRESSION_PARSER(T_PLUSPLUS, UNEXPR_PREFIX_INCREMENT, +CREATE_UNARY_EXPRESSION_PARSER('!', EXPR_UNARY_NOT, + semantic_unexpr_scalar) +CREATE_UNARY_EXPRESSION_PARSER('*', EXPR_UNARY_DEREFERENCE, + semantic_dereference) +CREATE_UNARY_EXPRESSION_PARSER('&', EXPR_UNARY_TAKE_ADDRESS, + semantic_take_addr) +CREATE_UNARY_EXPRESSION_PARSER('~', EXPR_UNARY_BITWISE_NEGATE, + semantic_unexpr_integer) +CREATE_UNARY_EXPRESSION_PARSER(T_PLUSPLUS, EXPR_UNARY_PREFIX_INCREMENT, semantic_incdec) -CREATE_UNARY_EXPRESSION_PARSER(T_MINUSMINUS, UNEXPR_PREFIX_DECREMENT, +CREATE_UNARY_EXPRESSION_PARSER(T_MINUSMINUS, EXPR_UNARY_PREFIX_DECREMENT, semantic_incdec) #define CREATE_UNARY_POSTFIX_EXPRESSION_PARSER(token_type, unexpression_type, \ @@ -2819,20 +3966,20 @@ static expression_t *parse_##unexpression_type(unsigned precedence, \ (void) precedence; \ eat(token_type); \ \ - unary_expression_t *unary_expression \ - = allocate_ast_zero(sizeof(unary_expression[0])); \ - unary_expression->expression.type = EXPR_UNARY; \ - unary_expression->type = unexpression_type; \ - unary_expression->value = left; \ + expression_t *unary_expression \ + = allocate_expression_zero(unexpression_type); \ + unary_expression->unary.value = left; \ \ - sfunc(unary_expression); \ + sfunc(&unary_expression->unary); \ \ - return (expression_t*) unary_expression; \ + return unary_expression; \ } -CREATE_UNARY_POSTFIX_EXPRESSION_PARSER(T_PLUSPLUS, UNEXPR_POSTFIX_INCREMENT, +CREATE_UNARY_POSTFIX_EXPRESSION_PARSER(T_PLUSPLUS, + EXPR_UNARY_POSTFIX_INCREMENT, semantic_incdec) -CREATE_UNARY_POSTFIX_EXPRESSION_PARSER(T_MINUSMINUS, UNEXPR_POSTFIX_DECREMENT, +CREATE_UNARY_POSTFIX_EXPRESSION_PARSER(T_MINUSMINUS, + EXPR_UNARY_POSTFIX_DECREMENT, semantic_incdec) static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right) @@ -2856,7 +4003,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 { @@ -2875,8 +4024,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; @@ -2901,8 +4050,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; @@ -2929,8 +4078,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; @@ -2945,9 +4094,9 @@ 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 { parser_print_error_prefix(); @@ -2963,8 +4112,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; @@ -2979,10 +4128,9 @@ static void semantic_sub(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_left->type == TYPE_POINTER && - type_right->type == TYPE_POINTER) { + } else if(is_type_pointer(type_left) && is_type_pointer(type_right)) { if(!pointers_compatible(type_left, type_right)) { parser_print_error_prefix(); fprintf(stderr, "pointers to incompatible objects to binary - ("); @@ -3007,8 +4155,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; @@ -3022,6 +4170,15 @@ static void semantic_comparison(binary_expression_t *expression) expression->left = create_implicit_cast(left, arithmetic_type); expression->right = create_implicit_cast(right, arithmetic_type); expression->expression.datatype = arithmetic_type; + } else if (is_type_pointer(type_left) && is_type_pointer(type_right)) { + /* TODO check compatibility */ + } else if (is_type_pointer(type_left)) { + expression->right = create_implicit_cast(right, type_left); + } else if (is_type_pointer(type_right)) { + expression->left = create_implicit_cast(left, type_right); + } else { + type_error_incompatible("invalid operands in comparison", + token.source_position, type_left, type_right); } expression->expression.datatype = type_int; } @@ -3030,8 +4187,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; @@ -3055,12 +4212,46 @@ static void semantic_arithmetic_assign(binary_expression_t *expression) expression->expression.datatype = type_left; } +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->base.datatype; + type_t *orig_type_right = right->base.datatype; + + if(orig_type_left == NULL || orig_type_right == NULL) + return; + + type_t *type_left = skip_typeref(orig_type_left); + type_t *type_right = skip_typeref(orig_type_right); + + if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { + /* combined instructions are tricky. We can't create an implicit cast on + * the left side, because we need the uncasted form for the store. + * The ast2firm pass has to know that left_type must be right_type + * for the arithmeitc operation and create a cast by itself */ + type_t *const arithmetic_type = semantic_arithmetic(type_left, type_right); + expression->right = create_implicit_cast(right, arithmetic_type); + expression->expression.datatype = type_left; + } else if (is_type_pointer(type_left) && is_type_integer(type_right)) { + expression->expression.datatype = type_left; + } else { + parser_print_error_prefix(); + fputs("Incompatible types ", stderr); + print_type_quoted(orig_type_left); + fputs(" and ", stderr); + print_type_quoted(orig_type_right); + fputs(" in assignment\n", stderr); + return; + } +} + 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; @@ -3068,96 +4259,148 @@ static void semantic_logical_op(binary_expression_t *expression) type_t *type_left = skip_typeref(orig_type_left); type_t *type_right = skip_typeref(orig_type_right); - if(!is_type_arithmetic(type_left) || !is_type_arithmetic(type_right)) { + if (!is_type_scalar(type_left) || !is_type_scalar(type_right)) { /* TODO: improve error message */ parser_print_error_prefix(); - fprintf(stderr, "operation needs arithmetic types\n"); + fprintf(stderr, "operation needs scalar types\n"); return; } 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 *type_left = left->datatype; + expression_t *left = expression->left; + type_t *orig_type_left = left->base.datatype; - if(type_left != NULL) { - semantic_assign(type_left, &expression->right, "assignment"); + if(orig_type_left == NULL) + return; + + type_t *type_left = revert_automatic_type_conversion(left); + type_left = skip_typeref(orig_type_left); + + /* must be a modifiable lvalue */ + if (is_type_array(type_left)) { + parser_print_error_prefix(); + fprintf(stderr, "Cannot assign to arrays ('"); + print_expression(left); + fprintf(stderr, "')\n"); + return; + } + 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; } - expression->expression.datatype = type_left; + semantic_assign(orig_type_left, &expression->right, "assignment"); + + expression->expression.datatype = orig_type_left; } static void semantic_comma(binary_expression_t *expression) { - expression->expression.datatype = expression->right->datatype; -} - -#define CREATE_BINEXPR_PARSER(token_type, binexpression_type, sfunc, lr) \ -static expression_t *parse_##binexpression_type(unsigned precedence, \ - expression_t *left) \ -{ \ - eat(token_type); \ - \ - expression_t *right = parse_sub_expression(precedence + lr); \ - \ - binary_expression_t *binexpr \ - = allocate_ast_zero(sizeof(binexpr[0])); \ - binexpr->expression.type = EXPR_BINARY; \ - binexpr->type = binexpression_type; \ - binexpr->left = left; \ - binexpr->right = right; \ - sfunc(binexpr); \ - \ - return (expression_t*) binexpr; \ -} - -CREATE_BINEXPR_PARSER(',', BINEXPR_COMMA, semantic_comma, 1) -CREATE_BINEXPR_PARSER('*', BINEXPR_MUL, semantic_binexpr_arithmetic, 1) -CREATE_BINEXPR_PARSER('/', BINEXPR_DIV, semantic_binexpr_arithmetic, 1) -CREATE_BINEXPR_PARSER('%', BINEXPR_MOD, semantic_binexpr_arithmetic, 1) -CREATE_BINEXPR_PARSER('+', BINEXPR_ADD, semantic_add, 1) -CREATE_BINEXPR_PARSER('-', BINEXPR_SUB, semantic_sub, 1) -CREATE_BINEXPR_PARSER('<', BINEXPR_LESS, semantic_comparison, 1) -CREATE_BINEXPR_PARSER('>', BINEXPR_GREATER, semantic_comparison, 1) -CREATE_BINEXPR_PARSER('=', BINEXPR_ASSIGN, semantic_binexpr_assign, 0) -CREATE_BINEXPR_PARSER(T_EQUALEQUAL, BINEXPR_EQUAL, semantic_comparison, 1) -CREATE_BINEXPR_PARSER(T_EXCLAMATIONMARKEQUAL, BINEXPR_NOTEQUAL, + expression->expression.datatype = expression->right->base.datatype; +} + +#define CREATE_BINEXPR_PARSER(token_type, binexpression_type, sfunc, lr) \ +static expression_t *parse_##binexpression_type(unsigned precedence, \ + expression_t *left) \ +{ \ + eat(token_type); \ + \ + expression_t *right = parse_sub_expression(precedence + lr); \ + \ + expression_t *binexpr = allocate_expression_zero(binexpression_type); \ + binexpr->binary.left = left; \ + binexpr->binary.right = right; \ + sfunc(&binexpr->binary); \ + \ + return binexpr; \ +} + +CREATE_BINEXPR_PARSER(',', EXPR_BINARY_COMMA, semantic_comma, 1) +CREATE_BINEXPR_PARSER('*', EXPR_BINARY_MUL, semantic_binexpr_arithmetic, 1) +CREATE_BINEXPR_PARSER('/', EXPR_BINARY_DIV, semantic_binexpr_arithmetic, 1) +CREATE_BINEXPR_PARSER('%', EXPR_BINARY_MOD, semantic_binexpr_arithmetic, 1) +CREATE_BINEXPR_PARSER('+', EXPR_BINARY_ADD, semantic_add, 1) +CREATE_BINEXPR_PARSER('-', EXPR_BINARY_SUB, semantic_sub, 1) +CREATE_BINEXPR_PARSER('<', EXPR_BINARY_LESS, semantic_comparison, 1) +CREATE_BINEXPR_PARSER('>', EXPR_BINARY_GREATER, semantic_comparison, 1) +CREATE_BINEXPR_PARSER('=', EXPR_BINARY_ASSIGN, semantic_binexpr_assign, 0) + +CREATE_BINEXPR_PARSER(T_EQUALEQUAL, EXPR_BINARY_EQUAL, + semantic_comparison, 1) +CREATE_BINEXPR_PARSER(T_EXCLAMATIONMARKEQUAL, EXPR_BINARY_NOTEQUAL, semantic_comparison, 1) -CREATE_BINEXPR_PARSER(T_LESSEQUAL, BINEXPR_LESSEQUAL, semantic_comparison, 1) -CREATE_BINEXPR_PARSER(T_GREATEREQUAL, BINEXPR_GREATEREQUAL, +CREATE_BINEXPR_PARSER(T_LESSEQUAL, EXPR_BINARY_LESSEQUAL, semantic_comparison, 1) -CREATE_BINEXPR_PARSER('&', BINEXPR_BITWISE_AND, semantic_binexpr_arithmetic, 1) -CREATE_BINEXPR_PARSER('|', BINEXPR_BITWISE_OR, semantic_binexpr_arithmetic, 1) -CREATE_BINEXPR_PARSER('^', BINEXPR_BITWISE_XOR, semantic_binexpr_arithmetic, 1) -CREATE_BINEXPR_PARSER(T_ANDAND, BINEXPR_LOGICAL_AND, semantic_logical_op, 1) -CREATE_BINEXPR_PARSER(T_PIPEPIPE, BINEXPR_LOGICAL_OR, semantic_logical_op, 1) -/* TODO shift has a bit special semantic */ -CREATE_BINEXPR_PARSER(T_LESSLESS, BINEXPR_SHIFTLEFT, +CREATE_BINEXPR_PARSER(T_GREATEREQUAL, EXPR_BINARY_GREATEREQUAL, + semantic_comparison, 1) + +CREATE_BINEXPR_PARSER('&', EXPR_BINARY_BITWISE_AND, + semantic_binexpr_arithmetic, 1) +CREATE_BINEXPR_PARSER('|', EXPR_BINARY_BITWISE_OR, + semantic_binexpr_arithmetic, 1) +CREATE_BINEXPR_PARSER('^', EXPR_BINARY_BITWISE_XOR, + semantic_binexpr_arithmetic, 1) +CREATE_BINEXPR_PARSER(T_ANDAND, EXPR_BINARY_LOGICAL_AND, + semantic_logical_op, 1) +CREATE_BINEXPR_PARSER(T_PIPEPIPE, EXPR_BINARY_LOGICAL_OR, + semantic_logical_op, 1) +CREATE_BINEXPR_PARSER(T_LESSLESS, EXPR_BINARY_SHIFTLEFT, semantic_shift_op, 1) -CREATE_BINEXPR_PARSER(T_GREATERGREATER, BINEXPR_SHIFTRIGHT, +CREATE_BINEXPR_PARSER(T_GREATERGREATER, EXPR_BINARY_SHIFTRIGHT, semantic_shift_op, 1) -CREATE_BINEXPR_PARSER(T_PLUSEQUAL, BINEXPR_ADD_ASSIGN, +CREATE_BINEXPR_PARSER(T_PLUSEQUAL, EXPR_BINARY_ADD_ASSIGN, + semantic_arithmetic_addsubb_assign, 0) +CREATE_BINEXPR_PARSER(T_MINUSEQUAL, EXPR_BINARY_SUB_ASSIGN, + semantic_arithmetic_addsubb_assign, 0) +CREATE_BINEXPR_PARSER(T_ASTERISKEQUAL, EXPR_BINARY_MUL_ASSIGN, semantic_arithmetic_assign, 0) -CREATE_BINEXPR_PARSER(T_MINUSEQUAL, BINEXPR_SUB_ASSIGN, +CREATE_BINEXPR_PARSER(T_SLASHEQUAL, EXPR_BINARY_DIV_ASSIGN, semantic_arithmetic_assign, 0) -CREATE_BINEXPR_PARSER(T_ASTERISKEQUAL, BINEXPR_MUL_ASSIGN, +CREATE_BINEXPR_PARSER(T_PERCENTEQUAL, EXPR_BINARY_MOD_ASSIGN, semantic_arithmetic_assign, 0) -CREATE_BINEXPR_PARSER(T_SLASHEQUAL, BINEXPR_DIV_ASSIGN, +CREATE_BINEXPR_PARSER(T_LESSLESSEQUAL, EXPR_BINARY_SHIFTLEFT_ASSIGN, semantic_arithmetic_assign, 0) -CREATE_BINEXPR_PARSER(T_PERCENTEQUAL, BINEXPR_MOD_ASSIGN, +CREATE_BINEXPR_PARSER(T_GREATERGREATEREQUAL, EXPR_BINARY_SHIFTRIGHT_ASSIGN, semantic_arithmetic_assign, 0) -CREATE_BINEXPR_PARSER(T_LESSLESSEQUAL, BINEXPR_SHIFTLEFT_ASSIGN, +CREATE_BINEXPR_PARSER(T_ANDEQUAL, EXPR_BINARY_BITWISE_AND_ASSIGN, semantic_arithmetic_assign, 0) -CREATE_BINEXPR_PARSER(T_GREATERGREATEREQUAL, BINEXPR_SHIFTRIGHT_ASSIGN, +CREATE_BINEXPR_PARSER(T_PIPEEQUAL, EXPR_BINARY_BITWISE_OR_ASSIGN, semantic_arithmetic_assign, 0) -CREATE_BINEXPR_PARSER(T_ANDEQUAL, BINEXPR_BITWISE_AND_ASSIGN, - semantic_arithmetic_assign, 0) -CREATE_BINEXPR_PARSER(T_PIPEEQUAL, BINEXPR_BITWISE_OR_ASSIGN, - semantic_arithmetic_assign, 0) -CREATE_BINEXPR_PARSER(T_CARETEQUAL, BINEXPR_BITWISE_XOR_ASSIGN, +CREATE_BINEXPR_PARSER(T_CARETEQUAL, EXPR_BINARY_BITWISE_XOR_ASSIGN, semantic_arithmetic_assign, 0) static expression_t *parse_sub_expression(unsigned precedence) @@ -3177,7 +4420,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) { @@ -3194,7 +4437,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; @@ -3214,7 +4457,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"); } @@ -3222,15 +4465,14 @@ static void register_expression_parser(parse_expression_function parser, entry->precedence = precedence; } -static void register_expression_infix_parser( - parse_expression_infix_function parser, int token_type, - unsigned precedence) +static void register_infix_parser(parse_expression_infix_function parser, + int token_type, unsigned precedence) { expression_parser_function_t *entry = &expression_parsers[token_type]; 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"); @@ -3243,99 +4485,201 @@ static void init_expression_parsers(void) { memset(&expression_parsers, 0, sizeof(expression_parsers)); - register_expression_infix_parser(parse_BINEXPR_MUL, '*', 16); - register_expression_infix_parser(parse_BINEXPR_DIV, '/', 16); - register_expression_infix_parser(parse_BINEXPR_MOD, '%', 16); - register_expression_infix_parser(parse_BINEXPR_SHIFTLEFT, T_LESSLESS, 16); - register_expression_infix_parser(parse_BINEXPR_SHIFTRIGHT, - T_GREATERGREATER, 16); - register_expression_infix_parser(parse_BINEXPR_ADD, '+', 15); - register_expression_infix_parser(parse_BINEXPR_SUB, '-', 15); - register_expression_infix_parser(parse_BINEXPR_LESS, '<', 14); - register_expression_infix_parser(parse_BINEXPR_GREATER, '>', 14); - register_expression_infix_parser(parse_BINEXPR_LESSEQUAL, T_LESSEQUAL, 14); - register_expression_infix_parser(parse_BINEXPR_GREATEREQUAL, - T_GREATEREQUAL, 14); - register_expression_infix_parser(parse_BINEXPR_EQUAL, T_EQUALEQUAL, 13); - register_expression_infix_parser(parse_BINEXPR_NOTEQUAL, - T_EXCLAMATIONMARKEQUAL, 13); - register_expression_infix_parser(parse_BINEXPR_BITWISE_AND, '&', 12); - register_expression_infix_parser(parse_BINEXPR_BITWISE_XOR, '^', 11); - register_expression_infix_parser(parse_BINEXPR_BITWISE_OR, '|', 10); - register_expression_infix_parser(parse_BINEXPR_LOGICAL_AND, T_ANDAND, 9); - register_expression_infix_parser(parse_BINEXPR_LOGICAL_OR, T_PIPEPIPE, 8); - register_expression_infix_parser(parse_conditional_expression, '?', 7); - register_expression_infix_parser(parse_BINEXPR_ASSIGN, '=', 2); - register_expression_infix_parser(parse_BINEXPR_ADD_ASSIGN, T_PLUSEQUAL, 2); - register_expression_infix_parser(parse_BINEXPR_SUB_ASSIGN, T_MINUSEQUAL, 2); - register_expression_infix_parser(parse_BINEXPR_MUL_ASSIGN, - T_ASTERISKEQUAL, 2); - register_expression_infix_parser(parse_BINEXPR_DIV_ASSIGN, T_SLASHEQUAL, 2); - register_expression_infix_parser(parse_BINEXPR_MOD_ASSIGN, - T_PERCENTEQUAL, 2); - register_expression_infix_parser(parse_BINEXPR_SHIFTLEFT_ASSIGN, + register_infix_parser(parse_array_expression, '[', 30); + register_infix_parser(parse_call_expression, '(', 30); + register_infix_parser(parse_select_expression, '.', 30); + register_infix_parser(parse_select_expression, T_MINUSGREATER, 30); + register_infix_parser(parse_EXPR_UNARY_POSTFIX_INCREMENT, + T_PLUSPLUS, 30); + register_infix_parser(parse_EXPR_UNARY_POSTFIX_DECREMENT, + T_MINUSMINUS, 30); + + register_infix_parser(parse_EXPR_BINARY_MUL, '*', 16); + register_infix_parser(parse_EXPR_BINARY_DIV, '/', 16); + register_infix_parser(parse_EXPR_BINARY_MOD, '%', 16); + register_infix_parser(parse_EXPR_BINARY_SHIFTLEFT, T_LESSLESS, 16); + register_infix_parser(parse_EXPR_BINARY_SHIFTRIGHT, T_GREATERGREATER, 16); + register_infix_parser(parse_EXPR_BINARY_ADD, '+', 15); + register_infix_parser(parse_EXPR_BINARY_SUB, '-', 15); + register_infix_parser(parse_EXPR_BINARY_LESS, '<', 14); + register_infix_parser(parse_EXPR_BINARY_GREATER, '>', 14); + register_infix_parser(parse_EXPR_BINARY_LESSEQUAL, T_LESSEQUAL, 14); + register_infix_parser(parse_EXPR_BINARY_GREATEREQUAL, T_GREATEREQUAL, 14); + register_infix_parser(parse_EXPR_BINARY_EQUAL, T_EQUALEQUAL, 13); + register_infix_parser(parse_EXPR_BINARY_NOTEQUAL, + T_EXCLAMATIONMARKEQUAL, 13); + register_infix_parser(parse_EXPR_BINARY_BITWISE_AND, '&', 12); + register_infix_parser(parse_EXPR_BINARY_BITWISE_XOR, '^', 11); + register_infix_parser(parse_EXPR_BINARY_BITWISE_OR, '|', 10); + register_infix_parser(parse_EXPR_BINARY_LOGICAL_AND, T_ANDAND, 9); + register_infix_parser(parse_EXPR_BINARY_LOGICAL_OR, T_PIPEPIPE, 8); + register_infix_parser(parse_conditional_expression, '?', 7); + register_infix_parser(parse_EXPR_BINARY_ASSIGN, '=', 2); + register_infix_parser(parse_EXPR_BINARY_ADD_ASSIGN, T_PLUSEQUAL, 2); + register_infix_parser(parse_EXPR_BINARY_SUB_ASSIGN, T_MINUSEQUAL, 2); + register_infix_parser(parse_EXPR_BINARY_MUL_ASSIGN, T_ASTERISKEQUAL, 2); + register_infix_parser(parse_EXPR_BINARY_DIV_ASSIGN, T_SLASHEQUAL, 2); + register_infix_parser(parse_EXPR_BINARY_MOD_ASSIGN, T_PERCENTEQUAL, 2); + register_infix_parser(parse_EXPR_BINARY_SHIFTLEFT_ASSIGN, T_LESSLESSEQUAL, 2); - register_expression_infix_parser(parse_BINEXPR_SHIFTRIGHT_ASSIGN, + register_infix_parser(parse_EXPR_BINARY_SHIFTRIGHT_ASSIGN, T_GREATERGREATEREQUAL, 2); - register_expression_infix_parser(parse_BINEXPR_BITWISE_AND_ASSIGN, + register_infix_parser(parse_EXPR_BINARY_BITWISE_AND_ASSIGN, T_ANDEQUAL, 2); - register_expression_infix_parser(parse_BINEXPR_BITWISE_OR_ASSIGN, + register_infix_parser(parse_EXPR_BINARY_BITWISE_OR_ASSIGN, T_PIPEEQUAL, 2); - register_expression_infix_parser(parse_BINEXPR_BITWISE_XOR_ASSIGN, + register_infix_parser(parse_EXPR_BINARY_BITWISE_XOR_ASSIGN, T_CARETEQUAL, 2); - register_expression_infix_parser(parse_BINEXPR_COMMA, ',', 1); - - register_expression_infix_parser(parse_array_expression, '[', 30); - register_expression_infix_parser(parse_call_expression, '(', 30); - register_expression_infix_parser(parse_select_expression, '.', 30); - register_expression_infix_parser(parse_select_expression, - T_MINUSGREATER, 30); - register_expression_infix_parser(parse_UNEXPR_POSTFIX_INCREMENT, - T_PLUSPLUS, 30); - register_expression_infix_parser(parse_UNEXPR_POSTFIX_DECREMENT, - T_MINUSMINUS, 30); - - register_expression_parser(parse_UNEXPR_NEGATE, '-', 25); - register_expression_parser(parse_UNEXPR_PLUS, '+', 25); - register_expression_parser(parse_UNEXPR_NOT, '!', 25); - register_expression_parser(parse_UNEXPR_BITWISE_NEGATE, '~', 25); - register_expression_parser(parse_UNEXPR_DEREFERENCE, '*', 25); - register_expression_parser(parse_UNEXPR_TAKE_ADDRESS, '&', 25); - register_expression_parser(parse_UNEXPR_PREFIX_INCREMENT, T_PLUSPLUS, 25); - register_expression_parser(parse_UNEXPR_PREFIX_DECREMENT, T_MINUSMINUS, 25); + register_infix_parser(parse_EXPR_BINARY_COMMA, ',', 1); + + register_expression_parser(parse_EXPR_UNARY_NEGATE, '-', 25); + register_expression_parser(parse_EXPR_UNARY_PLUS, '+', 25); + register_expression_parser(parse_EXPR_UNARY_NOT, '!', 25); + register_expression_parser(parse_EXPR_UNARY_BITWISE_NEGATE, '~', 25); + register_expression_parser(parse_EXPR_UNARY_DEREFERENCE, '*', 25); + register_expression_parser(parse_EXPR_UNARY_TAKE_ADDRESS, '&', 25); + register_expression_parser(parse_EXPR_UNARY_PREFIX_INCREMENT, + T_PLUSPLUS, 25); + register_expression_parser(parse_EXPR_UNARY_PREFIX_DECREMENT, + T_MINUSMINUS, 25); register_expression_parser(parse_sizeof, T_sizeof, 25); register_expression_parser(parse_extension, T___extension__, 25); + register_expression_parser(parse_builtin_classify_type, + 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); - case_label_statement_t *label = allocate_ast_zero(sizeof(label[0])); - label->statement.type = STATEMENT_CASE_LABEL; - label->statement.source_position = token.source_position; - label->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->statement.next = parse_statement(); + statement->case_label.label_statement = parse_statement(); - return (statement_t*) label; + return statement; } static statement_t *parse_default_statement(void) { eat(T_default); - case_label_statement_t *label = allocate_ast_zero(sizeof(label[0])); - label->statement.type = STATEMENT_CASE_LABEL; - label->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_CASE_LABEL); + + statement->base.source_position = token.source_position; expect(':'); - label->statement.next = parse_statement(); + statement->label.label_statement = parse_statement(); - return (statement_t*) label; + return statement; } static declaration_t *get_label(symbol_t *symbol) @@ -3351,7 +4695,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->namespace = NAMESPACE_LABEL; + declaration->namespc = NAMESPACE_LABEL; declaration->symbol = symbol; label_push(declaration); @@ -3484,7 +4828,7 @@ static statement_t *parse_for(void) if(token.type != ';') { if(is_declaration_specifier(&token, false)) { - parse_declaration(); + parse_declaration(record_declaration); } else { statement->initialisation = parse_expression(); expect(';'); @@ -3541,9 +4885,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; } @@ -3553,9 +4897,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; } @@ -3569,15 +4913,28 @@ static statement_t *parse_return(void) 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; - type_t *return_type = function_type->result_type; + assert(is_type_function(current_function->type)); + function_type_t *function_type = ¤t_function->type->function; + type_t *return_type = function_type->return_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; + if(return_value != NULL && return_value->base.datatype == 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 { @@ -3586,59 +4943,45 @@ 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; } static statement_t *parse_declaration_statement(void) { - declaration_t *before = last_declaration; - - declaration_statement_t *statement - = allocate_ast_zero(sizeof(statement[0])); - statement->statement.type = STATEMENT_DECLARATION; - statement->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->declarations_begin = context->declarations; + statement->declaration.declarations_begin = context->declarations; } else { - statement->declarations_begin = before->next; + statement->declaration.declarations_begin = before->next; } - statement->declarations_end = last_declaration; + statement->declaration.declarations_end = last_declaration; - return (statement_t*) statement; + return statement; } static statement_t *parse_expression_statement(void) { - expression_statement_t *statement = allocate_ast_zero(sizeof(statement[0])); - statement->statement.type = STATEMENT_EXPRESSION; - statement->statement.source_position = token.source_position; + statement_t *statement = allocate_statement_zero(STATEMENT_EXPRESSION); - statement->expression = parse_expression(); + statement->base.source_position = token.source_position; + statement->expression.expression = parse_expression(); expect(';'); - return (statement_t*) statement; + return statement; } static statement_t *parse_statement(void) @@ -3647,6 +4990,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; @@ -3732,7 +5079,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; } @@ -3758,13 +5106,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; } @@ -3783,6 +5131,16 @@ static statement_t *parse_compound_statement(void) 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) { translation_unit_t *unit = allocate_ast_zero(sizeof(unit[0])); @@ -3793,8 +5151,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); @@ -3836,16 +5196,19 @@ void init_parser(void) init_expression_parsers(); obstack_init(&temp_obst); - type_int = make_atomic_type(ATOMIC_TYPE_INT, 0); - type_uint = make_atomic_type(ATOMIC_TYPE_UINT, 0); - type_long_double = make_atomic_type(ATOMIC_TYPE_LONG_DOUBLE, 0); - type_double = make_atomic_type(ATOMIC_TYPE_DOUBLE, 0); - type_float = make_atomic_type(ATOMIC_TYPE_FLOAT, 0); - type_size_t = make_atomic_type(ATOMIC_TYPE_ULONG, 0); - type_ptrdiff_t = make_atomic_type(ATOMIC_TYPE_LONG, 0); - type_const_char = make_atomic_type(ATOMIC_TYPE_CHAR, TYPE_QUALIFIER_CONST); - type_void = make_atomic_type(ATOMIC_TYPE_VOID, 0); - type_string = make_pointer_type(type_const_char, 0); + type_int = make_atomic_type(ATOMIC_TYPE_INT, 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_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_char, TYPE_QUALIFIER_NONE); + + symbol_t *const va_list_sym = symbol_table_insert("__builtin_va_list"); + type_valist = create_builtin_type(va_list_sym, type_void_ptr); } void exit_parser(void)