wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

refactor: Use EvalState::getBuiltins()

Browse source
This commit is contained in:
Robert Hensing 2024-11-19 18:32:09 +01:00
parent 8a36d2d8a7
commit 5c258d7e25
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libexpr/eval.cc
View file

@ -448,7 +448,7 @@ void EvalState::addConstant(const std::string & name, Value * v, Constant info)
/* Install value the base environment. */ /* Install value the base environment. */
staticBaseEnv->vars.emplace_back(symbols.create(name), baseEnvDispl); staticBaseEnv->vars.emplace_back(symbols.create(name), baseEnvDispl);
baseEnv.values[baseEnvDispl++] = v; baseEnv.values[baseEnvDispl++] = v;
baseEnv.values[0]->payload.attrs->push_back(Attr(symbols.create(name2), v)); getBuiltins().payload.attrs->push_back(Attr(symbols.create(name2), v));
} }
} }
@ -516,7 +516,7 @@ Value * EvalState::addPrimOp(PrimOp && primOp)
else { else {
staticBaseEnv->vars.emplace_back(envName, baseEnvDispl); staticBaseEnv->vars.emplace_back(envName, baseEnvDispl);
baseEnv.values[baseEnvDispl++] = v; baseEnv.values[baseEnvDispl++] = v;
baseEnv.values[0]->payload.attrs->push_back(Attr(symbols.create(primOp.name), v)); getBuiltins().payload.attrs->push_back(Attr(symbols.create(primOp.name), v));
} }
return v; return v;
@ -531,7 +531,7 @@ Value & EvalState::getBuiltins()
Value & EvalState::getBuiltin(const std::string & name) Value & EvalState::getBuiltin(const std::string & name)
{ {
auto it = baseEnv.values[0]->attrs()->get(symbols.create(name)); auto it = getBuiltins().attrs()->get(symbols.create(name));
if (it) if (it)
return *it->value; return *it->value;
else else

2
src/libexpr/primops.cc
View file

@ -4937,7 +4937,7 @@ void EvalState::createBaseEnv()
/* Now that we've added all primops, sort the `builtins' set, /* Now that we've added all primops, sort the `builtins' set,
because attribute lookups expect it to be sorted. */ because attribute lookups expect it to be sorted. */
baseEnv.values[0]->payload.attrs->sort(); getBuiltins().payload.attrs->sort();
staticBaseEnv->sort(); staticBaseEnv->sort();

3
src/nix/main.cc
View file

@ -435,7 +435,8 @@ void mainWrapped(int argc, char * * argv)
evalSettings.pureEval = false; evalSettings.pureEval = false;
EvalState state({}, openStore("dummy://"), fetchSettings, evalSettings); EvalState state({}, openStore("dummy://"), fetchSettings, evalSettings);
auto builtinsJson = nlohmann::json::object(); auto builtinsJson = nlohmann::json::object();
for (auto & builtin : *state.baseEnv.values[0]->attrs()) { for (auto & builtinPtr : state.getBuiltins().attrs()->lexicographicOrder(state.symbols)) {
auto & builtin = *builtinPtr;
auto b = nlohmann::json::object(); auto b = nlohmann::json::object();
if (!builtin.value->isPrimOp()) continue; if (!builtin.value->isPrimOp()) continue;
auto primOp = builtin.value->primOp(); auto primOp = builtin.value->primOp();