From ac8e5f01db3f10b29869886e33548f8f2e894dee Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Sat, 24 Dec 2022 15:47:48 +0100 Subject: [PATCH] Clang-Format: set `AllowShortLoopsOnASingleLine` to `false` --- .clang-format | 1 + extras/tests/JsonArray/std_string.cpp | 3 ++- extras/tests/JsonObject/std_string.cpp | 3 ++- extras/tests/MemoryPool/size.cpp | 3 ++- extras/tests/MsgPackSerializer/serializeArray.cpp | 6 ++++-- src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp | 3 ++- src/ArduinoJson/Deserialization/Readers/RamReader.hpp | 3 ++- src/ArduinoJson/Json/PrettyJsonSerializer.hpp | 3 ++- src/ArduinoJson/Json/TextFormatter.hpp | 6 ++++-- src/ArduinoJson/Memory/MemoryPool.hpp | 3 ++- src/ArduinoJson/Polyfills/pgmspace.hpp | 3 ++- src/ArduinoJson/StringStorage/StringCopier.hpp | 6 ++++-- 12 files changed, 29 insertions(+), 14 deletions(-) diff --git a/.clang-format b/.clang-format index ac4c1061..ec1550db 100644 --- a/.clang-format +++ b/.clang-format @@ -9,3 +9,4 @@ DerivePointerAlignment: false # Always break after if to get accurate coverage AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false diff --git a/extras/tests/JsonArray/std_string.cpp b/extras/tests/JsonArray/std_string.cpp index 0ad5440d..7af0ac2e 100644 --- a/extras/tests/JsonArray/std_string.cpp +++ b/extras/tests/JsonArray/std_string.cpp @@ -7,7 +7,8 @@ static void eraseString(std::string& str) { char* p = const_cast(str.c_str()); - while (*p) *p++ = '*'; + while (*p) + *p++ = '*'; } TEST_CASE("std::string") { diff --git a/extras/tests/JsonObject/std_string.cpp b/extras/tests/JsonObject/std_string.cpp index 44bf1461..bc74d014 100644 --- a/extras/tests/JsonObject/std_string.cpp +++ b/extras/tests/JsonObject/std_string.cpp @@ -7,7 +7,8 @@ static void eraseString(std::string& str) { char* p = const_cast(str.c_str()); - while (*p) *p++ = '*'; + while (*p) + *p++ = '*'; } TEST_CASE("std::string") { diff --git a/extras/tests/MemoryPool/size.cpp b/extras/tests/MemoryPool/size.cpp index 47603fe2..5179b105 100644 --- a/extras/tests/MemoryPool/size.cpp +++ b/extras/tests/MemoryPool/size.cpp @@ -25,7 +25,8 @@ TEST_CASE("MemoryPool::size()") { SECTION("Doesn't grow when memory pool is full") { const size_t variantCount = sizeof(buffer) / sizeof(VariantSlot); - for (size_t i = 0; i < variantCount; i++) pool.allocVariant(); + for (size_t i = 0; i < variantCount; i++) + pool.allocVariant(); size_t size = pool.size(); pool.allocVariant(); diff --git a/extras/tests/MsgPackSerializer/serializeArray.cpp b/extras/tests/MsgPackSerializer/serializeArray.cpp index 74de8f17..58eae9cc 100644 --- a/extras/tests/MsgPackSerializer/serializeArray.cpp +++ b/extras/tests/MsgPackSerializer/serializeArray.cpp @@ -41,7 +41,8 @@ TEST_CASE("serialize MsgPack array") { } SECTION("array 16") { - for (int i = 0; i < 16; i++) array.add(i); + for (int i = 0; i < 16; i++) + array.add(i); check(array, "\xDC\x00\x10\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D" @@ -50,7 +51,8 @@ TEST_CASE("serialize MsgPack array") { SECTION("array 32") { const char* nil = 0; - for (int i = 0; i < 65536; i++) array.add(nil); + for (int i = 0; i < 65536; i++) + array.add(nil); check(array, std::string("\xDD\x00\x01\x00\x00", 5) + std::string(65536, '\xc0')); diff --git a/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp b/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp index 1c470c04..96494df0 100644 --- a/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp +++ b/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp @@ -23,7 +23,8 @@ class IteratorReader { size_t readBytes(char* buffer, size_t length) { size_t i = 0; - while (i < length && _ptr < _end) buffer[i++] = *_ptr++; + while (i < length && _ptr < _end) + buffer[i++] = *_ptr++; return i; } }; diff --git a/src/ArduinoJson/Deserialization/Readers/RamReader.hpp b/src/ArduinoJson/Deserialization/Readers/RamReader.hpp index 1181297e..120ce8a8 100644 --- a/src/ArduinoJson/Deserialization/Readers/RamReader.hpp +++ b/src/ArduinoJson/Deserialization/Readers/RamReader.hpp @@ -32,7 +32,8 @@ struct Reader { private: void indent() { - for (uint8_t i = 0; i < _nesting; i++) base::write(ARDUINOJSON_TAB); + for (uint8_t i = 0; i < _nesting; i++) + base::write(ARDUINOJSON_TAB); } uint8_t _nesting; diff --git a/src/ArduinoJson/Json/TextFormatter.hpp b/src/ArduinoJson/Json/TextFormatter.hpp index d2cdd943..2080b14c 100644 --- a/src/ArduinoJson/Json/TextFormatter.hpp +++ b/src/ArduinoJson/Json/TextFormatter.hpp @@ -37,14 +37,16 @@ class TextFormatter { void writeString(const char* value) { ARDUINOJSON_ASSERT(value != NULL); writeRaw('\"'); - while (*value) writeChar(*value++); + while (*value) + writeChar(*value++); writeRaw('\"'); } void writeString(const char* value, size_t n) { ARDUINOJSON_ASSERT(value != NULL); writeRaw('\"'); - while (n--) writeChar(*value++); + while (n--) + writeChar(*value++); writeRaw('\"'); } diff --git a/src/ArduinoJson/Memory/MemoryPool.hpp b/src/ArduinoJson/Memory/MemoryPool.hpp index 3d0c1c4f..a0329deb 100644 --- a/src/ArduinoJson/Memory/MemoryPool.hpp +++ b/src/ArduinoJson/Memory/MemoryPool.hpp @@ -183,7 +183,8 @@ class MemoryPool { return next; // jump to next terminator - while (*next) ++next; + while (*next) + ++next; } return 0; } diff --git a/src/ArduinoJson/Polyfills/pgmspace.hpp b/src/ArduinoJson/Polyfills/pgmspace.hpp index afef4ce9..3e39a37e 100644 --- a/src/ArduinoJson/Polyfills/pgmspace.hpp +++ b/src/ArduinoJson/Polyfills/pgmspace.hpp @@ -23,7 +23,8 @@ struct pgm_p { inline size_t strlen_P(ARDUINOJSON_NAMESPACE::pgm_p s) { const char* p = s.address; ARDUINOJSON_ASSERT(p != NULL); - while (pgm_read_byte(p)) p++; + while (pgm_read_byte(p)) + p++; return size_t(p - s.address); } #endif diff --git a/src/ArduinoJson/StringStorage/StringCopier.hpp b/src/ArduinoJson/StringStorage/StringCopier.hpp index ec61c4ed..e9624e59 100644 --- a/src/ArduinoJson/StringStorage/StringCopier.hpp +++ b/src/ArduinoJson/StringStorage/StringCopier.hpp @@ -27,11 +27,13 @@ class StringCopier { } void append(const char* s) { - while (*s) append(*s++); + while (*s) + append(*s++); } void append(const char* s, size_t n) { - while (n-- > 0) append(*s++); + while (n-- > 0) + append(*s++); } void append(char c) {