public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moved catAttrs, attrVals into attrsets.nix, adding attrValues 

svn path=/nixpkgs/trunk/; revision=14425
This commit is contained in:
Marc Weber 2009-03-06 23:21:14 +00:00
parent be3a9f2346
commit 5ddfa7ed64
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/lib/attrsets.nix
View File

@ -1,6 +1,9 @@
# Operations on attribute sets. # Operations on attribute sets.
with { inherit (builtins) head tail; }; with {
inherit (builtins) head tail;
inherit (import ./default.nix) fold;
};
rec { rec {
inherit (builtins) attrNames listToAttrs hasAttr isAttrs; inherit (builtins) attrNames listToAttrs hasAttr isAttrs;
@ -18,5 +21,14 @@ rec {
then getAttr (tail attrPath) default (builtins.getAttr attr e) then getAttr (tail attrPath) default (builtins.getAttr attr e)
else default; else default;
# ordered by name
attrValues = attrs: attrVals (__attrNames attrs) attrs;
attrVals = nameList : attrSet :
map (x: builtins.getAttr x attrSet) nameList;
# iterates over a list of attributes collecting the attribute attr if it exists
catAttrs = attr : l : fold ( s : l : if (hasAttr attr s) then [(builtins.getAttr attr s)] ++ l else l) [] l;
} }

6
pkgs/lib/misc.nix
View File

@ -277,12 +277,6 @@ rec {
setAttrMerge = name : default : attrs : f : setAttrMerge = name : default : attrs : f :
setAttr attrs name (f (maybeAttr name default attrs)); setAttr attrs name (f (maybeAttr name default attrs));
# iterates over a list of attributes collecting the attribute attr if it exists
catAttrs = attr : l : fold ( s : l : if (hasAttr attr s) then [(builtins.getAttr attr s)] ++ l else l) [] l;
attrVals = nameList : attrSet :
map (x: builtins.getAttr x attrSet) nameList;
# Using f = a : b = b the result is similar to // # Using f = a : b = b the result is similar to //
# merge attributes with custom function handling the case that the attribute # merge attributes with custom function handling the case that the attribute
# exists in both sets # exists in both sets