Apply the formatting specified in .clang-format file.
$ clang-format --version
clang-format version 7.0.0 (tags/google/stable/2018-01-11)
$ clang-format -i --style=file $(find . -name '*.cpp' -o -name '*.h')
diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp
index 531f541..7105b39 100644
--- a/src/jsontestrunner/main.cpp
+++ b/src/jsontestrunner/main.cpp
@@ -13,13 +13,12 @@
/* This executable is used for testing parser/writer using real JSON files.
*/
-#include <json/json.h>
#include <algorithm> // sort
+#include <json/json.h>
#include <sstream>
#include <stdio.h>
-struct Options
-{
+struct Options {
JSONCPP_STRING path;
Json::Features features;
bool parseOnly;
@@ -45,8 +44,8 @@
JSONCPP_STRING::size_type indexDigit =
s.find_first_not_of('0', exponentStartIndex);
JSONCPP_STRING exponent = "0";
- if (indexDigit !=
- JSONCPP_STRING::npos) // There is an exponent different from 0
+ if (indexDigit != JSONCPP_STRING::npos) // There is an exponent different
+ // from 0
{
exponent = s.substr(indexDigit);
}
@@ -73,8 +72,9 @@
return text;
}
-static void
-printValueTree(FILE* fout, Json::Value& value, const JSONCPP_STRING& path = ".") {
+static void printValueTree(FILE* fout,
+ Json::Value& value,
+ const JSONCPP_STRING& path = ".") {
if (value.hasComment(Json::commentBefore)) {
fprintf(fout, "%s\n", value.getComment(Json::commentBefore).c_str());
}
@@ -83,21 +83,15 @@
fprintf(fout, "%s=null\n", path.c_str());
break;
case Json::intValue:
- fprintf(fout,
- "%s=%s\n",
- path.c_str(),
+ fprintf(fout, "%s=%s\n", path.c_str(),
Json::valueToString(value.asLargestInt()).c_str());
break;
case Json::uintValue:
- fprintf(fout,
- "%s=%s\n",
- path.c_str(),
+ fprintf(fout, "%s=%s\n", path.c_str(),
Json::valueToString(value.asLargestUInt()).c_str());
break;
case Json::realValue:
- fprintf(fout,
- "%s=%s\n",
- path.c_str(),
+ fprintf(fout, "%s=%s\n", path.c_str(),
normalizeFloatingPointStr(value.asDouble()).c_str());
break;
case Json::stringValue:
@@ -125,8 +119,7 @@
std::sort(members.begin(), members.end());
JSONCPP_STRING suffix = *(path.end() - 1) == '.' ? "" : ".";
for (Json::Value::Members::iterator it = members.begin();
- it != members.end();
- ++it) {
+ it != members.end(); ++it) {
const JSONCPP_STRING name = *it;
printValueTree(fout, value[name], path + suffix + name);
}
@@ -145,13 +138,12 @@
const JSONCPP_STRING& kind,
const Json::Features& features,
bool parseOnly,
- Json::Value* root)
-{
+ Json::Value* root) {
Json::Reader reader(features);
- bool parsingSuccessful = reader.parse(input.data(), input.data() + input.size(), *root);
+ bool parsingSuccessful =
+ reader.parse(input.data(), input.data() + input.size(), *root);
if (!parsingSuccessful) {
- printf("Failed to parse %s file: \n%s\n",
- kind.c_str(),
+ printf("Failed to parse %s file: \n%s\n", kind.c_str(),
reader.getFormattedErrorMessages().c_str());
return 1;
}
@@ -171,32 +163,24 @@
// writer.enableYAMLCompatibility();
// return writer.write(root);
// }
-static JSONCPP_STRING useStyledWriter(
- Json::Value const& root)
-{
+static JSONCPP_STRING useStyledWriter(Json::Value const& root) {
Json::StyledWriter writer;
return writer.write(root);
}
-static JSONCPP_STRING useStyledStreamWriter(
- Json::Value const& root)
-{
+static JSONCPP_STRING useStyledStreamWriter(Json::Value const& root) {
Json::StyledStreamWriter writer;
JSONCPP_OSTRINGSTREAM sout;
writer.write(sout, root);
return sout.str();
}
-static JSONCPP_STRING useBuiltStyledStreamWriter(
- Json::Value const& root)
-{
+static JSONCPP_STRING useBuiltStyledStreamWriter(Json::Value const& root) {
Json::StreamWriterBuilder builder;
return Json::writeString(builder, root);
}
-static int rewriteValueTree(
- const JSONCPP_STRING& rewritePath,
- const Json::Value& root,
- Options::writeFuncType write,
- JSONCPP_STRING* rewrite)
-{
+static int rewriteValueTree(const JSONCPP_STRING& rewritePath,
+ const Json::Value& root,
+ Options::writeFuncType write,
+ JSONCPP_STRING* rewrite) {
*rewrite = write(root);
FILE* fout = fopen(rewritePath.c_str(), "wt");
if (!fout) {
@@ -209,7 +193,7 @@
}
static JSONCPP_STRING removeSuffix(const JSONCPP_STRING& path,
- const JSONCPP_STRING& extension) {
+ const JSONCPP_STRING& extension) {
if (extension.length() >= path.length())
return JSONCPP_STRING("");
JSONCPP_STRING suffix = path.substr(path.length() - extension.length());
@@ -232,9 +216,7 @@
return 3;
}
-static int parseCommandLine(
- int argc, const char* argv[], Options* opts)
-{
+static int parseCommandLine(int argc, const char* argv[], Options* opts) {
opts->parseOnly = false;
opts->write = &useStyledWriter;
if (argc < 2) {
@@ -270,8 +252,7 @@
opts->path = argv[index];
return 0;
}
-static int runTest(Options const& opts)
-{
+static int runTest(Options const& opts) {
int exitCode = 0;
JSONCPP_STRING input = readInputTestFile(opts.path.c_str());
@@ -283,7 +264,7 @@
JSONCPP_STRING basePath = removeSuffix(opts.path, ".json");
if (!opts.parseOnly && basePath.empty()) {
printf("Bad input path. Path does not end with '.expected':\n%s\n",
- opts.path.c_str());
+ opts.path.c_str());
return 3;
}
@@ -292,9 +273,8 @@
JSONCPP_STRING const rewriteActualPath = basePath + ".actual-rewrite";
Json::Value root;
- exitCode = parseAndSaveValueTree(
- input, actualPath, "input",
- opts.features, opts.parseOnly, &root);
+ exitCode = parseAndSaveValueTree(input, actualPath, "input", opts.features,
+ opts.parseOnly, &root);
if (exitCode || opts.parseOnly) {
return exitCode;
}
@@ -304,9 +284,8 @@
return exitCode;
}
Json::Value rewriteRoot;
- exitCode = parseAndSaveValueTree(
- rewrite, rewriteActualPath, "rewrite",
- opts.features, opts.parseOnly, &rewriteRoot);
+ exitCode = parseAndSaveValueTree(rewrite, rewriteActualPath, "rewrite",
+ opts.features, opts.parseOnly, &rewriteRoot);
if (exitCode) {
return exitCode;
}
@@ -315,14 +294,13 @@
int main(int argc, const char* argv[]) {
Options opts;
try {
- int exitCode = parseCommandLine(argc, argv, &opts);
- if (exitCode != 0) {
- printf("Failed to parse command-line.");
- return exitCode;
- }
+ int exitCode = parseCommandLine(argc, argv, &opts);
+ if (exitCode != 0) {
+ printf("Failed to parse command-line.");
+ return exitCode;
+ }
return runTest(opts);
- }
- catch (const std::exception& e) {
+ } catch (const std::exception& e) {
printf("Unhandled exception:\n%s\n", e.what());
return 1;
}