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

14
third_party/nix/src/nix-instantiate/nix-instantiate.cc vendored
View file

@ -23,7 +23,7 @@ static bool indirectRoot = false;
enum OutputKind { okPlain, okXML, okJSON };
void processExpr(EvalState& state, const Strings& attrPaths, bool parseOnly,
bool strict, Bindings& autoArgs, bool evalOnly,
bool strict, Bindings* autoArgs, bool evalOnly,
OutputKind output, bool location, Expr* e) {
if (parseOnly) {
std::cout << format("%1%\n") % *e;
@ -40,7 +40,7 @@ void processExpr(EvalState& state, const Strings& attrPaths, bool parseOnly,
PathSet context;
if (evalOnly) {
Value vRes;
if (autoArgs.empty()) {
if (autoArgs->empty()) {
vRes = v;
} else {
state.autoCallFunction(autoArgs, v, vRes);
@ -176,7 +176,7 @@ static int _main(int argc, char** argv) {
});
}
Bindings& autoArgs = *myArgs.getAutoArgs(*state);
std::unique_ptr<Bindings> autoArgs = myArgs.getAutoArgs(*state);
if (attrPaths.empty()) {
attrPaths = {""};
@ -195,8 +195,8 @@ static int _main(int argc, char** argv) {
if (readStdin) {
Expr* e = state->parseStdin();
processExpr(*state, attrPaths, parseOnly, strict, autoArgs, evalOnly,
outputKind, xmlOutputSourceLocation, e);
processExpr(*state, attrPaths, parseOnly, strict, autoArgs.get(),
evalOnly, outputKind, xmlOutputSourceLocation, e);
} else if (files.empty() && !fromArgs) {
files.push_back("./default.nix");
}
@ -206,8 +206,8 @@ static int _main(int argc, char** argv) {
? state->parseExprFromString(i, absPath("."))
: state->parseExprFromFile(resolveExprPath(
state->checkSourcePath(lookupFileArg(*state, i))));
processExpr(*state, attrPaths, parseOnly, strict, autoArgs, evalOnly,
outputKind, xmlOutputSourceLocation, e);
processExpr(*state, attrPaths, parseOnly, strict, autoArgs.get(),
evalOnly, outputKind, xmlOutputSourceLocation, e);
}
state->printStats();