language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-01 07:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Lambda sets don't need extension vars

Browse source
This commit is contained in:
Ayaz Hafiz 2022-05-31 17:40:21 -05:00
parent c2a2ce690c
commit 790eb8e20c
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
18 changed files with 165 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

37
compiler/unify/src/unify.rs
View file

@ -867,27 +867,34 @@ fn unify_lambda_set_help(
}
if joined_lambdas.len() == num_shared {
mismatch!(
"Problem with lambda sets: there should be {:?} matching lambda, but only found {:?}",
num_shared,
&joined_lambdas
)
} else {
let all_lambdas = joined_lambdas;
let all_lambdas = merge_sorted(
joined_lambdas,
(only_in_1.into_iter())
.chain(only_in_2.into_iter())
.map(|(name, subs_slice)| {
let vec = subs.get_subs_slice(subs_slice).to_vec();
all_lambdas,
only_in_1.into_iter().map(|(name, subs_slice)| {
let vec = subs.get_subs_slice(subs_slice).to_vec();
(name, vec)
}),
(name, vec)
}),
);
let all_lambdas = merge_sorted(
all_lambdas,
only_in_2.into_iter().map(|(name, subs_slice)| {
let vec = subs.get_subs_slice(subs_slice).to_vec();
(name, vec)
}),
);
let new_solved = UnionTags::insert_into_subs(subs, all_lambdas);
let new_lambda_set = Content::LambdaSet(LambdaSet { solved: new_solved });
merge(subs, ctx, new_lambda_set)
} else {
mismatch!(
"Problem with lambda sets: there should be {:?} matching lambda, but only found {:?}",
num_shared,
&joined_lambdas
)
}
}
@ -2165,9 +2172,7 @@ fn unify_function_or_tag_union_and_func(
{
let tag_name = TagName::Closure(tag_symbol);
let union_tags = UnionTags::tag_without_arguments(subs, tag_name);
let lambda_set_ext = subs.fresh_unnamed_flex_var();
let lambda_set_content = Structure(FlatType::TagUnion(union_tags, lambda_set_ext));
let lambda_set_content = LambdaSet(self::LambdaSet { solved: union_tags });
let tag_lambda_set = register(
subs,