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

List takes interned element

Browse source
This commit is contained in:
Ayaz Hafiz 2022-12-29 08:52:37 -06:00
parent f2a42affd1
commit e4b5252e51
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
16 changed files with 173 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,8 +11,8 @@ use roc_module::ident::TagName;
use roc_module::symbol::{Interns, ModuleId, Symbol};
use roc_mono::ir::ProcLayout;
use roc_mono::layout::{
self, union_sorted_tags_pub, Builtin, Layout, LayoutCache, LayoutInterner, UnionLayout,
UnionVariant, WrappedVariant,
self, union_sorted_tags_pub, Builtin, InLayout, Layout, LayoutCache, LayoutInterner,
UnionLayout, UnionVariant, WrappedVariant,
};
use roc_parse::ast::{AssignedField, Collection, Expr, Pattern, StrLiteral};
use roc_region::all::{Loc, Region};
@ -409,7 +409,7 @@ fn jit_to_ast_help<'a, A: ReplApp<'a>>(
mem,
addr,
len,
elem_layout,
*elem_layout,
env.subs.get_content_without_compacting(raw_var),
)
},
@ -597,7 +597,7 @@ fn addr_to_ast<'a, M: ReplAppMemory>(
let len = mem.deref_usize(addr + env.target_info.ptr_width() as usize);
let _cap = mem.deref_usize(addr + 2 * env.target_info.ptr_width() as usize);
list_to_ast(env, mem, elem_addr, len, elem_layout, raw_content)
list_to_ast(env, mem, elem_addr, len, *elem_layout, raw_content)
}
(_, Layout::Builtin(Builtin::Str)) => {
let string = mem.deref_str(addr);
@ -892,7 +892,7 @@ fn list_to_ast<'a, M: ReplAppMemory>(
mem: &'a M,
addr: usize,
len: usize,
elem_layout: &Layout<'a>,
elem_layout: InLayout<'a>,
content: &Content,
) -> Expr<'a> {
let elem_var = match content {
@ -912,6 +912,7 @@ fn list_to_ast<'a, M: ReplAppMemory>(
let arena = env.arena;
let mut output = Vec::with_capacity_in(len, arena);
let elem_layout = *env.layout_cache.get_in(elem_layout);
let elem_size = elem_layout.stack_size(&env.layout_cache.interner, env.target_info) as usize;
for index in 0..len {
@ -923,7 +924,7 @@ fn list_to_ast<'a, M: ReplAppMemory>(
env,
mem,
elem_addr,
elem_layout,
&elem_layout,
WhenRecursive::Unreachable,
elem_content,
);