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

partially revert to working state

Browse source
This commit is contained in:
Folkert 2022-03-05 13:16:41 +01:00
parent 477fe5a48e
commit 9302f2ca5e
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1639,9 +1639,11 @@ fn instantiate_rigids(
loc_pattern: &Loc<Pattern>,
headers: &mut SendMap<Symbol, Loc<Type>>,
) -> Type {
// find out if rigid type variables first occur in this annotation,
// or if they are already introduced in an outer annotation
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::*;
@ -1653,29 +1655,33 @@ 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);
}
let mut annotation = annotation.clone();
// Instantiate rigid variables
if !rigid_substitution.is_empty() {
annotation.substitute(&rigid_substitution);
}
let loc_annotation_ref = Loc::at(loc_pattern.region, &annotation);
if let Pattern::Identifier(symbol) = loc_pattern.value {
headers.insert(symbol, Loc::at(loc_pattern.region, annotation.clone()));
} else if let Some(new_headers) =
crate::pattern::headers_from_annotation(&loc_pattern.value, &loc_annotation_ref)
{
headers.extend(new_headers)
if let Some(new_headers) = crate::pattern::headers_from_annotation(
&loc_pattern.value,
&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