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

6
third_party/nix/src/nix-build/nix-build.cc vendored
View file

@ -266,7 +266,7 @@ static void _main(int argc, char** argv) {
auto state = std::make_unique<EvalState>(myArgs.searchPath, store);
state->repair = repair;
Bindings& autoArgs = *myArgs.getAutoArgs(*state);
std::unique_ptr<Bindings> autoArgs = myArgs.getAutoArgs(*state);
if (packages) {
std::ostringstream joined;
@ -334,9 +334,9 @@ static void _main(int argc, char** argv) {
state->eval(e, vRoot);
for (auto& i : attrPaths) {
Value& v(*findAlongAttrPath(*state, i, autoArgs, vRoot));
Value& v(*findAlongAttrPath(*state, i, autoArgs.get(), vRoot));
state->forceValue(v);
getDerivations(*state, v, "", autoArgs, drvs, false);
getDerivations(*state, v, "", autoArgs.get(), drvs, false);
}
}