From afdf1e0ed02ec6e12a264dcfed18e4ce3028cf2b Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Sat, 8 Oct 2022 14:17:47 -0400 Subject: feat(tvix/eval): Implement builtins.listToAttrs Implement the listToAttrs builtin, which constructs an attribute set from a list of attribute sets with keys name and value. This is tested using an adaptation of the nix `eval-ok-listtoattrs.nix`, with the utilities from `lib.nix` inlined. Change-Id: Ib5bf743466dda9722c2c1e00797df4b58448cf0f Reviewed-on: https://cl.tvl.fyi/c/depot/+/6894 Autosubmit: grfn Tested-by: BuildkiteCI Reviewed-by: tazjin --- tvix/eval/src/builtins/mod.rs | 17 +++++++++++++++++ .../eval/src/tests/tvix_tests/eval-okay-listtoattrs.exp | 1 + .../eval/src/tests/tvix_tests/eval-okay-listtoattrs.nix | 15 +++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-listtoattrs.exp create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-listtoattrs.nix diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index eeb784ce4468..b859e2844ee8 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -294,6 +294,23 @@ fn pure_builtins() -> Vec { let value = args[0].force(vm)?; Ok(Value::Bool(matches!(*value, Value::String(_)))) }), + Builtin::new("listToAttrs", &[true], |args: Vec, vm: &mut VM| { + let list = args[0].to_list()?; + let mut map = BTreeMap::new(); + for val in list { + let attrs = val.force(vm)?.to_attrs()?; + let get = |key| { + attrs + .select(key) + .ok_or(ErrorKind::AttributeNotFound { name: key.into() }) + }; + let name = get("name")?.to_str()?; + let value = get("value")?.clone(); + // Map entries earlier in the list take precedence over entries later in the list + map.entry(name).or_insert(value); + } + Ok(Value::attrs(NixAttrs::from_map(map))) + }), Builtin::new( "mul", &[false, false], diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-listtoattrs.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-listtoattrs.exp new file mode 100644 index 000000000000..74abef7bc6ed --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-listtoattrs.exp @@ -0,0 +1 @@ +"AAbar" diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-listtoattrs.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-listtoattrs.nix new file mode 100644 index 000000000000..89888fd56178 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-listtoattrs.nix @@ -0,0 +1,15 @@ +with builtins; +let + fold = op: nul: list: + if list == [] + then nul + else op (head list) (fold op nul (tail list)); + concat = + fold (x: y: x + y) ""; + asi = name: value : { inherit name value; }; + list = [ ( asi "a" "A" ) ( asi "b" "B" ) ]; + a = builtins.listToAttrs list; + b = builtins.listToAttrs ( list ++ list ); + r = builtins.listToAttrs [ (asi "result" [ a b ]) ( asi "throw" (throw "this should not be thrown")) ]; + x = builtins.listToAttrs [ (asi "foo" "bar") (asi "foo" "bla") ]; +in concat (map (x: x.a) r.result) + x.foo -- cgit 1.4.1