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

pass down correct layout/symbol to switch branches

Browse source
This commit is contained in:
Folkert 2021-01-18 22:12:26 +01:00
parent e11b478892
commit 6b90eaaf37
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -569,6 +569,7 @@ fn to_relevant_branch_help<'a>(
AppliedTag { AppliedTag {
tag_name, tag_name,
tag_id,
arguments, arguments,
layout, layout,
.. ..
@ -576,15 +577,20 @@ fn to_relevant_branch_help<'a>(
match test { match test {
IsCtor { IsCtor {
tag_name: test_name, tag_name: test_name,
tag_id, tag_id: test_id,
.. ..
} if &tag_name == test_name => { } if &tag_name == test_name => {
debug_assert_eq!(tag_id, *test_id);
// the test matches the constructor of this pattern
match Wrapped::opt_from_layout(&layout) { match Wrapped::opt_from_layout(&layout) {
None => todo!(), None => todo!(),
Some(wrapped) => { Some(wrapped) => {
match wrapped { match wrapped {
Wrapped::SingleElementRecord => { Wrapped::SingleElementRecord => {
// Theory: Unbox doesn't have any value for us // Theory: Unbox doesn't have any value for us
debug_assert_eq!(arguments.len(), 1);
let arg = arguments[0].clone(); let arg = arguments[0].clone();
{ {
start.push(( start.push((
@ -604,7 +610,7 @@ fn to_relevant_branch_help<'a>(
( (
Path::Index { Path::Index {
index: 1 + index as u64, index: 1 + index as u64,
tag_id: *tag_id, tag_id,
path: Box::new(path.clone()), path: Box::new(path.clone()),
}, },
Guard::NoGuard, Guard::NoGuard,
@ -999,7 +1005,7 @@ fn path_to_expr_help<'a>(
None => { None => {
// this MUST be an index into a single-element (hence unwrapped) record // this MUST be an index into a single-element (hence unwrapped) record
debug_assert_eq!(*index, 0); debug_assert_eq!(*index, 0, "{:?}", &layout);
debug_assert_eq!(*tag_id, 0); debug_assert_eq!(*tag_id, 0);
debug_assert!(it.peek().is_none()); debug_assert!(it.peek().is_none());
@ -1421,7 +1427,8 @@ fn decide_to_branching<'a>(
} => { } => {
// generate a (nested) if-then-else // generate a (nested) if-then-else
// TODO specialize layout in the true and false case? let (tests, guard) = stores_and_condition(env, cond_symbol, &cond_layout, test_chain);
let pass_expr = decide_to_branching( let pass_expr = decide_to_branching(
env, env,
procs, procs,
@ -1444,8 +1451,6 @@ fn decide_to_branching<'a>(
jumps, jumps,
); );
let (tests, guard) = stores_and_condition(env, cond_symbol, &cond_layout, test_chain);
let number_of_tests = tests.len() as i64 + guard.is_some() as i64; let number_of_tests = tests.len() as i64 + guard.is_some() as i64;
debug_assert!(number_of_tests > 0); debug_assert!(number_of_tests > 0);
@ -1485,8 +1490,8 @@ fn decide_to_branching<'a>(
env, env,
procs, procs,
layout_cache, layout_cache,
inner_cond_symbol, cond_symbol,
inner_cond_layout.clone(), cond_layout.clone(),
ret_layout.clone(), ret_layout.clone(),
*fallback, *fallback,
jumps, jumps,
@ -1499,8 +1504,8 @@ fn decide_to_branching<'a>(
env, env,
procs, procs,
layout_cache, layout_cache,
inner_cond_symbol, cond_symbol,
inner_cond_layout.clone(), cond_layout.clone(),
ret_layout.clone(), ret_layout.clone(),
decider, decider,
jumps, jumps,
@ -1522,7 +1527,7 @@ fn decide_to_branching<'a>(
// but tests are still relative to the original cond symbol // but tests are still relative to the original cond symbol
let mut switch = Stmt::Switch { let mut switch = Stmt::Switch {
cond_layout: inner_cond_layout, cond_layout: inner_cond_layout,
cond_symbol, cond_symbol: inner_cond_symbol,
branches: branches.into_bump_slice(), branches: branches.into_bump_slice(),
default_branch: env.arena.alloc(default_branch), default_branch: env.arena.alloc(default_branch),
ret_layout, ret_layout,