The pseudo-constructor `Value::mkAttrs` would previously be called on an default-constructed (under-initialized) `Value` to create a properly initialized `Value` that represents an attribute set. This change removes mkAttrs and constructs attr `Value`s directly. Change-Id: I11cd801eefecd454a7a5b6229d6770d06a6a6964
45 lines
1.0 KiB
C++
45 lines
1.0 KiB
C++
#include "lix/libexpr/attr-set.hh"
|
|
#include "lix/libexpr/eval.hh"
|
|
#include "lix/libexpr/gc-alloc.hh"
|
|
|
|
#include <algorithm>
|
|
|
|
|
|
namespace nix {
|
|
|
|
Bindings Bindings::EMPTY{};
|
|
|
|
/* Allocate a new array of attributes for an attribute set with a specific
|
|
capacity. The space is implicitly reserved after the Bindings
|
|
structure. */
|
|
Bindings * EvalMemory::allocBindings(size_t capacity)
|
|
{
|
|
if (capacity == 0)
|
|
return &Bindings::EMPTY;
|
|
if (capacity > std::numeric_limits<Bindings::Size>::max())
|
|
throw Error("attribute set of size %d is too big", capacity);
|
|
stats.nrAttrsets++;
|
|
stats.nrAttrsInAttrsets += capacity;
|
|
return new (allocBytes(sizeof(Bindings) + sizeof(Attr) * capacity)) Bindings();
|
|
}
|
|
|
|
|
|
Value & BindingsBuilder::alloc(Symbol name, PosIdx pos)
|
|
{
|
|
bindings->push_back(Attr(name, {}, pos));
|
|
return (bindings->end() - 1)->value;
|
|
}
|
|
|
|
|
|
Value & BindingsBuilder::alloc(std::string_view name, PosIdx pos)
|
|
{
|
|
return alloc(symbols.create(name), pos);
|
|
}
|
|
|
|
|
|
void Bindings::sort()
|
|
{
|
|
if (size_) std::sort(begin(), end());
|
|
}
|
|
}
|