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

fix(3p/nix): Fix incorrectly braced conditionals and loops

Browse source 
Fixes mistakes introduced by clang-tidy in the previous commit.
This commit is contained in:
Vincent Ambo 2020-05-19 18:01:12 +01:00
parent b490742a51
commit 09cbc431cc
16 changed files with 62 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

20
third_party/nix/src/libexpr/nixexpr.cc vendored
View file

@ -256,16 +256,20 @@ void ExprAttrs::bindVars(const StaticEnv& env) {
dynamicEnv = &newEnv;
unsigned int displ = 0;
for (auto& i : attrs) newEnv.vars[i.first] = i.second.displ = displ++;
for (auto& i : attrs) {
newEnv.vars[i.first] = i.second.displ = displ++;
}
for (auto& i : attrs)
for (auto& i : attrs) {
i.second.e->bindVars(i.second.inherited ? env : newEnv);
}
}
else {
for
for (auto& i : attrs) {
i.second.e->bindVars(env);
}
}
(auto& i : attrs) i.second.e->bindVars(env);
for (auto& i : dynamicAttrs) {
i.nameExpr->bindVars(*dynamicEnv);
@ -282,10 +286,14 @@ void ExprLambda::bindVars(const StaticEnv& env) {
unsigned int displ = 0;
if (!arg.empty()) newEnv.vars[arg] = displ++;
if (!arg.empty()) {
newEnv.vars[arg] = displ++;
}
if (matchAttrs) {
for (auto& i : formals->formals) newEnv.vars[i.name] = displ++;
for (auto& i : formals->formals) {
newEnv.vars[i.name] = displ++;
}
for (auto& i : formals->formals)
if (i.def) i.def->bindVars(newEnv);