language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 23:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

refactor

Browse source
This commit is contained in:
Folkert 2021-07-04 22:50:46 +02:00
parent b1a136bf2e
commit 1126921a9e
1 changed files with 93 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1797,78 +1797,13 @@ fn tree_to_decider(tree: DecisionTree) -> Decider<u64> {
let (_, failure_tree) = edges.remove(1); let (_, failure_tree) = edges.remove(1);
let (guarded_test, success_tree) = edges.remove(0); let (guarded_test, success_tree) = edges.remove(0);
match guarded_test { chain_decider(path, guarded_test, failure_tree, success_tree)
GuardedTest::TestGuarded { test, id, stmt } => {
let failure = Box::new(tree_to_decider(failure_tree));
let success = Box::new(tree_to_decider(success_tree));
let guarded = Decider::Guarded {
id,
stmt,
success,
failure: failure.clone(),
};
Chain {
test_chain: vec![(path, test)],
success: Box::new(guarded),
failure,
}
}
GuardedTest::GuardedNoTest { id, stmt } => {
let failure = Box::new(tree_to_decider(failure_tree));
let success = Box::new(tree_to_decider(success_tree));
Decider::Guarded {
id,
stmt,
success,
failure: failure.clone(),
}
}
GuardedTest::TestNotGuarded { test } => {
if test_always_succeeds(&test) {
tree_to_decider(success_tree)
} else {
to_chain(path, test, success_tree, failure_tree)
}
}
}
} }
_ => { _ => {
let fallback_tree = edges.remove(edges.len() - 1).1; let fallback = edges.remove(edges.len() - 1).1;
let fallback_decider = tree_to_decider(fallback_tree);
let necessary_tests = edges fanout_decider(path, fallback, edges)
.into_iter()
.map(|(guarded_test, dectree)| {
let decider = tree_to_decider(dectree);
match guarded_test {
GuardedTest::TestGuarded { test, id, stmt } => {
let guarded = Decider::Guarded {
id,
stmt,
success: Box::new(decider),
failure: Box::new(fallback_decider.clone()),
};
(test, guarded)
}
GuardedTest::GuardedNoTest { .. } => {
unreachable!("this would not end up in a switch")
}
GuardedTest::TestNotGuarded { test } => (test, decider),
}
})
.collect();
FanOut {
path,
tests: necessary_tests,
fallback: Box::new(fallback_decider),
}
} }
}, },
@ -1878,6 +1813,68 @@ fn tree_to_decider(tree: DecisionTree) -> Decider<u64> {
let failure_tree = *last; let failure_tree = *last;
let (guarded_test, success_tree) = edges.remove(0); let (guarded_test, success_tree) = edges.remove(0);
chain_decider(path, guarded_test, failure_tree, success_tree)
}
_ => {
let fallback = *last;
fanout_decider(path, fallback, edges)
}
},
},
}
}
fn fanout_decider<'a>(
path: Vec<PathInstruction>,
fallback: DecisionTree<'a>,
edges: Vec<(GuardedTest<'a>, DecisionTree<'a>)>,
) -> Decider<'a, u64> {
let fallback_decider = tree_to_decider(fallback);
let necessary_tests = edges
.into_iter()
.map(|(test, tree)| fanout_decider_help(tree, test, &fallback_decider))
.collect();
Decider::FanOut {
path,
tests: necessary_tests,
fallback: Box::new(fallback_decider),
}
}
fn fanout_decider_help<'a>(
dectree: DecisionTree<'a>,
guarded_test: GuardedTest<'a>,
fallback_decider: &Decider<'a, u64>,
) -> (Test<'a>, Decider<'a, u64>) {
let decider = tree_to_decider(dectree);
match guarded_test {
GuardedTest::TestGuarded { test, id, stmt } => {
let guarded = Decider::Guarded {
id,
stmt,
success: Box::new(decider),
failure: Box::new(fallback_decider.clone()),
};
(test, guarded)
}
GuardedTest::GuardedNoTest { .. } => {
unreachable!("this would not end up in a switch")
}
GuardedTest::TestNotGuarded { test } => (test, decider),
}
}
fn chain_decider<'a>(
path: Vec<PathInstruction>,
guarded_test: GuardedTest<'a>,
failure_tree: DecisionTree<'a>,
success_tree: DecisionTree<'a>,
) -> Decider<'a, u64> {
match guarded_test { match guarded_test {
GuardedTest::TestGuarded { test, id, stmt } => { GuardedTest::TestGuarded { test, id, stmt } => {
let failure = Box::new(tree_to_decider(failure_tree)); let failure = Box::new(tree_to_decider(failure_tree));
@ -1890,7 +1887,7 @@ fn tree_to_decider(tree: DecisionTree) -> Decider<u64> {
failure: failure.clone(), failure: failure.clone(),
}; };
Chain { Decider::Chain {
test_chain: vec![(path, test)], test_chain: vec![(path, test)],
success: Box::new(guarded), success: Box::new(guarded),
failure, failure,
@ -1917,45 +1914,6 @@ fn tree_to_decider(tree: DecisionTree) -> Decider<u64> {
} }
} }
_ => {
let fallback = *last;
let fallback_decider = tree_to_decider(fallback);
let necessary_tests = edges
.into_iter()
.map(|(guarded_test, dectree)| {
let decider = tree_to_decider(dectree);
match guarded_test {
GuardedTest::TestGuarded { test, id, stmt } => {
let guarded = Decider::Guarded {
id,
stmt,
success: Box::new(decider),
failure: Box::new(fallback_decider.clone()),
};
(test, guarded)
}
GuardedTest::GuardedNoTest { .. } => {
unreachable!("this would not end up in a switch")
}
GuardedTest::TestNotGuarded { test } => (test, decider),
}
})
.collect();
FanOut {
path,
tests: necessary_tests,
fallback: Box::new(fallback_decider),
}
}
},
},
}
}
fn to_chain<'a>( fn to_chain<'a>(
path: Vec<PathInstruction>, path: Vec<PathInstruction>,
test: Test<'a>, test: Test<'a>,