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

add LocalDefVarsVec::from_def_types

Browse source
This commit is contained in:
Folkert 2022-03-05 00:51:08 +01:00
parent 41df04184e
commit 3a1add6ce8
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 41 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@ use bumpalo::Bump;
use roc_can::constraint::Constraint::{self, *};
use roc_can::constraint::{LetConstraint, PresenceConstraint};
use roc_can::expected::{Expected, PExpected};
use roc_collections::all::MutMap;
use roc_collections::all::{MutMap, SendMap};
use roc_module::ident::TagName;
use roc_module::symbol::Symbol;
use roc_region::all::{Loc, Region};
@ -260,19 +260,13 @@ fn solve(
}
Work::LetConSimple { env, rank, let_con } => {
// Add a variable for each def to new_vars_by_env.
let mut local_def_vars = LocalDefVarsVec::with_length(let_con.def_types.len());
for (symbol, loc_type) in let_con.def_types.iter() {
let var = type_to_var(subs, rank, pools, cached_aliases, &loc_type.value);
local_def_vars.push((
*symbol,
Loc {
value: var,
region: loc_type.region,
},
));
}
let local_def_vars = LocalDefVarsVec::from_def_types(
rank,
pools,
cached_aliases,
subs,
&let_con.def_types,
);
let mut new_env = env.clone();
for (symbol, loc_var) in local_def_vars.iter() {
@ -548,22 +542,13 @@ fn solve(
// run solver in next pool
// Add a variable for each def to local_def_vars.
let mut local_def_vars =
LocalDefVarsVec::with_length(let_con.def_types.len());
for (symbol, loc_type) in let_con.def_types.iter() {
let def_type = &loc_type.value;
let var = type_to_var(subs, next_rank, pools, cached_aliases, def_type);
local_def_vars.push((
*symbol,
Loc {
value: var,
region: loc_type.region,
},
));
}
let local_def_vars = LocalDefVarsVec::from_def_types(
next_rank,
pools,
cached_aliases,
subs,
&let_con.def_types,
);
// Solve the assignments' constraints first.
// TODO: make into `WorkItem` with `After`
@ -759,6 +744,32 @@ impl<T> LocalDefVarsVec<T> {
}
}
impl LocalDefVarsVec<(Symbol, Loc<Variable>)> {
fn from_def_types(
rank: Rank,
pools: &mut Pools,
cached_aliases: &mut MutMap<Symbol, Variable>,
subs: &mut Subs,
def_types: &SendMap<Symbol, Loc<Type>>,
) -> Self {
let mut local_def_vars = Self::with_length(def_types.len());
for (symbol, loc_type) in def_types.iter() {
let var = type_to_var(subs, rank, pools, cached_aliases, &loc_type.value);
local_def_vars.push((
*symbol,
Loc {
value: var,
region: loc_type.region,
},
));
}
local_def_vars
}
}
use std::cell::RefCell;
std::thread_local! {
/// Scratchpad arena so we don't need to allocate a new one all the time