X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=a42e16923ee296b070397ea35f7f7f5cecb06fa1;hb=26b8b3b4af92e4bf85cb6b35abc2223d8d3486d1;hp=4c4163283fbe8b9fe2550a28debaf7834c8e55bf;hpb=e77d45ba71aeae1889b51967657e227d0e0be85e;p=cparser diff --git a/parser.c b/parser.c index 4c41632..a42e169 100644 --- a/parser.c +++ b/parser.c @@ -136,6 +136,13 @@ static void *allocate_ast_zero(size_t size) return res; } +static declaration_t *allocate_declaration_zero(void) +{ + declaration_t *declaration = allocate_ast_zero(sizeof(*allocate_declaration_zero())); + declaration->type = type_error_type; + return declaration; +} + /** * Returns the size of a statement node. * @@ -229,7 +236,8 @@ static expression_t *allocate_expression_zero(expression_kind_t kind) size_t size = get_expression_struct_size(kind); expression_t *res = allocate_ast_zero(size); - res->base.kind = kind; + res->base.kind = kind; + res->base.datatype = type_error_type; return res; } @@ -759,29 +767,34 @@ static expression_t *create_implicit_cast(expression_t *expression, expression->base.source_position, source_type, dest_type); return expression; + case TYPE_COMPOUND_STRUCT: + case TYPE_COMPOUND_UNION: + case TYPE_ERROR: + 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, +static type_t *semantic_assign(type_t *orig_type_left, + const expression_t *const right, const char *context) { - type_t *orig_type_right = (*right)->base.datatype; + type_t *const orig_type_right = right->base.datatype; - if(orig_type_right == NULL) - return; + if (!is_type_valid(orig_type_right)) + return orig_type_right; type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_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_pointer(type_left) && is_null_pointer_constant(right)) || (is_type_atomic(type_left, ATOMIC_TYPE_BOOL) && is_type_pointer(type_right))) { - *right = create_implicit_cast(*right, type_left); - return; + return orig_type_left; } if (is_type_pointer(type_left) && is_type_pointer(type_right)) { @@ -798,7 +811,7 @@ static void semantic_assign(type_t *orig_type_left, expression_t **right, = points_to_right->base.qualifiers & ~points_to_left->base.qualifiers; if(missing_qualifiers != 0) { errorf(HERE, "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointed-to type", type_left, context, type_right, missing_qualifiers); - return; + return orig_type_left; } points_to_left = get_unqualified_type(points_to_left); @@ -807,23 +820,21 @@ static void semantic_assign(type_t *orig_type_left, expression_t **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; + return NULL; } - *right = create_implicit_cast(*right, type_left); - return; + return orig_type_left; } - if (is_type_compound(type_left) - && types_compatible(type_left, type_right)) { - *right = create_implicit_cast(*right, type_left); - return; + if (is_type_compound(type_left) && is_type_compound(type_right)) { + type_t *const unqual_type_left = get_unqualified_type(type_left); + type_t *const unqual_type_right = get_unqualified_type(type_right); + if (types_compatible(unqual_type_left, unqual_type_right)) { + return orig_type_left; + } } -incompatible_assign_types: - /* TODO: improve error message */ - errorf(HERE, "incompatible types in %s: '%T' <- '%T'", - context, orig_type_left, orig_type_right); + return NULL; } static expression_t *parse_constant_expression(void) @@ -848,7 +859,7 @@ static type_t *make_global_typedef(const char *name, type_t *type) { symbol_t *const symbol = symbol_table_insert(name); - declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); + declaration_t *const declaration = allocate_declaration_zero(); declaration->namespc = NAMESPACE_NORMAL; declaration->storage_class = STORAGE_CLASS_TYPEDEF; declaration->type = type; @@ -863,15 +874,15 @@ static type_t *make_global_typedef(const char *name, type_t *type) return typedef_type; } -static const char *parse_string_literals(void) +static string_t parse_string_literals(void) { assert(token.type == T_STRING_LITERAL); - const char *result = token.v.string; + string_t result = token.v.string; next_token(); - while(token.type == T_STRING_LITERAL) { - result = concat_strings(result, token.v.string); + while (token.type == T_STRING_LITERAL) { + result = concat_strings(&result, &token.v.string); next_token(); } @@ -974,13 +985,13 @@ static designator_t *parse_designation(void) #endif static initializer_t *initializer_from_string(array_type_t *type, - const char *string) + const string_t *const string) { /* TODO: check len vs. size of array type */ (void) type; initializer_t *initializer = allocate_initializer_zero(INITIALIZER_STRING); - initializer->string.string = string; + initializer->string.string = *string; return initializer; } @@ -1014,7 +1025,7 @@ static initializer_t *initializer_from_expression(type_t *type, case EXPR_STRING_LITERAL: if (element_type->atomic.akind == ATOMIC_TYPE_CHAR) { return initializer_from_string(array_type, - expression->string.value); + &expression->string.value); } case EXPR_WIDE_STRING_LITERAL: { @@ -1031,17 +1042,14 @@ static initializer_t *initializer_from_expression(type_t *type, } } - type_t *expression_type = skip_typeref(expression->base.datatype); - if(is_type_scalar(type) || types_compatible(type, expression_type)) { - semantic_assign(type, &expression, "initializer"); - - initializer_t *result = allocate_initializer_zero(INITIALIZER_VALUE); - result->value.value = expression; + type_t *const res_type = semantic_assign(type, expression, "initializer"); + if (res_type == NULL) + return NULL; - return result; - } + initializer_t *const result = allocate_initializer_zero(INITIALIZER_VALUE); + result->value.value = create_implicit_cast(expression, res_type); - return NULL; + return result; } static initializer_t *parse_sub_initializer(type_t *type, @@ -1251,19 +1259,23 @@ static initializer_t *parse_sub_initializer(type_t *type, return result; } -static initializer_t *parse_initializer(type_t *type) +static initializer_t *parse_initializer(type_t *const orig_type) { initializer_t *result; - type = skip_typeref(type); + type_t *const type = skip_typeref(orig_type); if(token.type != '{') { expression_t *expression = parse_assignment_expression(); + if (expression->base.datatype == NULL) { + /* something bad happens, don't produce further errors */ + return NULL; + } initializer_t *initializer = initializer_from_expression(type, expression); if(initializer == NULL) { errorf(HERE, "initializer expression '%E' of type '%T' is incompatible with type '%T'", - expression, expression->base.datatype, type); + expression, expression->base.datatype, orig_type); } return initializer; } @@ -1327,13 +1339,9 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) } if(declaration == NULL) { - declaration = allocate_ast_zero(sizeof(declaration[0])); - - if(is_struct) { - declaration->namespc = NAMESPACE_STRUCT; - } else { - declaration->namespc = NAMESPACE_UNION; - } + declaration = allocate_declaration_zero(); + declaration->namespc = + (is_struct ? NAMESPACE_STRUCT : NAMESPACE_UNION); declaration->source_position = token.source_position; declaration->symbol = symbol; declaration->parent_context = context; @@ -1367,7 +1375,7 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) return declaration; } -static void parse_enum_entries(enum_type_t *const enum_type) +static void parse_enum_entries(type_t *const enum_type) { eat('{'); @@ -1378,15 +1386,15 @@ static void parse_enum_entries(enum_type_t *const enum_type) } do { - declaration_t *entry = allocate_ast_zero(sizeof(entry[0])); - if(token.type != T_IDENTIFIER) { parse_error_expected("while parsing enum entry", T_IDENTIFIER, 0); eat_block(); return; } + + declaration_t *const entry = allocate_declaration_zero(); entry->storage_class = STORAGE_CLASS_ENUM_ENTRY; - entry->type = (type_t*) enum_type; + entry->type = enum_type; entry->symbol = token.v.symbol; entry->source_position = token.source_position; next_token(); @@ -1430,9 +1438,8 @@ static type_t *parse_enum_specifier(void) } if(declaration == NULL) { - declaration = allocate_ast_zero(sizeof(declaration[0])); - - declaration->namespc = NAMESPACE_ENUM; + declaration = allocate_declaration_zero(); + declaration->namespc = NAMESPACE_ENUM; declaration->source_position = token.source_position; declaration->symbol = symbol; declaration->parent_context = context; @@ -1451,7 +1458,7 @@ static type_t *parse_enum_specifier(void) append_declaration(declaration); declaration->init.is_defined = 1; - parse_enum_entries(&type->enumt); + parse_enum_entries(type); parse_attributes(); } @@ -1673,7 +1680,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) } break; - /* TODO: if type != NULL for the following rules should issue + /* TODO: if is_type_valid(type) for the following rules should issue * an error */ case T_struct: { type = allocate_type_zero(TYPE_COMPOUND_STRUCT); @@ -1874,8 +1881,7 @@ static declaration_t *parse_identifier_list(void) declaration_t *declarations = NULL; declaration_t *last_declaration = NULL; do { - declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); - + declaration_t *const declaration = allocate_declaration_zero(); declaration->source_position = token.source_position; declaration->symbol = token.v.symbol; next_token(); @@ -2271,14 +2277,14 @@ static type_t *construct_declarator_type(construct_type_t *construct_list, static declaration_t *parse_declarator( const declaration_specifiers_t *specifiers, bool may_be_abstract) { - type_t *type = specifiers->type; - declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); + declaration_t *const declaration = allocate_declaration_zero(); declaration->storage_class = specifiers->storage_class; declaration->modifiers = specifiers->decl_modifiers; declaration->is_inline = specifiers->is_inline; construct_type_t *construct_type = parse_inner_declarator(declaration, may_be_abstract); + type_t *const type = specifiers->type; declaration->type = construct_declarator_type(construct_type, type); if(construct_type != NULL) { @@ -2372,7 +2378,7 @@ warn_redundant_declaration: errorf(declaration->source_position, "static declaration of '%Y' follows non-static declaration", symbol); errorf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol); } else { - if (old_storage_class != STORAGE_CLASS_EXTERN) { + if (old_storage_class != STORAGE_CLASS_EXTERN && !is_function_definition) { goto warn_redundant_declaration; } if (new_storage_class == STORAGE_CLASS_NONE) { @@ -2401,9 +2407,54 @@ warn_redundant_declaration: return append_declaration(declaration); } +/** + * Check if a given type is a vilid array type. + */ +static bool is_valid_array_type(const type_t *type) { + if (type->kind == TYPE_ARRAY) { + const array_type_t *array = &type->array; + const type_t *etype = skip_typeref(array->element_type); + + if (! is_valid_array_type(etype)) + return false; + + if (etype->kind == TYPE_ATOMIC) { + const atomic_type_t *atype = &etype->atomic; + + if (atype->akind == ATOMIC_TYPE_VOID) { + return false; + } + } + } + return true; +} + static declaration_t *record_declaration(declaration_t *declaration) { - return internal_record_declaration(declaration, false); + declaration = internal_record_declaration(declaration, false); + const type_t *type = skip_typeref(declaration->type); + + /* check the type here for several not allowed combinations */ + if (type->kind == TYPE_FUNCTION) { + const function_type_t* function_type = &type->function; + const type_t* ret_type = skip_typeref(function_type->return_type); + + if (ret_type->kind == TYPE_FUNCTION) { + errorf(declaration->source_position, "'%Y' declared as function returning a function", + declaration->symbol); + declaration->type = type_error_type; + } else if (ret_type->kind == TYPE_ARRAY) { + errorf(declaration->source_position, "'%Y' declared as function returning an array", + declaration->symbol); + declaration->type = type_error_type; + } + } + if (! is_valid_array_type(type)) { + errorf(declaration->source_position, "declaration of '%Y' as array of voids", + declaration->symbol); + declaration->type = type_error_type; + } + return declaration; } static declaration_t *record_function_definition(declaration_t *const declaration) @@ -2444,9 +2495,7 @@ static void parse_init_declarator_rest(declaration_t *declaration) eat('='); type_t *orig_type = declaration->type; - type_t *type = NULL; - if(orig_type != NULL) - type = skip_typeref(orig_type); + type_t *type = type = skip_typeref(orig_type); if(declaration->init.initializer != NULL) { parser_error_multiple_definition(declaration, token.source_position); @@ -2456,7 +2505,7 @@ static void parse_init_declarator_rest(declaration_t *declaration) /* § 6.7.5 (22) array initializers for arrays with unknown size determine * the array type size */ - if(type != NULL && is_type_array(type) && initializer != NULL) { + if(is_type_array(type) && initializer != NULL) { array_type_t *array_type = &type->array; if(array_type->size == NULL) { @@ -2473,7 +2522,7 @@ static void parse_init_declarator_rest(declaration_t *declaration) case INITIALIZER_STRING: { initializer_string_t *const string = &initializer->string; - cnst->conste.v.int_value = strlen(string->string) + 1; + cnst->conste.v.int_value = string->string.size; break; } @@ -2491,7 +2540,7 @@ static void parse_init_declarator_rest(declaration_t *declaration) } } - if(type != NULL && is_type_function(type)) { + if(is_type_function(type)) { errorf(declaration->source_position, "initializers not allowed for function types at declator '%Y' (type '%T')", declaration->symbol, orig_type); @@ -2507,8 +2556,7 @@ static void parse_anonymous_declaration_rest( { eat(';'); - declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); - + declaration_t *const declaration = allocate_declaration_zero(); declaration->type = specifiers->type; declaration->storage_class = specifiers->storage_class; declaration->source_position = specifiers->source_position; @@ -2549,7 +2597,8 @@ static void parse_declaration_rest(declaration_t *ndeclaration, type_t *orig_type = declaration->type; type_t *type = skip_typeref(orig_type); - if(type->kind != TYPE_FUNCTION && declaration->is_inline) { + if(is_type_valid(type) && + type->kind != TYPE_FUNCTION && declaration->is_inline) { warningf(declaration->source_position, "variable '%Y' declared 'inline'\n", declaration->symbol); } @@ -2844,15 +2893,12 @@ static void parse_struct_declarators(const declaration_specifiers_t *specifiers) type_t *type = make_bitfield_type(base_type, size); - declaration = allocate_ast_zero(sizeof(declaration[0])); - + declaration = allocate_declaration_zero(); declaration->namespc = NAMESPACE_NORMAL; declaration->storage_class = STORAGE_CLASS_NONE; declaration->source_position = token.source_position; declaration->modifiers = specifiers->decl_modifiers; declaration->type = type; - - record_declaration(declaration); } else { declaration = parse_declarator(specifiers,/*may_be_abstract=*/true); @@ -2934,10 +2980,15 @@ static expression_t *create_invalid_expression(void) return expression; } +/** + * Prints an error message if an expression was expected but not read + */ static expression_t *expected_expression_error(void) { - errorf(HERE, "expected expression, got token '%K'", &token); - + /* skip the error message if the error token was read */ + if (token.type != T_ERROR) { + errorf(HERE, "expected expression, got token '%K'", &token); + } next_token(); return create_invalid_expression(); @@ -3007,8 +3058,7 @@ static declaration_t *create_implicit_function(symbol_t *symbol, free_type(ntype); } - declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0])); - + declaration_t *const declaration = allocate_declaration_zero(); declaration->storage_class = STORAGE_CLASS_EXTERN; declaration->type = type; declaration->symbol = symbol; @@ -3288,7 +3338,6 @@ static expression_t *parse_function_keyword(void) expression->expression.kind = EXPR_FUNCTION; expression->expression.datatype = type_string; - expression->value = current_function->symbol->string; return (expression_t*) expression; } @@ -3307,7 +3356,6 @@ static expression_t *parse_pretty_function_keyword(void) expression->expression.kind = EXPR_PRETTY_FUNCTION; expression->expression.datatype = type_string; - expression->value = current_function->symbol->string; return (expression_t*) expression; } @@ -3632,7 +3680,7 @@ static void check_for_char_index_type(const expression_t *expression) { type_t *base_type = skip_typeref(type); if (base_type->base.kind == TYPE_ATOMIC) { - if (base_type->atomic.akind == ATOMIC_TYPE_CHAR) { + switch (base_type->atomic.akind == ATOMIC_TYPE_CHAR) { warningf(expression->base.source_position, "array subscript has type '%T'", type); } @@ -3817,7 +3865,7 @@ static expression_t *parse_call_expression(unsigned precedence, function_type_t *function_type = NULL; type_t *orig_type = expression->base.datatype; - if(orig_type != NULL) { + if(is_type_valid(orig_type)) { type_t *type = skip_typeref(orig_type); if(is_type_pointer(type)) { @@ -3941,9 +3989,9 @@ static expression_t *parse_conditional_expression(unsigned precedence, /* 6.5.15.2 */ type_t *condition_type_orig = expression->base.datatype; - if(condition_type_orig != NULL) { + if(is_type_valid(condition_type_orig)) { type_t *condition_type = skip_typeref(condition_type_orig); - if(condition_type != NULL && !is_type_scalar(condition_type)) { + if(condition_type->kind != TYPE_ERROR && !is_type_scalar(condition_type)) { type_error("expected a scalar type in conditional condition", expression->base.source_position, condition_type_orig); } @@ -3958,7 +4006,7 @@ static expression_t *parse_conditional_expression(unsigned precedence, 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) + if(!is_type_valid(orig_true_type) || !is_type_valid(orig_false_type)) return result; type_t *true_type = skip_typeref(orig_true_type); @@ -4026,7 +4074,7 @@ static expression_t *parse_builtin_classify_type(const unsigned precedence) static void semantic_incdec(unary_expression_t *expression) { type_t *orig_type = expression->value->base.datatype; - if(orig_type == NULL) + if(!is_type_valid(orig_type)) return; type_t *type = skip_typeref(orig_type); @@ -4042,7 +4090,7 @@ static void semantic_incdec(unary_expression_t *expression) static void semantic_unexpr_arithmetic(unary_expression_t *expression) { type_t *orig_type = expression->value->base.datatype; - if(orig_type == NULL) + if(!is_type_valid(orig_type)) return; type_t *type = skip_typeref(orig_type); @@ -4058,7 +4106,7 @@ static void semantic_unexpr_arithmetic(unary_expression_t *expression) static void semantic_unexpr_scalar(unary_expression_t *expression) { type_t *orig_type = expression->value->base.datatype; - if(orig_type == NULL) + if(!is_type_valid(orig_type)) return; type_t *type = skip_typeref(orig_type); @@ -4073,7 +4121,7 @@ static void semantic_unexpr_scalar(unary_expression_t *expression) static void semantic_unexpr_integer(unary_expression_t *expression) { type_t *orig_type = expression->value->base.datatype; - if(orig_type == NULL) + if(!is_type_valid(orig_type)) return; type_t *type = skip_typeref(orig_type); @@ -4088,7 +4136,7 @@ static void semantic_unexpr_integer(unary_expression_t *expression) static void semantic_dereference(unary_expression_t *expression) { type_t *orig_type = expression->value->base.datatype; - if(orig_type == NULL) + if(!is_type_valid(orig_type)) return; type_t *type = skip_typeref(orig_type); @@ -4113,7 +4161,7 @@ static void semantic_take_addr(unary_expression_t *expression) value->base.datatype = revert_automatic_type_conversion(value); type_t *orig_type = value->base.datatype; - if(orig_type == NULL) + if(!is_type_valid(orig_type)) return; if(value->kind == EXPR_REFERENCE) { @@ -4513,7 +4561,15 @@ static void semantic_binexpr_assign(binary_expression_t *expression) return; } - semantic_assign(orig_type_left, &expression->right, "assignment"); + type_t *const res_type = semantic_assign(orig_type_left, expression->right, + "assignment"); + if (res_type == NULL) { + errorf(expression->expression.source_position, + "cannot assign to '%T' from '%T'", + orig_type_left, expression->right->base.datatype); + } else { + expression->right = create_implicit_cast(expression->right, res_type); + } expression->expression.datatype = orig_type_left; } @@ -4969,7 +5025,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_t *const declaration = allocate_declaration_zero(); declaration->namespc = NAMESPACE_LABEL; declaration->symbol = symbol; @@ -5203,20 +5259,20 @@ static statement_t *parse_goto(void) */ static statement_t *parse_continue(void) { - statement_base_t *statement; + statement_t *statement; if (current_loop == NULL) { errorf(HERE, "continue statement not within loop"); statement = NULL; } else { - statement = allocate_ast_zero(sizeof(statement[0])); - statement->kind = STATEMENT_CONTINUE; - statement->source_position = token.source_position; + statement = allocate_statement_zero(STATEMENT_CONTINUE); + + statement->base.source_position = token.source_position; } eat(T_continue); expect(';'); - return (statement_t*)statement; + return statement; } /** @@ -5224,20 +5280,20 @@ static statement_t *parse_continue(void) */ static statement_t *parse_break(void) { - statement_base_t *statement; + statement_t *statement; if (current_switch == NULL && current_loop == NULL) { errorf(HERE, "break statement not within loop or switch"); statement = NULL; } else { - statement = allocate_ast_zero(sizeof(statement[0])); - statement->kind = STATEMENT_BREAK; - statement->source_position = token.source_position; + statement = allocate_statement_zero(STATEMENT_BREAK); + + statement->base.source_position = token.source_position; } eat(T_break); expect(';'); - return (statement_t*)statement; + return statement; } /** @@ -5310,8 +5366,20 @@ static statement_t *parse_return(void) "'return' with a value, in function returning void"); return_value = NULL; } else { - if(return_type != NULL) { - semantic_assign(return_type, &return_value, "'return'"); + if(is_type_valid(return_type)) { + if (return_value->base.datatype == NULL) + return (statement_t*)statement; + + type_t *const res_type = semantic_assign(return_type, + return_value, "'return'"); + if (res_type == NULL) { + errorf(statement->statement.source_position, + "cannot assign to '%T' from '%T'", + "cannot return something of type '%T' in function returning '%T'", + return_value->base.datatype, return_type); + } else { + return_value = create_implicit_cast(return_value, res_type); + } } } /* check for returning address of a local var */