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

refactor(tvix): always pass Bindings by ptr, use shared/unique_ptr

Browse source 
Value now carries a shared_ptr<Bindings>, and all Bindings constructors return a unique_ptr<Bindings>.

The test that wanted to compare two Bindings by putting them into Values has been modified to use the new Equal() method on Bindings (extracted from EvalState).

Change-Id: I8dfb60e65fdabb717e3b3e5d56d5b3fc82f70883
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1744
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Kane York 2020-08-13 16:40:27 -07:00 • committed by kanepyork
parent 38f2ea34f4
commit 1fc9ba4885
22 changed files with 129 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

15
third_party/nix/src/nix-env/nix-env.cc vendored
View file

@ -46,7 +46,7 @@ struct InstallSourceInfo {
Path nixExprPath; /* for srcNixExprDrvs, srcNixExprs */
Path profile; /* for srcProfile */
std::string systemFilter; /* for srcNixExprDrvs */
Bindings* autoArgs;
std::unique_ptr<Bindings> autoArgs;
};
struct Globals {
@ -170,7 +170,7 @@ static void loadSourceExpr(EvalState& state, const Path& path, Value& v) {
}
static void loadDerivations(EvalState& state, const Path& nixExprPath,
const std::string& systemFilter, Bindings& autoArgs,
const std::string& systemFilter, Bindings* autoArgs,
const std::string& pathPrefix, DrvInfos& elems) {
Value vRoot;
loadSourceExpr(state, nixExprPath, vRoot);
@ -333,7 +333,7 @@ static void queryInstSources(EvalState& state, InstallSourceInfo& instSource,
Nix expression. */
DrvInfos allElems;
loadDerivations(state, instSource.nixExprPath, instSource.systemFilter,
*instSource.autoArgs, "", allElems);
instSource.autoArgs.get(), "", allElems);
elems = filterBySelector(state, allElems, args, newestOnly);
@ -356,7 +356,7 @@ static void queryInstSources(EvalState& state, InstallSourceInfo& instSource,
Value vTmp;
state.eval(eFun, vFun);
mkApp(vTmp, vFun, vArg);
getDerivations(state, vTmp, "", *instSource.autoArgs, elems, true);
getDerivations(state, vTmp, "", instSource.autoArgs.get(), elems, true);
}
break;
@ -410,8 +410,9 @@ static void queryInstSources(EvalState& state, InstallSourceInfo& instSource,
Value vRoot;
loadSourceExpr(state, instSource.nixExprPath, vRoot);
for (auto& i : args) {
Value& v(*findAlongAttrPath(state, i, *instSource.autoArgs, vRoot));
getDerivations(state, v, "", *instSource.autoArgs, elems, true);
Value& v(
*findAlongAttrPath(state, i, instSource.autoArgs.get(), vRoot));
getDerivations(state, v, "", instSource.autoArgs.get(), elems, true);
}
break;
}
@ -959,7 +960,7 @@ static void opQuery(Globals& globals, Strings opFlags, Strings opArgs) {
if (source == sAvailable || compareVersions) {
loadDerivations(*globals.state, globals.instSource.nixExprPath,
globals.instSource.systemFilter,
*globals.instSource.autoArgs, attrPath, availElems);
globals.instSource.autoArgs.get(), attrPath, availElems);
}
DrvInfos elems_ = filterBySelector(

4
third_party/nix/src/nix-env/user-env.cc vendored
View file

@ -20,8 +20,8 @@ DrvInfos queryInstalled(EvalState& state, const Path& userEnv) {
if (pathExists(manifestFile)) {
Value v;
state.evalFile(manifestFile, v);
Bindings& bindings(*Bindings::NewGC());
getDerivations(state, v, "", bindings, elems, false);
std::unique_ptr<Bindings> bindings(Bindings::New());
getDerivations(state, v, "", bindings.get(), elems, false);
}
return elems;
}