roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-09-22 00:09:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix List.first types

Browse Source
This commit is contained in:
Richard Feldman 2020-06-24 23:08:25 -04:00
parent b3dfbeeec8
commit 0f36255f83
8 changed files with 90 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/builtins/src/std.rs
View File

@ -431,6 +431,15 @@ pub fn types() -> MutMap<Symbol, (SolvedType, Region)> {
Symbol::LIST_GET,
SolvedType::Func(
vec![list_type(flex(TVAR1)), int_type()],
Box::new(result_type(flex(TVAR1), index_out_of_bounds.clone())),
),
);
// first : List elem -> Result elem [ OutOfBounds ]*
add_type(
Symbol::LIST_FIRST,
SolvedType::Func(
vec![list_type(flex(TVAR1))],
Box::new(result_type(flex(TVAR1), index_out_of_bounds)),
),
);

9
compiler/builtins/src/unique.rs
View File

@ -525,6 +525,15 @@ pub fn types() -> MutMap<Symbol, (SolvedType, Region)> {
Symbol::LIST_GET,
unique_function(
vec![list_type(UVAR1, TVAR1), int_type(UVAR2)],
result_type(UVAR3, flex(TVAR1), lift(UVAR4, index_out_of_bounds.clone())),
),
);
// first : List elem -> Result elem [ OutOfBounds ]*
add_type(
Symbol::LIST_FIRST,
unique_function(
vec![list_type(UVAR1, TVAR1)],
result_type(UVAR3, flex(TVAR1), lift(UVAR4, index_out_of_bounds)),
),
);

84
compiler/can/src/builtins.rs
View File

