Just run clang format (#1025)
diff --git a/include/json/reader.h b/include/json/reader.h
index b94b307..8b388b0 100644
--- a/include/json/reader.h
+++ b/include/json/reader.h
@@ -36,7 +36,8 @@
*
* \deprecated Use CharReader and CharReaderBuilder.
*/
-class [[deprecated("deprecated Use CharReader and CharReaderBuilder.")]] JSON_API Reader {
+class [[deprecated(
+ "deprecated Use CharReader and CharReaderBuilder.")]] JSON_API Reader {
public:
typedef char Char;
typedef const Char* Location;
@@ -74,8 +75,8 @@
* \return \c true if the document was successfully parsed, \c false if an
* error occurred.
*/
- bool
- parse(const std::string& document, Value& root, bool collectComments = true);
+ bool parse(const std::string& document, Value& root,
+ bool collectComments = true);
/** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a>
* document.
@@ -93,14 +94,12 @@
* \return \c true if the document was successfully parsed, \c false if an
* error occurred.
*/
- bool parse(const char* beginDoc,
- const char* endDoc,
- Value& root,
+ bool parse(const char* beginDoc, const char* endDoc, Value& root,
bool collectComments = true);
/// \brief Parse from input stream.
/// \see Json::operator>>(std::istream&, Json::Value&).
- bool parse(IStream& is, Value& root, bool collectComments = true);
+ bool parse(IStream & is, Value & root, bool collectComments = true);
/** \brief Returns a user friendly string that list errors in the parsed
* document.
@@ -110,8 +109,8 @@
* occurred during parsing.
* \deprecated Use getFormattedErrorMessages() instead (typo fix).
*/
- [[deprecated("Use getFormattedErrorMessages() instead.")]]
- String getFormatedErrorMessages() const;
+ [[deprecated("Use getFormattedErrorMessages() instead.")]] String
+ getFormatedErrorMessages() const;
/** \brief Returns a user friendly string that list errors in the parsed
* document.
@@ -191,7 +190,7 @@
typedef std::deque<ErrorInfo> Errors;
- bool readToken(Token& token);
+ bool readToken(Token & token);
void skipSpaces();
bool match(const Char* pattern, int patternLength);
bool readComment();
@@ -200,35 +199,30 @@
bool readString();
void readNumber();
bool readValue();
- bool readObject(Token& token);
- bool readArray(Token& token);
- bool decodeNumber(Token& token);
- bool decodeNumber(Token& token, Value& decoded);
- bool decodeString(Token& token);
- bool decodeString(Token& token, String& decoded);
- bool decodeDouble(Token& token);
- bool decodeDouble(Token& token, Value& decoded);
- bool decodeUnicodeCodePoint(Token& token,
- Location& current,
- Location end,
+ bool readObject(Token & token);
+ bool readArray(Token & token);
+ bool decodeNumber(Token & token);
+ bool decodeNumber(Token & token, Value & decoded);
+ bool decodeString(Token & token);
+ bool decodeString(Token & token, String & decoded);
+ bool decodeDouble(Token & token);
+ bool decodeDouble(Token & token, Value & decoded);
+ bool decodeUnicodeCodePoint(Token & token, Location & current, Location end,
unsigned int& unicode);
- bool decodeUnicodeEscapeSequence(Token& token,
- Location& current,
- Location end,
- unsigned int& unicode);
+ bool decodeUnicodeEscapeSequence(Token & token, Location & current,
+ Location end, unsigned int& unicode);
bool addError(const String& message, Token& token, Location extra = nullptr);
bool recoverFromError(TokenType skipUntilToken);
- bool addErrorAndRecover(const String& message,
- Token& token,
+ bool addErrorAndRecover(const String& message, Token& token,
TokenType skipUntilToken);
void skipUntilSpace();
Value& currentValue();
Char getNextChar();
- void
- getLocationLineAndColumn(Location location, int& line, int& column) const;
+ void getLocationLineAndColumn(Location location, int& line, int& column)
+ const;
String getLocationLineAndColumn(Location location) const;
void addComment(Location begin, Location end, CommentPlacement placement);
- void skipCommentTokens(Token& token);
+ void skipCommentTokens(Token & token);
static bool containsNewLine(Location begin, Location end);
static String normalizeEOL(Location begin, Location end);
diff --git a/include/json/value.h b/include/json/value.h
index c972924..aa7bc54 100644
--- a/include/json/value.h
+++ b/include/json/value.h
@@ -203,7 +203,8 @@
static Value const& nullSingleton();
/// Minimum signed integer value that can be stored in a Json::Value.
- static constexpr LargestInt minLargestInt = LargestInt(~(LargestUInt(-1) / 2));
+ static constexpr LargestInt minLargestInt =
+ LargestInt(~(LargestUInt(-1) / 2));
/// Maximum signed integer value that can be stored in a Json::Value.
static constexpr LargestInt maxLargestInt = LargestInt(LargestUInt(-1) / 2);
/// Maximum unsigned integer value that can be stored in a Json::Value.
@@ -566,8 +567,8 @@
//# endif
/// \deprecated Always pass len.
- [[deprecated("Use setComment(String const&) instead.")]]
- void setComment(const char* comment, CommentPlacement placement) {
+ [[deprecated("Use setComment(String const&) instead.")]] void
+ setComment(const char* comment, CommentPlacement placement) {
setComment(String(comment, strlen(comment)), placement);
}
/// Comments must be //... or /* ... */
@@ -752,8 +753,7 @@
/// objectValue.
/// \deprecated This cannot be used for UTF-8 strings, since there can be
/// embedded nulls.
- [[deprecated("Use `key = name();` instead.")]]
- char const* memberName() const;
+ [[deprecated("Use `key = name();` instead.")]] char const* memberName() const;
/// Return the member name of the referenced Value, or NULL if it is not an
/// objectValue.
/// \note Better version than memberName(). Allows embedded nulls.
diff --git a/include/json/writer.h b/include/json/writer.h
index 7eab29e..9799a3b 100644
--- a/include/json/writer.h
+++ b/include/json/writer.h
@@ -27,30 +27,30 @@
class Value;
/**
-*
-* Usage:
-* \code
-* using namespace Json;
-* void writeToStdout(StreamWriter::Factory const& factory, Value const& value) {
-* std::unique_ptr<StreamWriter> const writer(
-* factory.newStreamWriter());
-* writer->write(value, &std::cout);
-* std::cout << std::endl; // add lf and flush
-* }
-* \endcode
-*/
+ *
+ * Usage:
+ * \code
+ * using namespace Json;
+ * void writeToStdout(StreamWriter::Factory const& factory, Value const& value)
+ * { std::unique_ptr<StreamWriter> const writer( factory.newStreamWriter());
+ * writer->write(value, &std::cout);
+ * std::cout << std::endl; // add lf and flush
+ * }
+ * \endcode
+ */
class JSON_API StreamWriter {
protected:
OStream* sout_; // not owned; will not delete
public:
StreamWriter();
virtual ~StreamWriter();
-/** Write Value into document as configured in sub-class.
-* Do not take ownership of sout, but maintain a reference during function.
-* \pre sout != NULL
-* \return zero on success (For now, we always return zero, so check the
-* stream instead.) \throw std::exception possibly, depending on configuration
-*/
+ /** Write Value into document as configured in sub-class.
+ * Do not take ownership of sout, but maintain a reference during function.
+ * \pre sout != NULL
+ * \return zero on success (For now, we always return zero, so check the
+ * stream instead.) \throw std::exception possibly, depending on
+ * configuration
+ */
virtual int write(Value const& root, OStream* sout) = 0;
/** \brief A simple abstract factory.
@@ -225,8 +225,8 @@
#pragma warning(push)
#pragma warning(disable : 4996) // Deriving from deprecated class
#endif
-class [[deprecated("Use StreamWriterBuilder instead")]] JSON_API
- StyledWriter : public Writer {
+class [[deprecated("Use StreamWriterBuilder instead")]] JSON_API StyledWriter
+ : public Writer {
public:
StyledWriter();
~StyledWriter() override = default;
@@ -294,8 +294,8 @@
#pragma warning(push)
#pragma warning(disable : 4996) // Deriving from deprecated class
#endif
-class [[deprecated("Use StreamWriterBuilder instead")]] JSON_API
- StyledStreamWriter {
+class [[deprecated(
+ "Use StreamWriterBuilder instead")]] JSON_API StyledStreamWriter {
public:
/**
* \param indentation Each level will be indented by this amount extra.
@@ -310,7 +310,7 @@
* \note There is no point in deriving from Writer, since write() should not
* return a value.
*/
- void write(OStream& out, const Value& root);
+ void write(OStream & out, const Value& root);
private:
void writeValue(const Value& value);