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:51:56 +02:00
parent 151fc52c1c
commit fafae8181b
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
JsonGenerator/PrettyPrintDecorator.cpp
View File

@ -49,8 +49,7 @@ size_t PrettyPrintDecorator::handleMarkupChar(uint8_t c)
size_t PrettyPrintDecorator::writeValueChar(uint8_t c) size_t PrettyPrintDecorator::writeValueChar(uint8_t c)
{ {
bool inEmptyBlock = previousChar == '{' || previousChar == '['; return inEmptyBlock() ? writeLineBreak() + sink.write(c) : sink.write(c);
return inEmptyBlock ? writeln() + sink.write(c) : sink.write(c);
} }
size_t PrettyPrintDecorator::writeColumn() size_t PrettyPrintDecorator::writeColumn()
@ -60,14 +59,12 @@ size_t PrettyPrintDecorator::writeColumn()
size_t PrettyPrintDecorator::writeComma() size_t PrettyPrintDecorator::writeComma()
{ {
return sink.write(',') + writeln(); return sink.write(',') + writeLineBreak();
} }
size_t PrettyPrintDecorator::writeOpening(uint8_t c) size_t PrettyPrintDecorator::writeOpening(uint8_t c)
{ {
bool inEmptyBlock = previousChar == '{' || previousChar == '['; size_t n = inEmptyBlock() ? writeLineBreak() + sink.write(c) : sink.write(c);
size_t n = inEmptyBlock ? writeln() + sink.write(c) : sink.write(c);
indent++; indent++;
@ -76,9 +73,7 @@ size_t PrettyPrintDecorator::writeOpening(uint8_t c)
size_t PrettyPrintDecorator::writeQuote() size_t PrettyPrintDecorator::writeQuote()
{ {
bool inEmptyBlock = previousChar == '{' || previousChar == '['; size_t n = inEmptyBlock() ? writeLineBreak() + sink.write('"') : sink.write('"');
size_t n = inEmptyBlock ? writeln() + sink.write('"') : sink.write('"');
inString = true; inString = true;
@ -87,14 +82,12 @@ size_t PrettyPrintDecorator::writeQuote()
size_t PrettyPrintDecorator::writeClosing(uint8_t c) size_t PrettyPrintDecorator::writeClosing(uint8_t c)
{ {
bool inEmptyBlock = previousChar == '{' || previousChar == '[';
indent--; indent--;
return inEmptyBlock ? sink.write(c) : writeln() + sink.write(c); return inEmptyBlock() ? sink.write(c) : writeLineBreak() + sink.write(c);
} }
size_t PrettyPrintDecorator::writeln() size_t PrettyPrintDecorator::writeLineBreak()
{ {
size_t n = sink.write('\n'); size_t n = sink.write('\n');

8
JsonGenerator/PrettyPrintDecorator.h
View File

@ -27,7 +27,10 @@ private:
Print& sink; Print& sink;
bool inString; bool inString;
size_t writeln(); bool inEmptyBlock()
{
return previousChar == '{' || previousChar == '[';
}
size_t handleStringChar(uint8_t); size_t handleStringChar(uint8_t);
size_t handleMarkupChar(uint8_t); size_t handleMarkupChar(uint8_t);
@ -35,8 +38,9 @@ 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 writeValueChar(uint8_t); size_t writeLineBreak();
size_t writeOpening(uint8_t); size_t writeOpening(uint8_t);
size_t writeQuote(); size_t writeQuote();
size_t writeValueChar(uint8_t);
}; };