diff options
| author | Vincent Ambo <mail@tazj.in> | 2022-08-10T18·09+0300 |
|---|---|---|
| committer | tazjin <tazjin@tvl.su> | 2022-08-25T11·34+0000 |
| commit | 7d55b776de29cfaa70a2ab9ae61b6cabe70ed637 (patch) | |
| tree | 88efe21bdf71867c3a5cbdc18aa893af6a2edf02 /tvix/eval | |
| parent | 058e77bab20db90347ce1d91c41076ef56b61b26 (diff) | |
feat(tvix): implement not-equals (!=) operator r/4476
Change-Id: Ic259d6d0cf30553e944682a0d1d2c610df7fe5c2 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6141 Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/eval')
9 files changed, 21 insertions, 8 deletions
diff --git a/tvix/eval/src/compiler.rs b/tvix/eval/src/compiler.rs index 4aadfaba80e7..d48490dde7a6 100644 --- a/tvix/eval/src/compiler.rs +++ b/tvix/eval/src/compiler.rs @@ -130,17 +130,22 @@ impl Compiler { use rnix::types::BinOpKind; - let opcode = match op.operator().unwrap() { - BinOpKind::Add => OpCode::OpAdd, - BinOpKind::Sub => OpCode::OpSub, - BinOpKind::Mul => OpCode::OpMul, - BinOpKind::Div => OpCode::OpDiv, - BinOpKind::Equal => OpCode::OpEqual, - BinOpKind::Update => OpCode::OpAttrsUpdate, + match op.operator().unwrap() { + BinOpKind::Add => self.chunk.add_op(OpCode::OpAdd), + BinOpKind::Sub => self.chunk.add_op(OpCode::OpSub), + BinOpKind::Mul => self.chunk.add_op(OpCode::OpMul), + BinOpKind::Div => self.chunk.add_op(OpCode::OpDiv), + BinOpKind::Update => self.chunk.add_op(OpCode::OpAttrsUpdate), + BinOpKind::Equal => self.chunk.add_op(OpCode::OpEqual), + + BinOpKind::NotEqual => { + self.chunk.add_op(OpCode::OpEqual); + self.chunk.add_op(OpCode::OpInvert) + } + _ => todo!(), }; - self.chunk.add_op(opcode); Ok(()) } diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-eq-float.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-eq-float.exp new file mode 100644 index 000000000000..27ba77ddaf61 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-eq-float.exp @@ -0,0 +1 @@ +true diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-eq-float.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-eq-float.nix new file mode 100644 index 000000000000..398f4a9dfc55 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-eq-float.nix @@ -0,0 +1 @@ +4.2 == 4.2 diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-eq-int.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-eq-int.exp new file mode 100644 index 000000000000..27ba77ddaf61 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-eq-int.exp @@ -0,0 +1 @@ +true diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-eq-int.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-eq-int.nix new file mode 100644 index 000000000000..dc52ba112a60 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-eq-int.nix @@ -0,0 +1 @@ +42 == 42 diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-ne-int.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-ne-int.exp new file mode 100644 index 000000000000..27ba77ddaf61 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-ne-int.exp @@ -0,0 +1 @@ +true diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-ne-int.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-ne-int.nix new file mode 100644 index 000000000000..e06b571a28bf --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-ne-int.nix @@ -0,0 +1 @@ +42 != 69 diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-ne-string.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-ne-string.exp new file mode 100644 index 000000000000..27ba77ddaf61 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-ne-string.exp @@ -0,0 +1 @@ +true diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-ne-string.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-ne-string.nix new file mode 100644 index 000000000000..a83471e500ce --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-ne-string.nix @@ -0,0 +1 @@ +"this" != "that" |