about summary refs log tree commit diff
path: root/tvix
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2022-09-05T18·42-0700
committerclbot <clbot@tvl.fyi>2022-09-19T00·57+0000
commitfefa8c55c45d82fc1d81e02a96e126812e1e1223 (patch)
treef04180e2cc57ac61ba7aa2a663973789f0a64efa /tvix
parent2fe18e44860ad97a88d488590c40cf610a274c1d (diff)
feat(tvix/eval): Support builtins.tail r/4917
TL;DR:
- support `builtins.tail`
- define `ErrorKind::TailEmptyList` and canonical error code
- support basic unit tests

Unsure whether or not the error should be a dedicated `ErrorKind`...

Change-Id: Iae90fda1bb21ce7bdb1aaa2aeb2b8c1e6dcb0f05
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6545
Reviewed-by: wpcarro <wpcarro@gmail.com>
Autosubmit: wpcarro <wpcarro@gmail.com>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Diffstat (limited to 'tvix')
-rw-r--r--tvix/eval/src/builtins/mod.rs10
-rw-r--r--tvix/eval/src/errors.rs6
-rw-r--r--tvix/eval/src/tests/tvix_tests/eval-okay-builtins-tail.exp1
-rw-r--r--tvix/eval/src/tests/tvix_tests/eval-okay-builtins-tail.nix4
4 files changed, 21 insertions, 0 deletions
diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs
index 4bcaaf7a00..527a8f8530 100644
--- a/tvix/eval/src/builtins/mod.rs
+++ b/tvix/eval/src/builtins/mod.rs
@@ -221,6 +221,16 @@ fn pure_builtins() -> Vec<Builtin> {
                 x.as_str()[(beg as usize)..(end as usize)].into(),
             ))
         }),
+        Builtin::new("tail", 1, |args, vm| {
+            let xs = args[0].force(vm)?.to_list()?;
+
+            if xs.len() == 0 {
+                Err(ErrorKind::TailEmptyList)
+            } else {
+                let output = xs.into_iter().skip(1).collect::<Vec<_>>();
+                Ok(Value::List(NixList::construct(output.len(), output)))
+            }
+        }),
         Builtin::new("throw", 1, |mut args, _| {
             return Err(ErrorKind::Throw(
                 args.pop().unwrap().to_str()?.as_str().to_owned(),
diff --git a/tvix/eval/src/errors.rs b/tvix/eval/src/errors.rs
index 6331ee64be..10bc9276ad 100644
--- a/tvix/eval/src/errors.rs
+++ b/tvix/eval/src/errors.rs
@@ -31,6 +31,9 @@ pub enum ErrorKind {
         index: i64,
     },
 
+    /// Attempted to call `builtins.tail` on an empty list.
+    TailEmptyList,
+
     TypeError {
         expected: &'static str,
         actual: &'static str,
@@ -150,6 +153,8 @@ impl Error {
                 format!("list index '{}' is out of bounds", index)
             }
 
+            ErrorKind::TailEmptyList => format!("'tail' called on an empty list"),
+
             ErrorKind::TypeError { expected, actual } => format!(
                 "expected value of type '{}', but found a '{}'",
                 expected, actual
@@ -257,6 +262,7 @@ to a missing value in the attribute set(s) included via `with`."#,
             ErrorKind::NotAnAbsolutePath(_) => "E020",
             ErrorKind::ParseIntError(_) => "E021",
             ErrorKind::NegativeLength { .. } => "E022",
+            ErrorKind::TailEmptyList { .. } => "E023",
             ErrorKind::NotImplemented(_) => "E999",
         }
     }
diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-tail.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-tail.exp
new file mode 100644
index 0000000000..b9e3aa1ef7
--- /dev/null
+++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-tail.exp
@@ -0,0 +1 @@
+[ [ ] [ 2 3 ] ]
diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-tail.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-tail.nix
new file mode 100644
index 0000000000..2be9496a98
--- /dev/null
+++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-tail.nix
@@ -0,0 +1,4 @@
+[
+  (builtins.tail [ "foo" ])
+  (builtins.tail [ 1 2 3 ])
+]