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

Remove piggyback of tag unions for lambda sets

Browse source
This commit is contained in:
Ayaz Hafiz 2022-06-01 10:51:32 -05:00
parent b4bca5423b
commit 2f29326e7a
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
1 changed files with 1 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -801,51 +801,7 @@ fn unify_lambda_set(
match other { match other {
FlexVar(_) => merge(subs, ctx, Content::LambdaSet(lambda_set)), FlexVar(_) => merge(subs, ctx, Content::LambdaSet(lambda_set)),
Content::LambdaSet(other_lambda_set) => { Content::LambdaSet(other_lambda_set) => {
let mut into_tag = |lset| match lset { unify_lambda_set_help(subs, pool, ctx, lambda_set, *other_lambda_set)
LambdaSet {
solved,
recursion_var,
} => {
let ext = fresh(subs, pool, ctx, Content::FlexVar(None));
match recursion_var.into_variable() {
Some(rv) => FlatType::RecursiveTagUnion(rv, solved, ext),
None => FlatType::TagUnion(solved, ext),
}
}
};
let tag1 = into_tag(lambda_set);
let tag2 = into_tag(*other_lambda_set);
let outcome = unify_flat_type(subs, pool, ctx, &tag1, &tag2);
if outcome.mismatches.is_empty() {
let (solved, recursion_var) = match subs.get_content_without_compacting(ctx.first) {
Content::Structure(FlatType::TagUnion(solved, e)) => {
debug_assert!(matches!(
subs.get_content_without_compacting(*e),
Content::FlexVar(..)
));
(*solved, OptVariable::NONE)
}
Content::Structure(FlatType::RecursiveTagUnion(rv, solved, e)) => {
debug_assert!(matches!(
subs.get_content_without_compacting(*e),
Content::FlexVar(..)
));
(*solved, OptVariable::from(*rv))
}
c => panic!(
"not a union: {:?}",
roc_types::subs::SubsFmtContent(c, subs)
),
};
let lset = Content::LambdaSet(self::LambdaSet {
solved,
recursion_var,
});
subs.set_content(ctx.first, lset);
subs.set_content(ctx.second, lset);
}
outcome
// unify_lambda_set_help(subs, pool, ctx, lambda_set, *other_lambda_set)
} }
RecursionVar { structure, .. } => { RecursionVar { structure, .. } => {
// suppose that the recursion var is a lambda set // suppose that the recursion var is a lambda set
@ -860,7 +816,6 @@ fn unify_lambda_set(
} }
} }
#[allow(unused)]
fn unify_lambda_set_help( fn unify_lambda_set_help(
subs: &mut Subs, subs: &mut Subs,
pool: &mut Pool, pool: &mut Pool,