mirror of
https://github.com/Ed94/Odin.git
synced 2026-08-06 15:48:51 +00:00
CHECK 3 done
Enhance support for polymorphic procedures in type checking 1. In src/check_type.cpp, added special handling for polymorphic procedures used as default parameter values. We now allow a polymorphic procedure to be used as a default parameter value, even when its type parameters can't be immediately determined. 2. In src/check_expr.cpp, we modified the check_is_assignable_to_with_score function to handle the special case of assigning a polymorphic procedure as a default parameter. The function now allows a polymorphic procedure to be assigned to a concrete procedure type in this specific context.
This commit is contained in:
+29
-9
@@ -643,7 +643,7 @@ gb_internal bool find_or_generate_polymorphic_procedure(CheckerContext *old_c, E
|
|||||||
|
|
||||||
gb_internal bool check_polymorphic_procedure_assignment(CheckerContext *c, Operand *operand, Type *type, Ast *poly_def_node, PolyProcData *poly_proc_data) {
|
gb_internal bool check_polymorphic_procedure_assignment(CheckerContext *c, Operand *operand, Type *type, Ast *poly_def_node, PolyProcData *poly_proc_data) {
|
||||||
if (operand->expr == nullptr) return false;
|
if (operand->expr == nullptr) return false;
|
||||||
Entity *base_entity = entity_of_node(operand->expr);
|
Entity *base_entity = entity_from_expr(operand->expr);
|
||||||
if (base_entity == nullptr) return false;
|
if (base_entity == nullptr) return false;
|
||||||
return find_or_generate_polymorphic_procedure(c, base_entity, type, nullptr, poly_def_node, poly_proc_data);
|
return find_or_generate_polymorphic_procedure(c, base_entity, type, nullptr, poly_def_node, poly_proc_data);
|
||||||
}
|
}
|
||||||
@@ -995,14 +995,34 @@ gb_internal i64 assign_score_function(i64 distance, bool is_variadic=false) {
|
|||||||
|
|
||||||
|
|
||||||
gb_internal bool check_is_assignable_to_with_score(CheckerContext *c, Operand *operand, Type *type, i64 *score_, bool is_variadic=false, bool allow_array_programming=true) {
|
gb_internal bool check_is_assignable_to_with_score(CheckerContext *c, Operand *operand, Type *type, i64 *score_, bool is_variadic=false, bool allow_array_programming=true) {
|
||||||
i64 score = 0;
|
if (c == nullptr) {
|
||||||
i64 distance = check_distance_between_types(c, operand, type, allow_array_programming);
|
GB_ASSERT(operand->mode == Addressing_Value);
|
||||||
bool ok = distance >= 0;
|
GB_ASSERT(is_type_typed(operand->type));
|
||||||
if (ok) {
|
|
||||||
score = assign_score_function(distance, is_variadic);
|
|
||||||
}
|
}
|
||||||
if (score_) *score_ = score;
|
if (operand->mode == Addressing_Invalid || type == t_invalid) {
|
||||||
return ok;
|
if (score_) *score_ = 0;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle polymorphic procedure used as default parameter
|
||||||
|
if (operand->mode == Addressing_Value && is_type_proc(type) && is_type_proc(operand->type)) {
|
||||||
|
Entity *e = entity_from_expr(operand->expr);
|
||||||
|
if (e != nullptr && e->kind == Entity_Procedure && is_type_polymorphic(e->type) && !is_type_polymorphic(type)) {
|
||||||
|
// Special case: Allow a polymorphic procedure to be used as default value for concrete proc type
|
||||||
|
// during the initial check. It will be properly instantiated when actually used.
|
||||||
|
if (score_) *score_ = assign_score_function(1);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
i64 score = check_distance_between_types(c, operand, type, allow_array_programming);
|
||||||
|
if (score >= 0) {
|
||||||
|
if (score_) *score_ = assign_score_function(score, is_variadic);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (score_) *score_ = 0;
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -10996,7 +11016,7 @@ gb_internal ExprKind check_expr_base_internal(CheckerContext *c, Operand *o, Ast
|
|||||||
return kind;
|
return kind;
|
||||||
case_end;
|
case_end;
|
||||||
|
|
||||||
case_ast_node(i, Implicit, node)
|
case_ast_node(i, Implicit, node);
|
||||||
switch (i->kind) {
|
switch (i->kind) {
|
||||||
case Token_context:
|
case Token_context:
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1910,6 +1910,15 @@ gb_internal Type *check_get_params(CheckerContext *ctx, Scope *scope, Ast *_para
|
|||||||
case ParameterValue_Location:
|
case ParameterValue_Location:
|
||||||
case ParameterValue_Expression:
|
case ParameterValue_Expression:
|
||||||
case ParameterValue_Value:
|
case ParameterValue_Value:
|
||||||
|
// Special case for polymorphic procedures as default values
|
||||||
|
if (param_value.ast_value != nullptr) {
|
||||||
|
Entity *e = entity_from_expr(param_value.ast_value);
|
||||||
|
if (e != nullptr && e->kind == Entity_Procedure && is_type_polymorphic(e->type)) {
|
||||||
|
// Allow polymorphic procedures as default parameter values
|
||||||
|
// The type will be correctly determined at call site
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
gbString str = type_to_string(type);
|
gbString str = type_to_string(type);
|
||||||
error(params[i], "A default value for a parameter must not be a polymorphic constant type, got %s", str);
|
error(params[i], "A default value for a parameter must not be a polymorphic constant type, got %s", str);
|
||||||
gb_string_free(str);
|
gb_string_free(str);
|
||||||
|
|||||||
Reference in New Issue
Block a user