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

refactor(3p/nix): Apply clang-tidy's readability-* fixes

Browse source 
This applies the readability fixes listed here:

https://clang.llvm.org/extra/clang-tidy/checks/list.html
This commit is contained in:
Vincent Ambo 2020-05-20 22:27:37 +01:00
parent d331d3a0b5
commit 689ef502f5
78 changed files with 863 additions and 792 deletions
Download patch file Download diff file Expand all files Collapse all files

11
third_party/nix/src/libexpr/json-to-value.cc vendored
View file

@ -16,7 +16,7 @@ static string parseJSONString(const char*& s) {
throw JSONParseError("expected JSON string");
}
while (*s != '"') {
if (!*s) {
if (*s == 0) {
throw JSONParseError("got end-of-string in JSON string");
}
if (*s == '\\') {
@ -57,7 +57,7 @@ static string parseJSONString(const char*& s) {
static void parseJSON(EvalState& state, const char*& s, Value& v) {
skipWhitespace(s);
if (!*s) {
if (*s == 0) {
throw JSONParseError("expected JSON value");
}
@ -127,12 +127,13 @@ static void parseJSON(EvalState& state, const char*& s, Value& v) {
mkString(v, parseJSONString(s));
}
else if (isdigit(*s) || *s == '-' || *s == '.') {
else if ((isdigit(*s) != 0) || *s == '-' || *s == '.') {
// Buffer into a string first, then use built-in C++ conversions
std::string tmp_number;
ValueType number_type = tInt;
while (isdigit(*s) || *s == '-' || *s == '.' || *s == 'e' || *s == 'E') {
while ((isdigit(*s) != 0) || *s == '-' || *s == '.' || *s == 'e' ||
*s == 'E') {
if (*s == '.' || *s == 'e' || *s == 'E') {
number_type = tFloat;
}
@ -176,7 +177,7 @@ void parseJSON(EvalState& state, const string& s_, Value& v) {
const char* s = s_.c_str();
parseJSON(state, s, v);
skipWhitespace(s);
if (*s) {
if (*s != 0) {
throw JSONParseError(
format("expected end-of-string while parsing JSON value: %1%") % s);
}