From 2ff6cbcb97e32e596ad7510d87b6ccb451a9cdca Mon Sep 17 00:00:00 2001 From: Jordan Bayles Date: Mon, 9 Sep 2024 18:47:01 -0700 Subject: [PATCH] run clang format --- include/json/reader.h | 14 +++++++------- src/lib_json/json_reader.cpp | 16 ++++++++++------ src/test_lib_json/main.cpp | 5 +++-- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/include/json/reader.h b/include/json/reader.h index b4d68d4..38b9360 100644 --- a/include/json/reader.h +++ b/include/json/reader.h @@ -272,7 +272,7 @@ public: /** \brief Returns a vector of structured errors encountered while parsing. * Each parse call resets the stored list of errors. - */ + */ std::vector getStructuredErrors() const; class JSON_API Factory { @@ -287,17 +287,17 @@ public: protected: class Impl { public: - virtual ~Impl() = default; - virtual bool parse(char const* beginDoc, char const* endDoc, Value* root, - String* errs) = 0; - virtual std::vector getStructuredErrors() const = 0; + virtual ~Impl() = default; + virtual bool parse(char const* beginDoc, char const* endDoc, Value* root, + String* errs) = 0; + virtual std::vector getStructuredErrors() const = 0; }; - explicit CharReader(std::unique_ptr impl) : _impl(std::move(impl)) { } + explicit CharReader(std::unique_ptr impl) : _impl(std::move(impl)) {} private: std::unique_ptr _impl; -}; // CharReader +}; // CharReader /** \brief Build a CharReader implementation. * diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp index 42a2413..4ab4dff 100644 --- a/src/lib_json/json_reader.cpp +++ b/src/lib_json/json_reader.cpp @@ -1831,7 +1831,8 @@ String OurReader::getFormattedErrorMessages() const { return formattedMessage; } -std::vector OurReader::getStructuredErrors() const { +std::vector +OurReader::getStructuredErrors() const { std::vector allErrors; for (const auto& error : errors_) { CharReader::StructuredError structured; @@ -1847,7 +1848,8 @@ class OurCharReader : public CharReader { public: OurCharReader(bool collectComments, OurFeatures const& features) - : CharReader(std::unique_ptr(new OurImpl(collectComments, features))) {} + : CharReader( + std::unique_ptr(new OurImpl(collectComments, features))) {} protected: class OurImpl : public Impl { @@ -1864,7 +1866,8 @@ protected: return ok; } - std::vector getStructuredErrors() const override { + std::vector + getStructuredErrors() const override { return reader_.getStructuredErrors(); } @@ -1961,13 +1964,14 @@ void CharReaderBuilder::setDefaults(Json::Value* settings) { //! [CharReaderBuilderDefaults] } -std::vector CharReader::getStructuredErrors() const { - return _impl->getStructuredErrors(); +std::vector +CharReader::getStructuredErrors() const { + return _impl->getStructuredErrors(); } bool CharReader::parse(char const* beginDoc, char const* endDoc, Value* root, String* errs) { - return _impl->parse(beginDoc, endDoc, root, errs); + return _impl->parse(beginDoc, endDoc, root, errs); } ////////////////////////////////// diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp index 21d05df..fa41d19 100644 --- a/src/test_lib_json/main.cpp +++ b/src/test_lib_json/main.cpp @@ -3918,8 +3918,9 @@ JSONTEST_FIXTURE_LOCAL(FuzzTest, fuzzDoesntCrash) { } struct ParseWithStructuredErrorsTest : JsonTest::TestCase { - void testErrors(const std::string& doc, bool success, - const std::vector& expectedErrors) { + void testErrors( + const std::string& doc, bool success, + const std::vector& expectedErrors) { Json::CharReaderBuilder b; CharReaderPtr reader(b.newCharReader()); Json::Value root;