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

style(3p/nix): Enforce braces around loops and conditionals

Browse source 
This change was generated with:

  fd -e cc -e hh | xargs -I{} clang-tidy {} -p ~/projects/nix-build/ \
    --checks='-*,readability-braces-around-statements' --fix \
    -fix-errors

Some manual fixes were applied because some convoluted unbraced
statements couldn't be untangled by clang-tidy.

This commit still includes invalid files, but I decided to clean them
up in a subsequent commit so that it becomes more obvious where
clang-tidy failed. Maybe this will allow for a bug-report to
clang-tidy.
This commit is contained in:
Vincent Ambo 2020-05-19 17:38:04 +01:00
parent c758de9d22
commit b490742a51
44 changed files with 661 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

18
third_party/nix/src/libexpr/eval-inline.hh vendored
View file

@ -38,33 +38,39 @@ void EvalState::forceValue(Value& v, const Pos& pos) {
v.thunk.expr = expr;
throw;
}
} else if (v.type == tApp)
} else if (v.type == tApp) {
callFunction(*v.app.left, *v.app.right, v, noPos);
else if (v.type == tBlackhole)
} else if (v.type == tBlackhole) {
throwEvalError("infinite recursion encountered, at %1%", pos);
}
}
inline void EvalState::forceAttrs(Value& v) {
forceValue(v);
if (v.type != tAttrs)
if (v.type != tAttrs) {
throwTypeError("value is %1% while a set was expected", v);
}
}
inline void EvalState::forceAttrs(Value& v, const Pos& pos) {
forceValue(v);
if (v.type != tAttrs)
if (v.type != tAttrs) {
throwTypeError("value is %1% while a set was expected, at %2%", v, pos);
}
}
inline void EvalState::forceList(Value& v) {
forceValue(v);
if (!v.isList()) throwTypeError("value is %1% while a list was expected", v);
if (!v.isList()) {
throwTypeError("value is %1% while a list was expected", v);
}
}
inline void EvalState::forceList(Value& v, const Pos& pos) {
forceValue(v);
if (!v.isList())
if (!v.isList()) {
throwTypeError("value is %1% while a list was expected, at %2%", v, pos);
}
}
/* Note: Various places expect the allocated memory to be zeroed. */