mirror of
https://github.com/odin-lang/Odin.git
synced 2026-01-07 05:23:12 +00:00
Try try and or_else built-in procedures with operators try and try else
This commit is contained in:
gingerBill
@@ -47,181 +47,6 @@ BuiltinTypeIsProc *builtin_type_is_procs[BuiltinProc__type_simple_boolean_end -
|
||||
type_has_nil,
|
||||
};
|
||||
|
||||
void check_promote_optional_ok(CheckerContext *c, Operand *x, Type **val_type_, Type **ok_type_) {
|
||||
switch (x->mode) {
|
||||
case Addressing_MapIndex:
|
||||
case Addressing_OptionalOk:
|
||||
case Addressing_OptionalOkPtr:
|
||||
if (val_type_) *val_type_ = x->type;
|
||||
break;
|
||||
default:
|
||||
if (ok_type_) *ok_type_ = x->type;
|
||||
return;
|
||||
}
|
||||
|
||||
Ast *expr = unparen_expr(x->expr);
|
||||
|
||||
if (expr->kind == Ast_CallExpr) {
|
||||
Type *pt = base_type(type_of_expr(expr->CallExpr.proc));
|
||||
if (is_type_proc(pt)) {
|
||||
Type *tuple = pt->Proc.results;
|
||||
add_type_and_value(&c->checker->info, x->expr, x->mode, tuple, x->value);
|
||||
|
||||
if (pt->Proc.result_count >= 2) {
|
||||
if (ok_type_) *ok_type_ = tuple->Tuple.variables[1]->type;
|
||||
}
|
||||
expr->CallExpr.optional_ok_one = false;
|
||||
x->type = tuple;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
Type *tuple = make_optional_ok_type(x->type);
|
||||
if (ok_type_) *ok_type_ = tuple->Tuple.variables[1]->type;
|
||||
add_type_and_value(&c->checker->info, x->expr, x->mode, tuple, x->value);
|
||||
x->type = tuple;
|
||||
GB_ASSERT(is_type_tuple(type_of_expr(x->expr)));
|
||||
}
|
||||
|
||||
void check_try_split_types(CheckerContext *c, Operand *x, String const &name, Type **left_type_, Type **right_type_) {
|
||||
Type *left_type = nullptr;
|
||||
Type *right_type = nullptr;
|
||||
if (x->type->kind == Type_Tuple) {
|
||||
auto const &vars = x->type->Tuple.variables;
|
||||
auto lhs = array_slice(vars, 0, vars.count-1);
|
||||
auto rhs = vars[vars.count-1];
|
||||
if (lhs.count == 1) {
|
||||
left_type = lhs[0]->type;
|
||||
} else if (lhs.count != 0) {
|
||||
left_type = alloc_type_tuple();
|
||||
left_type->Tuple.variables = array_make_from_ptr(lhs.data, lhs.count, lhs.count);
|
||||
}
|
||||
|
||||
right_type = rhs->type;
|
||||
} else {
|
||||
check_promote_optional_ok(c, x, &left_type, &right_type);
|
||||
}
|
||||
|
||||
if (left_type_) *left_type_ = left_type;
|
||||
if (right_type_) *right_type_ = right_type;
|
||||
|
||||
if (!type_has_nil(right_type) && !is_type_boolean(right_type)) {
|
||||
gbString str = type_to_string(right_type);
|
||||
error(x->expr, "'%.*s' expects an \"optional ok\" like value, or an n-valued expression where the last value is either a boolean or can be compared against 'nil', got %s", LIT(name), str);
|
||||
gb_string_free(str);
|
||||
}
|
||||
}
|
||||
|
||||
bool check_builtin_try(CheckerContext *c, Operand *operand, String const &name, Ast *call, Type *type_hint) {
|
||||
ast_node(ce, CallExpr, call);
|
||||
|
||||
Operand x = {};
|
||||
check_multi_expr_with_type_hint(c, &x, ce->args[0], type_hint);
|
||||
if (x.mode == Addressing_Invalid) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (c->in_defer) {
|
||||
error(call, "'%.*s' cannot be used within a defer statement", LIT(name));
|
||||
}
|
||||
|
||||
Type *left_type = nullptr;
|
||||
Type *right_type = nullptr;
|
||||
check_try_split_types(c, &x, name, &left_type, &right_type);
|
||||
add_type_and_value(&c->checker->info, ce->args[0], x.mode, x.type, x.value);
|
||||
|
||||
if (c->curr_proc_sig == nullptr) {
|
||||
error(call, "'%.*s' can only be used within a procedure", LIT(name));
|
||||
}
|
||||
Type *proc_type = base_type(c->curr_proc_sig);
|
||||
GB_ASSERT(proc_type->kind == Type_Proc);
|
||||
Type *result_type = proc_type->Proc.results;
|
||||
if (result_type == nullptr) {
|
||||
error(call, "'%.*s' requires the current procedure to have at least one return value", LIT(name));
|
||||
} else {
|
||||
GB_ASSERT(result_type->kind == Type_Tuple);
|
||||
|
||||
auto const &vars = result_type->Tuple.variables;
|
||||
Type *end_type = vars[vars.count-1]->type;
|
||||
|
||||
if (vars.count > 1) {
|
||||
if (!proc_type->Proc.has_named_results) {
|
||||
error(call, "'%.*s' within a procedure with more than 1 return value requires that the return values are named, allowing for early return", LIT(name));
|
||||
}
|
||||
}
|
||||
|
||||
Operand rhs = {};
|
||||
rhs.type = right_type;
|
||||
rhs.mode = Addressing_Value;
|
||||
|
||||
// TODO(bill): better error message
|
||||
if (!check_is_assignable_to(c, &rhs, end_type)) {
|
||||
gbString a = type_to_string(right_type);
|
||||
gbString b = type_to_string(end_type);
|
||||
gbString ret_type = type_to_string(result_type);
|
||||
error(call, "Cannot assign end value of type '%s' to '%s' in '%.*s'", a, b, LIT(name));
|
||||
if (vars.count == 1) {
|
||||
error_line("\tProcedure return value type: %s\n", ret_type);
|
||||
} else {
|
||||
error_line("\tProcedure return value types: (%s)\n", ret_type);
|
||||
}
|
||||
gb_string_free(ret_type);
|
||||
gb_string_free(b);
|
||||
gb_string_free(a);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (left_type != nullptr) {
|
||||
operand->mode = Addressing_Value;
|
||||
operand->type = left_type;
|
||||
} else {
|
||||
operand->mode = Addressing_NoValue;
|
||||
operand->type = nullptr;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool check_builtin_or_else(CheckerContext *c, Operand *operand, String const &name, Ast *call, Type *type_hint) {
|
||||
ast_node(ce, CallExpr, call);
|
||||
|
||||
Operand x = {};
|
||||
Operand y = {};
|
||||
check_multi_expr_with_type_hint(c, &x, ce->args[0], type_hint);
|
||||
if (x.mode == Addressing_Invalid) {
|
||||
return false;
|
||||
}
|
||||
|
||||
check_multi_expr(c, &y, ce->args[1]);
|
||||
error_operand_no_value(&y);
|
||||
if (y.mode == Addressing_Invalid) {
|
||||
return false;
|
||||
}
|
||||
|
||||
Type *left_type = nullptr;
|
||||
Type *right_type = nullptr;
|
||||
check_try_split_types(c, &x, name, &left_type, &right_type);
|
||||
add_type_and_value(&c->checker->info, ce->args[0], x.mode, x.type, x.value);
|
||||
|
||||
if (left_type != nullptr) {
|
||||
check_assignment(c, &y, left_type, name);
|
||||
} else {
|
||||
// TODO(bill): better error message
|
||||
error(call, "'%.*s' does not return a value", LIT(name));
|
||||
}
|
||||
|
||||
|
||||
if (left_type == nullptr) {
|
||||
left_type = t_invalid;
|
||||
}
|
||||
operand->mode = Addressing_Value;
|
||||
operand->type = left_type;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32 id, Type *type_hint) {
|
||||
ast_node(ce, CallExpr, call);
|
||||
if (ce->inlining != ProcInlining_none) {
|
||||
@@ -259,10 +84,6 @@ bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32
|
||||
// NOTE(bill): The first arg may be a Type, this will be checked case by case
|
||||
break;
|
||||
|
||||
case BuiltinProc_try:
|
||||
case BuiltinProc_or_else:
|
||||
// NOTE(bill): The first arg may be a tuple
|
||||
break;
|
||||
|
||||
case BuiltinProc_DIRECTIVE: {
|
||||
ast_node(bd, BasicDirective, ce->proc);
|
||||
@@ -1891,11 +1712,6 @@ bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32
|
||||
break;
|
||||
}
|
||||
|
||||
case BuiltinProc_try:
|
||||
return check_builtin_try(c, operand, builtin_name, call, type_hint);
|
||||
case BuiltinProc_or_else:
|
||||
return check_builtin_or_else(c, operand, builtin_name, call, type_hint);
|
||||
|
||||
case BuiltinProc_simd_vector: {
|
||||
Operand x = {};
|
||||
Operand y = {};
|
||||
|
||||
Reference in New Issue
Block a user