about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdam Joseph <adam@westernsemico.com>2023-12-12T11·07-0800
committerclbot <clbot@tvl.fyi>2023-12-12T17·34+0000
commitafba1500361005f02dfd7423a04f215839f59557 (patch)
tree7b4e0905ca5b094024066b75e7a6a74d6fb946a8
parent07ca556a942b78ea70f3b7a7ee812948801c4865 (diff)
fix(tvix/eval): builtins.elemAt: propagate catchables r/7198
This commit fixes builtins.elemAt so it propagates catchables like
cppnix does.

Change-Id: Ieca5e128da17e78af0b14dae4a28a1ff8796e4f2
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10308
Autosubmit: Adam Joseph <adam@westernsemico.com>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
-rw-r--r--tvix/eval/src/builtins/mod.rs6
-rw-r--r--tvix/eval/src/tests/tvix_tests/eval-okay-builtins-elemAt-catchable.exp1
-rw-r--r--tvix/eval/src/tests/tvix_tests/eval-okay-builtins-elemAt-catchable.nix1
3 files changed, 8 insertions, 0 deletions
diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs
index d85d6567ea8a..58fe6bbbcb0c 100644
--- a/tvix/eval/src/builtins/mod.rs
+++ b/tvix/eval/src/builtins/mod.rs
@@ -291,6 +291,12 @@ mod pure_builtins {
 
     #[builtin("elemAt")]
     async fn builtin_elem_at(co: GenCo, xs: Value, i: Value) -> Result<Value, ErrorKind> {
+        if xs.is_catchable() {
+            return Ok(xs);
+        }
+        if i.is_catchable() {
+            return Ok(i);
+        }
         let xs = xs.to_list()?;
         let i = i.as_int()?;
         if i < 0 {
diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-elemAt-catchable.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-elemAt-catchable.exp
new file mode 100644
index 000000000000..c508d5366f70
--- /dev/null
+++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-elemAt-catchable.exp
@@ -0,0 +1 @@
+false
diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-elemAt-catchable.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-elemAt-catchable.nix
new file mode 100644
index 000000000000..97be4b013c9d
--- /dev/null
+++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-elemAt-catchable.nix
@@ -0,0 +1 @@
+(builtins.tryEval (builtins.elemAt (throw "fred") 0)).success