X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=1d9a9a79ceb7888d49a845c9256467f78adf2547;hb=ae40d62f736098a12e3e31ab2d5cfb24f2467742;hp=78bc75abf0effbac787a45aa70bc93e1a4687688;hpb=641ec35bb5f0bc0c1e3b5af530658fa993928dc0;p=cparser diff --git a/parser.c b/parser.c index 78bc75a..1d9a9a7 100644 --- a/parser.c +++ b/parser.c @@ -22,7 +22,7 @@ typedef struct { declaration_t *old_declaration; symbol_t *symbol; - unsigned short namespace; + unsigned short namespc; } stack_entry_t; static token_t token; @@ -263,7 +263,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, @@ -275,7 +274,6 @@ static void type_error_incompatible(const char *msg, fprintf(stderr, " - "); print_type_quoted(type2); fprintf(stderr, ")\n"); - error(); } static void eat_block(void) @@ -374,20 +372,20 @@ static bool is_compatible_declaration (declaration_t *declaration, return declaration->type == previous->type; } -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: @@ -411,21 +409,20 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr, context_t *parent_context) { symbol_t *symbol = declaration->symbol; - namespace_t namespace = (namespace_t)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(); + get_namespace_prefix(namespc), symbol->string); print_type_quoted(declaration->type); fputc('\n', stderr); parser_print_error_prefix_pos( @@ -434,6 +431,54 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr, "of type "); print_type_quoted(previous_declaration->type); fputc('\n', stderr); + } else { + const storage_class_t old_storage = previous_declaration->storage_class; + const storage_class_t new_storage = declaration->storage_class; + if (current_function == NULL) { + if (old_storage != STORAGE_CLASS_STATIC && + new_storage == 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 == STORAGE_CLASS_EXTERN) { + if (new_storage == 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 == STORAGE_CLASS_EXTERN && + new_storage == 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 == new_storage) { + 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; } @@ -442,8 +487,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 = namespc; + ARR_APP1(stack_entry_t, *stack_ptr, entry); /* replace/add declaration into declaration list of the symbol */ if(symbol->declaration == NULL) { @@ -453,7 +498,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 { @@ -501,12 +546,12 @@ static void stack_pop_to(stack_entry_t **stack_ptr, size_t new_top) 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 { @@ -517,7 +562,7 @@ static void stack_pop_to(stack_entry_t **stack_ptr, size_t new_top) 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; old_declaration->symbol_next = iter->symbol_next; @@ -579,6 +624,17 @@ static expression_t *create_cast_expression(expression_t *expression, return (expression_t*) cast; } +static bool is_null_expression(const expression_t *const expr) +{ + if (expr->type != EXPR_CONST) return false; + + type_t *const type = skip_typeref(expr->datatype); + if (!is_type_integer(type)) return false; + + const const_t *const const_expr = (const const_t*)expr; + return const_expr->v.int_value == 0; +} + static expression_t *create_implicit_cast(expression_t *expression, type_t *dest_type) { @@ -609,26 +665,36 @@ static expression_t *create_implicit_cast(expression_t *expression, 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); - } - } 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; + switch (source_type->type) { + case TYPE_ATOMIC: + if (is_null_expression(expression)) { + return create_cast_expression(expression, dest_type); + } + break; + + case TYPE_POINTER: + if (pointers_compatible(source_type, dest_type)) { + return create_cast_expression(expression, dest_type); + } + break; + + case TYPE_ARRAY: { + array_type_t *const array_type = (array_type_t*) source_type; + if (types_compatible(array_type->element_type, + pointer_type->points_to)) { + return create_cast_expression(expression, dest_type); + } + break; } - return create_cast_expression(expression, dest_type); + + default: + panic("casting of non-atomic types not implemented yet"); } + + type_error_incompatible("can't implicitly cast types", + expression->source_position, + source_type, dest_type); + return expression; } panic("casting of non-atomic types not implemented yet"); @@ -642,27 +708,51 @@ static void semantic_assign(type_t *orig_type_left, expression_t **right, 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) { + return; + } - 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)) || + (type_left->type == TYPE_POINTER && is_null_expression(*right)) || + (type_left->type == TYPE_POINTER && type_right->type == TYPE_POINTER)) { *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 (type_left->type == TYPE_POINTER) { + switch (type_right->type) { + case TYPE_FUNCTION: { + pointer_type_t *const ptr_type = (pointer_type_t*)type_left; + if (ptr_type->points_to == type_right) { + return; + } + break; + } + + case TYPE_ARRAY: { + pointer_type_t *const ptr_type = (pointer_type_t*)type_left; + array_type_t *const arr_type = (array_type_t*)type_right; + if (ptr_type->points_to == arr_type->element_type) { + return; + } + break; + } + + default: break; + } } + /* 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); } static expression_t *parse_constant_expression(void) @@ -870,6 +960,11 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) 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(); @@ -895,9 +990,9 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) declaration = allocate_type_zero(sizeof(declaration[0])); if(is_struct) { - declaration->namespace = NAMESPACE_STRUCT; + declaration->namespc = NAMESPACE_STRUCT; } else { - declaration->namespace = NAMESPACE_UNION; + declaration->namespc = NAMESPACE_UNION; } declaration->source_position = token.source_position; declaration->symbol = symbol; @@ -991,7 +1086,7 @@ static declaration_t *parse_enum_specifier(void) if(declaration == NULL) { declaration = allocate_type_zero(sizeof(declaration[0])); - declaration->namespace = NAMESPACE_ENUM; + declaration->namespc = NAMESPACE_ENUM; declaration->source_position = token.source_position; declaration->symbol = symbol; } @@ -1017,12 +1112,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) @@ -1446,6 +1540,15 @@ static declaration_t *parse_parameter(void) parse_error("typedef not allowed in parameter list"); } + /* Array as last part of a paramter type is just syntactic sugar. Turn it + * into a pointer */ + if (declaration->type->type == TYPE_ARRAY) { + const array_type_t *const arr_type = + (const array_type_t*)declaration->type; + declaration->type = + make_pointer_type(arr_type->element_type, TYPE_QUALIFIER_NONE); + } + return declaration; } @@ -1817,7 +1920,6 @@ static void parser_error_multiple_definition(declaration_t *previous, parser_print_error_prefix_pos(previous->source_position); fprintf(stderr, "this is the location of the previous " "definition.\n"); - error(); } static void parse_init_declarators(const declaration_specifiers_t *specifiers) @@ -2133,7 +2235,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", @@ -2560,7 +2662,7 @@ 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); + fprintf(stderr, " has no member named '%s'\n", symbol->string); return make_invalid_expression(); } @@ -2579,20 +2681,24 @@ static expression_t *parse_call_expression(unsigned precedence, function_type_t *function_type; type_t *type = expression->datatype; - if(type->type != TYPE_FUNCTION) { - /* TODO calling pointers to functions is ok */ + if (type->type == TYPE_FUNCTION) { + function_type = (function_type_t*) type; + call->expression.datatype = function_type->result_type; + } else if (type->type == TYPE_POINTER && + ((pointer_type_t*)type)->points_to->type == TYPE_FUNCTION) { + pointer_type_t *const ptr_type = (pointer_type_t*)type; + function_type = (function_type_t*)ptr_type->points_to; + call->expression.datatype = function_type->result_type; + } else { parser_print_error_prefix(); fputs("called object '", stderr); print_expression(expression); fputs("' (type ", stderr); print_type_quoted(type); - fputs("is not a function\n", stderr); + 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; } /* parse arguments */ @@ -2687,7 +2793,7 @@ static expression_t *parse_conditional_expression(unsigned precedence, /* 6.5.15.2 */ type_t *condition_type = conditional->condition->datatype; if(condition_type != NULL) { - if(!is_type_scalar(condition_type)) { + if(!is_type_scalar(skip_typeref(condition_type))) { type_error("expected a scalar type", expression->source_position, condition_type); } @@ -2704,27 +2810,33 @@ static expression_t *parse_conditional_expression(unsigned precedence, if(false_type == NULL) return (expression_t*) conditional; + type_t *const skipped_true_type = skip_typeref(true_type); + type_t *const skipped_false_type = skip_typeref(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); + if (skipped_true_type == skipped_false_type) { + conditional->expression.datatype = skipped_true_type; + } else if (is_type_arithmetic(skipped_true_type) && + is_type_arithmetic(skipped_false_type)) { + type_t *const result = get_type_after_conversion(skipped_true_type, + skipped_false_type); /* TODO: create implicit convs if necessary */ conditional->expression.datatype = result; - } else if(true_type->type == TYPE_POINTER && - false_type->type == TYPE_POINTER && + } else if (skipped_true_type->type == TYPE_POINTER && + skipped_false_type->type == TYPE_POINTER && true /* TODO compatible points_to types */) { /* TODO */ - } else if(/* (is_null_ptr_const(true_type) && false_type->type == TYPE_POINTER) - || (is_null_ptr_const(false_type) && - true_type->type == TYPE_POINTER) TODO*/ false) { + } else if(/* (is_null_ptr_const(skipped_true_type) && + skipped_false_type->type == TYPE_POINTER) + || (is_null_ptr_const(skipped_false_type) && + skipped_true_type->type == TYPE_POINTER) TODO*/ false) { /* TODO */ } else if(/* 1 is pointer to object type, other is void* */ false) { /* TODO */ } else { type_error_incompatible("while parsing conditional", expression->source_position, true_type, - false_type); + skipped_false_type); } return (expression_t*) conditional; @@ -2739,6 +2851,23 @@ 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); + + classify_type_expression_t *const classify_type_expr = + allocate_ast_zero(sizeof(classify_type_expr[0])); + classify_type_expr->expression.type = EXPR_CLASSIFY_TYPE; + classify_type_expr->expression.datatype = type_int; + + expect('('); + expression_t *const expression = parse_sub_expression(precedence); + expect(')'); + classify_type_expr->type_expression = expression; + + return (expression_t*)classify_type_expr; +} + static void semantic_incdec(unary_expression_t *expression) { type_t *orig_type = expression->value->datatype; @@ -2773,22 +2902,63 @@ static void semantic_unexpr_arithmetic(unary_expression_t *expression) expression->expression.datatype = orig_type; } -static void semantic_dereference(unary_expression_t *expression) +static void semantic_unexpr_scalar(unary_expression_t *expression) { type_t *orig_type = expression->value->datatype; if(orig_type == NULL) return; type_t *type = skip_typeref(orig_type); - if(type->type != TYPE_POINTER) { - /* TODO: improve error message */ - parser_print_error_prefix(); - fprintf(stderr, "operation needs a pointer type\n"); + if (!is_type_scalar(type)) { + parse_error("operand of ! must be of scalar type\n"); return; } - pointer_type_t *pointer_type = (pointer_type_t*) type; - expression->expression.datatype = pointer_type->points_to; + expression->expression.datatype = orig_type; +} + +static void semantic_unexpr_integer(unary_expression_t *expression) +{ + type_t *orig_type = expression->value->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; + if(orig_type == NULL) + return; + + type_t *type = skip_typeref(orig_type); + switch (type->type) { + case TYPE_ARRAY: { + array_type_t *const array_type = (array_type_t*)type; + expression->expression.datatype = array_type->element_type; + break; + } + + case TYPE_POINTER: { + pointer_type_t *pointer_type = (pointer_type_t*)type; + expression->expression.datatype = pointer_type->points_to; + break; + } + + default: + parser_print_error_prefix(); + fputs("'Unary *' needs pointer or arrray type, but type ", stderr); + print_type_quoted(orig_type); + fputs(" given.\n", stderr); + return; + } } static void semantic_take_addr(unary_expression_t *expression) @@ -2827,11 +2997,11 @@ static expression_t *parse_##unexpression_type(unsigned precedence) \ 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_NOT, semantic_unexpr_scalar) 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, - semantic_unexpr_arithmetic) + semantic_unexpr_integer) CREATE_UNARY_EXPRESSION_PARSER(T_PLUSPLUS, UNEXPR_PREFIX_INCREMENT, semantic_incdec) CREATE_UNARY_EXPRESSION_PARSER(T_MINUSMINUS, UNEXPR_PREFIX_DECREMENT, @@ -2975,6 +3145,14 @@ static void semantic_add(binary_expression_t *expression) expression->expression.datatype = type_left; } else if(type_right->type == TYPE_POINTER && is_type_integer(type_left)) { expression->expression.datatype = type_right; + } else if (type_left->type == TYPE_ARRAY && is_type_integer(type_right)) { + const array_type_t *const arr_type = (const array_type_t*)type_left; + expression->expression.datatype = + make_pointer_type(arr_type->element_type, TYPE_QUALIFIER_NONE); + } else if (type_right->type == TYPE_ARRAY && is_type_integer(type_left)) { + const array_type_t *const arr_type = (const array_type_t*)type_right; + expression->expression.datatype = + make_pointer_type(arr_type->element_type, TYPE_QUALIFIER_NONE); } else { parser_print_error_prefix(); fprintf(stderr, "invalid operands to binary + ("); @@ -3048,6 +3226,17 @@ 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 (type_left->type == TYPE_POINTER && + type_right->type == TYPE_POINTER) { + /* TODO check compatibility */ + } else if (type_left->type == TYPE_POINTER) { + expression->right = create_implicit_cast(right, type_left); + } else if (type_right->type == TYPE_POINTER) { + expression->left = create_implicit_cast(left, type_right); + } else { + type_error_incompatible("invalid operands in comparison", + expression->expression.source_position, + type_left, type_right); } expression->expression.datatype = type_int; } @@ -3081,6 +3270,40 @@ 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->datatype; + type_t *orig_type_right = right->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 (type_left->type == TYPE_POINTER && 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; @@ -3094,10 +3317,10 @@ 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; } @@ -3109,7 +3332,9 @@ static void semantic_binexpr_assign(binary_expression_t *expression) expression_t *left = expression->left; type_t *type_left = left->datatype; - if(type_left != NULL) { + if (type_left->type == TYPE_ARRAY) { + parse_error("Cannot assign to arrays."); + } else if (type_left != NULL) { semantic_assign(type_left, &expression->right, "assignment"); } @@ -3166,9 +3391,9 @@ CREATE_BINEXPR_PARSER(T_LESSLESS, BINEXPR_SHIFTLEFT, CREATE_BINEXPR_PARSER(T_GREATERGREATER, BINEXPR_SHIFTRIGHT, semantic_shift_op, 1) CREATE_BINEXPR_PARSER(T_PLUSEQUAL, BINEXPR_ADD_ASSIGN, - semantic_arithmetic_assign, 0) + semantic_arithmetic_addsubb_assign, 0) CREATE_BINEXPR_PARSER(T_MINUSEQUAL, BINEXPR_SUB_ASSIGN, - semantic_arithmetic_assign, 0) + semantic_arithmetic_addsubb_assign, 0) CREATE_BINEXPR_PARSER(T_ASTERISKEQUAL, BINEXPR_MUL_ASSIGN, semantic_arithmetic_assign, 0) CREATE_BINEXPR_PARSER(T_SLASHEQUAL, BINEXPR_DIV_ASSIGN, @@ -3332,6 +3557,8 @@ static void init_expression_parsers(void) register_expression_parser(parse_UNEXPR_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); } @@ -3377,7 +3604,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);