language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-02 16:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix bug in constraint gen for If

Browse source 
the condition expression wasn't actually constrained
This commit is contained in:
Folkert 2020-03-13 00:16:40 +01:00
parent 7f358cd14c
commit aeeaf99c17
1 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

27
compiler/constrain/src/expr.rs
View file

@ -328,16 +328,27 @@ pub fn constrain_expr(
} => { } => {
let bool_type = Type::Variable(Variable::BOOL); let bool_type = Type::Variable(Variable::BOOL);
let expect_bool = Expected::ForReason(Reason::IfCondition, bool_type, region); let expect_bool = Expected::ForReason(Reason::IfCondition, bool_type, region);
let mut branch_cons = Vec::with_capacity(2 * branches.len() + 2); let mut branch_cons = Vec::with_capacity(2 * branches.len() + 3);
// TODO why does this cond var exist? is it for error messages?
let cond_var_is_bool_con = Eq(
Type::Variable(*cond_var),
expect_bool.clone(),
Region::zero(),
);
branch_cons.push(cond_var_is_bool_con);
match expected { match expected {
FromAnnotation(name, arity, _, tipe) => { FromAnnotation(name, arity, _, tipe) => {
for (index, (loc_cond, loc_body)) in branches.iter().enumerate() { for (index, (loc_cond, loc_body)) in branches.iter().enumerate() {
let cond_con = Eq( let cond_con = constrain_expr(
Type::Variable(*cond_var), env,
expect_bool.clone(),
loc_cond.region, loc_cond.region,
&loc_cond.value,
expect_bool.clone(),
); );
let then_con = constrain_expr( let then_con = constrain_expr(
env, env,
loc_body.region, loc_body.region,
@ -374,11 +385,13 @@ pub fn constrain_expr(
} }
_ => { _ => {
for (index, (loc_cond, loc_body)) in branches.iter().enumerate() { for (index, (loc_cond, loc_body)) in branches.iter().enumerate() {
let cond_con = Eq( let cond_con = constrain_expr(
Type::Variable(*cond_var), env,
expect_bool.clone(),
loc_cond.region, loc_cond.region,
&loc_cond.value,
expect_bool.clone(),
); );
let then_con = constrain_expr( let then_con = constrain_expr(
env, env,
loc_body.region, loc_body.region,