mirror of
https://github.com/roc-lang/roc.git
synced 2025-09-29 14:54:47 +00:00
Revert "use union layout in mono patterns"
This reverts commit 9ba4885083.
This commit is contained in:
Folkert
parent
9ba4885083
commit
e84559aa44
2 changed files with 68 additions and 68 deletions
|
|
@ -220,7 +220,8 @@ fn flatten<'a>(
|
||||||
} if union.alternatives.len() == 1
|
} if union.alternatives.len() == 1
|
||||||
&& !matches!(
|
&& !matches!(
|
||||||
layout,
|
layout,
|
||||||
UnionLayout::NullableWrapped { .. } | UnionLayout::NullableUnwrapped { .. }
|
Layout::Union(UnionLayout::NullableWrapped { .. })
|
||||||
|
| Layout::Union(UnionLayout::NullableUnwrapped { .. })
|
||||||
) =>
|
) =>
|
||||||
{
|
{
|
||||||
// TODO ^ do we need to check that guard.is_none() here?
|
// TODO ^ do we need to check that guard.is_none() here?
|
||||||
|
|
@ -580,60 +581,59 @@ fn to_relevant_branch_help<'a>(
|
||||||
debug_assert_eq!(tag_id, *test_id);
|
debug_assert_eq!(tag_id, *test_id);
|
||||||
|
|
||||||
// the test matches the constructor of this pattern
|
// the test matches the constructor of this pattern
|
||||||
match layout {
|
|
||||||
UnionLayout::NonRecursive([[Layout::Struct([_])]]) => {
|
match Wrapped::opt_from_layout(&layout) {
|
||||||
// a one-element record equivalent
|
None => todo!(),
|
||||||
// Theory: Unbox doesn't have any value for us
|
Some(wrapped) => {
|
||||||
debug_assert_eq!(arguments.len(), 1);
|
match wrapped {
|
||||||
let arg = arguments[0].clone();
|
Wrapped::SingleElementRecord => {
|
||||||
{
|
// Theory: Unbox doesn't have any value for us
|
||||||
// NOTE here elm unboxes, but we ignore that
|
debug_assert_eq!(arguments.len(), 1);
|
||||||
// Path::Unbox(Box::new(path.clone()))
|
let arg = arguments[0].clone();
|
||||||
start.push((path.to_vec(), guard, arg.0));
|
{
|
||||||
start.extend(end);
|
// NOTE here elm unboxes, but we ignore that
|
||||||
|
// Path::Unbox(Box::new(path.clone()))
|
||||||
|
start.push((path.to_vec(), guard, arg.0));
|
||||||
|
start.extend(end);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Wrapped::RecordOrSingleTagUnion | Wrapped::LikeARoseTree => {
|
||||||
|
let sub_positions = arguments.into_iter().enumerate().map(
|
||||||
|
|(index, (pattern, _))| {
|
||||||
|
let mut new_path = path.to_vec();
|
||||||
|
new_path.push(PathInstruction {
|
||||||
|
index: index as u64,
|
||||||
|
tag_id,
|
||||||
|
});
|
||||||
|
(new_path, Guard::NoGuard, pattern)
|
||||||
|
},
|
||||||
|
);
|
||||||
|
start.extend(sub_positions);
|
||||||
|
start.extend(end);
|
||||||
|
}
|
||||||
|
Wrapped::MultiTagUnion => {
|
||||||
|
let sub_positions = arguments.into_iter().enumerate().map(
|
||||||
|
|(index, (pattern, _))| {
|
||||||
|
let mut new_path = path.to_vec();
|
||||||
|
new_path.push(PathInstruction {
|
||||||
|
index: 1 + index as u64,
|
||||||
|
tag_id,
|
||||||
|
});
|
||||||
|
(new_path, Guard::NoGuard, pattern)
|
||||||
|
},
|
||||||
|
);
|
||||||
|
start.extend(sub_positions);
|
||||||
|
start.extend(end);
|
||||||
|
}
|
||||||
|
Wrapped::EmptyRecord => todo!(),
|
||||||
}
|
}
|
||||||
}
|
|
||||||
UnionLayout::NonRecursive([_]) | UnionLayout::NonNullableUnwrapped(_) => {
|
Some(Branch {
|
||||||
let sub_positions =
|
goal: branch.goal,
|
||||||
arguments
|
patterns: start,
|
||||||
.into_iter()
|
})
|
||||||
.enumerate()
|
|
||||||
.map(|(index, (pattern, _))| {
|
|
||||||
let mut new_path = path.to_vec();
|
|
||||||
new_path.push(PathInstruction {
|
|
||||||
index: index as u64,
|
|
||||||
tag_id,
|
|
||||||
});
|
|
||||||
(new_path, Guard::NoGuard, pattern)
|
|
||||||
});
|
|
||||||
start.extend(sub_positions);
|
|
||||||
start.extend(end);
|
|
||||||
}
|
|
||||||
UnionLayout::NonRecursive(_)
|
|
||||||
| UnionLayout::Recursive(_)
|
|
||||||
| UnionLayout::NullableWrapped { .. }
|
|
||||||
| UnionLayout::NullableUnwrapped { .. } => {
|
|
||||||
let sub_positions =
|
|
||||||
arguments
|
|
||||||
.into_iter()
|
|
||||||
.enumerate()
|
|
||||||
.map(|(index, (pattern, _))| {
|
|
||||||
let mut new_path = path.to_vec();
|
|
||||||
new_path.push(PathInstruction {
|
|
||||||
index: 1 + index as u64,
|
|
||||||
tag_id,
|
|
||||||
});
|
|
||||||
(new_path, Guard::NoGuard, pattern)
|
|
||||||
});
|
|
||||||
start.extend(sub_positions);
|
|
||||||
start.extend(end);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Some(Branch {
|
|
||||||
goal: branch.goal,
|
|
||||||
patterns: start,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
_ => None,
|
_ => None,
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5589,7 +5589,7 @@ fn store_pattern_help<'a>(
|
||||||
AppliedTag {
|
AppliedTag {
|
||||||
arguments, layout, ..
|
arguments, layout, ..
|
||||||
} => {
|
} => {
|
||||||
let wrapped = Wrapped::from_layout(&Layout::Union(*layout));
|
let wrapped = Wrapped::from_layout(layout);
|
||||||
let write_tag = wrapped == Wrapped::MultiTagUnion;
|
let write_tag = wrapped == Wrapped::MultiTagUnion;
|
||||||
|
|
||||||
let mut arg_layouts = Vec::with_capacity_in(arguments.len(), env.arena);
|
let mut arg_layouts = Vec::with_capacity_in(arguments.len(), env.arena);
|
||||||
|
|
@ -5607,10 +5607,10 @@ fn store_pattern_help<'a>(
|
||||||
for (index, (argument, arg_layout)) in arguments.iter().enumerate().rev() {
|
for (index, (argument, arg_layout)) in arguments.iter().enumerate().rev() {
|
||||||
let index = if write_tag { index + 1 } else { index };
|
let index = if write_tag { index + 1 } else { index };
|
||||||
|
|
||||||
let mut arg_layout = *arg_layout;
|
let mut arg_layout = arg_layout;
|
||||||
|
|
||||||
if let Layout::RecursivePointer = arg_layout {
|
if let Layout::RecursivePointer = arg_layout {
|
||||||
arg_layout = Layout::Union(*layout);
|
arg_layout = layout;
|
||||||
}
|
}
|
||||||
|
|
||||||
let load = Expr::AccessAtIndex {
|
let load = Expr::AccessAtIndex {
|
||||||
|
|
@ -5623,7 +5623,7 @@ fn store_pattern_help<'a>(
|
||||||
match argument {
|
match argument {
|
||||||
Identifier(symbol) => {
|
Identifier(symbol) => {
|
||||||
// store immediately in the given symbol
|
// store immediately in the given symbol
|
||||||
stmt = Stmt::Let(*symbol, load, arg_layout, env.arena.alloc(stmt));
|
stmt = Stmt::Let(*symbol, load, *arg_layout, env.arena.alloc(stmt));
|
||||||
is_productive = true;
|
is_productive = true;
|
||||||
}
|
}
|
||||||
Underscore => {
|
Underscore => {
|
||||||
|
|
@ -5645,7 +5645,7 @@ fn store_pattern_help<'a>(
|
||||||
stmt = new;
|
stmt = new;
|
||||||
// only if we bind one of its (sub)fields to a used name should we
|
// only if we bind one of its (sub)fields to a used name should we
|
||||||
// extract the field
|
// extract the field
|
||||||
stmt = Stmt::Let(symbol, load, arg_layout, env.arena.alloc(stmt));
|
stmt = Stmt::Let(symbol, load, *arg_layout, env.arena.alloc(stmt));
|
||||||
}
|
}
|
||||||
StorePattern::NotProductive(new) => {
|
StorePattern::NotProductive(new) => {
|
||||||
// do nothing
|
// do nothing
|
||||||
|
|
@ -6734,7 +6734,7 @@ pub enum Pattern<'a> {
|
||||||
tag_name: TagName,
|
tag_name: TagName,
|
||||||
tag_id: u8,
|
tag_id: u8,
|
||||||
arguments: Vec<'a, (Pattern<'a>, Layout<'a>)>,
|
arguments: Vec<'a, (Pattern<'a>, Layout<'a>)>,
|
||||||
layout: UnionLayout<'a>,
|
layout: Layout<'a>,
|
||||||
union: crate::exhaustive::Union,
|
union: crate::exhaustive::Union,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
@ -6928,9 +6928,7 @@ fn from_can_pattern_help<'a>(
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
let layout = UnionLayout::NonRecursive(
|
let layout = Layout::Struct(field_layouts.into_bump_slice());
|
||||||
env.arena.alloc([field_layouts.into_bump_slice()]),
|
|
||||||
);
|
|
||||||
|
|
||||||
Pattern::AppliedTag {
|
Pattern::AppliedTag {
|
||||||
tag_name: tag_name.clone(),
|
tag_name: tag_name.clone(),
|
||||||
|
|
@ -7018,7 +7016,8 @@ fn from_can_pattern_help<'a>(
|
||||||
temp
|
temp
|
||||||
};
|
};
|
||||||
|
|
||||||
let layout = UnionLayout::NonRecursive(layouts.into_bump_slice());
|
let layout =
|
||||||
|
Layout::Union(UnionLayout::NonRecursive(layouts.into_bump_slice()));
|
||||||
|
|
||||||
Pattern::AppliedTag {
|
Pattern::AppliedTag {
|
||||||
tag_name: tag_name.clone(),
|
tag_name: tag_name.clone(),
|
||||||
|
|
@ -7076,7 +7075,8 @@ fn from_can_pattern_help<'a>(
|
||||||
};
|
};
|
||||||
|
|
||||||
debug_assert!(layouts.len() > 1);
|
debug_assert!(layouts.len() > 1);
|
||||||
let layout = UnionLayout::Recursive(layouts.into_bump_slice());
|
let layout =
|
||||||
|
Layout::Union(UnionLayout::Recursive(layouts.into_bump_slice()));
|
||||||
|
|
||||||
Pattern::AppliedTag {
|
Pattern::AppliedTag {
|
||||||
tag_name: tag_name.clone(),
|
tag_name: tag_name.clone(),
|
||||||
|
|
@ -7121,7 +7121,7 @@ fn from_can_pattern_help<'a>(
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
let layout = UnionLayout::NonNullableUnwrapped(fields);
|
let layout = Layout::Union(UnionLayout::NonNullableUnwrapped(fields));
|
||||||
|
|
||||||
Pattern::AppliedTag {
|
Pattern::AppliedTag {
|
||||||
tag_name: tag_name.clone(),
|
tag_name: tag_name.clone(),
|
||||||
|
|
@ -7206,10 +7206,10 @@ fn from_can_pattern_help<'a>(
|
||||||
temp
|
temp
|
||||||
};
|
};
|
||||||
|
|
||||||
let layout = UnionLayout::NullableWrapped {
|
let layout = Layout::Union(UnionLayout::NullableWrapped {
|
||||||
nullable_id,
|
nullable_id,
|
||||||
other_tags: layouts.into_bump_slice(),
|
other_tags: layouts.into_bump_slice(),
|
||||||
};
|
});
|
||||||
|
|
||||||
Pattern::AppliedTag {
|
Pattern::AppliedTag {
|
||||||
tag_name: tag_name.clone(),
|
tag_name: tag_name.clone(),
|
||||||
|
|
@ -7267,10 +7267,10 @@ fn from_can_pattern_help<'a>(
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
let layout = UnionLayout::NullableUnwrapped {
|
let layout = Layout::Union(UnionLayout::NullableUnwrapped {
|
||||||
nullable_id,
|
nullable_id,
|
||||||
other_fields,
|
other_fields,
|
||||||
};
|
});
|
||||||
|
|
||||||
Pattern::AppliedTag {
|
Pattern::AppliedTag {
|
||||||
tag_name: tag_name.clone(),
|
tag_name: tag_name.clone(),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue