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

make arbitrary AccessAtIndex work

Browse source 
it now uses that actual layout, not a hardcoded one
This commit is contained in:
Folkert 2020-03-19 00:25:16 +01:00
parent f3f135eca5
commit b93fe4e341
6 changed files with 78 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,7 @@ pub enum Test<'a> {
tag_id: u8,
tag_name: TagName,
union: crate::pattern::Union,
arguments: Vec<Pattern<'a>>,
arguments: Vec<(Pattern<'a>, Layout<'a>)>,
},
IsInt(i64),
// float patterns are stored as u64 so they are comparable/hashable
@ -261,7 +261,7 @@ fn test_at_path<'a>(selected_path: &Path, branch: Branch<'a>) -> Option<Test<'a>
tag_id: *tag_id,
tag_name: tag_name.clone(),
union: union.clone(),
arguments: arguments.clone().into_iter().map(|v| v.0).collect(),
arguments: arguments.to_vec(),
}),
BitLiteral(v) => Some(IsBit(*v)),
EnumLiteral { tag_id, enum_size } => Some(IsByte {
@ -711,7 +711,7 @@ fn decide_to_branching<'a>(
cond_symbol: Symbol,
cond_layout: Layout<'a>,
ret_layout: Layout<'a>,
decider: Decider<Choice<'a>>,
decider: Decider<'a, Choice<'a>>,
jumps: &Vec<(u64, Expr<'a>)>,
) -> Expr<'a> {
use Choice::*;
@ -733,18 +733,29 @@ fn decide_to_branching<'a>(
for (path, test) in test_chain {
match test {
Test::IsCtor { tag_id, union, .. } => {
Test::IsCtor {
tag_id,
union,
arguments,
..
} => {
let lhs = Expr::Int(tag_id as i64);
// NOTE this is hardcoded, and should be made dynamic
let field_layouts = env.arena.alloc([
Layout::Builtin(Builtin::Int64),
Layout::Builtin(Builtin::Int64),
Layout::Builtin(Builtin::Int64),
]);
let mut field_layouts =
bumpalo::collections::Vec::with_capacity_in(arguments.len(), env.arena);
if union.alternatives.len() > 1 {
// the tag discriminant
field_layouts.push(Layout::Builtin(Builtin::Int64));
}
for (_, layout) in arguments {
field_layouts.push(layout);
}
let rhs = Expr::AccessAtIndex {
index: 0,
field_layouts,
field_layouts: field_layouts.into_bump_slice(),
expr: env.arena.alloc(Expr::Load(cond_symbol)),
is_unwrapped: union.alternatives.len() == 1,
};