about summary refs log tree commit diff
path: root/tvix/eval/src/value/mod.rs
diff options
context:
space:
mode:
authorGriffin Smith <root@gws.fyi>2022-10-23T17·37-0400
committertazjin <tazjin@tvl.su>2022-10-29T10·45+0000
commitd0a836b0e1ee1034144d1e5b71df6ab285c8450e (patch)
tree73fd2ee2803af3d0a1617e7da3769cd5076091dd /tvix/eval/src/value/mod.rs
parentb8a7dba709436eeb562f8911ae1b5691830d6fd7 (diff)
feat(tvix/eval): Implement comparison for lists r/5221
Lists are compared lexicographically in C++ nix as of [0], and our
updated nix test suites depend on this. This implements comparison of
list values in `Value::nix_cmp` using a very similar algorithm to what
C++ does - similarly to there, this requires passing in the VM so we can
force thunks in the list elements as we go.

[0]: https://github.com/NixOS/nix/commit/09471d2680292af48b2788108de56a8da755d661#

Change-Id: I5d8bb07f90647a1fec83f775243e21af856afbb1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7070
Autosubmit: grfn <grfn@gws.fyi>
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/eval/src/value/mod.rs')
-rw-r--r--tvix/eval/src/value/mod.rs15
1 files changed, 14 insertions, 1 deletions
diff --git a/tvix/eval/src/value/mod.rs b/tvix/eval/src/value/mod.rs
index 355540402d42..c590495b5344 100644
--- a/tvix/eval/src/value/mod.rs
+++ b/tvix/eval/src/value/mod.rs
@@ -351,12 +351,25 @@ impl Value {
     }
 
     /// Compare `self` against other using (fallible) Nix ordering semantics.
-    pub fn nix_cmp(&self, other: &Self) -> Result<Option<Ordering>, ErrorKind> {
+    pub fn nix_cmp(&self, other: &Self, vm: &mut VM) -> Result<Option<Ordering>, ErrorKind> {
         match (self, other) {
             // same types
             (Value::Integer(i1), Value::Integer(i2)) => Ok(i1.partial_cmp(i2)),
             (Value::Float(f1), Value::Float(f2)) => Ok(f1.partial_cmp(f2)),
             (Value::String(s1), Value::String(s2)) => Ok(s1.partial_cmp(s2)),
+            (Value::List(l1), Value::List(l2)) => {
+                for i in 0.. {
+                    if i == l2.len() {
+                        return Ok(Some(Ordering::Greater));
+                    } else if i == l1.len() {
+                        return Ok(Some(Ordering::Less));
+                    } else if !l1[i].nix_eq(&l2[i], vm)? {
+                        return l1[i].force(vm)?.nix_cmp(&*l2[i].force(vm)?, vm);
+                    }
+                }
+
+                unreachable!()
+            }
 
             // different types
             (Value::Integer(i1), Value::Float(f2)) => Ok((*i1 as f64).partial_cmp(f2)),