max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-25 15:26:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add primop ‘attrValues’

Browse source
This commit is contained in:
Eelco Dolstra 2014-10-04 16:41:24 +02:00
parent 58d8a213b0
commit d4fcbe1687
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/libexpr/primops.cc
View file

@ -974,7 +974,28 @@ static void prim_attrNames(EvalState & state, const Pos & pos, Value * * args, V
for (auto & i : *args[0]->attrs)
mkString(*(v.list.elems[n++] = state.allocValue()), i.name);
std::sort(v.list.elems, v.list.elems + n, [](Value * v1, Value * v2) { return strcmp(v1->string.s, v2->string.s) < 0; });
std::sort(v.list.elems, v.list.elems + n,
[](Value * v1, Value * v2) { return strcmp(v1->string.s, v2->string.s) < 0; });
}
/* Return the values of the attributes in a set as a list, in the same
order as attrNames. */
static void prim_attrValues(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
state.forceAttrs(*args[0], pos);
state.mkList(v, args[0]->attrs->size());
unsigned int n = 0;
for (auto & i : *args[0]->attrs)
v.list.elems[n++] = (Value *) &i;
std::sort(v.list.elems, v.list.elems + n,
[](Value * v1, Value * v2) { return (string) ((Attr *) v1)->name < (string) ((Attr *) v2)->name; });
for (unsigned int i = 0; i < n; ++i)
v.list.elems[i] = ((Attr *) v.list.elems[i])->value;
}
@ -1501,6 +1522,7 @@ void EvalState::createBaseEnv()
// Sets
addPrimOp("__attrNames", 1, prim_attrNames);
addPrimOp("__attrValues", 1, prim_attrValues);
addPrimOp("__getAttr", 2, prim_getAttr);
addPrimOp("__unsafeGetAttrPos", 2, prim_unsafeGetAttrPos);
addPrimOp("__hasAttr", 2, prim_hasAttr);

2
tests/lang/eval-okay-attrnames.nix
View file

@ -8,4 +8,4 @@ let
values = map (name: builtins.getAttr name attrs) names;
in concat values
in assert values == builtins.attrValues attrs; concat values