language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 23:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

repl: explicit lifetimes for app

Browse source
This commit is contained in:
Brian Carroll 2022-02-04 09:58:39 +00:00
parent fdf8363b7e
commit 1528651a5a
2 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
repl_cli/src/lib.rs
View file

@ -288,11 +288,13 @@ fn gen_and_eval_llvm<'a>(
let lib = module_to_dylib(env.module, &target, opt_level) let lib = module_to_dylib(env.module, &target, opt_level)
.expect("Error loading compiled dylib for test"); .expect("Error loading compiled dylib for test");
let app = CliReplApp { lib }; // The app is `mut` only because Wasm needs it.
// It has no public fields, and its "mutating" methods don't actually mutate.
let mut app = CliReplApp { lib };
let res_answer = jit_to_ast( let res_answer = jit_to_ast(
&arena, &arena,
app, &mut app,
main_fn_name, main_fn_name,
main_fn_layout, main_fn_layout,
content, content,

34
repl_eval/src/eval.rs
View file

@ -41,7 +41,7 @@ pub enum ToAstProblem {
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
pub fn jit_to_ast<'a, A: ReplApp>( pub fn jit_to_ast<'a, A: ReplApp>(
arena: &'a Bump, arena: &'a Bump,
app: A, app: &'a mut A,
main_fn_name: &str, main_fn_name: &str,
layout: ProcLayout<'a>, layout: ProcLayout<'a>,
content: &'a Content, content: &'a Content,
@ -180,7 +180,7 @@ fn get_tags_vars_and_variant<'a>(
fn expr_of_tag<'a, A: ReplApp>( fn expr_of_tag<'a, A: ReplApp>(
env: &Env<'a, 'a>, env: &Env<'a, 'a>,
app: &A, app: &'a A,
data_addr: usize, data_addr: usize,
tag_name: &TagName, tag_name: &TagName,
arg_layouts: &'a [Layout<'a>], arg_layouts: &'a [Layout<'a>],
@ -257,7 +257,7 @@ const OPAQUE_FUNCTION: Expr = Expr::Var {
fn jit_to_ast_help<'a, A: ReplApp>( fn jit_to_ast_help<'a, A: ReplApp>(
env: &Env<'a, 'a>, env: &Env<'a, 'a>,
mut app: A, app: &'a mut A,
main_fn_name: &str, main_fn_name: &str,
layout: &Layout<'a>, layout: &Layout<'a>,
content: &'a Content, content: &'a Content,
@ -266,7 +266,7 @@ fn jit_to_ast_help<'a, A: ReplApp>(
let content = unroll_aliases(env, content); let content = unroll_aliases(env, content);
let result = match layout { let result = match layout {
Layout::Builtin(Builtin::Bool) => Ok(app.call_function(main_fn_name, |num: bool| { Layout::Builtin(Builtin::Bool) => Ok(app.call_function(main_fn_name, |num: bool| {
bool_to_ast(env, &app, num, content) bool_to_ast(env, app, num, content)
})), })),
Layout::Builtin(Builtin::Int(int_width)) => { Layout::Builtin(Builtin::Int(int_width)) => {
use IntWidth::*; use IntWidth::*;
@ -282,7 +282,7 @@ fn jit_to_ast_help<'a, A: ReplApp>(
let result = match int_width { let result = match int_width {
U8 | I8 => { U8 | I8 => {
// NOTE: `helper!` does not handle 8-bit numbers yet // NOTE: `helper!` does not handle 8-bit numbers yet
app.call_function(main_fn_name, |num: u8| byte_to_ast(env, &app, num, content)) app.call_function(main_fn_name, |num: u8| byte_to_ast(env, app, num, content))
} }
U16 => helper!(u16), U16 => helper!(u16),
U32 => helper!(u32), U32 => helper!(u32),
@ -321,7 +321,7 @@ fn jit_to_ast_help<'a, A: ReplApp>(
})), })),
Layout::Builtin(Builtin::List(elem_layout)) => Ok(app Layout::Builtin(Builtin::List(elem_layout)) => Ok(app
.call_function(main_fn_name, |(addr, len): (usize, usize)| { .call_function(main_fn_name, |(addr, len): (usize, usize)| {
list_to_ast(env, &app, addr, len, elem_layout, content) list_to_ast(env, app, addr, len, elem_layout, content)
})), })),
Layout::Builtin(other) => { Layout::Builtin(other) => {
todo!("add support for rendering builtin {:?} to the REPL", other) todo!("add support for rendering builtin {:?} to the REPL", other)
@ -329,11 +329,11 @@ fn jit_to_ast_help<'a, A: ReplApp>(
Layout::Struct(field_layouts) => { Layout::Struct(field_layouts) => {
let struct_addr_to_ast = |addr: usize| match content { let struct_addr_to_ast = |addr: usize| match content {
Content::Structure(FlatType::Record(fields, _)) => { Content::Structure(FlatType::Record(fields, _)) => {
Ok(struct_to_ast(env, &app, addr, field_layouts, *fields)) Ok(struct_to_ast(env, app, addr, field_layouts, *fields))
} }
Content::Structure(FlatType::EmptyRecord) => Ok(struct_to_ast( Content::Structure(FlatType::EmptyRecord) => Ok(struct_to_ast(
env, env,
&app, app,
addr, addr,
field_layouts, field_layouts,
RecordFields::empty(), RecordFields::empty(),
@ -345,7 +345,7 @@ fn jit_to_ast_help<'a, A: ReplApp>(
Ok(single_tag_union_to_ast( Ok(single_tag_union_to_ast(
env, env,
&app, app,
addr, addr,
field_layouts, field_layouts,
tag_name, tag_name,
@ -357,7 +357,7 @@ fn jit_to_ast_help<'a, A: ReplApp>(
Ok(single_tag_union_to_ast( Ok(single_tag_union_to_ast(
env, env,
&app, app,
addr, addr,
field_layouts, field_layouts,
tag_name, tag_name,
@ -391,7 +391,7 @@ fn jit_to_ast_help<'a, A: ReplApp>(
let size = layout.stack_size(env.target_info); let size = layout.stack_size(env.target_info);
Ok( Ok(
app.call_function_dynamic_size(main_fn_name, size as usize, |addr: usize| { app.call_function_dynamic_size(main_fn_name, size as usize, |addr: usize| {
addr_to_ast(env, &app, addr, layout, WhenRecursive::Unreachable, content) addr_to_ast(env, app, addr, layout, WhenRecursive::Unreachable, content)
}), }),
) )
} }
@ -404,7 +404,7 @@ fn jit_to_ast_help<'a, A: ReplApp>(
app.call_function_dynamic_size(main_fn_name, size as usize, |addr: usize| { app.call_function_dynamic_size(main_fn_name, size as usize, |addr: usize| {
addr_to_ast( addr_to_ast(
env, env,
&app, app,
addr, addr,
layout, layout,
WhenRecursive::Loop(*layout), WhenRecursive::Loop(*layout),
@ -445,7 +445,7 @@ enum WhenRecursive<'a> {
fn addr_to_ast<'a, A: ReplApp>( fn addr_to_ast<'a, A: ReplApp>(
env: &Env<'a, 'a>, env: &Env<'a, 'a>,
app: &A, app: &'a A,
addr: usize, addr: usize,
layout: &Layout<'a>, layout: &Layout<'a>,
when_recursive: WhenRecursive<'a>, when_recursive: WhenRecursive<'a>,
@ -715,7 +715,7 @@ fn addr_to_ast<'a, A: ReplApp>(
fn list_to_ast<'a, A: ReplApp>( fn list_to_ast<'a, A: ReplApp>(
env: &Env<'a, 'a>, env: &Env<'a, 'a>,
app: &A, app: &'a A,
addr: usize, addr: usize,
len: usize, len: usize,
elem_layout: &Layout<'a>, elem_layout: &Layout<'a>,
@ -766,7 +766,7 @@ fn list_to_ast<'a, A: ReplApp>(
fn single_tag_union_to_ast<'a, A: ReplApp>( fn single_tag_union_to_ast<'a, A: ReplApp>(
env: &Env<'a, 'a>, env: &Env<'a, 'a>,
app: &A, app: &'a A,
addr: usize, addr: usize,
field_layouts: &'a [Layout<'a>], field_layouts: &'a [Layout<'a>],
tag_name: &TagName, tag_name: &TagName,
@ -793,7 +793,7 @@ fn single_tag_union_to_ast<'a, A: ReplApp>(
fn sequence_of_expr<'a, I, A: ReplApp>( fn sequence_of_expr<'a, I, A: ReplApp>(
env: &Env<'a, 'a>, env: &Env<'a, 'a>,
app: &A, app: &'a A,
addr: usize, addr: usize,
sequence: I, sequence: I,
when_recursive: WhenRecursive<'a>, when_recursive: WhenRecursive<'a>,
@ -825,7 +825,7 @@ where
fn struct_to_ast<'a, A: ReplApp>( fn struct_to_ast<'a, A: ReplApp>(
env: &Env<'a, 'a>, env: &Env<'a, 'a>,
app: &A, app: &'a A,
addr: usize, addr: usize,
field_layouts: &'a [Layout<'a>], field_layouts: &'a [Layout<'a>],
record_fields: RecordFields, record_fields: RecordFields,