language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-30 23:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

record alias data in Annotation

Browse source
This commit is contained in:
Folkert 2020-11-04 20:06:57 +01:00
parent 2acbfa91f1
commit 33820dd82e
2 changed files with 38 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

36
compiler/can/src/annotation.rs
View file

@ -14,14 +14,6 @@ pub struct Annotation {
pub introduced_variables: IntroducedVariables,
pub references: MutSet<Symbol>,
pub aliases: SendMap<Symbol, Alias>,
// pub host_exposed_aliases: SendMap<Symbol, Variable>,
pub variably_sized_types: VariablySizedTypes,
}
#[derive(Clone, Debug, Default, PartialEq)]
pub struct VariablySizedTypes {
rigids: MutMap<Lowercase, ()>,
aliases: MutMap<Symbol, ()>,
}
#[derive(Clone, Debug, PartialEq, Default)]
@ -39,6 +31,7 @@ pub struct IntroducedVariables {
pub wildcards: Vec<Variable>,
pub var_by_name: SendMap<Lowercase, Variable>,
pub name_by_var: SendMap<Variable, Lowercase>,
pub host_exposed_aliases: MutMap<Symbol, Variable>,
}
impl IntroducedVariables {
@ -51,6 +44,10 @@ impl IntroducedVariables {
self.wildcards.push(var);
}
pub fn insert_host_exposed_alias(&mut self, symbol: Symbol, var: Variable) {
self.host_exposed_aliases.insert(symbol, var);
}
pub fn union(&mut self, other: &Self) {
self.wildcards.extend(other.wildcards.iter().cloned());
self.var_by_name.extend(other.var_by_name.clone());
@ -76,7 +73,6 @@ pub fn canonicalize_annotation(
let mut introduced_variables = IntroducedVariables::default();
let mut references = MutSet::default();
let mut aliases = SendMap::default();
let variably_sized_types = VariablySizedTypes::default();
let typ = can_annotation_help(
env,
annotation,
@ -93,7 +89,6 @@ pub fn canonicalize_annotation(
introduced_variables,
references,
aliases,
variably_sized_types,
}
}
@ -230,7 +225,15 @@ fn can_annotation_help(
// instantiate variables
actual.substitute(&substitutions);
Type::Alias(symbol, vars, Box::new(actual))
// Type::Alias(symbol, vars, Box::new(actual))
let actual_var = var_store.fresh();
introduced_variables.insert_host_exposed_alias(symbol, actual_var);
Type::HostExposedAlias {
name: symbol,
arguments: vars,
actual: Box::new(actual),
actual_var,
}
}
None => {
let mut args = Vec::new();
@ -362,7 +365,16 @@ fn can_annotation_help(
let alias = scope.lookup_alias(symbol).unwrap();
local_aliases.insert(symbol, alias.clone());
Type::Alias(symbol, vars, Box::new(alias.typ.clone()))
// Type::Alias(symbol, vars, Box::new(alias.typ.clone()))
let actual_var = var_store.fresh();
introduced_variables.insert_host_exposed_alias(symbol, actual_var);
Type::HostExposedAlias {
name: symbol,
arguments: vars,
actual: Box::new(alias.typ.clone()),
actual_var,
}
}
_ => {
// This is a syntactically invalid type alias.