mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(tvix/eval): Support builtins.{mul,div}

Browse source 
Multiplication and division :)

Change-Id: I79e76f3b55b7e9b8d1eb09b3d9741140b4d75742
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6406
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
William Carroll 2022-08-29 17:31:47 -07:00 committed by tazjin
parent b3097de75d
commit 15e2bc54f1
5 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tvix/eval/src/builtins/mod.rs
View file

@ -40,6 +40,11 @@ fn pure_builtins() -> Vec<Builtin> {
Ok(Value::List(NixList::construct(output.len(), output))) Ok(Value::List(NixList::construct(output.len(), output)))
}), }),
Builtin::new("div", 2, |mut args| {
let b = args.pop().unwrap();
let a = args.pop().unwrap();
Ok(arithmetic_op!(a, b, /))
}),
Builtin::new("isAttrs", 1, |args| { Builtin::new("isAttrs", 1, |args| {
Ok(Value::Bool(matches!(args[0], Value::Attrs(_)))) Ok(Value::Bool(matches!(args[0], Value::Attrs(_))))
}), }),
@ -70,6 +75,11 @@ fn pure_builtins() -> Vec<Builtin> {
Builtin::new("isString", 1, |args| { Builtin::new("isString", 1, |args| {
Ok(Value::Bool(matches!(args[0], Value::String(_)))) Ok(Value::Bool(matches!(args[0], Value::String(_))))
}), }),
Builtin::new("mul", 2, |mut args| {
let b = args.pop().unwrap();
let a = args.pop().unwrap();
Ok(arithmetic_op!(a, b, *))
}),
Builtin::new("sub", 2, |mut args| { Builtin::new("sub", 2, |mut args| {
let b = args.pop().unwrap(); let b = args.pop().unwrap();
let a = args.pop().unwrap(); let a = args.pop().unwrap();

1
tvix/eval/src/tests/tvix_tests/eval-okay-builtins-div.exp Normal file
View file

@ -0,0 +1 @@
[ 3 7 0 1 0 0.5 0.5 0.5 ]

10
tvix/eval/src/tests/tvix_tests/eval-okay-builtins-div.nix Normal file
View file

@ -0,0 +1,10 @@
[
(builtins.div 9 3)
(builtins.div 7 1)
(builtins.div 3 9)
(builtins.div 4 4)
(builtins.div 1 2)
(builtins.div 1.0 2)
(builtins.div 1 2.0)
(builtins.div 1.0 2.0)
]

1
tvix/eval/src/tests/tvix_tests/eval-okay-builtins-mul.exp Normal file
View file

@ -0,0 +1 @@
[ 36 0 0 14 ]

6
tvix/eval/src/tests/tvix_tests/eval-okay-builtins-mul.nix Normal file
View file

@ -0,0 +1,6 @@
[
(builtins.mul 4 9)
(builtins.mul 0 7)
(builtins.mul 7 0)
(builtins.mul 7 2)
]