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

Merge branch 'trunk' into int_a_float_a

Browse source
This commit is contained in:
rvcas 2021-01-04 09:53:45 -05:00
commit b34436e5cb
93 changed files with 2982 additions and 1575 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -276,7 +276,7 @@ fn flatten<'a>(
/// path. If that is the case we give the resulting label and a mapping from free
/// variables to "how to get their value". So a pattern like (Just (x,_)) will give
/// us something like ("x" => value.0.0)
fn check_for_match<'a>(branches: &Vec<Branch<'a>>) -> Option<Label> {
fn check_for_match(branches: &Vec<Branch>) -> Option<Label> {
match branches.get(0) {
Some(Branch { goal, patterns })
if patterns
@ -730,7 +730,7 @@ fn is_irrelevant_to<'a>(selected_path: &Path, branch: &Branch<'a>) -> bool {
}
}
fn needs_tests<'a>(pattern: &Pattern<'a>) -> bool {
fn needs_tests(pattern: &Pattern) -> bool {
use Pattern::*;
match pattern {
@ -1231,15 +1231,14 @@ fn compile_guard<'a>(
let test_symbol = env.unique_symbol();
let arena = env.arena;
cond = Stmt::Cond {
cond_symbol: test_symbol,
cond_layout: Layout::Builtin(Builtin::Int1),
branching_symbol: test_symbol,
branching_layout: Layout::Builtin(Builtin::Int1),
pass: arena.alloc(cond),
fail,
cond = crate::ir::cond(
env,
test_symbol,
Layout::Builtin(Builtin::Int1),
cond,
fail.clone(),
ret_layout,
};
);
// calculate the guard value
let param = Param {
@ -1269,17 +1268,19 @@ fn compile_test<'a>(
let test_symbol = env.unique_symbol();
let arena = env.arena;
cond = Stmt::Cond {
cond_symbol: test_symbol,
cond_layout: Layout::Builtin(Builtin::Int1),
branching_symbol: test_symbol,
branching_layout: Layout::Builtin(Builtin::Int1),
pass: arena.alloc(cond),
fail,
cond = crate::ir::cond(
env,
test_symbol,
Layout::Builtin(Builtin::Int1),
cond,
fail.clone(),
ret_layout,
};
);
let test = Expr::RunLowLevel(LowLevel::Eq, arena.alloc([lhs, rhs]));
let test = Expr::Call(crate::ir::Call {
call_type: crate::ir::CallType::LowLevel { op: LowLevel::Eq },
arguments: arena.alloc([lhs, rhs]),
});
// write to the test symbol
cond = Stmt::Let(
@ -1711,5 +1712,3 @@ fn insert_choices<'a>(
},
}
}
// Opt.FanOut path (map (second go) tests) (go fallback)