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/vm.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/vm.rs')
-rw-r--r-- | tvix/eval/src/vm.rs | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tvix/eval/src/vm.rs b/tvix/eval/src/vm.rs index a64e0b337aea..4ea1b3b65cf5 100644 --- a/tvix/eval/src/vm.rs +++ b/tvix/eval/src/vm.rs @@ -83,6 +83,10 @@ impl VM { self.stack.push(value) } + fn peek(&self, offset: usize) -> &Value { + &self.stack[self.stack.len() - 1 - offset] + } + fn run(&mut self) -> EvalResult<Value> { loop { match self.inc_ip() { @@ -91,6 +95,10 @@ impl VM { self.push(c); } + OpCode::OpPop => { + self.pop(); + } + OpCode::OpAdd => { let b = self.pop(); let a = self.pop(); @@ -163,6 +171,16 @@ impl VM { } OpCode::OpInterpolate(count) => self.run_interpolate(count)?, + + OpCode::OpJump(offset) => { + self.ip += offset; + } + + OpCode::OpJumpIfFalse(offset) => { + if !self.peek(0).as_bool()? { + self.ip += offset; + } + } } if self.ip == self.chunk.code.len() { |