language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 13:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Unification of multiple tag-functions

Browse source
This commit is contained in:
Ayaz Hafiz 2022-10-03 12:20:08 -05:00
parent 61cf8e53e6
commit 06e5110aa5
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
2 changed files with 77 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/compiler/solve/tests/solve_expr.rs
View file

@ -7841,4 +7841,18 @@ mod solve_expr {
"hasher -> hasher | hasher has Hasher", "hasher -> hasher | hasher has Hasher",
); );
} }
#[test]
fn dispatch_tag_union_function_inferred() {
infer_eq_without_problem(
indoc!(
r#"
g = if Bool.true then A else B
g ""
"#
),
"[A Str, B Str]*",
);
}
} }

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

@ -2685,34 +2685,20 @@ fn unify_flat_type<M: MetaCollector>(
false, false,
) )
} }
(FunctionOrTagUnion(tag_names_1, _, ext1), FunctionOrTagUnion(tag_names_2, _, ext2)) => { (
let tag_name_1_ref = &env.subs.get_subs_slice(*tag_names_1); FunctionOrTagUnion(tag_names_1, tag_symbols_1, ext1),
let tag_name_2_ref = &env.subs.get_subs_slice(*tag_names_2); FunctionOrTagUnion(tag_names_2, tag_symbols_2, ext2),
) => unify_two_function_or_tag_unions(
if tag_name_1_ref == tag_name_2_ref { env,
let outcome = unify_pool(env, pool, *ext1, *ext2, ctx.mode); pool,
if outcome.mismatches.is_empty() { ctx,
let content = *env.subs.get_content_without_compacting(ctx.second); *tag_names_1,
merge(env, ctx, content) *tag_symbols_1,
} else { *ext1,
outcome *tag_names_2,
} *tag_symbols_2,
} else { *ext2,
let empty_tag_var_slices_1 = SubsSlice::extend_new( ),
&mut env.subs.variable_slices,
std::iter::repeat(Default::default()).take(tag_names_1.len()),
);
let tags1 = UnionTags::from_slices(*tag_names_1, empty_tag_var_slices_1);
let empty_tag_var_slices_2 = SubsSlice::extend_new(
&mut env.subs.variable_slices,
std::iter::repeat(Default::default()).take(tag_names_2.len()),
);
let tags2 = UnionTags::from_slices(*tag_names_2, empty_tag_var_slices_2);
unify_tag_unions(env, pool, ctx, tags1, *ext1, tags2, *ext2, Rec::None)
}
}
(TagUnion(tags1, ext1), FunctionOrTagUnion(tag_names, _, ext2)) => { (TagUnion(tags1, ext1), FunctionOrTagUnion(tag_names, _, ext2)) => {
let empty_tag_var_slices = SubsSlice::extend_new( let empty_tag_var_slices = SubsSlice::extend_new(
&mut env.subs.variable_slices, &mut env.subs.variable_slices,
@ -3231,3 +3217,52 @@ fn unify_function_or_tag_union_and_func<M: MetaCollector>(
outcome outcome
} }
fn unify_two_function_or_tag_unions<M: MetaCollector>(
env: &mut Env,
pool: &mut Pool,
ctx: &Context,
tag_names_1: SubsSlice<TagName>,
tag_symbols_1: SubsSlice<Symbol>,
ext1: Variable,
tag_names_2: SubsSlice<TagName>,
tag_symbols_2: SubsSlice<Symbol>,
ext2: Variable,
) -> Outcome<M> {
let merged_tags = {
let mut all_tags: Vec<_> = (env.subs.get_subs_slice(tag_names_1).iter())
.chain(env.subs.get_subs_slice(tag_names_2))
.cloned()
.collect();
all_tags.sort();
all_tags.dedup();
SubsSlice::extend_new(&mut env.subs.tag_names, all_tags)
};
let merged_lambdas = {
let mut all_lambdas: Vec<_> = (env.subs.get_subs_slice(tag_symbols_1).iter())
.chain(env.subs.get_subs_slice(tag_symbols_2))
.cloned()
.collect();
all_lambdas.sort();
all_lambdas.dedup();
SubsSlice::extend_new(&mut env.subs.closure_names, all_lambdas)
};
let mut outcome = unify_pool(env, pool, ext1, ext2, ctx.mode);
if !outcome.mismatches.is_empty() {
return outcome;
}
let merge_outcome = merge(
env,
ctx,
Content::Structure(FlatType::FunctionOrTagUnion(
merged_tags,
merged_lambdas,
ext1,
)),
);
outcome.union(merge_outcome);
outcome
}