From fc20134c92770fe60db522e0c10c2d6c264f7b50 Mon Sep 17 00:00:00 2001 From: Marian Klymov Date: Sat, 2 Jun 2018 20:15:26 +0300 Subject: [PATCH] Fix different names for parameters in declaration and definition --- include/json/value.h | 10 ++++---- src/lib_json/json_reader.cpp | 50 ++++++++++++++++++------------------ src/lib_json/json_value.cpp | 48 +++++++++++++++++----------------- src/lib_json/json_writer.cpp | 4 +-- src/test_lib_json/jsontest.h | 2 +- 5 files changed, 57 insertions(+), 57 deletions(-) diff --git a/include/json/value.h b/include/json/value.h index b94aeec..8a0054c 100644 --- a/include/json/value.h +++ b/include/json/value.h @@ -427,12 +427,12 @@ Json::Value obj_value(Json::objectValue); // {} /// \post type() is unchanged void clear(); - /// Resize the array to size elements. + /// Resize the array to newSize elements. /// New elements are initialized to null. /// May only be called on nullValue or arrayValue. /// \pre type() is arrayValue or nullValue /// \post type() is arrayValue - void resize(ArrayIndex size); + void resize(ArrayIndex newSize); /// Access an array element (zero based index ). /// If the array contains less than index element, then null value are @@ -562,10 +562,10 @@ Json::Value obj_value(Json::objectValue); // {} /** \brief Remove the indexed array element. O(n) expensive operations. - Update 'removed' iff removed. - \return true iff removed (no exceptions) + Update 'removed' if removed. + \return true if removed (no exceptions) */ - bool removeIndex(ArrayIndex i, Value* removed); + bool removeIndex(ArrayIndex index, Value* removed); /// Return true if the object has a member named key. /// \note 'key' must be null-terminated. diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp index 58a1b9a..7628e71 100644 --- a/src/lib_json/json_reader.cpp +++ b/src/lib_json/json_reader.cpp @@ -112,8 +112,8 @@ bool Reader::parse(const std::string& document, return parse(begin, end, root, collectComments); } -bool Reader::parse(std::istream& sin, Value& root, bool collectComments) { - // std::istream_iterator begin(sin); +bool Reader::parse(std::istream& is, Value& root, bool collectComments) { + // std::istream_iterator begin(is); // std::istream_iterator end; // Those would allow streamed input from a file, if parse() were a // template function. @@ -121,7 +121,7 @@ bool Reader::parse(std::istream& sin, Value& root, bool collectComments) { // Since JSONCPP_STRING is reference-counted, this at least does not // create an extra copy. JSONCPP_STRING doc; - std::getline(sin, doc, (char)EOF); + std::getline(is, doc, (char)EOF); return parse(doc.data(), doc.data() + doc.size(), root, collectComments); } @@ -460,12 +460,12 @@ bool Reader::readString() { return c == '"'; } -bool Reader::readObject(Token& tokenStart) { +bool Reader::readObject(Token& token) { Token tokenName; JSONCPP_STRING name; Value init(objectValue); currentValue().swapPayload(init); - currentValue().setOffsetStart(tokenStart.start_ - begin_); + currentValue().setOffsetStart(token.start_ - begin_); while (readToken(tokenName)) { bool initialTokenOk = true; while (tokenName.type_ == tokenComment && initialTokenOk) @@ -516,10 +516,10 @@ bool Reader::readObject(Token& tokenStart) { tokenObjectEnd); } -bool Reader::readArray(Token& tokenStart) { +bool Reader::readArray(Token& token) { Value init(arrayValue); currentValue().swapPayload(init); - currentValue().setOffsetStart(tokenStart.start_ - begin_); + currentValue().setOffsetStart(token.start_ - begin_); skipSpaces(); if (current_ != end_ && *current_ == ']') // empty array { @@ -536,19 +536,19 @@ bool Reader::readArray(Token& tokenStart) { if (!ok) // error already set return recoverFromError(tokenArrayEnd); - Token token; + Token currentToken; // Accept Comment after last item in the array. - ok = readToken(token); - while (token.type_ == tokenComment && ok) { - ok = readToken(token); + ok = readToken(currentToken); + while (currentToken.type_ == tokenComment && ok) { + ok = readToken(currentToken); } bool badTokenType = - (token.type_ != tokenArraySeparator && token.type_ != tokenArrayEnd); + (currentToken.type_ != tokenArraySeparator && currentToken.type_ != tokenArrayEnd); if (!ok || badTokenType) { return addErrorAndRecover("Missing ',' or ']' in array declaration", - token, tokenArrayEnd); + currentToken, tokenArrayEnd); } - if (token.type_ == tokenArrayEnd) + if (currentToken.type_ == tokenArrayEnd) break; } return true; @@ -1450,12 +1450,12 @@ bool OurReader::readStringSingleQuote() { return c == '\''; } -bool OurReader::readObject(Token& tokenStart) { +bool OurReader::readObject(Token& token) { Token tokenName; JSONCPP_STRING name; Value init(objectValue); currentValue().swapPayload(init); - currentValue().setOffsetStart(tokenStart.start_ - begin_); + currentValue().setOffsetStart(token.start_ - begin_); while (readToken(tokenName)) { bool initialTokenOk = true; while (tokenName.type_ == tokenComment && initialTokenOk) @@ -1512,10 +1512,10 @@ bool OurReader::readObject(Token& tokenStart) { tokenObjectEnd); } -bool OurReader::readArray(Token& tokenStart) { +bool OurReader::readArray(Token& token) { Value init(arrayValue); currentValue().swapPayload(init); - currentValue().setOffsetStart(tokenStart.start_ - begin_); + currentValue().setOffsetStart(token.start_ - begin_); skipSpaces(); if (current_ != end_ && *current_ == ']') // empty array { @@ -1532,19 +1532,19 @@ bool OurReader::readArray(Token& tokenStart) { if (!ok) // error already set return recoverFromError(tokenArrayEnd); - Token token; + Token currentToken; // Accept Comment after last item in the array. - ok = readToken(token); - while (token.type_ == tokenComment && ok) { - ok = readToken(token); + ok = readToken(currentToken); + while (currentToken.type_ == tokenComment && ok) { + ok = readToken(currentToken); } bool badTokenType = - (token.type_ != tokenArraySeparator && token.type_ != tokenArrayEnd); + (currentToken.type_ != tokenArraySeparator && token.type_ != tokenArrayEnd); if (!ok || badTokenType) { return addErrorAndRecover("Missing ',' or ']' in array declaration", - token, tokenArrayEnd); + currentToken, tokenArrayEnd); } - if (token.type_ == tokenArrayEnd) + if (currentToken.type_ == tokenArrayEnd) break; } return true; diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp index 6bf981e..1160c22 100644 --- a/src/lib_json/json_value.cpp +++ b/src/lib_json/json_value.cpp @@ -241,15 +241,15 @@ void Value::CommentInfo::setComment(const char* text, size_t len) { // Notes: policy_ indicates if the string was allocated when // a string is stored. -Value::CZString::CZString(ArrayIndex aindex) : cstr_(0), index_(aindex) {} +Value::CZString::CZString(ArrayIndex index) : cstr_(0), index_(index) {} Value::CZString::CZString(char const* str, - unsigned ulength, + unsigned length, DuplicationPolicy allocate) : cstr_(str) { // allocate != duplicate storage_.policy_ = allocate & 0x3; - storage_.length_ = ulength & 0x3FFFFFFF; + storage_.length_ = length & 0x3FFFFFFF; } Value::CZString::CZString(const CZString& other) { @@ -357,10 +357,10 @@ bool Value::CZString::isStaticString() const { * memset( this, 0, sizeof(Value) ) * This optimization is used in ValueInternalMap fast allocator. */ -Value::Value(ValueType vtype) { +Value::Value(ValueType type) { static char const emptyString[] = ""; - initBasic(vtype); - switch (vtype) { + initBasic(type); + switch (type) { case nullValue: break; case intValue: @@ -418,10 +418,10 @@ Value::Value(const char* value) { value, static_cast(strlen(value))); } -Value::Value(const char* beginValue, const char* endValue) { +Value::Value(const char* begin, const char* end) { initBasic(stringValue, true); value_.string_ = duplicateAndPrefixStringValue( - beginValue, static_cast(endValue - beginValue)); + begin, static_cast(end - begin)); } Value::Value(const JSONCPP_STRING& value) { @@ -645,14 +645,14 @@ unsigned Value::getCStringLength() const { } #endif -bool Value::getString(char const** str, char const** cend) const { +bool Value::getString(char const** begin, char const** end) const { if (type_ != stringValue) return false; if (value_.string_ == 0) return false; unsigned length; - decodePrefixedString(this->allocated_, this->value_.string_, &length, str); - *cend = *str + length; + decodePrefixedString(this->allocated_, this->value_.string_, &length, begin); + *end = *begin + length; return true; } @@ -1003,8 +1003,8 @@ const Value& Value::operator[](int index) const { return (*this)[ArrayIndex(index)]; } -void Value::initBasic(ValueType vtype, bool allocated) { - type_ = vtype; +void Value::initBasic(ValueType type, bool allocated) { + type_ = type; allocated_ = allocated; comments_ = 0; start_ = 0; @@ -1101,13 +1101,13 @@ Value& Value::resolveReference(const char* key) { } // @param key is not null-terminated. -Value& Value::resolveReference(char const* key, char const* cend) { +Value& Value::resolveReference(char const* key, char const* end) { JSON_ASSERT_MESSAGE( type_ == nullValue || type_ == objectValue, "in Json::Value::resolveReference(key, end): requires objectValue"); if (type_ == nullValue) *this = Value(objectValue); - CZString actualKey(key, static_cast(cend - key), + CZString actualKey(key, static_cast(end - key), CZString::duplicateOnCopy); ObjectValues::iterator it = value_.map_->lower_bound(actualKey); if (it != value_.map_->end() && (*it).first == actualKey) @@ -1126,13 +1126,13 @@ Value Value::get(ArrayIndex index, const Value& defaultValue) const { bool Value::isValidIndex(ArrayIndex index) const { return index < size(); } -Value const* Value::find(char const* key, char const* cend) const { +Value const* Value::find(char const* begin, char const* end) const { JSON_ASSERT_MESSAGE(type_ == nullValue || type_ == objectValue, "in Json::Value::find(key, end, found): requires " "objectValue or nullValue"); if (type_ == nullValue) return NULL; - CZString actualKey(key, static_cast(cend - key), + CZString actualKey(begin, static_cast(end - begin), CZString::noDuplication); ObjectValues::const_iterator it = value_.map_->find(actualKey); if (it == value_.map_->end()) @@ -1184,10 +1184,10 @@ Value& Value::append(Value&& value) { } #endif -Value Value::get(char const* key, - char const* cend, +Value Value::get(char const* begin, + char const* end, Value const& defaultValue) const { - Value const* found = find(key, cend); + Value const* found = find(begin, end); return !found ? defaultValue : *found; } Value Value::get(char const* key, Value const& defaultValue) const { @@ -1197,11 +1197,11 @@ Value Value::get(JSONCPP_STRING const& key, Value const& defaultValue) const { return get(key.data(), key.data() + key.length(), defaultValue); } -bool Value::removeMember(const char* key, const char* cend, Value* removed) { +bool Value::removeMember(const char* begin, const char* end, Value* removed) { if (type_ != objectValue) { return false; } - CZString actualKey(key, static_cast(cend - key), + CZString actualKey(begin, static_cast(end - begin), CZString::noDuplication); ObjectValues::iterator it = value_.map_->find(actualKey); if (it == value_.map_->end()) @@ -1264,8 +1264,8 @@ Value Value::get(const CppTL::ConstString& key, } #endif -bool Value::isMember(char const* key, char const* cend) const { - Value const* value = find(key, cend); +bool Value::isMember(char const* begin, char const* end) const { + Value const* value = find(begin, end); return NULL != value; } bool Value::isMember(char const* key) const { diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp index e0e47ad..5eaa041 100644 --- a/src/lib_json/json_writer.cpp +++ b/src/lib_json/json_writer.cpp @@ -1245,10 +1245,10 @@ void StreamWriterBuilder::setDefaults(Json::Value* settings) { //! [StreamWriterBuilderDefaults] } -JSONCPP_STRING writeString(StreamWriter::Factory const& builder, +JSONCPP_STRING writeString(StreamWriter::Factory const& factory, Value const& root) { JSONCPP_OSTRINGSTREAM sout; - StreamWriterPtr const writer(builder.newStreamWriter()); + StreamWriterPtr const writer(factory.newStreamWriter()); writer->write(root, &sout); return sout.str(); } diff --git a/src/test_lib_json/jsontest.h b/src/test_lib_json/jsontest.h index 9d50e90..9aab538 100644 --- a/src/test_lib_json/jsontest.h +++ b/src/test_lib_json/jsontest.h @@ -167,7 +167,7 @@ private: // prevents copy construction and assignment private: void listTests() const; - bool testIndex(const JSONCPP_STRING& testName, unsigned int& index) const; + bool testIndex(const JSONCPP_STRING& testName, unsigned int& indexOut) const; static void preventDialogOnCrash(); private: