From abdfa7459eb60f2b92064bdff12e33d04491e1cd Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sat, 3 Sep 2022 16:18:06 +0300
Subject: feat(tvix/eval): thunk binary operations and select expressions

With this, most cases of `fix` in attribute sets will work correctly.
A simple test exercising both has been added.

Change-Id: I70fd431177bb6e48ecb33a87518b050c4c3d1c09
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6437
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
---
 tvix/eval/src/compiler/mod.rs                    | 16 ++++++++++++++--
 tvix/eval/src/tests/tvix_tests/eval-okay-fix.exp |  1 +
 tvix/eval/src/tests/tvix_tests/eval-okay-fix.nix |  7 +++++++
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-fix.exp
 create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-fix.nix

(limited to 'tvix/eval')

diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs
index bae607d4a024..b58852299445 100644
--- a/tvix/eval/src/compiler/mod.rs
+++ b/tvix/eval/src/compiler/mod.rs
@@ -156,16 +156,27 @@ impl Compiler<'_> {
             ast::Expr::Literal(literal) => self.compile_literal(literal),
             ast::Expr::Path(path) => self.compile_path(path),
             ast::Expr::Str(s) => self.compile_str(slot, s),
+
             ast::Expr::UnaryOp(op) => self.compile_unary_op(slot, op),
-            ast::Expr::BinOp(op) => self.compile_binop(slot, op),
+
+            ast::Expr::BinOp(binop) => {
+                self.thunk(slot, &binop, move |c, o, s| c.compile_binop(s, o.clone()))
+            }
+
             ast::Expr::HasAttr(has_attr) => self.compile_has_attr(slot, has_attr),
+
             ast::Expr::List(list) => {
                 self.thunk(slot, &list, move |c, l, s| c.compile_list(s, l.clone()))
             }
+
             ast::Expr::AttrSet(attrs) => self.thunk(slot, &attrs, move |c, a, s| {
                 c.compile_attr_set(s, a.clone())
             }),
-            ast::Expr::Select(select) => self.compile_select(slot, select),
+
+            ast::Expr::Select(select) => self.thunk(slot, &select, move |c, sel, s| {
+                c.compile_select(s, sel.clone())
+            }),
+
             ast::Expr::Assert(assert) => self.compile_assert(slot, assert),
             ast::Expr::IfElse(if_else) => self.compile_if_else(slot, if_else),
             ast::Expr::LetIn(let_in) => self.compile_let_in(slot, let_in),
@@ -644,6 +655,7 @@ impl Compiler<'_> {
     //                        └────────────────────┘
     fn compile_if_else(&mut self, slot: LocalIdx, node: ast::IfElse) {
         self.compile(slot, node.condition().unwrap());
+        self.emit_force(&node.condition().unwrap());
 
         let then_idx = self.push_op(
             OpCode::OpJumpIfFalse(JumpOffset(0)),
diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-fix.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-fix.exp
new file mode 100644
index 000000000000..c1581543511f
--- /dev/null
+++ b/tvix/eval/src/tests/tvix_tests/eval-okay-fix.exp
@@ -0,0 +1 @@
+{ a = 1; b = 21; c = 42; }
diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-fix.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-fix.nix
new file mode 100644
index 000000000000..27d2fae1042e
--- /dev/null
+++ b/tvix/eval/src/tests/tvix_tests/eval-okay-fix.nix
@@ -0,0 +1,7 @@
+let
+  fix = f: let x = f x; in x;
+in fix(self: {
+  a = 1;
+  b = self.a + 20;
+  c = self.b * 2;
+})
-- 
cgit 1.4.1