feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Refactoring...

Browse Source
This commit is contained in:
Benoit Blanchon
2014-08-25 12:48:38 +02:00
parent ea79340dc7
commit 151fc52c1c
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
JsonGenerator/PrettyPrintDecorator.cpp
View File

@ -16,7 +16,9 @@ size_t PrettyPrintDecorator::handleStringChar(uint8_t c)
{ {
bool isQuote = c == '"' && previousChar != '\\'; bool isQuote = c == '"' && previousChar != '\\';
return isQuote ? writeQuote() : writeNormalChar(c); if (isQuote) inString = false;
return sink.write(c);
} }
size_t PrettyPrintDecorator::handleMarkupChar(uint8_t c) size_t PrettyPrintDecorator::handleMarkupChar(uint8_t c)
@ -41,14 +43,13 @@ size_t PrettyPrintDecorator::handleMarkupChar(uint8_t c)
return writeQuote(); return writeQuote();
default: default:
return writeNormalChar(c); // <- should not happen anyway return writeValueChar(c);
} }
} }
size_t PrettyPrintDecorator::writeNormalChar(uint8_t c) size_t PrettyPrintDecorator::writeValueChar(uint8_t c)
{ {
bool inEmptyBlock = !inString && (previousChar == '{' || previousChar == '['); bool inEmptyBlock = previousChar == '{' || previousChar == '[';
return inEmptyBlock ? writeln() + sink.write(c) : sink.write(c); return inEmptyBlock ? writeln() + sink.write(c) : sink.write(c);
} }
@ -75,8 +76,12 @@ size_t PrettyPrintDecorator::writeOpening(uint8_t c)
size_t PrettyPrintDecorator::writeQuote() size_t PrettyPrintDecorator::writeQuote()
{ {
size_t n = writeNormalChar('"'); bool inEmptyBlock = previousChar == '{' || previousChar == '[';
inString = !inString;
size_t n = inEmptyBlock ? writeln() + sink.write('"') : sink.write('"');
inString = true;
return n; return n;
} }

2
JsonGenerator/PrettyPrintDecorator.h
View File

@ -35,7 +35,7 @@ private:
size_t writeClosing(uint8_t); size_t writeClosing(uint8_t);
size_t writeColumn(); size_t writeColumn();
size_t writeComma(); size_t writeComma();
size_t writeNormalChar(uint8_t); size_t writeValueChar(uint8_t);
size_t writeOpening(uint8_t); size_t writeOpening(uint8_t);
size_t writeQuote(); size_t writeQuote();
}; };