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 11:46:42 +02:00
parent 2ddf8f1619
commit 8465cc0c83
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
JsonGenerator/PrettyPrintDecorator.cpp
View File

@ -7,13 +7,13 @@
size_t PrettyPrintDecorator::write(uint8_t c) size_t PrettyPrintDecorator::write(uint8_t c)
{ {
size_t n;
switch (c) switch (c)
{ {
case '{': case '{':
case '[': case '[':
size_t n;
if (previousChar == '{' || previousChar == '[') if (previousChar == '{' || previousChar == '[')
{ {
n = writeln() + sink.write(c); n = writeln() + sink.write(c);
@ -23,9 +23,8 @@ size_t PrettyPrintDecorator::write(uint8_t c)
n = sink.write(c); n = sink.write(c);
} }
previousChar = c;
indent++; indent++;
return n; break;
case '}': case '}':
case ']': case ']':
@ -33,56 +32,59 @@ size_t PrettyPrintDecorator::write(uint8_t c)
if (previousChar == '{' || previousChar == '[') if (previousChar == '{' || previousChar == '[')
{ {
previousChar = c; n = sink.write(c);
return sink.write(c);
} }
else else
{ {
previousChar = c; n = writeln() + sink.write(c);
return writeln() + sink.write(c);
} }
break;
case ',': case ',':
previousChar = c;
if (isInAString) if (isInAString)
{ {
return sink.write(c); n = sink.write(c);
} }
else else
{ {
return sink.write(c) + writeln(); n = sink.write(c) + writeln();
} }
break;
case ':': case ':':
previousChar = c;
if (isInAString) if (isInAString)
{ {
return sink.write(c); n = sink.write(c);
} }
else else
{ {
return sink.write(c) + sink.write(' '); n = sink.write(c) + sink.write(' ');
} }
break;
case '\"': case '\"':
if (previousChar != '\\') if (previousChar != '\\')
{ {
isInAString = !isInAString; isInAString = !isInAString;
} }
// no break;
default: default:
if (previousChar == '{' || previousChar == '[') if (previousChar == '{' || previousChar == '[')
{ {
previousChar = c; n = writeln() + sink.write(c);
return writeln() + sink.write(c);
} }
else else
{ {
previousChar = c; n = sink.write(c);
return sink.write(c);
} }
break;
} }
previousChar = c;
return n;
} }
size_t PrettyPrintDecorator::writeln() size_t PrettyPrintDecorator::writeln()