refactor(tvix/eval): add VM::call_value helper method

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>
This commit is contained in:
Vincent Ambo 2022-09-21 00:32:49 +03:00 committed by tazjin
parent f600aa5322
commit 8f2004d360
5 changed files with 32 additions and 34 deletions

View file

@ -12,8 +12,7 @@ use std::{
use crate::{
errors::ErrorKind,
upvalues::UpvalueCarrier,
value::{Builtin, Closure, CoercionKind, NixAttrs, NixList, NixString, Value},
value::{Builtin, CoercionKind, NixAttrs, NixList, NixString, Value},
vm::VM,
};
@ -147,14 +146,13 @@ fn pure_builtins() -> Vec<Builtin> {
}),
Builtin::new("map", &[true, true], |args, vm| {
let list: NixList = args[1].to_list()?;
let func: Closure = args[0].to_closure()?;
list.into_iter()
.map(|val| {
// Leave the argument on the stack before calling the
// function.
vm.push(val);
vm.call(func.lambda(), func.upvalues().clone(), 1)
vm.call_value(&args[0])
})
.collect::<Result<Vec<Value>, _>>()
.map(|list| Value::List(NixList::from(list)))