diff options
| author | William Carroll <wpcarro@gmail.com> | 2022-09-06T18·58-0700 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2022-09-17T12·54+0000 |
| commit | 3a67a140093335e93cee560c1d2f9873035ffa95 (patch) | |
| tree | b8f8bf10d78aaf6fd1c45a0c2b368c6d87c75290 /tvix | |
| parent | 53fbc75df9ee4aa06eccc9f12bfe9cab8eab5755 (diff) | |
feat(tvix/eval): Support builtins.elemAt r/4882
(Attempt to) index into a list. Change-Id: I3592e60a79e64d265e34100d4062041b0b410e00 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6551 Reviewed-by: wpcarro <wpcarro@gmail.com> Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: wpcarro <wpcarro@gmail.com> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix')
| -rw-r--r-- | tvix/eval/src/builtins/mod.rs | 14 | ||||
| -rw-r--r-- | tvix/eval/src/errors.rs | 4 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-builtins-elemat.exp | 1 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-builtins-elemat.nix | 5 |
4 files changed, 22 insertions, 2 deletions
diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index 149669015b..3f8b73f7d7 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -140,6 +140,20 @@ fn pure_builtins() -> Vec<Builtin> { let a = args.pop().unwrap(); arithmetic_op!(a, b, /) }), + Builtin::new("elemAt", 2, |args, vm| { + force!(vm, &args[0], value, { + let xs = value.to_list()?; + let i = args[1].as_int()?; + if i < 0 { + Err(ErrorKind::IndexOutOfBounds { index: i }) + } else { + match xs.get(i as usize) { + Some(x) => Ok(x.clone()), + None => Err(ErrorKind::IndexOutOfBounds { index: i }), + } + } + }) + }), Builtin::new("length", 1, |args, vm| { if let Value::Thunk(t) = &args[0] { t.force(vm)?; diff --git a/tvix/eval/src/errors.rs b/tvix/eval/src/errors.rs index 23ac6abbf4..d3d41cbbcd 100644 --- a/tvix/eval/src/errors.rs +++ b/tvix/eval/src/errors.rs @@ -26,9 +26,9 @@ pub enum ErrorKind { name: String, }, - // Attempted to index into a list beyond its boundaries. + /// Attempted to index into a list beyond its boundaries. IndexOutOfBounds { - index: usize, + index: i64, }, TypeError { diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-elemat.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-elemat.exp new file mode 100644 index 0000000000..3701c9d75f --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-elemat.exp @@ -0,0 +1 @@ +[ "foo" "bar" "baz" ] diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-elemat.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-elemat.nix new file mode 100644 index 0000000000..762adeebbf --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-elemat.nix @@ -0,0 +1,5 @@ +[ + (builtins.elemAt [ "foo" "bar" "baz" ] 0) + (builtins.elemAt [ "foo" "bar" "baz" ] 1) + (builtins.elemAt [ "foo" "bar" "baz" ] 2) +] |