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

Allow union lambdas to have duplicates

Browse source
This commit is contained in:
Ayaz Hafiz 2022-06-27 13:07:22 -04:00 • committed by ayazhafiz
parent 8fb9ccccfe
commit ca87faa906
No known key found for this signature in database
GPG key ID: B443F7A3030C9AED
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/compiler/types/src/subs.rs
View file

@ -2650,11 +2650,14 @@ impl<L> UnionLabels<L>
where where
L: Label + Ord, L: Label + Ord,
{ {
pub fn is_sorted_no_duplicates(&self, subs: &Subs) -> bool { /// Checks if the union of labels is sorted by label.
/// Duplicates *are* admitted, since this represents a lambda set, in which we may have
/// duplicate lambda captures, if those lambda captures have different representations!
pub fn is_sorted(&self, subs: &Subs) -> bool {
let mut iter = self.iter_from_subs(subs).peekable(); let mut iter = self.iter_from_subs(subs).peekable();
while let Some((before, _)) = iter.next() { while let Some((before, _)) = iter.next() {
if let Some((after, _)) = iter.peek() { if let Some((after, _)) = iter.peek() {
if before >= after { if before > after {
return false; return false;
} }
} }

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

@ -1506,8 +1506,8 @@ fn separate_union_lambdas(
fields1: UnionLambdas, fields1: UnionLambdas,
fields2: UnionLambdas, fields2: UnionLambdas,
) -> Separate<Symbol, VariableSubsSlice> { ) -> Separate<Symbol, VariableSubsSlice> {
debug_assert!(fields1.is_sorted_no_duplicates(subs)); debug_assert!(fields1.is_sorted(subs));
debug_assert!(fields2.is_sorted_no_duplicates(subs)); debug_assert!(fields2.is_sorted(subs));
let it1 = fields1.iter_all().map(|(s, vars)| (subs[s], subs[vars])); let it1 = fields1.iter_all().map(|(s, vars)| (subs[s], subs[vars]));
let it2 = fields2.iter_all().map(|(s, vars)| (subs[s], subs[vars])); let it2 = fields2.iter_all().map(|(s, vars)| (subs[s], subs[vars]));