diff options
Diffstat (limited to 'tvix/eval/src')
| -rw-r--r-- | tvix/eval/src/compiler/mod.rs | 2 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-test-catchables-in-implications.exp (renamed from tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-test-catchables-in-implications.exp) | 0 | ||||
| -rw-r--r-- | tvix/eval/src/tests/tvix_tests/eval-okay-test-catchables-in-implications.nix (renamed from tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-test-catchables-in-implications.nix) | 0 |
3 files changed, 2 insertions, 0 deletions
diff --git a/tvix/eval/src/compiler/mod.rs b/tvix/eval/src/compiler/mod.rs index 4edb5f204533..211fd079a047 100644 --- a/tvix/eval/src/compiler/mod.rs +++ b/tvix/eval/src/compiler/mod.rs @@ -593,6 +593,7 @@ impl Compiler<'_> { // Leave left-hand side value on the stack and invert it. self.compile(slot, node.lhs().unwrap()); self.emit_force(&node.lhs().unwrap()); + let throw_idx = self.push_op(OpCode::OpJumpIfCatchable(JumpOffset(0)), node); self.push_op(OpCode::OpInvert, node); // Exactly as `||` (because `a -> b` = `!a || b`). @@ -603,6 +604,7 @@ impl Compiler<'_> { self.patch_jump(end_idx); self.push_op(OpCode::OpAssertBool, node); + self.patch_jump(throw_idx); } /// Compile list literals into equivalent bytecode. List diff --git a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-test-catchables-in-implications.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-test-catchables-in-implications.exp index c508d5366f70..c508d5366f70 100644 --- a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-test-catchables-in-implications.exp +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-test-catchables-in-implications.exp diff --git a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-test-catchables-in-implications.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-test-catchables-in-implications.nix index 126738d88329..126738d88329 100644 --- a/tvix/eval/src/tests/tvix_tests/notyetpassing/eval-okay-test-catchables-in-implications.nix +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-test-catchables-in-implications.nix |