language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 00:24:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Get rid of variable name on DelayedAlias

Browse source
This commit is contained in:
Ayaz Hafiz 2022-04-29 10:55:29 -04:00
parent 2e62fba7bc
commit c225515a1b
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
4 changed files with 28 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -510,10 +510,8 @@ fn can_annotation_help(
let mut type_var_to_arg = Vec::new();
for (loc_var, arg_ann) in alias.type_variables.iter().zip(args) {
let name = loc_var.value.0.clone();
type_var_to_arg.push((name, arg_ann));
for (_, arg_ann) in alias.type_variables.iter().zip(args) {
type_var_to_arg.push(arg_ann);
}
let mut lambda_set_variables =
@ -671,8 +669,6 @@ 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()))
if vars.is_empty() && env.home == symbol.module_id() {
let actual_var = var_store.fresh();
introduced_variables.insert_host_exposed_alias(symbol, actual_var);

14
compiler/load_internal/src/file.rs
View file

@ -4738,16 +4738,13 @@ fn default_aliases() -> roc_solve::solve::Aliases {
let typ = Type::DelayedAlias(AliasCommon {
symbol: Symbol::NUM_NUM,
type_arguments: vec![(
"range".into(),
Type::Alias {
type_arguments: vec![Type::Alias {
symbol: Symbol::NUM_INTEGER,
type_arguments: vec![("range".into(), Type::Variable(tvar))],
lambda_set_variables: vec![],
actual: Box::new(Type::Variable(tvar)),
kind: AliasKind::Opaque,
},
)],
}],
lambda_set_variables: vec![],
});
@ -4770,16 +4767,13 @@ fn default_aliases() -> roc_solve::solve::Aliases {
let typ = Type::DelayedAlias(AliasCommon {
symbol: Symbol::NUM_NUM,
type_arguments: vec![(
"range".into(),
Type::Alias {
type_arguments: vec![Type::Alias {
symbol: Symbol::NUM_FLOATINGPOINT,
type_arguments: vec![("range".into(), Type::Variable(tvar))],
lambda_set_variables: vec![],
actual: Box::new(Type::Variable(tvar)),
kind: AliasKind::Opaque,
},
)],
}],
lambda_set_variables: vec![],
});

4
compiler/solve/src/solve.rs
View file

@ -1928,9 +1928,7 @@ fn type_to_variable<'a>(
let length = type_arguments.len() + lambda_set_variables.len();
let new_variables = VariableSubsSlice::reserve_into_subs(subs, length);
for (target_index, (_, arg_type)) in
(new_variables.indices()).zip(type_arguments)
{
for (target_index, arg_type) in (new_variables.indices()).zip(type_arguments) {
let copy_var = helper!(arg_type);
subs.variables[target_index] = copy_var;
}

26
compiler/types/src/types.rs
View file

@ -187,7 +187,7 @@ impl LambdaSet {
#[derive(PartialEq, Eq, Clone)]
pub struct AliasCommon {
pub symbol: Symbol,
pub type_arguments: Vec<(Lowercase, Type)>,
pub type_arguments: Vec<Type>,
pub lambda_set_variables: Vec<LambdaSet>,
}
@ -385,7 +385,7 @@ impl fmt::Debug for Type {
}) => {
write!(f, "(DelayedAlias {:?}", symbol)?;
for (_, arg) in type_arguments {
for arg in type_arguments {
write!(f, " {:?}", arg)?;
}
@ -694,7 +694,7 @@ impl Type {
lambda_set_variables,
..
}) => {
for (_, value) in type_arguments.iter_mut() {
for value in type_arguments.iter_mut() {
stack.push(value);
}
@ -803,7 +803,7 @@ impl Type {
lambda_set_variables,
..
}) => {
for (_, value) in type_arguments.iter_mut() {
for value in type_arguments.iter_mut() {
stack.push(value);
}
@ -903,7 +903,7 @@ impl Type {
lambda_set_variables: _no_aliases_in_lambda_sets,
..
}) => {
for (_, ta) in type_arguments {
for ta in type_arguments {
ta.substitute_alias(rep_symbol, rep_args, actual)?;
}
@ -985,9 +985,7 @@ impl Type {
..
}) => {
symbol == &rep_symbol
|| type_arguments
.iter()
.any(|v| v.1.contains_symbol(rep_symbol))
|| type_arguments.iter().any(|v| v.contains_symbol(rep_symbol))
|| lambda_set_variables
.iter()
.any(|v| v.0.contains_symbol(rep_symbol))
@ -1163,10 +1161,8 @@ impl Type {
if false {
let mut type_var_to_arg = Vec::new();
for (loc_var, arg_ann) in alias.type_variables.iter().zip(args) {
let name = loc_var.value.0.clone();
type_var_to_arg.push((name, arg_ann.clone()));
for (_, arg_ann) in alias.type_variables.iter().zip(args) {
type_var_to_arg.push(arg_ann.clone());
}
let mut lambda_set_variables =
@ -1383,7 +1379,7 @@ fn symbols_help(initial: &Type) -> Vec<Symbol> {
..
}) => {
output.push(*symbol);
stack.extend(type_arguments.iter().map(|v| &v.1));
stack.extend(type_arguments);
}
Alias {
symbol: alias_symbol,
@ -1491,7 +1487,7 @@ fn variables_help(tipe: &Type, accum: &mut ImSet<Variable>) {
lambda_set_variables,
..
}) => {
for (_, arg) in type_arguments {
for arg in type_arguments {
variables_help(arg, accum);
}
@ -1623,7 +1619,7 @@ fn variables_help_detailed(tipe: &Type, accum: &mut VariableDetail) {
lambda_set_variables,
..
}) => {
for (_, arg) in type_arguments {
for arg in type_arguments {
variables_help_detailed(arg, accum);
}