maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(3p/nix/libexpr): Fix attrNames/attrValues builtins for btree_map

Browse source 
Replaces the previous implementations which performed sorting with one
that instead walks through the map (which is already sorted) and
yields values from it.

This fixes a handful of language tests because the previous
implementation did not actually yield useful values on the new implementation.
This commit is contained in:
Vincent Ambo 2020-05-23 06:17:08 +01:00
parent 811c42d255
commit 3b903193be
1 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

30
third_party/nix/src/libexpr/primops.cc vendored
View file

@ -1263,35 +1263,23 @@ static void prim_attrNames(EvalState& state, const Pos& pos, Value** args,
state.mkList(v, args[0]->attrs->size());
size_t n = 0;
for (auto& i : *args[0]->attrs) {
mkString(*(v.listElems()[n++] = state.allocValue()), i.second.name);
unsigned int n = 0;
for (auto& [key, value] : *args[0]->attrs) {
mkString(*(v.listElems()[n++] = state.allocValue()), key);
}
std::sort(v.listElems(), v.listElems() + 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);
static void prim_attrValues(EvalState& state, const Pos& pos, Value** input,
Value& output) {
state.forceAttrs(*input[0], pos);
state.mkList(v, args[0]->attrs->size());
state.mkList(output, input[0]->attrs->size());
unsigned int n = 0;
for (auto& i : *args[0]->attrs) {
v.listElems()[n++] = (Value*)&i;
}
std::sort(v.listElems(), v.listElems() + n, [](Value* v1, Value* v2) {
return (string)((Attr*)v1)->name < (string)((Attr*)v2)->name;
});
for (unsigned int i = 0; i < n; ++i) {
v.listElems()[i] = ((Attr*)v.listElems()[i])->value;
for (auto& [key, value] : *input[0]->attrs) {
output.listElems()[n++] = value.value;
}
}