about summary refs log tree commit diff
path: root/tvix/eval/src/tests
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2022-09-20T21·32+0300
committertazjin <tazjin@tvl.su>2022-09-20T23·48+0000
commit8f2004d360dde108f90d2b49b0609bd43b7b6d7d (patch)
tree6ee59500b7d5a6f54de607627357d45e8cf285af /tvix/eval/src/tests
parentf600aa5322f6628e1af63e9dd4c6ad073020e152 (diff)
refactor(tvix/eval): add VM::call_value helper method r/4943
This makes it possible to call a callable value (builtin or
closure/lambda) directly, without unwrapping it first. This is needed
for pretty much all higher-order functions to work correctly.

This is mostly equivalent to the previous code in coerce_to_string for
calling `__toString`, except it expects the argument(s) to already be
placed on the stack.

Note that the span for the `NotCallable` error is not currently
guaranteed to make any sense, will experiment with this.

Change-Id: I821224368d438a28900858b343defc1817e46a0a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6717
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'tvix/eval/src/tests')
-rw-r--r--tvix/eval/src/tests/tvix_tests/eval-okay-builtins-map.exp2
-rw-r--r--tvix/eval/src/tests/tvix_tests/eval-okay-builtins-map.nix3
2 files changed, 4 insertions, 1 deletions
diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-map.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-map.exp
index e1ff70800245..6cf53040320f 100644
--- a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-map.exp
+++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-map.exp
@@ -1 +1 @@
-[ [ 1 2 3 4 5 ] [ 2 4 6 8 10 ] [ 2 4 6 8 10 ] [ 1 2 3 4 5 ] ]
+[ [ 1 2 3 4 5 ] [ 2 4 6 8 10 ] [ 2 4 6 8 10 ] [ 2 4 6 8 10 ] [ 1 2 3 4 5 ] ]
diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-map.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-map.nix
index 6ff42d0891dc..71b351fd55b0 100644
--- a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-map.nix
+++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-map.nix
@@ -11,6 +11,9 @@
     in builtins.map (x: x * n) [ 1 2 3 4 5 ]
   )
 
+  # same, but with a builtin
+  (builtins.map (builtins.mul 2) [ 1 2 3 4 5 ])
+
   # from global scope
   (map (x: x) [ 1 2 3 4 5 ])
 ]