From 4eafaae9e66c66a7765ff3854890039d7536a9b9 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 11 Aug 2022 11:37:04 +0300 Subject: feat(tvix/eval): implement binary comparison operators This is accomplished by simply delegating to the Rust implementations of (Partial)Ord and (Partial)Eq, which are implemented for Value and underlying wrapper types to behave like they do in Nix. To ease the implementation overhead, a new comparison operator macro has been added to the VM module. Incomparable types will raise a new error variant when a comparison is attempted, containing both supplied types. This mimics the information carried in the error thrown by C++ Nix. Change-Id: Ia19634d69119d40722f3ca672387bc3a80096998 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6143 Reviewed-by: sterni Tested-by: BuildkiteCI --- tvix/eval/src/errors.rs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tvix/eval/src/errors.rs') diff --git a/tvix/eval/src/errors.rs b/tvix/eval/src/errors.rs index fb9f3b6ec5..f7f64f4e68 100644 --- a/tvix/eval/src/errors.rs +++ b/tvix/eval/src/errors.rs @@ -14,6 +14,11 @@ pub enum Error { expected: &'static str, actual: &'static str, }, + + Incomparable { + lhs: &'static str, + rhs: &'static str, + }, } impl Display for Error { -- cgit 1.4.1