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

make it clearer the variables come from the def's pattern

Browse source
This commit is contained in:
Folkert 2020-11-11 20:49:04 +01:00
parent cf80e2852f
commit d6e7e8381c
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1052,9 +1052,9 @@ fn constrain_def(env: &Env, def: &Def, body_con: Constraint) -> Constraint {
let expr_var = def.expr_var;
let expr_type = Type::Variable(expr_var);
let mut pattern_state = constrain_def_pattern(env, &def.loc_pattern, expr_type.clone());
let mut def_pattern_state = constrain_def_pattern(env, &def.loc_pattern, expr_type.clone());
pattern_state.vars.push(expr_var);
def_pattern_state.vars.push(expr_var);
let mut new_rigids = Vec::new();
@ -1070,7 +1070,7 @@ fn constrain_def(env: &Env, def: &Def, body_con: Constraint) -> Constraint {
&mut new_rigids,
&mut ftv,
&def.loc_pattern,
&mut pattern_state.headers,
&mut def_pattern_state.headers,
);
let env = &Env {
@ -1087,7 +1087,7 @@ fn constrain_def(env: &Env, def: &Def, body_con: Constraint) -> Constraint {
signature.clone(),
);
pattern_state.constraints.push(Eq(
def_pattern_state.constraints.push(Eq(
expr_type,
annotation_expected.clone(),
Category::Storage(std::file!(), std::line!()),
@ -1113,7 +1113,7 @@ fn constrain_def(env: &Env, def: &Def, body_con: Constraint) -> Constraint {
..
},
Type::Function(arg_types, _, _),
) => {
) if false => {
let expected = annotation_expected;
let region = def.loc_expr.region;
@ -1248,13 +1248,13 @@ fn constrain_def(env: &Env, def: &Def, body_con: Constraint) -> Constraint {
Let(Box::new(LetConstraint {
rigid_vars: new_rigids,
flex_vars: pattern_state.vars,
def_types: pattern_state.headers,
flex_vars: def_pattern_state.vars,
def_types: def_pattern_state.headers,
defs_constraint: Let(Box::new(LetConstraint {
rigid_vars: Vec::new(), // always empty
flex_vars: Vec::new(), // empty, because our functions have no arguments
def_types: SendMap::default(), // empty, because our functions have no arguments!
defs_constraint: And(pattern_state.constraints),
defs_constraint: And(def_pattern_state.constraints),
ret_constraint: expr_con,
})),
ret_constraint: body_con,