about summary refs log tree commit diff
path: root/tvix/eval
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2022-10-13T04·04-0400
committergrfn <grfn@gws.fyi>2022-10-15T20·35+0000
commit3f45f6191d44f0abdab75f86827a8f26ff9c496f (patch)
treee0ab00465e77dc23d05224332608be198a07c2e0 /tvix/eval
parent03a3189a3d8e3e9d198ccf73bc0a836aaa6b6e3d (diff)
feat(tvix/eval): Implement builtins.intersectAttrs r/5137
Change-Id: Iaba9bcfa19f283cd0c1931be2f211e2528a1a940
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6998
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: kanepyork <rikingcoding@gmail.com>
Diffstat (limited to 'tvix/eval')
-rw-r--r--tvix/eval/src/builtins/mod.rs15
-rw-r--r--tvix/eval/src/tests/tvix_tests/eval-okay-intersectattrs.exp1
-rw-r--r--tvix/eval/src/tests/tvix_tests/eval-okay-intersectattrs.nix3
3 files changed, 19 insertions, 0 deletions
diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs
index 0082d36d5735..03466af65f89 100644
--- a/tvix/eval/src/builtins/mod.rs
+++ b/tvix/eval/src/builtins/mod.rs
@@ -309,6 +309,21 @@ fn pure_builtins() -> Vec<Builtin> {
                 None => Err(ErrorKind::IndexOutOfBounds { index: 0 }),
             }
         }),
+        Builtin::new(
+            "intersectAttrs",
+            &[true, true],
+            |args: Vec<Value>, _: &mut VM| {
+                let mut res = BTreeMap::new();
+                let attrs1 = args[0].to_attrs()?;
+                let attrs2 = args[1].to_attrs()?;
+                for (k, v) in attrs2.iter() {
+                    if attrs1.contains(k) {
+                        res.insert(k.clone(), v.clone());
+                    }
+                }
+                Ok(Value::attrs(NixAttrs::from_map(res)))
+            },
+        ),
         // For `is*` predicates we force manually, as Value::force also unwraps any Thunks
         Builtin::new("isAttrs", &[false], |args: Vec<Value>, vm: &mut VM| {
             let value = args[0].force(vm)?;
diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-intersectattrs.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-intersectattrs.exp
new file mode 100644
index 000000000000..25001b211fb8
--- /dev/null
+++ b/tvix/eval/src/tests/tvix_tests/eval-okay-intersectattrs.exp
@@ -0,0 +1 @@
+{ a = 100; b = 200; }
diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-intersectattrs.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-intersectattrs.nix
new file mode 100644
index 000000000000..3534132ed48b
--- /dev/null
+++ b/tvix/eval/src/tests/tvix_tests/eval-okay-intersectattrs.nix
@@ -0,0 +1,3 @@
+builtins.intersectAttrs
+  { a = 1; b = 2; c = 3; }
+  { a = 100; b = 200; d = 5; }