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

simple implementation of NullableUnwrapped

Browse source
This commit is contained in:
Folkert 2021-01-17 00:34:08 +01:00
parent 2ce35cca28
commit c1cf43eda3
4 changed files with 261 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

25
compiler/mono/src/decision_tree.rs
View file

@ -229,7 +229,7 @@ fn flatten<'a>(
tag_name,
layout,
} if union.alternatives.len() == 1
&& !matches!(layout, Layout::Union(UnionLayout::NullableWrapped { .. })) =>
&& !matches!(layout, Layout::Union(UnionLayout::NullableWrapped { .. })| Layout::Union(UnionLayout::NullableUnwrapped { .. })) =>
{
// TODO ^ do we need to check that guard.is_none() here?
@ -1020,9 +1020,8 @@ fn path_to_expr_help<'a>(
use std::cmp::Ordering;
dbg!(nullable_id, tag_id);
match (*tag_id as usize).cmp(&(*nullable_id as usize)) {
Ordering::Equal =>
// the nullable tag is going to predent it stores a tag id
{
Ordering::Equal => {
// the nullable tag is going to pretend it stores a tag id
&*env
.arena
.alloc([Layout::Builtin(crate::layout::TAG_SIZE)])
@ -1033,16 +1032,15 @@ fn path_to_expr_help<'a>(
}
NullableUnwrapped {
nullable_id,
other_id: _,
other_fields,
} => {
let tag_id = *tag_id == 0;
let tag_id = *tag_id != 0;
if tag_id == *nullable_id {
// the nullable tag is going to predent it stores a tag id
&[] as &[_]
// the nullable tag is going to pretend it stores a tag id
&*env.arena.alloc([Layout::Builtin(crate::layout::TAG_SIZE)])
} else {
other_fields
*other_fields
}
}
}
@ -1052,7 +1050,14 @@ fn path_to_expr_help<'a>(
other => env.arena.alloc([other.clone()]),
};
debug_assert!(*index < field_layouts.len() as u64);
debug_assert!(
*index < field_layouts.len() as u64,
"{} {:?} {:?} {:?}",
index,
field_layouts,
&layout,
tag_id,
);
let inner_layout = match &field_layouts[*index as usize] {
Layout::RecursivePointer => layout.clone(),