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

more efficient approach for finding new rigids

Browse source
This commit is contained in:
Folkert 2022-03-05 14:50:23 +01:00
parent 6370a80c62
commit 97b0e3df9b
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
2 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1642,8 +1642,6 @@ fn instantiate_rigids(
let mut annotation = annotation.clone();
let mut rigid_substitution: ImMap<Variable, Type> = ImMap::default();
let outside_rigids: Vec<Variable> = ftv.values().copied().collect();
for (name, var) in introduced_vars.var_by_name.iter() {
use std::collections::hash_map::Entry::*;
@ -1655,11 +1653,27 @@ fn instantiate_rigids(
Vacant(vacant) => {
// It's possible to use this rigid in nested defs
vacant.insert(*var);
// new_rigids.push(*var);
new_rigids.push(*var);
}
}
}
// wildcards are always freshly introduced in this annotation
for (i, wildcard) in introduced_vars.wildcards.iter().enumerate() {
ftv.insert(format!("*{}", i).into(), *wildcard);
new_rigids.push(*wildcard);
}
// lambda set vars are always freshly introduced in this annotation
for var in introduced_vars.lambda_sets.iter() {
new_rigids.push(*var);
}
// lambda set vars are always freshly introduced in this annotation
for var in introduced_vars.inferred.iter() {
new_rigids.push(*var);
}
// Instantiate rigid variables
if !rigid_substitution.is_empty() {
annotation.substitute(&rigid_substitution);
@ -1670,20 +1684,10 @@ fn instantiate_rigids(
&Loc::at(loc_pattern.region, &annotation),
) {
for (symbol, loc_type) in new_headers {
for var in loc_type.value.variables() {
// a rigid is only new if this annotation is the first occurrence of this rigid
if !outside_rigids.contains(&var) {
new_rigids.push(var);
}
}
headers.insert(symbol, loc_type);
}
}
for (i, wildcard) in introduced_vars.wildcards.iter().enumerate() {
ftv.insert(format!("*{}", i).into(), *wildcard);
}
annotation
}