Merge branch 'trunk' into list-append

This commit is contained in:
Chadtech 2020-07-18 21:30:51 -04:00 committed by GitHub
commit 36a259b56b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 1659 additions and 789 deletions

View file

@ -704,6 +704,11 @@ fn list_len(symbol: Symbol, var_store: &mut VarStore) -> Def {
}
/// List.get : List elem, Int -> Result elem [ OutOfBounds ]*
///
/// List.get :
/// Attr (* | u) (List (Attr u a)),
/// Attr * Int
/// -> Attr * (Result (Attr u a) (Attr * [ OutOfBounds ]*))
fn list_get(symbol: Symbol, var_store: &mut VarStore) -> Def {
let arg_list = Symbol::ARG_1;
let arg_index = Symbol::ARG_2;
@ -716,7 +721,7 @@ fn list_get(symbol: Symbol, var_store: &mut VarStore) -> Def {
// Perform a bounds check. If it passes, run LowLevel::ListGetUnsafe
let body = If {
cond_var: bool_var,
branch_var: ret_var,
branch_var: var_store.fresh(),
branches: vec![(
// if-condition
no_region(
@ -777,21 +782,27 @@ fn list_get(symbol: Symbol, var_store: &mut VarStore) -> Def {
}
/// List.set : List elem, Int, elem -> List elem
///
/// List.set :
/// Attr (w | u | v) (List (Attr u a)),
/// Attr * Int,
/// Attr (u | v) a
/// -> Attr * (List (Attr u a))
fn list_set(symbol: Symbol, var_store: &mut VarStore) -> Def {
let arg_list = Symbol::ARG_1;
let arg_index = Symbol::ARG_2;
let arg_elem = Symbol::ARG_3;
let bool_var = var_store.fresh();
let len_var = var_store.fresh();
let list_var = var_store.fresh();
let elem_var = var_store.fresh();
let ret_var = var_store.fresh();
let list_arg_var = var_store.fresh(); // Uniqueness type Attr differs between
let list_ret_var = var_store.fresh(); // the arg list and the returned list
// Perform a bounds check. If it passes, run LowLevel::ListSet.
// Otherwise, return the list unmodified.
let body = If {
cond_var: bool_var,
branch_var: ret_var,
branch_var: list_ret_var,
branches: vec![(
// if-condition
no_region(
@ -804,7 +815,7 @@ fn list_set(symbol: Symbol, var_store: &mut VarStore) -> Def {
len_var,
RunLowLevel {
op: LowLevel::ListLen,
args: vec![(list_var, Var(arg_list))],
args: vec![(list_arg_var, Var(arg_list))],
ret_var: len_var,
},
),
@ -818,11 +829,11 @@ fn list_set(symbol: Symbol, var_store: &mut VarStore) -> Def {
RunLowLevel {
op: LowLevel::ListSet,
args: vec![
(list_var, Var(arg_list)),
(list_arg_var, Var(arg_list)),
(len_var, Var(arg_index)),
(elem_var, Var(arg_elem)),
],
ret_var: list_var,
ret_var: list_ret_var,
},
),
)],
@ -835,13 +846,13 @@ fn list_set(symbol: Symbol, var_store: &mut VarStore) -> Def {
defn(
symbol,
vec![
(list_var, Symbol::ARG_1),
(list_arg_var, Symbol::ARG_1),
(len_var, Symbol::ARG_2),
(elem_var, Symbol::ARG_3),
],
var_store,
body,
ret_var,
list_ret_var,
)
}
@ -1090,6 +1101,10 @@ fn num_div_int(symbol: Symbol, var_store: &mut VarStore) -> Def {
}
/// List.first : List elem -> Result elem [ ListWasEmpty ]*
///
/// List.first :
/// Attr (* | u) (List (Attr u a)),
/// -> Attr * (Result (Attr u a) (Attr * [ OutOfBounds ]*))
fn list_first(symbol: Symbol, var_store: &mut VarStore) -> Def {
let bool_var = var_store.fresh();
let list_var = var_store.fresh();
@ -1101,7 +1116,7 @@ fn list_first(symbol: Symbol, var_store: &mut VarStore) -> Def {
// Perform a bounds check. If it passes, delegate to List.getUnsafe.
let body = If {
cond_var: bool_var,
branch_var: ret_var,
branch_var: var_store.fresh(),
branches: vec![(
// if-condition
no_region(