language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-01 07:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

remove layout field in decision_tree

Browse source
This commit is contained in:
Folkert 2021-07-24 12:44:46 +02:00
parent f5e5ec42ad
commit da495244c5
1 changed files with 8 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1217,13 +1217,7 @@ fn test_to_equality<'a>(
cond_layout: &Layout<'a>, cond_layout: &Layout<'a>,
path: &[PathInstruction], path: &[PathInstruction],
test: Test<'a>, test: Test<'a>,
) -> ( ) -> (StoresVec<'a>, Symbol, Symbol, Option<ConstructorKnown<'a>>) {
StoresVec<'a>,
Symbol,
Symbol,
Layout<'a>,
Option<ConstructorKnown<'a>>,
) {
let (rhs_symbol, mut stores, test_layout) = let (rhs_symbol, mut stores, test_layout) =
path_to_expr_help(env, cond_symbol, &path, *cond_layout); path_to_expr_help(env, cond_symbol, &path, *cond_layout);
@ -1255,7 +1249,6 @@ fn test_to_equality<'a>(
stores, stores,
lhs_symbol, lhs_symbol,
rhs_symbol, rhs_symbol,
Layout::Builtin(Builtin::Int64),
Some(ConstructorKnown::OnlyPass { Some(ConstructorKnown::OnlyPass {
scrutinee: path_symbol, scrutinee: path_symbol,
layout: *cond_layout, layout: *cond_layout,
@ -1273,13 +1266,7 @@ fn test_to_equality<'a>(
let lhs_symbol = env.unique_symbol(); let lhs_symbol = env.unique_symbol();
stores.push((lhs_symbol, Layout::Builtin(Builtin::Int64), lhs)); stores.push((lhs_symbol, Layout::Builtin(Builtin::Int64), lhs));
( (stores, lhs_symbol, rhs_symbol, None)
stores,
lhs_symbol,
rhs_symbol,
Layout::Builtin(Builtin::Int64),
None,
)
} }
Test::IsFloat(test_int) => { Test::IsFloat(test_int) => {
@ -1289,13 +1276,7 @@ fn test_to_equality<'a>(
let lhs_symbol = env.unique_symbol(); let lhs_symbol = env.unique_symbol();
stores.push((lhs_symbol, Layout::Builtin(Builtin::Float64), lhs)); stores.push((lhs_symbol, Layout::Builtin(Builtin::Float64), lhs));
( (stores, lhs_symbol, rhs_symbol, None)
stores,
lhs_symbol,
rhs_symbol,
Layout::Builtin(Builtin::Float64),
None,
)
} }
Test::IsByte { Test::IsByte {
@ -1305,13 +1286,7 @@ fn test_to_equality<'a>(
let lhs_symbol = env.unique_symbol(); let lhs_symbol = env.unique_symbol();
stores.push((lhs_symbol, Layout::Builtin(Builtin::Int8), lhs)); stores.push((lhs_symbol, Layout::Builtin(Builtin::Int8), lhs));
( (stores, lhs_symbol, rhs_symbol, None)
stores,
lhs_symbol,
rhs_symbol,
Layout::Builtin(Builtin::Int8),
None,
)
} }
Test::IsBit(test_bit) => { Test::IsBit(test_bit) => {
@ -1319,13 +1294,7 @@ fn test_to_equality<'a>(
let lhs_symbol = env.unique_symbol(); let lhs_symbol = env.unique_symbol();
stores.push((lhs_symbol, Layout::Builtin(Builtin::Int1), lhs)); stores.push((lhs_symbol, Layout::Builtin(Builtin::Int1), lhs));
( (stores, lhs_symbol, rhs_symbol, None)
stores,
lhs_symbol,
rhs_symbol,
Layout::Builtin(Builtin::Int1),
None,
)
} }
Test::IsStr(test_str) => { Test::IsStr(test_str) => {
@ -1334,13 +1303,7 @@ fn test_to_equality<'a>(
stores.push((lhs_symbol, Layout::Builtin(Builtin::Str), lhs)); stores.push((lhs_symbol, Layout::Builtin(Builtin::Str), lhs));
( (stores, lhs_symbol, rhs_symbol, None)
stores,
lhs_symbol,
rhs_symbol,
Layout::Builtin(Builtin::Str),
None,
)
} }
} }
} }
@ -1349,7 +1312,6 @@ type Tests<'a> = std::vec::Vec<(
bumpalo::collections::Vec<'a, (Symbol, Layout<'a>, Expr<'a>)>, bumpalo::collections::Vec<'a, (Symbol, Layout<'a>, Expr<'a>)>,
Symbol, Symbol,
Symbol, Symbol,
Layout<'a>,
Option<ConstructorKnown<'a>>, Option<ConstructorKnown<'a>>,
)>; )>;
@ -1495,7 +1457,7 @@ fn compile_tests<'a>(
fail: &'a Stmt<'a>, fail: &'a Stmt<'a>,
mut cond: Stmt<'a>, mut cond: Stmt<'a>,
) -> Stmt<'a> { ) -> Stmt<'a> {
for (new_stores, lhs, rhs, _layout, opt_constructor_info) in tests.into_iter() { for (new_stores, lhs, rhs, opt_constructor_info) in tests.into_iter() {
match opt_constructor_info { match opt_constructor_info {
None => { None => {
cond = compile_test(env, ret_layout, new_stores, lhs, rhs, fail, cond); cond = compile_test(env, ret_layout, new_stores, lhs, rhs, fail, cond);
@ -1684,7 +1646,7 @@ fn decide_to_branching<'a>(
if number_of_tests == 1 { if number_of_tests == 1 {
// if there is just one test, compile to a simple if-then-else // if there is just one test, compile to a simple if-then-else
let (new_stores, lhs, rhs, _layout, _cinfo) = tests.into_iter().next().unwrap(); let (new_stores, lhs, rhs, _cinfo) = tests.into_iter().next().unwrap();
compile_test_help( compile_test_help(
env, env,