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

Decide rank to work in for weakening

Browse source
This commit is contained in:
Ayaz Hafiz 2023-01-10 11:10:46 -06:00
parent 5ccedca093
commit c2cb94a927
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/compiler/solve/src/solve.rs
View file

@ -1254,25 +1254,30 @@ fn solve(
state
} else {
// work in the next pool to localize header
let next_rank = rank.next();
// If the let-binding is generalizable, work at the next rank (which will be
// the rank promoted to generalization); otherwise, don't leave our rank.
let binding_rank = if let_con.generalizable.0 {
rank.next()
} else {
rank
};
// introduce variables
for &var in rigid_vars.iter().chain(flex_vars.iter()) {
subs.set_rank(var, next_rank);
subs.set_rank(var, binding_rank);
}
// determine the next pool
if next_rank.into_usize() < pools.len() {
if binding_rank.into_usize() < pools.len() {
// Nothing to do, we already accounted for the next rank, no need to
// adjust the pools
} else {
// we should be off by one at this point
debug_assert_eq!(next_rank.into_usize(), 1 + pools.len());
pools.extend_to(next_rank.into_usize());
debug_assert_eq!(binding_rank.into_usize(), 1 + pools.len());
pools.extend_to(binding_rank.into_usize());
}
let pool: &mut Vec<Variable> = pools.get_mut(next_rank);
let pool: &mut Vec<Variable> = pools.get_mut(binding_rank);
// Replace the contents of this pool with rigid_vars and flex_vars
pool.clear();
@ -1295,7 +1300,7 @@ fn solve(
});
stack.push(Work::Constraint {
env,
rank: next_rank,
rank: binding_rank,
constraint: defs_constraint,
});