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

Add a new type to handle list and attribute sets. 

List elements are attributed a unique name.

svn path=/nixpkgs/trunk/; revision=27449
This commit is contained in:
Nicolas Pierron 2011-06-14 02:41:13 +00:00
parent 9451c1e2ca
commit 6cb018fe90
1 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pkgs/lib/types.nix
View File

@ -6,6 +6,7 @@ let lib = import ./default.nix; in
with import ./lists.nix; with import ./lists.nix;
with import ./attrsets.nix; with import ./attrsets.nix;
with import ./options.nix; with import ./options.nix;
with import ./trivial.nix;
rec { rec {
@ -16,7 +17,7 @@ rec {
_type = typeName; _type = typeName;
}; };
# name (name of the type) # name (name of the type)
# check (boolean function) # check (boolean function)
# merge (default merge function) # merge (default merge function)
@ -43,7 +44,7 @@ rec {
inherit name check merge iter fold docPath hasOptions delayOnGlobalEval; inherit name check merge iter fold docPath hasOptions delayOnGlobalEval;
}; };
types = rec { types = rec {
inferred = mkOptionType { inferred = mkOptionType {
@ -75,7 +76,7 @@ rec {
attrs = mkOptionType { attrs = mkOptionType {
name = "attribute set"; name = "attribute set";
check = lib.traceValIfNot builtins.isAttrs; check = lib.traceValIfNot isAttrs;
merge = fold lib.mergeAttrs {}; merge = fold lib.mergeAttrs {};
}; };
@ -102,7 +103,7 @@ rec {
attrsOf = elemType: mkOptionType { attrsOf = elemType: mkOptionType {
name = "attribute set of ${elemType.name}s"; name = "attribute set of ${elemType.name}s";
check = x: lib.traceValIfNot builtins.isAttrs x check = x: lib.traceValIfNot isAttrs x
&& fold (e: v: v && elemType.check e) true (lib.attrValues x); && fold (e: v: v && elemType.check e) true (lib.attrValues x);
merge = lib.zip (name: elemType.merge); merge = lib.zip (name: elemType.merge);
iter = f: path: set: lib.mapAttrs (name: elemType.iter f (path + "." + name)) set; iter = f: path: set: lib.mapAttrs (name: elemType.iter f (path + "." + name)) set;
@ -111,6 +112,43 @@ rec {
inherit (elemType) hasOptions delayOnGlobalEval; inherit (elemType) hasOptions delayOnGlobalEval;
}; };
# List or attribute set of ...
loaOf = elemType:
let
convertIfList = defIdx: def:
if isList def then
listToAttrs (
flip imap def (elemIdx: elem:
nameValuePair "unnamed-${toString defIdx}.${toString elemIdx}" elem))
else
def;
listOnly = listOf elemType;
attrOnly = attrsOf elemType;
in mkOptionType {
name = "list or attribute set of ${elemType.name}s";
check = x:
if isList x then listOnly.check x
else if isAttrs x then attrOnly.check x
else lib.traceValIfNot (x: false) x;
## The merge function returns an attribute set
merge = defs:
attrOnly.merge (imap convertIfList defs);
iter = f: path: def:
if isList def then listOnly.iter f path def
else if isAttrs def then attrOnly.iter f path def
else throw "Unexpected value";
fold = op: nul: def:
if isList def then listOnly.fold op nul def
else if isAttrs def then attrOnly.fold op nul def
else throw "Unexpected value";
docPath = path: elemType.docPath (path + ".<name?>");
inherit (elemType) hasOptions delayOnGlobalEval;
}
;
uniq = elemType: mkOptionType { uniq = elemType: mkOptionType {
inherit (elemType) name check iter fold docPath hasOptions; inherit (elemType) name check iter fold docPath hasOptions;
merge = list: merge = list: