language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-07-23 06:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Store solve aliases as TypeTag

Browse source
This commit is contained in:
Ayaz Hafiz 2022-11-08 14:59:11 -06:00
parent e3dbf5c09c
commit e3ef9828c7
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
4 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -138,7 +138,7 @@ impl DelayedAliasVariables {
#[derive(Debug, Default)]
pub struct Aliases {
aliases: Vec<(Symbol, Type, DelayedAliasVariables, AliasKind)>,
aliases: Vec<(Symbol, Index<TypeTag>, DelayedAliasVariables, AliasKind)>,
variables: Vec<OptAbleVar>,
}
@ -150,7 +150,7 @@ impl Aliases {
}
}
pub fn insert(&mut self, symbol: Symbol, alias: Alias) {
pub fn insert(&mut self, types: &mut Types, symbol: Symbol, alias: Alias) {
let alias_variables =
{
let start = self.variables.len() as _;
@ -195,8 +195,11 @@ impl Aliases {
}
};
// TODO: can we construct Aliases from TypeTag directly?
let alias_typ = types.from_old_type(&alias.typ);
self.aliases
.push((symbol, alias.typ, alias_variables, alias.kind));
.push((symbol, alias_typ, alias_variables, alias.kind));
}
fn instantiate_result_result(
@ -335,19 +338,16 @@ impl Aliases {
return (var, kind);
}
let (typ, delayed_variables, &mut kind) =
match self.aliases.iter_mut().find(|(s, _, _, _)| *s == symbol) {
let (typ, delayed_variables, kind) =
match self.aliases.iter().find(|(s, _, _, _)| *s == symbol) {
None => internal_error!(
"Alias {:?} not registered in delayed aliases! {:?}",
symbol,
&self.aliases
),
Some((_, typ, delayed_variables, kind)) => (typ, delayed_variables, kind),
Some(&(_, typ, delayed_variables, kind)) => (typ, delayed_variables, kind),
};
// TODO(types-soa) store SoA type in aliases directly
let typ = types.from_old_type(typ);
let mut substitutions: MutMap<_, _> = Default::default();
let old_type_variables = delayed_variables.type_variables(&mut self.variables);