diff options
author | Vincent Ambo <mail@tazj.in> | 2022-09-02T01·38+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2022-09-08T07·59+0000 |
commit | 0d7ad5e6d1992d4f80f0ea08fee636b7e34eec59 (patch) | |
tree | 28474ff042e31b55d3c8698bbfa1d43e117c0282 /tvix/eval/src/builtins/mod.rs | |
parent | 5ee89bcf5ca3f0b0d3b809b01ac04bf38f51d7e4 (diff) |
refactor(tvix/eval): pass a VM reference to builtins r/4744
This makes it possible for builtins to force values on their own, without the VM having to apply a strictness mask to the arguments first. Change-Id: Ib49a94e56ca2a8d515c39647381ab55a727766e3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6411 Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/eval/src/builtins/mod.rs')
-rw-r--r-- | tvix/eval/src/builtins/mod.rs | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index 3e1f49d6995a..16ac418f6bd8 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -17,17 +17,17 @@ use crate::arithmetic_op; fn pure_builtins() -> Vec<Builtin> { vec![ - Builtin::new("add", 2, |mut args| { + Builtin::new("add", 2, |mut args, _| { let b = args.pop().unwrap(); let a = args.pop().unwrap(); arithmetic_op!(a, b, +) }), - Builtin::new("abort", 1, |mut args| { + Builtin::new("abort", 1, |mut args, _| { return Err(ErrorKind::Abort( args.pop().unwrap().to_string()?.as_str().to_owned(), )); }), - Builtin::new("catAttrs", 2, |mut args| { + Builtin::new("catAttrs", 2, |mut args, _| { let list = args.pop().unwrap().to_list()?; let key = args.pop().unwrap().to_string()?; let mut output = vec![]; @@ -40,64 +40,64 @@ fn pure_builtins() -> Vec<Builtin> { Ok(Value::List(NixList::construct(output.len(), output))) }), - Builtin::new("div", 2, |mut args| { + Builtin::new("div", 2, |mut args, _| { let b = args.pop().unwrap(); let a = args.pop().unwrap(); arithmetic_op!(a, b, /) }), - Builtin::new("length", 1, |args| { + Builtin::new("length", 1, |args, _| { Ok(Value::Integer(args[0].as_list()?.len() as i64)) }), - Builtin::new("isAttrs", 1, |args| { + Builtin::new("isAttrs", 1, |args, _| { Ok(Value::Bool(matches!(args[0], Value::Attrs(_)))) }), - Builtin::new("isBool", 1, |args| { + Builtin::new("isBool", 1, |args, _| { Ok(Value::Bool(matches!(args[0], Value::Bool(_)))) }), - Builtin::new("isFloat", 1, |args| { + Builtin::new("isFloat", 1, |args, _| { Ok(Value::Bool(matches!(args[0], Value::Float(_)))) }), - Builtin::new("isFunction", 1, |args| { + Builtin::new("isFunction", 1, |args, _| { Ok(Value::Bool(matches!( args[0], Value::Closure(_) | Value::Builtin(_) ))) }), - Builtin::new("isInt", 1, |args| { + Builtin::new("isInt", 1, |args, _| { Ok(Value::Bool(matches!(args[0], Value::Integer(_)))) }), - Builtin::new("isList", 1, |args| { + Builtin::new("isList", 1, |args, _| { Ok(Value::Bool(matches!(args[0], Value::List(_)))) }), - Builtin::new("isNull", 1, |args| { + Builtin::new("isNull", 1, |args, _| { Ok(Value::Bool(matches!(args[0], Value::Null))) }), - Builtin::new("isPath", 1, |args| { + Builtin::new("isPath", 1, |args, _| { Ok(Value::Bool(matches!(args[0], Value::Path(_)))) }), - Builtin::new("isString", 1, |args| { + Builtin::new("isString", 1, |args, _| { Ok(Value::Bool(matches!(args[0], Value::String(_)))) }), - Builtin::new("mul", 2, |mut args| { + Builtin::new("mul", 2, |mut args, _| { let b = args.pop().unwrap(); let a = args.pop().unwrap(); arithmetic_op!(a, b, *) }), - Builtin::new("sub", 2, |mut args| { + Builtin::new("sub", 2, |mut args, _| { let b = args.pop().unwrap(); let a = args.pop().unwrap(); arithmetic_op!(a, b, -) }), - Builtin::new("throw", 1, |mut args| { + Builtin::new("throw", 1, |mut args, _| { return Err(ErrorKind::Throw( args.pop().unwrap().to_string()?.as_str().to_owned(), )); }), - Builtin::new("toString", 1, |args| { + Builtin::new("toString", 1, |args, _| { // TODO: toString is actually not the same as Display Ok(Value::String(format!("{}", args[0]).into())) }), - Builtin::new("typeOf", 1, |args| { + Builtin::new("typeOf", 1, |args, _| { Ok(Value::String(args[0].type_of().into())) }), ] |