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

Extracted class IndentedPrintDecorator from PrettyPrintDecorator

Browse Source
This commit is contained in:
Benoit Blanchon
2014-08-26 09:28:41 +02:00
parent d877d77b63
commit 6539c6982c
12 changed files with 128 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
JsonGenerator/PrettyPrintDecorator.cpp
View File

@ -51,18 +51,20 @@ size_t PrettyPrintDecorator::handleMarkupChar(uint8_t c)
size_t PrettyPrintDecorator::handleBlockOpen(uint8_t c)
{
size_t n = inEmptyBlock() ? breakThenWrite(c) : writeChar(c);
indent++;
return n;
return indentIfNeeded() + writeChar(c);
}
size_t PrettyPrintDecorator::handleBlockClose(uint8_t c)
{
indent--;
return inEmptyBlock() ? writeChar(c) : breakThenWrite(c);
{
if (inEmptyBlock())
{
return writeChar(c);
}
else
{
sink.unindent();
return breakThenWrite(c);
}
}
size_t PrettyPrintDecorator::handleColumn()
@ -77,7 +79,7 @@ size_t PrettyPrintDecorator::handleComma()
size_t PrettyPrintDecorator::handleQuoteOpen()
{
size_t n = inEmptyBlock() ? breakThenWrite('"') : writeChar('"');
size_t n = indentIfNeeded() + writeChar('"');
inString = true;
@ -86,15 +88,13 @@ size_t PrettyPrintDecorator::handleQuoteOpen()
size_t PrettyPrintDecorator::handleNormalChar(uint8_t c)
{
return inEmptyBlock() ? breakThenWrite(c) : writeChar(c);
return indentIfNeeded() + writeChar(c);
}
size_t PrettyPrintDecorator::breakAndIndent()
size_t PrettyPrintDecorator::indentIfNeeded()
{
size_t n = writeChar('\n');
if (!inEmptyBlock()) return 0;
for (int i = 0; i < indent; i++)
n += writeChar(' ');
return n;
sink.indent();
return sink.println();
}