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

highlight code snippets better

Browse source
This commit is contained in:
Folkert 2020-04-12 20:52:43 +02:00
parent c326b09964
commit 7632a4b484
11 changed files with 216 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/mono/src/expr.rs
View file

@ -393,6 +393,7 @@ fn pattern_to_when<'a>(
let wrapped_body = When {
cond_var: pattern_var,
expr_var: body_var,
region: Region::zero(),
loc_cond: Box::new(Located::at_zero(Var(symbol))),
branches: vec![WhenBranch {
patterns: vec![pattern],
@ -613,9 +614,10 @@ fn from_can<'a>(
When {
cond_var,
expr_var,
region,
loc_cond,
branches,
} => from_can_when(env, cond_var, expr_var, *loc_cond, branches, procs),
} => from_can_when(env, cond_var, expr_var, region, *loc_cond, branches, procs),
If {
cond_var,
@ -1077,6 +1079,7 @@ fn from_can_when<'a>(
env: &mut Env<'a, '_>,
cond_var: Variable,
expr_var: Variable,
region: Region,
loc_cond: Located<roc_can::expr::Expr>,
mut branches: std::vec::Vec<roc_can::expr::WhenBranch>,
procs: &mut Procs<'a>,
@ -1106,7 +1109,7 @@ fn from_can_when<'a>(
let context = crate::pattern::Context::BadCase;
match crate::pattern::check(
loc_when_pattern.region,
region,
&[(
Located::at(loc_when_pattern.region, mono_pattern.clone()),
guard,
@ -1225,7 +1228,7 @@ fn from_can_when<'a>(
}
let context = crate::pattern::Context::BadCase;
match crate::pattern::check(loc_cond.region, &loc_branches, context) {
match crate::pattern::check(region, &loc_branches, context) {
Ok(_) => {}
Err(errors) => {
use crate::pattern::Error::*;