language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 21:39:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Propagate layout_cache throughout Env in generating layout

Browse source 
Sets up actually using the LayoutCache to get cached layouts.
This commit is contained in:
Ayaz Hafiz 2022-08-24 09:59:44 -05:00
parent 459faac064
commit 8b0f7dc82f
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
3 changed files with 176 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/repl_eval/src/eval.rs
View file

@ -10,7 +10,8 @@ use roc_module::ident::TagName;
use roc_module::symbol::{Interns, ModuleId, Symbol};
use roc_mono::ir::ProcLayout;
use roc_mono::layout::{
union_sorted_tags_help, Builtin, Layout, LayoutCache, UnionLayout, UnionVariant, WrappedVariant,
self, union_sorted_tags_help, Builtin, Layout, LayoutCache, UnionLayout, UnionVariant,
WrappedVariant,
};
use roc_parse::ast::{AssignedField, Collection, Expr, StrLiteral};
use roc_region::all::{Loc, Region};
@ -196,8 +197,12 @@ fn get_tags_vars_and_variant<'a>(
let vars_of_tag: MutMap<_, _> = tags_vec.iter().cloned().collect();
let union_variant =
union_sorted_tags_help(env.arena, tags_vec, opt_rec_var, env.subs, env.target_info);
let union_variant = {
let cache = LayoutCache::new(env.target_info);
let mut layout_env =
layout::Env::from_components(&cache, env.subs, env.arena, env.target_info);
union_sorted_tags_help(&mut layout_env, tags_vec, opt_rec_var)
};
(vars_of_tag, union_variant)
}
@ -1195,13 +1200,16 @@ fn byte_to_ast<'a, M: ReplAppMemory>(
.map(|(a, b)| (a.clone(), b.to_vec()))
.collect();
let union_variant = union_sorted_tags_help(
env.arena,
tags_vec,
None,
env.subs,
env.target_info,
);
let union_variant = {
let cache = LayoutCache::new(env.target_info);
let mut layout_env = layout::Env::from_components(
&cache,
env.subs,
env.arena,
env.target_info,
);
union_sorted_tags_help(&mut layout_env, tags_vec, None)
};
match union_variant {
UnionVariant::ByteUnion(tagnames) => {