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

Account for return types being different in the uniqueness case

Browse source
This commit is contained in:
Richard Feldman 2020-07-10 21:55:43 -04:00
parent 814ca7c7cc
commit b8a9a3ef42
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
compiler/can/src/builtins.rs
View file

@ -698,7 +698,7 @@ fn list_get(symbol: Symbol, var_store: &mut VarStore) -> Def {
// Perform a bounds check. If it passes, run LowLevel::ListGetUnsafe // Perform a bounds check. If it passes, run LowLevel::ListGetUnsafe
let body = If { let body = If {
cond_var: bool_var, cond_var: bool_var,
branch_var: ret_var, branch_var: var_store.fresh(),
branches: vec![( branches: vec![(
// if-condition // if-condition
no_region( no_region(
@ -771,15 +771,15 @@ fn list_set(symbol: Symbol, var_store: &mut VarStore) -> Def {
let arg_elem = Symbol::ARG_3; let arg_elem = Symbol::ARG_3;
let bool_var = var_store.fresh(); let bool_var = var_store.fresh();
let len_var = var_store.fresh(); let len_var = var_store.fresh();
let list_var = var_store.fresh();
let elem_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. // Perform a bounds check. If it passes, run LowLevel::ListSet.
// Otherwise, return the list unmodified. // Otherwise, return the list unmodified.
let body = If { let body = If {
cond_var: bool_var, cond_var: bool_var,
branch_var: ret_var, branch_var: list_ret_var,
branches: vec![( branches: vec![(
// if-condition // if-condition
no_region( no_region(
@ -792,7 +792,7 @@ fn list_set(symbol: Symbol, var_store: &mut VarStore) -> Def {
len_var, len_var,
RunLowLevel { RunLowLevel {
op: LowLevel::ListLen, op: LowLevel::ListLen,
args: vec![(list_var, Var(arg_list))], args: vec![(list_arg_var, Var(arg_list))],
ret_var: len_var, ret_var: len_var,
}, },
), ),
@ -806,11 +806,11 @@ fn list_set(symbol: Symbol, var_store: &mut VarStore) -> Def {
RunLowLevel { RunLowLevel {
op: LowLevel::ListSet, op: LowLevel::ListSet,
args: vec![ args: vec![
(list_var, Var(arg_list)), (list_arg_var, Var(arg_list)),
(len_var, Var(arg_index)), (len_var, Var(arg_index)),
(elem_var, Var(arg_elem)), (elem_var, Var(arg_elem)),
], ],
ret_var: list_var, ret_var: list_ret_var,
}, },
), ),
)], )],
@ -823,13 +823,13 @@ fn list_set(symbol: Symbol, var_store: &mut VarStore) -> Def {
defn( defn(
symbol, symbol,
vec![ vec![
(list_var, Symbol::ARG_1), (list_arg_var, Symbol::ARG_1),
(len_var, Symbol::ARG_2), (len_var, Symbol::ARG_2),
(elem_var, Symbol::ARG_3), (elem_var, Symbol::ARG_3),
], ],
var_store, var_store,
body, body,
ret_var, list_ret_var,
) )
} }
@ -1093,7 +1093,7 @@ fn list_first(symbol: Symbol, var_store: &mut VarStore) -> Def {
// Perform a bounds check. If it passes, delegate to List.getUnsafe. // Perform a bounds check. If it passes, delegate to List.getUnsafe.
let body = If { let body = If {
cond_var: bool_var, cond_var: bool_var,
branch_var: ret_var, branch_var: var_store.fresh(),
branches: vec![( branches: vec![(
// if-condition // if-condition
no_region( no_region(