commit 736409f1b5dadc392a7a301c9176d8ef0d2a1d76
author dota17 <50514813+dota17@users.noreply.github.com> Wed Oct 02 03:54:07 2019 +0800
committer Jordan Bayles <jophba@chromium.org> Tue Oct 01 12:54:07 2019 -0700
tree 3941a0dfb41b38bdd8c095e08cbefb6d998c0504
parent 7e97345e26ebbd9b72266378255130fb433bc2fa

fix clang-format error for ci (#1036)

* fix clang-format error for ci

* update

src/lib_json/json_reader.cpp

diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp
index d1ae192..5d6207c 100644
--- a/src/lib_json/json_reader.cpp
+++ b/src/lib_json/json_reader.cpp
@@ -85,12 +85,9 @@
 // Class Reader
 // //////////////////////////////////////////////////////////////////
 
-Reader::Reader()
-    :  features_(Features::all()) {}
+Reader::Reader() : features_(Features::all()) {}
 
-Reader::Reader(const Features& features)
-    :    features_(features) {
-}
+Reader::Reader(const Features& features) : features_(features) {}
 
 bool Reader::parse(const std::string& document,
                    Value& root,
@@ -110,7 +107,7 @@
   // Since String is reference-counted, this at least does not
   // create an extra copy.
   String doc;
-  std::getline(is, doc, static_cast<char>EOF);
+  std::getline(is, doc, static_cast<char> EOF);
   return parse(doc.data(), doc.data() + doc.size(), root, collectComments);
 }
 
@@ -895,7 +892,7 @@
 class OurReader {
 public:
   using Char = char;
-  using Location = const Char *;
+  using Location = const Char*;
   struct StructuredError {
     ptrdiff_t offset_start;
     ptrdiff_t offset_limit;
@@ -996,7 +993,7 @@
   static String normalizeEOL(Location begin, Location end);
   static bool containsNewLine(Location begin, Location end);
 
-  using Nodes = std::stack<Value *>;
+  using Nodes = std::stack<Value*>;
   Nodes nodes_;
   Errors errors_;
   String document_;
@@ -1022,9 +1019,8 @@
 }
 
 OurReader::OurReader(OurFeatures const& features)
-    :  begin_(), end_(), current_(), lastValueEnd_(),
-      lastValue_(),  features_(features), collectComments_() {
-}
+    : begin_(), end_(), current_(), lastValueEnd_(), lastValue_(),
+      features_(features), collectComments_() {}
 
 bool OurReader::parse(const char* beginDoc,
                       const char* endDoc,

src/lib_json/json_value.cpp

diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
index e2cb7a1..6ee999c 100644
--- a/src/lib_json/json_value.cpp
+++ b/src/lib_json/json_value.cpp
@@ -1551,16 +1551,15 @@
 // class PathArgument
 // //////////////////////////////////////////////////////////////////
 
-PathArgument::PathArgument()  {}
+PathArgument::PathArgument() {}
 
 PathArgument::PathArgument(ArrayIndex index)
-    :  index_(index), kind_(kindIndex) {}
+    : index_(index), kind_(kindIndex) {}
 
-PathArgument::PathArgument(const char* key)
-    : key_(key),  kind_(kindKey) {}
+PathArgument::PathArgument(const char* key) : key_(key), kind_(kindKey) {}
 
 PathArgument::PathArgument(const String& key)
-    : key_(key.c_str()),  kind_(kindKey) {}
+    : key_(key.c_str()), kind_(kindKey) {}
 
 // class Path
 // //////////////////////////////////////////////////////////////////

src/test_lib_json/jsontest.cpp

diff --git a/src/test_lib_json/jsontest.cpp b/src/test_lib_json/jsontest.cpp
index 4c59d07..c0b5296 100644
--- a/src/test_lib_json/jsontest.cpp
+++ b/src/test_lib_json/jsontest.cpp
@@ -378,8 +378,8 @@
   _CrtSetReportHook(&msvcrtSilentReportHook);
 #endif // if defined(_MSC_VER)
 
-// @todo investigate this handler (for buffer overflow)
-// _set_security_error_handler
+  // @todo investigate this handler (for buffer overflow)
+  // _set_security_error_handler
 
 #if defined(_WIN32)
   // Prevents the system from popping a dialog for debugging if the

src/test_lib_json/main.cpp

diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
index 7b9abaf..c15b03f 100644
--- a/src/test_lib_json/main.cpp
+++ b/src/test_lib_json/main.cpp
@@ -1391,8 +1391,10 @@
 
 JSONTEST_FIXTURE(ValueTest, compareNull) {
   JSONTEST_ASSERT_PRED(checkIsEqual(Json::Value(), Json::Value()));
-  JSONTEST_ASSERT_PRED(checkIsEqual(Json::Value::nullSingleton(), Json::Value()));
-  JSONTEST_ASSERT_PRED(checkIsEqual(Json::Value::nullSingleton(), Json::Value::nullSingleton()));
+  JSONTEST_ASSERT_PRED(
+      checkIsEqual(Json::Value::nullSingleton(), Json::Value()));
+  JSONTEST_ASSERT_PRED(
+      checkIsEqual(Json::Value::nullSingleton(), Json::Value::nullSingleton()));
 }
 
 JSONTEST_FIXTURE(ValueTest, compareInt) {
@@ -2644,8 +2646,7 @@
 JSONTEST_FIXTURE(IteratorTest, const) {
   Json::Value const v;
   JSONTEST_ASSERT_THROWS(
-      Json::Value::iterator it(v.begin()) // Compile, but throw.
-      );
+      Json::Value::iterator it(v.begin())); // Compile, but throw.
 
   Json::Value value;