language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-04 04:08:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Coalesce signature types in value def constraining

Browse source
This commit is contained in:
Ayaz Hafiz 2022-10-25 11:40:18 -05:00
parent 34cd1fb825
commit 3362763e45
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/compiler/constrain/src/expr.rs
View file

@ -1465,8 +1465,14 @@ pub fn constrain_expr(
)
}
RuntimeError(_) => {
// Runtime Errors have no constraints because they're going to crash.
Constraint::True
// Runtime Errors are always going to crash, so they don't introduce any new
// constraints.
// Instead, trivially equate the expected type to itself. This will never yield
// unification errors but it will catch errors in type translation, including ability
// obligations.
let trivial_type = *expected.get_type_ref();
let expected = constraints.push_expected_type(expected);
constraints.equal_types(trivial_type, expected, Category::Unknown, region)
}
}
}
@ -1924,14 +1930,15 @@ fn constrain_value_def(
let loc_pattern = Loc::at(loc_symbol.region, Pattern::Identifier(loc_symbol.value));
let signature_index = constraints.push_type(signature);
let annotation_expected = FromAnnotation(
loc_pattern,
arity,
AnnotationSource::TypedBody {
region: annotation.region,
},
// TODO coalesce with other signature_index
constraints.push_type(signature.clone()),
signature_index,
);
// This will fill in inference variables in the `signature` as well, so that we can
@ -1946,8 +1953,6 @@ fn constrain_value_def(
);
let ret_constraint = attach_resolution_constraints(constraints, env, ret_constraint);
let signature_index = constraints.push_type(signature.clone());
let cons = [
ret_constraint,
// Store type into AST vars. We use Store so errors aren't reported twice
@ -1955,7 +1960,6 @@ fn constrain_value_def(
];
let expr_con = constraints.and_constraint(cons);
let signature_index = constraints.push_type(signature.clone());
constrain_value_def_make_constraint(
constraints,
new_rigid_variables,
@ -1964,7 +1968,6 @@ fn constrain_value_def(
body_con,
loc_symbol,
expr_var,
// TODO coalesce
signature_index,
)
}