mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-24 06:56:14 +02:00
8c0590fa32
Thunks are now overwritten by a helper function `Value::finishValue(newType, payload)` (where `payload` is the original anonymous union inside `Value`). This helps to ensure we never update a value elsewhere, since that would be incompatible with parallel evaluation (i.e. after a value has transitioned from being a thunk to being a non-thunk, it should be immutable). There were two places where this happened: `Value::mkString()` and `ExprAttrs::eval()`. This PR also adds a bunch of accessor functions for value contents, like `Value::integer()` to access the integer field in the union.
53 lines
1.1 KiB
C++
53 lines
1.1 KiB
C++
#include "attr-set.hh"
|
|
#include "eval-inline.hh"
|
|
|
|
#include <algorithm>
|
|
|
|
|
|
namespace nix {
|
|
|
|
|
|
|
|
/* Allocate a new array of attributes for an attribute set with a specific
|
|
capacity. The space is implicitly reserved after the Bindings
|
|
structure. */
|
|
Bindings * EvalState::allocBindings(size_t capacity)
|
|
{
|
|
if (capacity == 0)
|
|
return &emptyBindings;
|
|
if (capacity > std::numeric_limits<Bindings::size_t>::max())
|
|
throw Error("attribute set of size %d is too big", capacity);
|
|
nrAttrsets++;
|
|
nrAttrsInAttrsets += capacity;
|
|
return new (allocBytes(sizeof(Bindings) + sizeof(Attr) * capacity)) Bindings((Bindings::size_t) capacity);
|
|
}
|
|
|
|
|
|
Value & BindingsBuilder::alloc(Symbol name, PosIdx pos)
|
|
{
|
|
auto value = state.allocValue();
|
|
bindings->push_back(Attr(name, value, pos));
|
|
return *value;
|
|
}
|
|
|
|
|
|
Value & BindingsBuilder::alloc(std::string_view name, PosIdx pos)
|
|
{
|
|
return alloc(state.symbols.create(name), pos);
|
|
}
|
|
|
|
|
|
void Bindings::sort()
|
|
{
|
|
if (size_) std::sort(begin(), end());
|
|
}
|
|
|
|
|
|
Value & Value::mkAttrs(BindingsBuilder & bindings)
|
|
{
|
|
mkAttrs(bindings.finish());
|
|
return *this;
|
|
}
|
|
|
|
|
|
}
|