language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 16:44:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Unify functions fx vars

Browse source
This commit is contained in:
Agus Zubiaga 2024-10-08 20:59:10 -03:00
parent 5a5abe3bc5
commit 7776883262
No known key found for this signature in database
26 changed files with 222 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/compiler/unify/src/unify.rs
View file

@ -3309,17 +3309,19 @@ fn unify_flat_type<M: MetaCollector>(
outcome
}
(Func(l_args, l_closure, l_ret), Func(r_args, r_closure, r_ret))
(Func(l_args, l_closure, l_ret, l_fx), Func(r_args, r_closure, r_ret, r_fx))
if l_args.len() == r_args.len() =>
{
let arg_outcome = unify_zip_slices(env, pool, *l_args, *r_args, ctx.mode);
let ret_outcome = unify_pool(env, pool, *l_ret, *r_ret, ctx.mode);
let closure_outcome = unify_pool(env, pool, *l_closure, *r_closure, ctx.mode);
let fx_outcome = unify_pool(env, pool, *l_fx, *r_fx, ctx.mode);
let mut outcome = ret_outcome;
outcome.union(closure_outcome);
outcome.union(arg_outcome);
outcome.union(fx_outcome);
if outcome.mismatches.is_empty() {
let merged_closure_var = choose_merged_var(env, *l_closure, *r_closure);
@ -3327,13 +3329,13 @@ fn unify_flat_type<M: MetaCollector>(
outcome.union(merge(
env,
ctx,
Structure(Func(*r_args, merged_closure_var, *r_ret)),
Structure(Func(*r_args, merged_closure_var, *r_ret, *r_fx)),
));
}
outcome
}
(FunctionOrTagUnion(tag_names, tag_symbols, ext), Func(args, closure, ret)) => {
(FunctionOrTagUnion(tag_names, tag_symbols, ext), Func(args, closure, ret, fx)) => {
unify_function_or_tag_union_and_func(
env,
pool,
@ -3344,10 +3346,11 @@ fn unify_flat_type<M: MetaCollector>(
*args,
*ret,
*closure,
*fx,
true,
)
}
(Func(args, closure, ret), FunctionOrTagUnion(tag_names, tag_symbols, ext)) => {
(Func(args, closure, ret, fx), FunctionOrTagUnion(tag_names, tag_symbols, ext)) => {
unify_function_or_tag_union_and_func(
env,
pool,
@ -3358,6 +3361,7 @@ fn unify_flat_type<M: MetaCollector>(
*args,
*ret,
*closure,
*fx,
false,
)
}
@ -3928,6 +3932,7 @@ fn unify_function_or_tag_union_and_func<M: MetaCollector>(
function_arguments: VariableSubsSlice,
function_return: Variable,
function_lambda_set: Variable,
function_fx: Variable,
left: bool,
) -> Outcome<M> {
let tag_names = env.get_subs_slice(tag_names_slice).to_vec();
@ -3946,6 +3951,12 @@ fn unify_function_or_tag_union_and_func<M: MetaCollector>(
unify_pool(env, pool, function_return, new_tag_union_var, ctx.mode)
};
outcome.union(if left {
unify_pool(env, pool, Variable::PURE, function_fx, ctx.mode)
} else {
unify_pool(env, pool, function_fx, Variable::PURE, ctx.mode)
});
{
let lambda_names = env.get_subs_slice(tag_fn_lambdas).to_vec();
let new_lambda_names = slice_extend_new(&mut env.symbol_names, lambda_names);