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

Remove TagName in favor of explicit TagName or Closure

Browse source 
Note that we still need a `TagOrClosure` enum for phases past mono, but
at least we get rid of the branches in the front end.
This commit is contained in:
Ayaz Hafiz 2022-06-01 16:54:04 -05:00
parent bbc022b2f5
commit bde107da49
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
29 changed files with 841 additions and 704 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,8 @@ use roc_types::num::NumericRange;
use roc_types::subs::Content::{self, *};
use roc_types::subs::{
AliasVariables, Descriptor, ErrorTypeContext, FlatType, GetSubsSlice, LambdaSet, Mark,
OptVariable, RecordFields, Subs, SubsIndex, SubsSlice, UnionTags, Variable, VariableSubsSlice,
OptVariable, RecordFields, Subs, SubsIndex, SubsSlice, UnionLabels, UnionLambdas, UnionTags,
Variable, VariableSubsSlice,
};
use roc_types::types::{AliasKind, DoesNotImplementAbility, ErrorType, Mismatch, RecordField};
@ -842,19 +843,11 @@ fn unify_lambda_set_help(
"Recursion var is present, but it doesn't have a recursive content!"
);
let (separate_solved, _, _) = separate_union_tags(
subs,
solved1,
Variable::EMPTY_TAG_UNION,
solved2,
Variable::EMPTY_TAG_UNION,
);
let Separate {
only_in_1,
only_in_2,
in_both,
} = separate_solved;
} = separate_union_lambdas(subs, solved1, solved2);
let num_shared = in_both.len();
@ -898,7 +891,6 @@ fn unify_lambda_set_help(
all_lambdas,
only_in_1.into_iter().map(|(name, subs_slice)| {
let vec = subs.get_subs_slice(subs_slice).to_vec();
(name, vec)
}),
);
@ -906,7 +898,6 @@ fn unify_lambda_set_help(
all_lambdas,
only_in_2.into_iter().map(|(name, subs_slice)| {
let vec = subs.get_subs_slice(subs_slice).to_vec();
(name, vec)
}),
);
@ -917,7 +908,7 @@ fn unify_lambda_set_help(
(None, None) => OptVariable::NONE,
};
let new_solved = UnionTags::insert_into_subs(subs, all_lambdas);
let new_solved = UnionLabels::insert_into_subs(subs, all_lambdas);
let new_lambda_set = Content::LambdaSet(LambdaSet {
solved: new_solved,
recursion_var,
@ -1330,6 +1321,19 @@ fn separate_union_tags(
(separate(it1, it2), new_ext1, new_ext2)
}
fn separate_union_lambdas(
subs: &Subs,
fields1: UnionLambdas,
fields2: UnionLambdas,
) -> Separate<Symbol, VariableSubsSlice> {
debug_assert!(fields1.is_sorted_no_duplicates(subs));
debug_assert!(fields2.is_sorted_no_duplicates(subs));
let it1 = fields1.iter_all().map(|(s, vars)| (subs[s], subs[vars]));
let it2 = fields2.iter_all().map(|(s, vars)| (subs[s], subs[vars]));
separate(it1, it2)
}
#[derive(Debug, Copy, Clone)]
enum Rec {
None,
@ -2214,8 +2218,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 union_tags = UnionLambdas::tag_without_arguments(subs, tag_symbol);
let lambda_set_content = LambdaSet(self::LambdaSet {
solved: union_tags,
recursion_var: OptVariable::NONE,