mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/eval): builtins.length: propagate catchables

Browse source 
This commit fixes out builtins.length so it propagates catchables
like cppnix does.

Change-Id: I7670bec5eee1d4cd3f67a04c9a6808979fb56a8d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10315
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: Adam Joseph <adam@westernsemico.com>
Tested-by: BuildkiteCI
This commit is contained in:
Adam Joseph 2023-12-12 03:39:07 -08:00 committed by clbot
parent 331d9ee54a
commit 2565a21aa9
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tvix/eval/src/builtins/mod.rs
View file

@ -665,6 +665,9 @@ mod pure_builtins {
#[builtin("length")]
async fn builtin_length(co: GenCo, list: Value) -> Result<Value, ErrorKind> {
if list.is_catchable() {
return Ok(list);
}
Ok(Value::Integer(list.to_list()?.len() as i64))
}

1
tvix/eval/src/tests/tvix_tests/eval-okay-builtins-length-catchable.exp Normal file
View file

@ -0,0 +1 @@
false

1
tvix/eval/src/tests/tvix_tests/eval-okay-builtins-length-catchable.nix Normal file
View file

@ -0,0 +1 @@
(builtins.tryEval (builtins.length (throw "fred"))).success