guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate EvalState::eval from out param to return a Value

Browse Source 
Instead of taking in a final argument `Value &` out parameter which it
writes to, it now returns its result

Change-Id: Iab6bc3a3ac6a4b17c6d31115a766a6ea6a6a6964
This commit is contained in:
skye
2026-02-24 13:00:30 -05:00
parent d14613459b
commit 53c0e884d8
17 changed files with 47 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lix/legacy/nix-build.cc
+2 -4
View File
@@ -272,8 +272,7 @@ static int main_nix_build(AsyncIoRoot & aio, std::string programName, Strings ar
if (attrPaths.empty()) attrPaths = {""};
for (auto e : exprs) {
Value vRoot;
state->eval(e, vRoot);
Value vRoot = state->eval(e);
std::function<bool(const Value & v)> takesNixShellAttr;
takesNixShellAttr = [&](const Value & v) {
@@ -356,8 +355,7 @@ static int main_nix_build(AsyncIoRoot & aio, std::string programName, Strings ar
"(import <nixpkgs> {}).bashInteractive",
CanonPath::fromCwd());
Value v;
state->eval(expr, v);
Value v = state->eval(expr);
auto drv = getDerivation(*state, v, false);
if (!drv)
lix/legacy/nix-env.cc
+2 -3
View File
@@ -425,9 +425,8 @@ static void queryInstSources(EvalState & state,
for (auto & i : args) {
Expr & eFun = state.ctx.parseExprFromString(i, CanonPath::fromCwd());
Value vFun, vTmp;
state.eval(eFun, vFun);
vTmp = {NewValueAs::app, state.ctx.mem, vFun, vArg};
Value vFun = state.eval(eFun);
Value vTmp = {NewValueAs::app, state.ctx.mem, vFun, vArg};
getDerivations(state, vTmp, "", *instSource.autoArgs, elems, true);
}
lix/legacy/nix-instantiate.cc
+1 -2
View File
@@ -34,8 +34,7 @@ void processExpr(EvalState & state, const Strings & attrPaths,
return;
}
Value vRoot;
state.eval(e, vRoot);
Value vRoot = state.eval(e);
for (auto & i : attrPaths) {
Value v(findAlongAttrPath(state, i, autoArgs, vRoot).first);
lix/legacy/user-env.cc
+4 -4
View File
@@ -99,10 +99,10 @@ bool createUserEnv(EvalState & state, DrvInfos & elems,
str.str(), references));
/* Get the environment builder expression. */
Value envBuilder;
state.eval(state.ctx.parseExprFromString(
#include "buildenv.nix.gen.hh"
, CanonPath::root), envBuilder);
Value envBuilder = state.eval(state.ctx.parseExprFromString(
#include "buildenv.nix.gen.hh"
, CanonPath::root
));
/* Construct a Nix expression that calls the user environment
builder with the manifest as argument. */
lix/libcmd/installables.cc
+3 -4
View File
@@ -219,8 +219,7 @@ void SourceExprCommand::completeInstallable(EvalState & state, AddCompletions &
state.aio.blockOn(lookupFileArg(*evaluator, *file)).unwrap()
));
Value root;
state.eval(e, root);
Value root = state.eval(e);
auto autoArgs = getAutoArgs(*evaluator);
@@ -453,13 +452,13 @@ Installables SourceExprCommand::parseInstallables(
if (file == "-") {
auto & e = evaluator->parseStdin();
state.eval(e, vFile);
vFile = state.eval(e);
}
else if (file)
state.evalFile(state.aio.blockOn(lookupFileArg(*evaluator, *file)).unwrap(), vFile);
else {
auto & e = evaluator->parseExprFromString(*expr, CanonPath::fromCwd());
state.eval(e, vFile);
vFile = state.eval(e);
}
for (auto & s : ss) {
lix/libcmd/repl.cc
+1 -1
View File
@@ -1434,7 +1434,7 @@ Value NixRepl::getReplOverlaysEvalFunction()
evaluator.builtins.staticEnv
);
state.eval(expr, **replOverlaysEvalFunction);
**replOverlaysEvalFunction = state.eval(expr);
return **replOverlaysEvalFunction;
}
lix/libexpr/eval.cc
+3 -4
View File
@@ -955,7 +955,7 @@ void EvalState::evalFile(const SourcePath & path_, Value & v)
"while evaluating the file '%1%':", resolvedPath.to_string())
: nullptr;
eval(e, v);
v = eval(e);
} catch (Error & e) {
e.addTrace(nullptr, "while evaluating the file '%1%':", resolvedPath.to_string());
throw;
@@ -972,10 +972,9 @@ void EvalState::resetFileCache()
ctx.caches.fileEval.clear();
}
void EvalState::eval(Expr & e, Value & v)
Value EvalState::eval(Expr & e)
{
v = e.eval(*this, ctx.builtins.env);
return e.eval(*this, ctx.builtins.env);
}
std::string showAttrPath(EvalState & state, Env & env, const AttrPath & attrPath)
lix/libexpr/eval.hh
+1 -3
View File
@@ -652,10 +652,8 @@ public:
/**
* Evaluate an expression to normal form
*
* @param [out] v The resulting is stored here.
*/
void eval(Expr & e, Value & v);
Value eval(Expr & e);
/**
* If `v` is a thunk, enter it and overwrite `v` with the result
lix/libexpr/flake/flake.cc
+4 -8
View File
@@ -331,8 +331,7 @@ static Flake getFlake(
state.ctx.errors.make<EvalError>("file '%s' must be an attribute set", resolvedFlakeFile).debugThrow();
}
Value vInfo;
state.eval(flakeExpr, vInfo);
Value vInfo = state.eval(flakeExpr);
if (auto description = vInfo.attrs()->get(state.ctx.symbols.sym_description)) {
expectType(state, nString, description->value, description->pos);
@@ -964,13 +963,10 @@ void callFlake(EvalState & state,
if (!state.ctx.caches.vCallFlake) {
state.ctx.caches.vCallFlake = allocRootValue({});
state.eval(
state.ctx.parseExprFromString(
*state.ctx.caches.vCallFlake = state.eval(state.ctx.parseExprFromString(
#include "call-flake.nix.gen.hh"
, CanonPath::root
),
*state.ctx.caches.vCallFlake
);
, CanonPath::root
));
}
Value vTmp1 = state.callFunction(*state.ctx.caches.vCallFlake, vLocks, noPos);
lix/libexpr/primops.cc
+9 -11
View File
@@ -201,13 +201,10 @@ static void import(EvalState & state, Value & vPath, Value * vScope, Value & v)
if (!state.ctx.caches.vImportedDrvToDerivation) {
state.ctx.caches.vImportedDrvToDerivation = allocRootValue({});
state.eval(
state.ctx.parseExprFromString(
*state.ctx.caches.vImportedDrvToDerivation = state.eval(state.ctx.parseExprFromString(
#include "imported-drv-to-derivation.nix.gen.hh"
, CanonPath::root
),
*state.ctx.caches.vImportedDrvToDerivation
);
, CanonPath::root
));
}
state.forceFunction(
@@ -220,9 +217,10 @@ static void import(EvalState & state, Value & vPath, Value * vScope, Value & v)
}
else if (path2 == corepkgsPrefix + "fetchurl.nix") {
state.eval(state.ctx.parseExprFromString(
#include "fetchurl.nix.gen.hh"
, CanonPath::root), v);
v = state.eval(state.ctx.parseExprFromString(
#include "fetchurl.nix.gen.hh"
, CanonPath::root
));
}
else {
@@ -347,7 +345,7 @@ void prim_exec(EvalState & state, Value * * args, Value & v)
throw;
}
try {
state.eval(*parsed, v);
v = state.eval(*parsed);
} catch (Error & e) {
e.addTrace(nullptr, "while evaluating the output from '%1%'", program);
throw;
@@ -3113,7 +3111,7 @@ void EvalBuiltins::createBaseEnv(const SearchPath & searchPath, const Path & sto
auto & expr = *state.ctx.parse(
code, sizeof(code), Pos::Hidden{}, {CanonPath::root}, state.ctx.builtins.staticEnv
);
state.eval(expr, v);
v = state.eval(expr);
},
}};
static Value initializeDerivation{NewValueAs::primop, prim_initializeDerivation};
lix/nix/eval.cc
+1 -2
View File
@@ -79,8 +79,7 @@ struct CmdEval : MixJSON, InstallableCommand, MixReadOnlyOption
NixStringContext context;
if (apply) {
Value vApply;
state->eval(evaluator->parseExprFromString(*apply, CanonPath::fromCwd()), vApply);
Value vApply = state->eval(evaluator->parseExprFromString(*apply, CanonPath::fromCwd()));
v = state->callFunction(vApply, v, noPos);
}
lix/nix/main.cc
+3 -7
View File
@@ -360,14 +360,10 @@ static void showHelp(AsyncIoRoot & aio, std::vector<std::string> subcommand, Nix
Evaluator evaluator(aio, {}, aio.blockOn(openStore("dummy://")));
auto state = evaluator.begin(aio);
Value vGenerateManpage;
state->eval(
evaluator.parseExprFromString(
Value vGenerateManpage = state->eval(evaluator.parseExprFromString(
#include "generate-manpage.nix.gen.hh"
, CanonPath::root
),
vGenerateManpage
);
, CanonPath::root
));
Value vDump;
vDump.mkString(toplevel.dumpCli());
lix/nix/prefetch.cc
+3 -5
View File
@@ -28,12 +28,10 @@ std::string resolveMirrorUrl(EvalState & state, const std::string & url)
if (p == std::string::npos) throw Error("invalid mirror URL '%s'", url);
std::string mirrorName(s, 0, p);
Value vMirrors;
// FIXME: use nixpkgs flake
state.eval(state.ctx.parseExprFromString(
"import <nixpkgs/pkgs/build-support/fetchurl/mirrors.nix>",
CanonPath::root),
vMirrors);
Value vMirrors = state.eval(state.ctx.parseExprFromString(
"import <nixpkgs/pkgs/build-support/fetchurl/mirrors.nix>", CanonPath::root
));
state.forceAttrs(vMirrors, noPos, "while evaluating the set of all mirrors");
auto mirrorList = vMirrors.attrs()->get(state.ctx.symbols.create(mirrorName));
lix/nix/upgrade-nix.cc
+1 -2
View File
@@ -311,8 +311,7 @@ struct CmdUpgradeNix : MixDryRun, EvalCommand
auto evaluator = std::make_unique<Evaluator>(aio(), SearchPath{}, store);
auto state = evaluator->begin(aio());
Value v;
state->eval(evaluator->parseExprFromString(data, CanonPath("/no-such-path")), v);
Value v = state->eval(evaluator->parseExprFromString(data, CanonPath("/no-such-path")));
Bindings & bindings(*evaluator->mem.allocBindings(0));
auto v2 = findAlongAttrPath(*state, settings.thisSystem, bindings, v).first;
subprojects/nix-eval-jobs/src/worker.cc
+1 -1
View File
@@ -50,7 +50,7 @@ static nix::Value releaseExprTopLevelValue(nix::EvalState &state,
if (args.fromArgs) {
nix::Expr &e = state.ctx.parseExprFromString(args.releaseExpr,
nix::CanonPath::fromCwd());
state.eval(e, vTop);
vTop = state.eval(e);
} else {
state.evalFile(
state.aio.blockOn(nix::lookupFileArg(state.ctx, args.releaseExpr))
tests/unit/libexpr-support/tests/libexpr.hh
+5 -3
View File
@@ -31,10 +31,12 @@ namespace nix {
, state(*statePtr)
{
}
Value eval(std::string input, bool forceValue = true, const FeatureSettings & fSettings = featureSettings) {
Value v;
Value eval(
std::string input, bool forceValue = true, const FeatureSettings & fSettings = featureSettings
)
{
Expr & e = evaluator.parseExprFromString(input, CanonPath::root, fSettings);
state.eval(e, v);
Value v = state.eval(e);
if (forceValue)
state.forceValue(v, noPos);
return v;
tests/unit/libexpr/value/print.cc
+3 -6
View File
@@ -435,9 +435,8 @@ TEST_F(ValuePrintingTests, ansiColorsDerivation)
TEST_F(ValuePrintingTests, ansiColorsError)
{
Value vError;
auto & e = evaluator.parseExprFromString("{ a = throw \"uh oh!\"; }", {CanonPath::root});
state.eval(e, vError);
Value vError = state.eval(e);
test(
vError.attrs()->begin()->value,
@@ -451,11 +450,10 @@ TEST_F(ValuePrintingTests, ansiColorsError)
TEST_F(ValuePrintingTests, ansiColorsDerivationError)
{
Value vAttrs;
auto & e = evaluator.parseExprFromString(
"{ type = \"derivation\"; drvPath = throw \"uh oh!\"; }", {CanonPath::root}
);
state.eval(e, vAttrs);
Value vAttrs = state.eval(e);
test(vAttrs,
"{ drvPath = "
@@ -486,8 +484,7 @@ TEST_F(ValuePrintingTests, ansiColorsDerivationError)
TEST_F(ValuePrintingTests, ansiColorsAssert)
{
auto & e = evaluator.parseExprFromString("{ a = assert false; 1; }", {CanonPath::root});
Value v;
state.eval(e, v);
Value v = state.eval(e);
ASSERT_EQ(v.type(), nAttrs);
test(