language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 08:34:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix If bug in uniq constraint gen

Browse source
This commit is contained in:
Folkert 2020-03-13 00:20:59 +01:00
parent aeeaf99c17
commit e3e84ecb0c
1 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

37
compiler/constrain/src/uniq.rs
View file

@ -806,6 +806,21 @@ pub fn constrain_expr(
let mut branch_cons = Vec::with_capacity(2 * branches.len() + 2); let mut branch_cons = Vec::with_capacity(2 * branches.len() + 2);
let mut cond_uniq_vars = Vec::with_capacity(branches.len() + 2); let mut cond_uniq_vars = Vec::with_capacity(branches.len() + 2);
// TODO why does this cond var exist? is it for error messages?
let cond_uniq_var = var_store.fresh();
cond_uniq_vars.push(cond_uniq_var);
let cond_var_is_bool_con = Eq(
Type::Variable(*cond_var),
Expected::ForReason(
Reason::IfCondition,
attr_type(Bool::variable(cond_uniq_var), bool_type.clone()),
region,
),
Region::zero(),
);
branch_cons.push(cond_var_is_bool_con);
match expected { match expected {
Expected::FromAnnotation(name, arity, _, tipe) => { Expected::FromAnnotation(name, arity, _, tipe) => {
for (index, (loc_cond, loc_body)) in branches.iter().enumerate() { for (index, (loc_cond, loc_body)) in branches.iter().enumerate() {
@ -817,11 +832,16 @@ pub fn constrain_expr(
); );
cond_uniq_vars.push(cond_uniq_var); cond_uniq_vars.push(cond_uniq_var);
let cond_con = Eq( let cond_con = constrain_expr(
Type::Variable(*cond_var), env,
expect_bool.clone(), var_store,
var_usage,
applied_usage_constraint,
loc_cond.region, loc_cond.region,
&loc_cond.value,
expect_bool,
); );
let then_con = constrain_expr( let then_con = constrain_expr(
env, env,
var_store, var_store,
@ -879,11 +899,16 @@ pub fn constrain_expr(
); );
cond_uniq_vars.push(cond_uniq_var); cond_uniq_vars.push(cond_uniq_var);
let cond_con = Eq( let cond_con = constrain_expr(
Type::Variable(*cond_var), env,
expect_bool.clone(), var_store,
var_usage,
applied_usage_constraint,
loc_cond.region, loc_cond.region,
&loc_cond.value,
expect_bool,
); );
let then_con = constrain_expr( let then_con = constrain_expr(
env, env,
var_store, var_store,