forked from bblanchon/ArduinoJson
Formated code with clang-format
This commit is contained in:
Benoit Blanchon
@@ -2,44 +2,39 @@
|
||||
|
||||
using namespace ArduinoJson::Internals;
|
||||
|
||||
void IndentedPrint::indent()
|
||||
{
|
||||
if (level < MAX_LEVEL)
|
||||
level++;
|
||||
void IndentedPrint::indent() {
|
||||
if (level < MAX_LEVEL)
|
||||
level++;
|
||||
}
|
||||
|
||||
void IndentedPrint::unindent()
|
||||
{
|
||||
if (level > 0)
|
||||
level--;
|
||||
void IndentedPrint::unindent() {
|
||||
if (level > 0)
|
||||
level--;
|
||||
}
|
||||
|
||||
void IndentedPrint::setTabSize(uint8_t n)
|
||||
{
|
||||
if (n < MAX_TAB_SIZE)
|
||||
tabSize = n;
|
||||
void IndentedPrint::setTabSize(uint8_t n) {
|
||||
if (n < MAX_TAB_SIZE)
|
||||
tabSize = n;
|
||||
}
|
||||
|
||||
size_t IndentedPrint::write(uint8_t c)
|
||||
{
|
||||
size_t n = 0;
|
||||
size_t IndentedPrint::write(uint8_t c) {
|
||||
size_t n = 0;
|
||||
|
||||
if (isNewLine)
|
||||
n += writeTabs();
|
||||
if (isNewLine)
|
||||
n += writeTabs();
|
||||
|
||||
n += sink->write(c);
|
||||
n += sink->write(c);
|
||||
|
||||
isNewLine = c == '\n';
|
||||
isNewLine = c == '\n';
|
||||
|
||||
return n;
|
||||
return n;
|
||||
}
|
||||
|
||||
inline size_t IndentedPrint::writeTabs()
|
||||
{
|
||||
size_t n = 0;
|
||||
inline size_t IndentedPrint::writeTabs() {
|
||||
size_t n = 0;
|
||||
|
||||
for (int i = 0; i < level*tabSize; i++)
|
||||
n += sink->write(' ');
|
||||
for (int i = 0; i < level * tabSize; i++)
|
||||
n += sink->write(' ');
|
||||
|
||||
return n;
|
||||
return n;
|
||||
}
|
||||
+102
-121
@@ -7,163 +7,144 @@
|
||||
|
||||
using namespace ArduinoJson::Internals;
|
||||
|
||||
void JsonNode::writeTo(JsonWriter& writer)
|
||||
{
|
||||
switch (type)
|
||||
{
|
||||
case JSON_PROXY:
|
||||
content.asProxy.target->writeTo(writer);
|
||||
break;
|
||||
void JsonNode::writeTo(JsonWriter &writer) {
|
||||
switch (type) {
|
||||
case JSON_PROXY:
|
||||
content.asProxy.target->writeTo(writer);
|
||||
break;
|
||||
|
||||
case JSON_ARRAY:
|
||||
writeArrayTo(writer);
|
||||
break;
|
||||
case JSON_ARRAY:
|
||||
writeArrayTo(writer);
|
||||
break;
|
||||
|
||||
case JSON_OBJECT:
|
||||
writeObjectTo(writer);
|
||||
break;
|
||||
case JSON_OBJECT:
|
||||
writeObjectTo(writer);
|
||||
break;
|
||||
|
||||
case JSON_STRING:
|
||||
writer.writeString(content.asString);
|
||||
break;
|
||||
case JSON_STRING:
|
||||
writer.writeString(content.asString);
|
||||
break;
|
||||
|
||||
case JSON_LONG:
|
||||
writer.writeInteger(content.asInteger);
|
||||
break;
|
||||
case JSON_LONG:
|
||||
writer.writeInteger(content.asInteger);
|
||||
break;
|
||||
|
||||
case JSON_BOOLEAN:
|
||||
writer.writeBoolean(content.asBoolean);
|
||||
break;
|
||||
case JSON_BOOLEAN:
|
||||
writer.writeBoolean(content.asBoolean);
|
||||
break;
|
||||
|
||||
default: // >= JSON_DOUBLE_0_DECIMALS
|
||||
writer.writeDouble(content.asDouble, type - JSON_DOUBLE_0_DECIMALS);
|
||||
break;
|
||||
}
|
||||
default: // >= JSON_DOUBLE_0_DECIMALS
|
||||
writer.writeDouble(content.asDouble, type - JSON_DOUBLE_0_DECIMALS);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void JsonNode::addChild(JsonNode* childToAdd)
|
||||
{
|
||||
if (type == JSON_PROXY)
|
||||
return content.asProxy.target->addChild(childToAdd);
|
||||
void JsonNode::addChild(JsonNode *childToAdd) {
|
||||
if (type == JSON_PROXY)
|
||||
return content.asProxy.target->addChild(childToAdd);
|
||||
|
||||
if (type != JSON_ARRAY && type != JSON_OBJECT)
|
||||
return;
|
||||
if (type != JSON_ARRAY && type != JSON_OBJECT)
|
||||
return;
|
||||
|
||||
JsonNode* lastChild = content.asContainer.child;
|
||||
JsonNode *lastChild = content.asContainer.child;
|
||||
|
||||
if (!lastChild)
|
||||
{
|
||||
content.asContainer.child = childToAdd;
|
||||
return;
|
||||
}
|
||||
if (!lastChild) {
|
||||
content.asContainer.child = childToAdd;
|
||||
return;
|
||||
}
|
||||
|
||||
while (lastChild->next)
|
||||
lastChild = lastChild->next;
|
||||
while (lastChild->next)
|
||||
lastChild = lastChild->next;
|
||||
|
||||
lastChild->next = childToAdd;
|
||||
lastChild->next = childToAdd;
|
||||
}
|
||||
|
||||
void JsonNode::removeChild(JsonNode* childToRemove)
|
||||
{
|
||||
if (type == JSON_PROXY)
|
||||
return content.asProxy.target->removeChild(childToRemove);
|
||||
void JsonNode::removeChild(JsonNode *childToRemove) {
|
||||
if (type == JSON_PROXY)
|
||||
return content.asProxy.target->removeChild(childToRemove);
|
||||
|
||||
if (type != JSON_ARRAY && type != JSON_OBJECT) return;
|
||||
if (type != JSON_ARRAY && type != JSON_OBJECT)
|
||||
return;
|
||||
|
||||
if (content.asContainer.child == childToRemove)
|
||||
{
|
||||
content.asContainer.child = childToRemove->next;
|
||||
return;
|
||||
}
|
||||
if (content.asContainer.child == childToRemove) {
|
||||
content.asContainer.child = childToRemove->next;
|
||||
return;
|
||||
}
|
||||
|
||||
for (JsonNode* child = content.asContainer.child; child; child = child->next)
|
||||
{
|
||||
if (child->next == childToRemove)
|
||||
child->next = childToRemove->next;
|
||||
}
|
||||
for (JsonNode *child = content.asContainer.child; child;
|
||||
child = child->next) {
|
||||
if (child->next == childToRemove)
|
||||
child->next = childToRemove->next;
|
||||
}
|
||||
}
|
||||
|
||||
void JsonNode::writeArrayTo(JsonWriter& writer)
|
||||
{
|
||||
JsonNode* child = content.asContainer.child;
|
||||
void JsonNode::writeArrayTo(JsonWriter &writer) {
|
||||
JsonNode *child = content.asContainer.child;
|
||||
|
||||
if (child)
|
||||
{
|
||||
writer.beginArray();
|
||||
if (child) {
|
||||
writer.beginArray();
|
||||
|
||||
for (;;)
|
||||
{
|
||||
child->writeTo(writer);
|
||||
for (;;) {
|
||||
child->writeTo(writer);
|
||||
|
||||
child = child->next;
|
||||
if (!child) break;
|
||||
|
||||
writer.writeComma();
|
||||
}
|
||||
child = child->next;
|
||||
if (!child)
|
||||
break;
|
||||
|
||||
writer.endArray();
|
||||
}
|
||||
else
|
||||
{
|
||||
writer.writeEmptyArray();
|
||||
writer.writeComma();
|
||||
}
|
||||
|
||||
writer.endArray();
|
||||
} else {
|
||||
writer.writeEmptyArray();
|
||||
}
|
||||
}
|
||||
|
||||
void JsonNode::writeObjectTo(JsonWriter& writer)
|
||||
{
|
||||
JsonNode* child = content.asContainer.child;
|
||||
void JsonNode::writeObjectTo(JsonWriter &writer) {
|
||||
JsonNode *child = content.asContainer.child;
|
||||
|
||||
if (child)
|
||||
{
|
||||
writer.beginObject();
|
||||
if (child) {
|
||||
writer.beginObject();
|
||||
|
||||
for (;;)
|
||||
{
|
||||
writer.writeString(child->content.asKeyValue.key);
|
||||
writer.writeColon();
|
||||
child->content.asKeyValue.value->writeTo(writer);
|
||||
for (;;) {
|
||||
writer.writeString(child->content.asKeyValue.key);
|
||||
writer.writeColon();
|
||||
child->content.asKeyValue.value->writeTo(writer);
|
||||
|
||||
child = child->next;
|
||||
if (!child) break;
|
||||
child = child->next;
|
||||
if (!child)
|
||||
break;
|
||||
|
||||
writer.writeComma();
|
||||
}
|
||||
|
||||
writer.endObject();
|
||||
}
|
||||
else
|
||||
{
|
||||
writer.writeEmptyObject();
|
||||
writer.writeComma();
|
||||
}
|
||||
|
||||
writer.endObject();
|
||||
} else {
|
||||
writer.writeEmptyObject();
|
||||
}
|
||||
}
|
||||
|
||||
void JsonNode::setAsProxyOfSelf()
|
||||
{
|
||||
JsonBuffer* buffer = content.asContainer.buffer;
|
||||
if (!buffer) return;
|
||||
|
||||
JsonNode* newNode = buffer->createNode();
|
||||
if (!newNode) return;
|
||||
void JsonNode::setAsProxyOfSelf() {
|
||||
JsonBuffer *buffer = content.asContainer.buffer;
|
||||
if (!buffer)
|
||||
return;
|
||||
|
||||
*newNode = *this;
|
||||
JsonNode *newNode = buffer->createNode();
|
||||
if (!newNode)
|
||||
return;
|
||||
|
||||
setAsProxyOf(newNode);
|
||||
*newNode = *this;
|
||||
|
||||
setAsProxyOf(newNode);
|
||||
}
|
||||
|
||||
void JsonNode::duplicate(JsonNode* other)
|
||||
{
|
||||
if (!other)
|
||||
{
|
||||
type = JSON_UNDEFINED;
|
||||
}
|
||||
else if (other->type == JSON_ARRAY || other->type==JSON_OBJECT)
|
||||
{
|
||||
other->setAsProxyOfSelf();
|
||||
setAsProxyOf(other->content.asProxy.target);
|
||||
}
|
||||
else
|
||||
{
|
||||
*this = *other;
|
||||
}
|
||||
void JsonNode::duplicate(JsonNode *other) {
|
||||
if (!other) {
|
||||
type = JSON_UNDEFINED;
|
||||
} else if (other->type == JSON_ARRAY || other->type == JSON_OBJECT) {
|
||||
other->setAsProxyOfSelf();
|
||||
setAsProxyOf(other->content.asProxy.target);
|
||||
} else {
|
||||
*this = *other;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+123
-136
@@ -8,176 +8,163 @@
|
||||
|
||||
using namespace ArduinoJson::Internals;
|
||||
|
||||
void JsonParser::skipSpaces()
|
||||
{
|
||||
while(isspace(*_ptr)) _ptr++;
|
||||
}
|
||||
|
||||
bool JsonParser::skip(char charToSkip)
|
||||
{
|
||||
skipSpaces();
|
||||
if (*_ptr != charToSkip) return false;
|
||||
void JsonParser::skipSpaces() {
|
||||
while (isspace(*_ptr))
|
||||
_ptr++;
|
||||
skipSpaces();
|
||||
return true;
|
||||
}
|
||||
|
||||
JsonNode* JsonParser::parseAnything()
|
||||
{
|
||||
skipSpaces();
|
||||
|
||||
switch(*_ptr)
|
||||
{
|
||||
case '[':
|
||||
return parseArray();
|
||||
|
||||
case 't':
|
||||
case 'f':
|
||||
return parseBoolean();
|
||||
|
||||
case '-':
|
||||
case '.':
|
||||
case '0':
|
||||
case '1':
|
||||
case '2':
|
||||
case '3':
|
||||
case '4':
|
||||
case '5':
|
||||
case '6':
|
||||
case '7':
|
||||
case '8':
|
||||
case '9':
|
||||
return parseNumber();
|
||||
|
||||
case 'n':
|
||||
return parseNull();
|
||||
|
||||
case '{':
|
||||
return parseObject();
|
||||
|
||||
case '\'':
|
||||
case '\"':
|
||||
return parseString();
|
||||
|
||||
default:
|
||||
return NULL; // invalid JSON
|
||||
}
|
||||
bool JsonParser::skip(char charToSkip) {
|
||||
skipSpaces();
|
||||
if (*_ptr != charToSkip)
|
||||
return false;
|
||||
_ptr++;
|
||||
skipSpaces();
|
||||
return true;
|
||||
}
|
||||
|
||||
JsonNode* JsonParser::parseArray()
|
||||
{
|
||||
JsonNode* node = _buffer->createArrayNode();
|
||||
JsonNode *JsonParser::parseAnything() {
|
||||
skipSpaces();
|
||||
|
||||
skip('[');
|
||||
switch (*_ptr) {
|
||||
case '[':
|
||||
return parseArray();
|
||||
|
||||
if (isEnd())
|
||||
return 0;
|
||||
case 't':
|
||||
case 'f':
|
||||
return parseBoolean();
|
||||
|
||||
case '-':
|
||||
case '.':
|
||||
case '0':
|
||||
case '1':
|
||||
case '2':
|
||||
case '3':
|
||||
case '4':
|
||||
case '5':
|
||||
case '6':
|
||||
case '7':
|
||||
case '8':
|
||||
case '9':
|
||||
return parseNumber();
|
||||
|
||||
case 'n':
|
||||
return parseNull();
|
||||
|
||||
case '{':
|
||||
return parseObject();
|
||||
|
||||
case '\'':
|
||||
case '\"':
|
||||
return parseString();
|
||||
|
||||
default:
|
||||
return NULL; // invalid JSON
|
||||
}
|
||||
}
|
||||
|
||||
JsonNode *JsonParser::parseArray() {
|
||||
JsonNode *node = _buffer->createArrayNode();
|
||||
|
||||
skip('[');
|
||||
|
||||
if (isEnd())
|
||||
return 0;
|
||||
|
||||
if (skip(']'))
|
||||
return node; // empty array
|
||||
|
||||
for (;;) {
|
||||
JsonNode *child = parseAnything();
|
||||
|
||||
if (!child)
|
||||
return 0; // child parsing failed
|
||||
|
||||
node->addChild(child);
|
||||
|
||||
if (skip(']'))
|
||||
return node; // empty array
|
||||
return node; // end of the array
|
||||
|
||||
for(;;)
|
||||
{
|
||||
JsonNode* child = parseAnything();
|
||||
|
||||
if (!child)
|
||||
return 0; // child parsing failed
|
||||
|
||||
node->addChild(child);
|
||||
|
||||
if (skip(']'))
|
||||
return node; // end of the array
|
||||
|
||||
if (!skip(','))
|
||||
return 0; // comma is missing
|
||||
}
|
||||
if (!skip(','))
|
||||
return 0; // comma is missing
|
||||
}
|
||||
}
|
||||
|
||||
JsonNode *JsonParser::parseBoolean()
|
||||
{
|
||||
bool value = *_ptr == 't';
|
||||
JsonNode *JsonParser::parseBoolean() {
|
||||
bool value = *_ptr == 't';
|
||||
|
||||
_ptr += value ? 4 : 5;
|
||||
// 4 = strlen("true")
|
||||
// 5 = strlen("false");
|
||||
_ptr += value ? 4 : 5;
|
||||
// 4 = strlen("true")
|
||||
// 5 = strlen("false");
|
||||
|
||||
return _buffer->createBoolNode(value);
|
||||
return _buffer->createBoolNode(value);
|
||||
}
|
||||
|
||||
JsonNode* JsonParser::parseNumber()
|
||||
{
|
||||
char* endOfLong;
|
||||
long longValue = strtol(_ptr, &endOfLong, 10);
|
||||
JsonNode *JsonParser::parseNumber() {
|
||||
char *endOfLong;
|
||||
long longValue = strtol(_ptr, &endOfLong, 10);
|
||||
|
||||
if (*endOfLong == '.') // stopped on a decimal separator
|
||||
{
|
||||
double value = strtod(_ptr, &_ptr);
|
||||
int decimals = _ptr - endOfLong - 1;
|
||||
return _buffer->createDoubleNode(value, decimals);
|
||||
}
|
||||
else
|
||||
{
|
||||
_ptr = endOfLong;
|
||||
return _buffer->createLongNode(longValue);
|
||||
}
|
||||
if (*endOfLong == '.') // stopped on a decimal separator
|
||||
{
|
||||
double value = strtod(_ptr, &_ptr);
|
||||
int decimals = _ptr - endOfLong - 1;
|
||||
return _buffer->createDoubleNode(value, decimals);
|
||||
} else {
|
||||
_ptr = endOfLong;
|
||||
return _buffer->createLongNode(longValue);
|
||||
}
|
||||
}
|
||||
|
||||
JsonNode* JsonParser::parseNull()
|
||||
{
|
||||
_ptr += 4; // strlen("null")
|
||||
JsonNode *JsonParser::parseNull() {
|
||||
_ptr += 4; // strlen("null")
|
||||
|
||||
return _buffer->createStringNode(0);
|
||||
return _buffer->createStringNode(0);
|
||||
}
|
||||
|
||||
JsonNode* JsonParser::parseObject()
|
||||
{
|
||||
JsonNode* node = _buffer->createObjectNode();
|
||||
JsonNode *JsonParser::parseObject() {
|
||||
JsonNode *node = _buffer->createObjectNode();
|
||||
|
||||
skip('{');
|
||||
skip('{');
|
||||
|
||||
if (isEnd())
|
||||
return 0; // premature ending
|
||||
if (isEnd())
|
||||
return 0; // premature ending
|
||||
|
||||
if (skip('}'))
|
||||
return node; // empty object
|
||||
|
||||
for (;;) {
|
||||
JsonNode *child = parseObjectKeyValue();
|
||||
|
||||
if (!child)
|
||||
return 0; // child parsing failed
|
||||
|
||||
node->addChild(child);
|
||||
|
||||
if (skip('}'))
|
||||
return node; // empty object
|
||||
return node; // end of the object
|
||||
|
||||
for(;;)
|
||||
{
|
||||
JsonNode* child = parseObjectKeyValue();
|
||||
|
||||
if (!child)
|
||||
return 0; // child parsing failed
|
||||
|
||||
node->addChild(child);
|
||||
|
||||
if (skip('}'))
|
||||
return node; // end of the object
|
||||
|
||||
if (!skip(','))
|
||||
return 0; // comma is missing
|
||||
}
|
||||
if (!skip(','))
|
||||
return 0; // comma is missing
|
||||
}
|
||||
}
|
||||
|
||||
JsonNode* JsonParser::parseObjectKeyValue()
|
||||
{
|
||||
const char* key = QuotedString::extractFrom(_ptr, &_ptr);
|
||||
JsonNode *JsonParser::parseObjectKeyValue() {
|
||||
const char *key = QuotedString::extractFrom(_ptr, &_ptr);
|
||||
|
||||
if (!key)
|
||||
return 0; // failed to extract key
|
||||
if (!key)
|
||||
return 0; // failed to extract key
|
||||
|
||||
if (!skip(':'))
|
||||
return 0; // colon is missing
|
||||
if (!skip(':'))
|
||||
return 0; // colon is missing
|
||||
|
||||
JsonNode* value = parseAnything();
|
||||
JsonNode *value = parseAnything();
|
||||
|
||||
if (!value)
|
||||
return 0; // value parsing failed
|
||||
if (!value)
|
||||
return 0; // value parsing failed
|
||||
|
||||
return _buffer->createObjectKeyValueNode(key, value);
|
||||
return _buffer->createObjectKeyValueNode(key, value);
|
||||
}
|
||||
|
||||
JsonNode* JsonParser::parseString()
|
||||
{
|
||||
const char* s = QuotedString::extractFrom(_ptr, &_ptr);
|
||||
return _buffer->createStringNode(s);
|
||||
JsonNode *JsonParser::parseString() {
|
||||
const char *s = QuotedString::extractFrom(_ptr, &_ptr);
|
||||
return _buffer->createStringNode(s);
|
||||
}
|
||||
|
||||
@@ -3,22 +3,16 @@
|
||||
|
||||
using namespace ArduinoJson::Internals;
|
||||
|
||||
void JsonWriter::writeString(char const* value)
|
||||
{
|
||||
_length += QuotedString::printTo(value, _sink);
|
||||
void JsonWriter::writeString(char const *value) {
|
||||
_length += QuotedString::printTo(value, _sink);
|
||||
}
|
||||
|
||||
void JsonWriter::writeInteger(long value)
|
||||
{
|
||||
_length += _sink->print(value);
|
||||
void JsonWriter::writeInteger(long value) { _length += _sink->print(value); }
|
||||
|
||||
void JsonWriter::writeBoolean(bool value) {
|
||||
_length += _sink->print(value ? "true" : "false");
|
||||
}
|
||||
|
||||
void JsonWriter::writeBoolean(bool value)
|
||||
{
|
||||
_length += _sink->print(value ? "true" : "false");
|
||||
}
|
||||
|
||||
void JsonWriter::writeDouble(double value, int decimals)
|
||||
{
|
||||
_length += _sink->print(value, decimals);
|
||||
void JsonWriter::writeDouble(double value, int decimals) {
|
||||
_length += _sink->print(value, decimals);
|
||||
}
|
||||
@@ -7,109 +7,95 @@
|
||||
|
||||
using namespace ArduinoJson::Internals;
|
||||
|
||||
static inline char getSpecialChar(char c)
|
||||
{
|
||||
// Optimized for code size on a 8-bit AVR
|
||||
static inline char getSpecialChar(char c) {
|
||||
// Optimized for code size on a 8-bit AVR
|
||||
|
||||
const char* p = "\"\"\\\\\bb\ff\nn\rr\tt\0";
|
||||
const char *p = "\"\"\\\\\bb\ff\nn\rr\tt\0";
|
||||
|
||||
while (p[0] && p[0] != c)
|
||||
{
|
||||
p += 2;
|
||||
}
|
||||
while (p[0] && p[0] != c) {
|
||||
p += 2;
|
||||
}
|
||||
|
||||
return p[1];
|
||||
return p[1];
|
||||
}
|
||||
|
||||
static inline size_t printCharTo(char c, Print* p)
|
||||
{
|
||||
char specialChar = getSpecialChar(c);
|
||||
static inline size_t printCharTo(char c, Print *p) {
|
||||
char specialChar = getSpecialChar(c);
|
||||
|
||||
return specialChar != 0
|
||||
? p->write('\\') + p->write(specialChar)
|
||||
: p->write(c);
|
||||
return specialChar != 0 ? p->write('\\') + p->write(specialChar)
|
||||
: p->write(c);
|
||||
}
|
||||
|
||||
size_t QuotedString::printTo(const char* s, Print* p)
|
||||
{
|
||||
if (!s) return p->print("null");
|
||||
|
||||
size_t n = p->write('\"');
|
||||
size_t QuotedString::printTo(const char *s, Print *p) {
|
||||
if (!s)
|
||||
return p->print("null");
|
||||
|
||||
while (*s)
|
||||
{
|
||||
n += printCharTo(*s++, p);
|
||||
}
|
||||
size_t n = p->write('\"');
|
||||
|
||||
return n + p->write('\"');
|
||||
while (*s) {
|
||||
n += printCharTo(*s++, p);
|
||||
}
|
||||
|
||||
return n + p->write('\"');
|
||||
}
|
||||
|
||||
static char unescapeChar(char c)
|
||||
{
|
||||
// Optimized for code size on a 8-bit AVR
|
||||
static char unescapeChar(char c) {
|
||||
// Optimized for code size on a 8-bit AVR
|
||||
|
||||
const char* p = "b\bf\fn\nr\rt\t";
|
||||
const char *p = "b\bf\fn\nr\rt\t";
|
||||
|
||||
for (;;)
|
||||
{
|
||||
if (p[0] == 0) return c;
|
||||
if (p[0] == c) return p[1];
|
||||
p += 2;
|
||||
}
|
||||
for (;;) {
|
||||
if (p[0] == 0)
|
||||
return c;
|
||||
if (p[0] == c)
|
||||
return p[1];
|
||||
p += 2;
|
||||
}
|
||||
}
|
||||
|
||||
static inline bool isQuote(char c)
|
||||
{
|
||||
return c == '\"' || c == '\'';
|
||||
}
|
||||
static inline bool isQuote(char c) { return c == '\"' || c == '\''; }
|
||||
|
||||
char* QuotedString::extractFrom(char* input, char** endPtr)
|
||||
{
|
||||
char firstChar = *input;
|
||||
char *QuotedString::extractFrom(char *input, char **endPtr) {
|
||||
char firstChar = *input;
|
||||
|
||||
if (!isQuote(firstChar))
|
||||
{
|
||||
// must start with a quote
|
||||
return 0;
|
||||
if (!isQuote(firstChar)) {
|
||||
// must start with a quote
|
||||
return 0;
|
||||
}
|
||||
|
||||
char stopChar = firstChar; // closing quote is the same as opening quote
|
||||
|
||||
char *startPtr = input + 1; // skip the quote
|
||||
char *readPtr = startPtr;
|
||||
char *writePtr = startPtr;
|
||||
char c;
|
||||
|
||||
for (;;) {
|
||||
c = *readPtr++;
|
||||
|
||||
if (c == 0) {
|
||||
// premature ending
|
||||
return 0;
|
||||
}
|
||||
|
||||
char stopChar = firstChar; // closing quote is the same as opening quote
|
||||
|
||||
char* startPtr = input + 1; // skip the quote
|
||||
char* readPtr = startPtr;
|
||||
char* writePtr = startPtr;
|
||||
char c;
|
||||
|
||||
for (;;)
|
||||
{
|
||||
c = *readPtr++;
|
||||
|
||||
if (c == 0)
|
||||
{
|
||||
// premature ending
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (c == stopChar)
|
||||
{
|
||||
// closing quote
|
||||
break;
|
||||
}
|
||||
|
||||
if (c == '\\')
|
||||
{
|
||||
// replace char
|
||||
c = unescapeChar(*readPtr++);
|
||||
}
|
||||
|
||||
*writePtr++ = c;
|
||||
if (c == stopChar) {
|
||||
// closing quote
|
||||
break;
|
||||
}
|
||||
|
||||
// end the string here
|
||||
*writePtr = 0;
|
||||
if (c == '\\') {
|
||||
// replace char
|
||||
c = unescapeChar(*readPtr++);
|
||||
}
|
||||
|
||||
// update end ptr
|
||||
*endPtr = readPtr;
|
||||
*writePtr++ = c;
|
||||
}
|
||||
|
||||
return startPtr;
|
||||
// end the string here
|
||||
*writePtr = 0;
|
||||
|
||||
// update end ptr
|
||||
*endPtr = readPtr;
|
||||
|
||||
return startPtr;
|
||||
}
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
using namespace ArduinoJson::Internals;
|
||||
|
||||
size_t StringBuilder::write(uint8_t c)
|
||||
{
|
||||
if (length >= capacity) return 0;
|
||||
size_t StringBuilder::write(uint8_t c) {
|
||||
if (length >= capacity)
|
||||
return 0;
|
||||
|
||||
buffer[length++] = c;
|
||||
buffer[length] = 0;
|
||||
return 1;
|
||||
buffer[length++] = c;
|
||||
buffer[length] = 0;
|
||||
return 1;
|
||||
}
|
||||
Reference in New Issue
Block a user