diff options
author | Vincent Ambo <mail@tazj.in> | 2022-08-11T10·12+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2022-08-25T16·00+0000 |
commit | d9d94eb27f283fdfdbcc4af5eb5069201765d623 (patch) | |
tree | 7ab63ff7765904fdd4af5c56f637fe7066392a75 /tvix/eval/src/opcode.rs | |
parent | 2422f2f2245e96fbed61200bb42d04b4e96a32b0 (diff) |
feat(tvix/eval): implement if/else expressions r/4483
These expressions use simple jumps to skip the correct expression conditionally in the bytecode by advancing the instruction pointer. Note that these expressions are already covered by a test behind the `nix_tests` feature flag, but adding more is probably sensible. Change-Id: Ibe0eba95d216321c883d3b6b5816e2ab6fe7eef1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6148 Tested-by: BuildkiteCI Reviewed-by: grfn <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'tvix/eval/src/opcode.rs')
-rw-r--r-- | tvix/eval/src/opcode.rs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tvix/eval/src/opcode.rs b/tvix/eval/src/opcode.rs index b1e6d3259363..8bb8fe9a1f31 100644 --- a/tvix/eval/src/opcode.rs +++ b/tvix/eval/src/opcode.rs @@ -12,6 +12,9 @@ pub enum OpCode { // Push a constant onto the stack. OpConstant(ConstantIdx), + // Discard a value from the stack. + OpPop, + // Push a literal value. OpNull, OpTrue, @@ -27,13 +30,17 @@ pub enum OpCode { OpMul, OpDiv, - // Logical binary operators + // Comparison operators OpEqual, OpLess, OpLessOrEq, OpMore, OpMoreOrEq, + // Logical operators & generic jumps + OpJump(usize), + OpJumpIfFalse(usize), + // Attribute sets OpAttrs(usize), OpAttrPath(usize), |