language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 05:49:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Use a helper to emplace type cells

Browse source
This commit is contained in:
Ayaz Hafiz 2022-10-24 12:07:00 -05:00
parent d3e14550d8
commit 04a3f1c00e
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
1 changed files with 44 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1327,27 +1327,21 @@ fn solve(
let tys_cells = &constraints.types[types.indices()]; let tys_cells = &constraints.types[types.indices()];
let pattern_category = &constraints.pattern_categories[pattern_category.index()]; let pattern_category = &constraints.pattern_categories[pattern_category.index()];
let actual = { let actual = type_cell_to_var(
let typ = typ_cell.replace(Type::EmptyTagUnion); subs,
let actual = type_to_var( rank,
subs, problems,
rank, abilities_store,
problems, obligation_cache,
abilities_store, pools,
obligation_cache, aliases,
pools, typ_cell,
aliases, );
&typ,
);
typ_cell.replace(Type::Variable(actual));
actual
};
let tys = { let tys = {
let mut tys = Vec::with_capacity(tys_cells.len()); let mut tys = Vec::with_capacity(tys_cells.len());
for cell in tys_cells { for cell in tys_cells {
let ty = cell.replace(Type::EmptyTagUnion); let actual = type_cell_to_var(
let actual = type_to_var(
subs, subs,
rank, rank,
problems, problems,
@ -1355,9 +1349,8 @@ fn solve(
obligation_cache, obligation_cache,
pools, pools,
aliases, aliases,
&ty, &cell,
); );
cell.replace(Type::Variable(actual));
tys.push(Type::Variable(actual)); tys.push(Type::Variable(actual));
} }
tys tys
@ -2057,8 +2050,7 @@ impl LocalDefVarsVec<(Symbol, Loc<Variable>)> {
let mut local_def_vars = Self::with_length(types_slice.len()); let mut local_def_vars = Self::with_length(types_slice.len());
for (&(symbol, region), typ_cell) in (loc_symbols_slice.iter()).zip(types_slice) { for (&(symbol, region), typ_cell) in (loc_symbols_slice.iter()).zip(types_slice) {
let typ = typ_cell.replace(Type::EmptyTagUnion); let var = type_cell_to_var(
let var = type_to_var(
subs, subs,
rank, rank,
problems, problems,
@ -2066,9 +2058,8 @@ impl LocalDefVarsVec<(Symbol, Loc<Variable>)> {
obligation_cache, obligation_cache,
pools, pools,
aliases, aliases,
&typ, typ_cell,
); );
typ_cell.replace(Type::Variable(var));
local_def_vars.push((symbol, Loc { value: var, region })); local_def_vars.push((symbol, Loc { value: var, region }));
} }
@ -2077,7 +2068,7 @@ impl LocalDefVarsVec<(Symbol, Loc<Variable>)> {
} }
} }
use std::cell::RefCell; use std::cell::{Cell, RefCell};
use std::ops::ControlFlow; use std::ops::ControlFlow;
std::thread_local! { std::thread_local! {
/// Scratchpad arena so we don't need to allocate a new one all the time /// Scratchpad arena so we don't need to allocate a new one all the time
@ -2109,8 +2100,7 @@ fn either_type_index_to_var(
Ok(type_index) => { Ok(type_index) => {
let typ_cell = &constraints.types[type_index.index()]; let typ_cell = &constraints.types[type_index.index()];
let typ = typ_cell.replace(Type::EmptyTagUnion); type_cell_to_var(
let var = type_to_var(
subs, subs,
rank, rank,
problems, problems,
@ -2118,10 +2108,8 @@ fn either_type_index_to_var(
obligation_cache, obligation_cache,
pools, pools,
aliases, aliases,
&typ, typ_cell,
); )
typ_cell.replace(Type::Variable(var));
var
} }
Err(var_index) => { Err(var_index) => {
// we cheat, and store the variable directly in the index // we cheat, and store the variable directly in the index
@ -2130,6 +2118,32 @@ fn either_type_index_to_var(
} }
} }
/// Converts a type in a cell to a variable, leaving the converted variable behind for re-use.
fn type_cell_to_var(
subs: &mut Subs,
rank: Rank,
problems: &mut Vec<TypeError>,
abilities_store: &mut AbilitiesStore,
obligation_cache: &mut ObligationCache,
pools: &mut Pools,
aliases: &mut Aliases,
typ_cell: &Cell<Type>,
) -> Variable {
let typ = typ_cell.replace(Type::EmptyTagUnion);
let var = type_to_var(
subs,
rank,
problems,
abilities_store,
obligation_cache,
pools,
aliases,
&typ,
);
typ_cell.replace(Type::Variable(var));
var
}
pub(crate) fn type_to_var( pub(crate) fn type_to_var(
subs: &mut Subs, subs: &mut Subs,
rank: Rank, rank: Rank,