language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 05:49:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

use layout_from_recursive_union to generate lambda set recursive layouts

Browse source
This commit is contained in:
Ayaz Hafiz 2022-08-09 16:45:35 -07:00
parent 4d5331557c
commit ee188b8e85
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
1 changed files with 22 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

52
crates/compiler/mono/src/layout.rs
View file

@ -1155,6 +1155,23 @@ impl<'a> LambdaSet<'a> {
opt_rec_var: Option<Variable>,
target_info: TargetInfo,
) -> Layout<'a> {
if let Some(rec_var) = opt_rec_var {
let tags: std::vec::Vec<_> = tags
.iter()
.map(|(sym, vars)| (sym, vars.as_slice()))
.collect();
let tags = UnsortedUnionLabels { tags };
let mut env = Env {
seen: Vec::new_in(arena),
target_info,
arena,
subs,
};
return layout_from_recursive_union(&mut env, rec_var, &tags)
.expect("unable to create lambda set representation");
}
// otherwise, this is a closure with a payload
let variant = union_sorted_tags_help(arena, tags, opt_rec_var, subs, target_info);
@ -1190,34 +1207,12 @@ impl<'a> LambdaSet<'a> {
Layout::Union(UnionLayout::NonRecursive(tag_arguments.into_bump_slice()))
}
Recursive {
sorted_tag_layouts: tags,
} => {
debug_assert!(tags.len() > 1);
let mut tag_arguments = Vec::with_capacity_in(tags.len(), arena);
for (_, tag_args) in tags.iter() {
tag_arguments.push(&tag_args[0..]);
Recursive { .. }
| NullableUnwrapped { .. }
| NullableWrapped { .. }
| NonNullableUnwrapped { .. } => {
internal_error!("Recursive layouts should be produced in an earlier branch")
}
Layout::Union(UnionLayout::Recursive(tag_arguments.into_bump_slice()))
}
NullableUnwrapped {
nullable_id,
nullable_name: _,
other_name,
other_fields,
} => {
debug_assert!(matches!(other_name, TagOrClosure::Closure(_)));
Layout::Union(UnionLayout::NullableUnwrapped {
nullable_id,
other_fields,
})
}
layout => panic!("handle recursive layout: {:?}", layout),
}
}
}
@ -2802,9 +2797,6 @@ where
seen: Vec::new_in(arena),
target_info,
};
if let Some(rec_var) = opt_rec_var {
env.insert_seen(rec_var);
}
match tags_vec.len() {
0 => {