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

Eliminate a Vec in record solving

Browse source
This commit is contained in:
Richard Feldman 2021-08-07 08:22:23 -04:00
parent 5e42a7b8b1
commit 49aa0b8ffd
2 changed files with 58 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1392,24 +1392,39 @@ fn deep_copy_var_help(
same @ EmptyRecord | same @ EmptyTagUnion | same @ Erroneous(_) => same, same @ EmptyRecord | same @ EmptyTagUnion | same @ Erroneous(_) => same,
Record(fields, ext_var) => { Record(fields, ext_var) => {
let record_fields = {
let mut new_vars = Vec::with_capacity(fields.len()); let mut new_vars = Vec::with_capacity(fields.len());
for index in fields.iter_variables() { for index in fields.iter_variables() {
let var = subs[index]; let var = subs[index];
let copy_var = deep_copy_var_help(subs, max_rank, pools, var); let copy_var = deep_copy_var_help(subs, max_rank, pools, var);
new_vars.push(copy_var); new_vars.push(copy_var);
} }
let it = fields.iter_all().zip(new_vars).map(|((i1, _, i3), var)| { let field_names_start = subs.field_names.len() as u32;
let label = subs[i1].clone(); let variables_start = subs.variables.len() as u32;
let field_types_start = subs.record_fields.len() as u32;
let mut length = 0;
for ((i1, _, i3), var) in fields.iter_all().zip(new_vars) {
let record_field = subs[i3].map(|_| var); let record_field = subs[i3].map(|_| var);
(label, record_field) subs.field_names.push(subs[i1].clone());
}); subs.record_fields.push(record_field.map(|_| ()));
subs.variables.push(*record_field.as_inner());
// lifetime troubles length += 1;
let vec: Vec<_> = it.collect(); }
let record_fields = RecordFields::insert_into_subs(subs, vec); RecordFields {
length,
field_names_start,
variables_start,
field_types_start,
}
};
Record( Record(
record_fields, record_fields,

29
editor/src/lang/solve.rs
View file

@ -1519,24 +1519,39 @@ fn deep_copy_var_help(
same @ EmptyRecord | same @ EmptyTagUnion | same @ Erroneous(_) => same, same @ EmptyRecord | same @ EmptyTagUnion | same @ Erroneous(_) => same,
Record(fields, ext_var) => { Record(fields, ext_var) => {
let record_fields = {
let mut new_vars = Vec::with_capacity(fields.len()); let mut new_vars = Vec::with_capacity(fields.len());
for index in fields.iter_variables() { for index in fields.iter_variables() {
let var = subs[index]; let var = subs[index];
let copy_var = deep_copy_var_help(subs, max_rank, pools, var); let copy_var = deep_copy_var_help(subs, max_rank, pools, var);
new_vars.push(copy_var); new_vars.push(copy_var);
} }
let it = fields.iter_all().zip(new_vars).map(|((i1, _, i3), var)| { let field_names_start = subs.field_names.len() as u32;
let label = subs[i1].clone(); let variables_start = subs.variables.len() as u32;
let field_types_start = subs.record_fields.len() as u32;
let mut length = 0;
for ((i1, _, i3), var) in fields.iter_all().zip(new_vars) {
let record_field = subs[i3].map(|_| var); let record_field = subs[i3].map(|_| var);
(label, record_field) subs.field_names.push(subs[i1].clone());
}); subs.record_fields.push(record_field.map(|_| ()));
subs.variables.push(*record_field.as_inner());
// lifetime troubles length += 1;
let vec: Vec<_> = it.collect(); }
let record_fields = RecordFields::insert_into_subs(subs, vec); RecordFields {
length,
field_names_start,
variables_start,
field_types_start,
}
};
Record( Record(
record_fields, record_fields,