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

attrNames: Don't allocate duplicates of the symbols

Browse source
This commit is contained in:
Eelco Dolstra 2014-09-19 18:11:46 +02:00
parent ea525a261f
commit 2d6cd8aafd
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libexpr/primops.cc
View file

@ -914,13 +914,11 @@ static void prim_attrNames(EvalState & state, const Pos & pos, Value * * args, V
state.mkList(v, args[0]->attrs->size());
StringSet names;
foreach (Bindings::iterator, i, *args[0]->attrs)
names.insert(i->name);
unsigned int n = 0;
foreach (StringSet::iterator, i, names)
mkString(*(v.list.elems[n++] = state.allocValue()), *i);
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; });
}