From 64d3efcc2ce055ffe45034ed169569ece961f04d Mon Sep 17 00:00:00 2001 From: sterni Date: Wed, 21 Sep 2022 22:20:37 +0200 Subject: fix(tvix/eval): handle thunks in arithmetic builtins The simplest solution seems to be to pass references to arithmetic_op!() which avoids the moving annoyance we had to deal with in the builtins (no more popping!). We then use .force() to force the values and dereference any Thunks (which arithmetic_op! doesn't do for us). Change-Id: I0eb8ad60e80a0b3ba9d9f411e973ef8bcf136989 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6724 Tested-by: BuildkiteCI Reviewed-by: wpcarro Reviewed-by: tazjin --- tvix/eval/src/tests/tvix_tests/eval-okay-builtins-div.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'tvix/eval/src/tests/tvix_tests/eval-okay-builtins-div.nix') diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-div.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-div.nix index 622ce889daa9..98b8b74bdf2b 100644 --- a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-div.nix +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-div.nix @@ -7,4 +7,5 @@ (builtins.div 1.0 2) (builtins.div 1 2.0) (builtins.div 1.0 2.0) + (builtins.div (builtins.div 84 4) 0.5) ] -- cgit 1.4.1