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-26 09:49:59 +02:00
parent 6539c6982c
commit e48ea94789
2 changed files with 16 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
JsonGenerator/PrettyPrintDecorator.cpp
View File

@ -20,7 +20,7 @@ size_t PrettyPrintDecorator::handleStringChar(uint8_t c)
if (isQuote) inString = false;
return writeChar(c);
return sink.write(c);
}
size_t PrettyPrintDecorator::handleMarkupChar(uint8_t c)
@ -51,44 +51,33 @@ size_t PrettyPrintDecorator::handleMarkupChar(uint8_t c)
size_t PrettyPrintDecorator::handleBlockOpen(uint8_t c)
{
return indentIfNeeded() + writeChar(c);
return indentIfNeeded() + sink.write(c);
}
size_t PrettyPrintDecorator::handleBlockClose(uint8_t c)
{
if (inEmptyBlock())
{
return writeChar(c);
}
else
{
sink.unindent();
return breakThenWrite(c);
}
return unindentIfNeeded() + sink.write(c);
}
size_t PrettyPrintDecorator::handleColumn()
{
return writeChar(':') + writeChar(' ');
return sink.write(':') + sink.write(' ');
}
size_t PrettyPrintDecorator::handleComma()
{
return writeThenBreak(',');
return sink.write(',') + sink.println();
}
size_t PrettyPrintDecorator::handleQuoteOpen()
{
size_t n = indentIfNeeded() + writeChar('"');
inString = true;
return n;
return indentIfNeeded() + sink.write('"');
}
size_t PrettyPrintDecorator::handleNormalChar(uint8_t c)
{
return indentIfNeeded() + writeChar(c);
return indentIfNeeded() + sink.write(c);
}
size_t PrettyPrintDecorator::indentIfNeeded()
@ -97,4 +86,12 @@ size_t PrettyPrintDecorator::indentIfNeeded()
sink.indent();
return sink.println();
}
size_t PrettyPrintDecorator::unindentIfNeeded()
{
if (inEmptyBlock()) return 0;
sink.unindent();
return sink.println();
}

16
JsonGenerator/PrettyPrintDecorator.h
View File

@ -45,21 +45,7 @@ namespace ArduinoJson
size_t handleQuoteOpen();
size_t handleNormalChar(uint8_t);
size_t indentIfNeeded();
size_t breakThenWrite(uint8_t c)
{
return sink.println() + writeChar(c);
}
size_t writeThenBreak(uint8_t c)
{
return writeChar(c) + sink.println();
}
size_t writeChar(uint8_t c)
{
return sink.write(c);
}
size_t unindentIfNeeded();
};
}
}