@ -459,7 +459,7 @@ fn list_get(symbol: Symbol, var_store: &mut VarStore) -> Def {
let arg_list = Symbol::ARG_1;
let arg_index = Symbol::ARG_2;
let bool_var = var_store.fresh();
let ulen_var = var_store.fresh();
let len_var = var_store.fresh();
let branch_var = var_store.fresh();
let list_var = var_store.fresh();
@ -474,13 +474,13 @@ fn list_get(symbol: Symbol, var_store: &mut VarStore) -> Def {
RunLowLevel {
op: LowLevel::NumLt,
args: vec![
(ulen_var, Var(arg_index)),
(len_var, Var(arg_index)),
(
ulen_var,
len_var,
RunLowLevel {
op: LowLevel::ListLen,
args: vec![(list_var, Var(arg_list))],
ret_var: ulen_var,
ret_var: len_var,
},
),
],
@ -496,8 +496,8 @@ fn list_get(symbol: Symbol, var_store: &mut VarStore) -> Def {
// List#getUnsafe list index
RunLowLevel {
op: LowLevel::ListGetUnsafe,
args: vec![(list_var, Var(arg_list)), (ulen_var, Var(arg_index))],
ret_var: ulen_var,
args: vec![(list_var, Var(arg_list)), (len_var, Var(arg_index))],
ret_var: len_var,
},
],
var_store,
@ -526,7 +526,7 @@ fn list_set(symbol: Symbol, var_store: &mut VarStore) -> Def {
let arg_index = Symbol::ARG_2;
let arg_elem = Symbol::ARG_3;
let bool_var = var_store.fresh();
let ulen_var = var_store.fresh();
let len_var = var_store.fresh();
let list_var = var_store.fresh();
let branch_var = var_store.fresh();
let elem_var = var_store.fresh();
@ -543,13 +543,13 @@ fn list_set(symbol: Symbol, var_store: &mut VarStore) -> Def {
RunLowLevel {
op: LowLevel::NumLt,
args: vec![
(ulen_var, Var(arg_index)),
(len_var, Var(arg_index)),
(
ulen_var,
len_var,
RunLowLevel {
op: LowLevel::ListLen,
args: vec![(list_var, Var(arg_list))],
ret_var: ulen_var,
ret_var: len_var,
},
),
],
@ -563,7 +563,7 @@ fn list_set(symbol: Symbol, var_store: &mut VarStore) -> Def {
op: LowLevel::ListSet,
args: vec![
(list_var, Var(arg_list)),
(ulen_var, Var(arg_index)),
(len_var, Var(arg_index)),
(elem_var, Var(arg_elem)),
],
ret_var: list_var,
@ -770,52 +770,64 @@ fn num_div_int(symbol: Symbol, var_store: &mut VarStore) -> Def {
/// List.first : List elem -> Result elem [ ListWasEmpty ]*
fn list_first(symbol: Symbol, var_store: &mut VarStore) -> Def {
let branch_var = var_store.fresh();
let bool_var = var_store.fresh();
let list_var = var_store.fresh();
let len_var = var_store.fresh();
let zero_var = var_store.fresh();
let list_elem_var = var_store.fresh();
// Perform a bounds check. If it passes, delegate to List.getUnsafe.
let body = If {
// TODO Use "when" instead of "if" so that we can have False be the first branch.
// We want that for branch prediction; usually we expect the list to be nonempty.
cond_var: var_store.fresh(),
branch_var: var_store.fresh(),
cond_var: bool_var,
branch_var,
branches: vec![(
// if-condition
no_region(
// List.isEmpty list
// List.len list != 0
RunLowLevel {
op: LowLevel::ListIsEmpty,
args: vec![(var_store.fresh(), Var(Symbol::ARG_1))],
ret_var: var_store.fresh(),
op: LowLevel::NotEq,
args: vec![
(len_var, Int(zero_var, 0)),
(
len_var,
RunLowLevel {
op: LowLevel::ListLen,
args: vec![(list_var, Var(Symbol::ARG_1))],
ret_var: len_var,
},
),
],
ret_var: bool_var,
},
),
// list was empty
no_region(
// Err ListWasEmpty
tag(
"Err",
vec![tag("ListWasEmpty", Vec::new(), var_store)],
var_store,
),
),
)],
final_else: Box::new(
// list was not empty
no_region(
// Ok (List.#getUnsafe list 0)
tag(
"Ok",
vec![
// List#getUnsafe list 0
// List.#getUnsafe list 0
RunLowLevel {
op: LowLevel::ListGetUnsafe,
args: vec![
(var_store.fresh(), Var(Symbol::ARG_1)),
(var_store.fresh(), Int(var_store.fresh(), 0)),
],
ret_var: var_store.fresh(),
args: vec![(list_var, Var(Symbol::ARG_1)), (len_var, Int(zero_var, 0))],
ret_var: list_elem_var,
},
],
var_store,
),
),
)],
final_else: Box::new(
// list was empty
no_region(
// Err ListWasEmpty
tag(
"Err",
vec![tag("ListWasEmpty", Vec::new(), var_store)],
var_store,
),
),
),
};

17
compiler/gen/src/llvm/build.rs
View File

@ -1290,18 +1290,6 @@ fn run_low_level<'a, 'ctx, 'env>(
BasicValueEnum::IntValue(load_list_len(env.builder, arg.into_struct_value()))
}
ListIsEmpty => {
debug_assert_eq!(args.len(), 1);
let arg = build_expr(env, layout_ids, scope, parent, &args[0].0);
let list_struct = arg.into_struct_value();
let builder = env.builder;
let list_len = load_list_len(builder, list_struct);
let zero = env.ptr_int().const_zero();
let answer = builder.build_int_compare(IntPredicate::EQ, list_len, zero, "is_zero");
BasicValueEnum::IntValue(answer)
}
ListSingle => {
// List.single : a -> List a
debug_assert_eq!(args.len(), 1);
@ -1528,7 +1516,10 @@ fn run_low_level<'a, 'ctx, 'env>(
builder.build_load(elem_ptr, "List.get")
}
_ => {
unreachable!("Invalid List layout for List.get: {:?}", list_layout);
unreachable!(
"Invalid List layout for ListGetUnsafe operation: {:?}",
list_layout
);
}
}
}

15
compiler/gen/tests/gen_builtins.rs
View File

@ -576,6 +576,21 @@ mod gen_builtins {
);
}
#[test]
fn get_empty_list() {
assert_evals_to!(
indoc!(
r#"
when List.get [] 0 is
Ok val -> val
Err _ -> -1
"#
),
-1,
i64
);
}
#[test]
fn get_int_list_ok() {
assert_evals_to!(

1
compiler/module/src/low_level.rs
View File

@ -7,7 +7,6 @@ pub enum LowLevel {
ListGetUnsafe,
ListSet,
ListSetInPlace,
ListIsEmpty,
ListSingle,
NumAdd,
NumSub,

15
compiler/mono/src/expr.rs
View File

@ -520,13 +520,13 @@ fn from_can<'a>(
for (arg_var, arg_expr) in args {
let arg = from_can(env, arg_expr, procs, layout_cache);
let layout = layout_cache
.from_var(env.arena, dbg!(arg_var), env.subs, env.pointer_size)
.from_var(env.arena, arg_var, env.subs, env.pointer_size)
.unwrap_or_else(|err| todo!("TODO turn fn_var into a RuntimeError {:?}", err));
mono_args.push((arg, layout));
}
dbg!(Expr::RunLowLevel(op, mono_args.into_bump_slice()))
Expr::RunLowLevel(op, mono_args.into_bump_slice())
}
Call(boxed, loc_args, _) => {
@ -597,13 +597,6 @@ fn from_can<'a>(
branches,
final_else,
} => {
dbg!(If {
cond_var,
branch_var,
branches: branches.clone(),
final_else: final_else.clone(),
});
let mut expr = from_can(env, final_else.value, procs, layout_cache);
let arena = env.arena;
@ -615,8 +608,8 @@ fn from_can<'a>(
.expect("invalid cond_layout");
for (loc_cond, loc_then) in branches.into_iter().rev() {
let cond = from_can(env, dbg!(loc_cond.value), procs, layout_cache);
let then = from_can(env, dbg!(loc_then.value), procs, layout_cache);
let cond = from_can(env, loc_cond.value, procs, layout_cache);
let then = from_can(env, loc_then.value, procs, layout_cache);
let branch_symbol = env.unique_symbol();

2
compiler/uniq/src/sharing.rs
View File

@ -715,7 +715,7 @@ fn annotate_low_level_usage(
use Usage::*;
match op {
ListLen | ListIsEmpty | ListGetUnsafe => {
ListLen | ListGetUnsafe => {
match &args[0].1 {
Var(list_var) => {
usage.register_with(