suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

innerMerge: Handle empty definition lists after discharging properties

Browse Source
This commit is contained in:
Shea Levy 2014-03-05 11:27:07 -05:00
parent 48f41cb90e
commit ccfc2e4415
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/types.nix
View File

@ -10,7 +10,9 @@ with import ./strings.nix;
let let
inherit (import ./modules.nix) mergeDefinitions evalModules; inherit (import ./modules.nix) mergeDefinitions evalModules;
innerMerge = loc: type: defs: (mergeDefinitions loc type defs).mergedValue; innerMerge = loc: type: defs: let
inherit (mergeDefinitions loc type defs) mergedValue defsFinal;
in if defsFinal == [] then {} else { value = mergedValue; };
in rec { in rec {
isType = type: x: (x._type or "") == type; isType = type: x: (x._type or "") == type;
@ -120,10 +122,12 @@ in rec {
value = m.value.f x y; value = m.value.f x y;
} ]) l)) } ]) l))
(map (d: map (x: []) d.value) nonMaps) maps; (map (d: map (x: []) d.value) nonMaps) maps;
in concatLists (imap (n: def: imap (m: def': in map (getAttr "value") (filter (hasAttr "value") (
innerMerge (loc ++ ["[${toString n}-${toString m}]"]) elemType concatLists (imap (n: def: imap (m: def':
([{ inherit (def) file; value = def'; }] ++ elemAt (elemAt mapResults (n - 1)) (m - 1)) innerMerge (loc ++ ["[${toString n}-${toString m}]"]) elemType
) def.value) nonMaps); ([{ inherit (def) file; value = def'; }] ++ elemAt (elemAt mapResults (n - 1)) (m - 1))
) def.value) nonMaps)
));
getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]); getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]);
mappable = true; mappable = true;
}; };
@ -140,12 +144,14 @@ in rec {
inherit name; inherit name;
value = map (m: { inherit (m) file; value = m.value.f name; }) maps; value = map (m: { inherit (m) file; value = m.value.f name; }) maps;
}) names); }) names);
in zipAttrsWith (name: defs: in mapAttrs (n: getAttr "value") (filterAttrs (n: hasAttr "value") (
innerMerge (loc ++ [name]) elemType (defs ++ getAttr name mapResults) zipAttrsWith (name: defs:
) innerMerge (loc ++ [name]) elemType (defs ++ getAttr name mapResults)
# Push down position info. )
(map (def: listToAttrs (mapAttrsToList (n: def': # Push down position info.
{ name = n; value = { inherit (def) file; value = def'; }; }) def.value)) nonMaps); (map (def: listToAttrs (mapAttrsToList (n: def':
{ name = n; value = { inherit (def) file; value = def'; }; }) def.value)) nonMaps)
));
getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name>"]); getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name>"]);
mappable = true; mappable = true;
}; };
@ -196,8 +202,11 @@ in rec {
functionTo = elemType: mkOptionType { functionTo = elemType: mkOptionType {
name = "function that evaluates to a(n) ${elemType.name}"; name = "function that evaluates to a(n) ${elemType.name}";
check = isFunction; check = isFunction;
merge = loc: defs: merge = loc: defs: fnArgs:
fnArgs: innerMerge loc elemType (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs); (innerMerge loc elemType (map (fn:
{ inherit (fn) file; value = fn.value fnArgs; }
) defs)).value or (throw
"The option `${showOption loc}' is defined as a function that doesn't return any value (using mkIf or mkMerge), in ${showFiles (getFiles defs)}");
getSubOptions = elemType.getSubOptions; getSubOptions = elemType.getSubOptions;
}; };