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

Renamed PrettyPrintDecorator into JsonPrettyPrint

Browse Source
This commit is contained in:
Benoit Blanchon
2014-08-26 10:08:54 +02:00
parent 23e61cc0f7
commit 3ae7327687
8 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
JsonGenerator/JsonGenerator.vcxproj
View File

@ -13,7 +13,7 @@
<ItemGroup>
<ClInclude Include="EscapedString.h" />
<ClInclude Include="IndentedPrint.h" />
<ClInclude Include="PrettyPrintDecorator.h" />
<ClInclude Include="JsonPrettyPrint.h" />
<ClInclude Include="JsonArray.h" />
<ClInclude Include="JsonArrayBase.h" />
<ClInclude Include="JsonObject.h" />
@ -27,7 +27,7 @@
<ItemGroup>
<ClCompile Include="EscapedString.cpp" />
<ClCompile Include="IndentedPrint.cpp" />
<ClCompile Include="PrettyPrintDecorator.cpp" />
<ClCompile Include="JsonPrettyPrint.cpp" />
<ClCompile Include="JsonArrayBase.cpp" />
<ClCompile Include="JsonObjectBase.cpp" />
<ClCompile Include="JsonValue.cpp" />

8
JsonGenerator/JsonGenerator.vcxproj.filters
View File

@ -45,10 +45,10 @@
<ClInclude Include="JsonObject.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PrettyPrintDecorator.h">
<ClInclude Include="IndentedPrint.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="IndentedPrint.h">
<ClInclude Include="JsonPrettyPrint.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
@ -71,10 +71,10 @@
<ClCompile Include="JsonObjectBase.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PrettyPrintDecorator.cpp">
<ClCompile Include="IndentedPrint.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="IndentedPrint.cpp">
<ClCompile Include="JsonPrettyPrint.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>

24
JsonGenerator/PrettyPrintDecorator.cpp → JsonGenerator/JsonPrettyPrint.cpp
View File

@ -3,18 +3,18 @@
* Benoit Blanchon 2014 - MIT License
*/
#include "PrettyPrintDecorator.h"
#include "JsonPrettyPrint.h"
using namespace ArduinoJson::Generator;
size_t PrettyPrintDecorator::write(uint8_t c)
size_t JsonPrettyPrint::write(uint8_t c)
{
size_t n = inString ? handleStringChar(c) : handleMarkupChar(c);
previousChar = c;
return n;
}
size_t PrettyPrintDecorator::handleStringChar(uint8_t c)
size_t JsonPrettyPrint::handleStringChar(uint8_t c)
{
bool isQuote = c == '"' && previousChar != '\\';
@ -23,7 +23,7 @@ size_t PrettyPrintDecorator::handleStringChar(uint8_t c)
return sink.write(c);
}
size_t PrettyPrintDecorator::handleMarkupChar(uint8_t c)
size_t JsonPrettyPrint::handleMarkupChar(uint8_t c)
{
switch (c)
{
@ -49,38 +49,38 @@ size_t PrettyPrintDecorator::handleMarkupChar(uint8_t c)
}
}
size_t PrettyPrintDecorator::handleBlockOpen(uint8_t c)
size_t JsonPrettyPrint::handleBlockOpen(uint8_t c)
{
return indentIfNeeded() + sink.write(c);
}
size_t PrettyPrintDecorator::handleBlockClose(uint8_t c)
size_t JsonPrettyPrint::handleBlockClose(uint8_t c)
{
return unindentIfNeeded() + sink.write(c);
}
size_t PrettyPrintDecorator::handleColumn()
size_t JsonPrettyPrint::handleColumn()
{
return sink.write(':') + sink.write(' ');
}
size_t PrettyPrintDecorator::handleComma()
size_t JsonPrettyPrint::handleComma()
{
return sink.write(',') + sink.println();
}
size_t PrettyPrintDecorator::handleQuoteOpen()
size_t JsonPrettyPrint::handleQuoteOpen()
{
inString = true;
return indentIfNeeded() + sink.write('"');
}
size_t PrettyPrintDecorator::handleNormalChar(uint8_t c)
size_t JsonPrettyPrint::handleNormalChar(uint8_t c)
{
return indentIfNeeded() + sink.write(c);
}
size_t PrettyPrintDecorator::indentIfNeeded()
size_t JsonPrettyPrint::indentIfNeeded()
{
if (!inEmptyBlock()) return 0;
@ -88,7 +88,7 @@ size_t PrettyPrintDecorator::indentIfNeeded()
return sink.println();
}
size_t PrettyPrintDecorator::unindentIfNeeded()
size_t JsonPrettyPrint::unindentIfNeeded()
{
if (inEmptyBlock()) return 0;

4
JsonGenerator/PrettyPrintDecorator.h → JsonGenerator/JsonPrettyPrint.h
View File

@ -12,11 +12,11 @@ namespace ArduinoJson
{
namespace Generator
{
class PrettyPrintDecorator : public Print
class JsonPrettyPrint : public Print
{
public:
PrettyPrintDecorator(IndentedPrint& p)
JsonPrettyPrint(IndentedPrint& p)
: sink(p)
{
previousChar = 0;

4
JsonGenerator/JsonPrintable.h
View File

@ -8,7 +8,7 @@
#include "JsonValue.h"
#include "Print.h"
#include "Printable.h"
#include "PrettyPrintDecorator.h"
#include "JsonPrettyPrint.h"
namespace ArduinoJson
{
@ -28,7 +28,7 @@ namespace ArduinoJson
size_t prettyPrintTo(IndentedPrint& p) const
{
PrettyPrintDecorator decorator(p);
JsonPrettyPrint decorator(p);
return printTo(decorator);
}

4
JsonGeneratorTests/PrettyPrint_Array_Tests.cpp
View File

@ -4,7 +4,7 @@
*/
#include "CppUnitTest.h"
#include "PrettyPrintDecorator.h"
#include "JsonPrettyPrint.h"
#include "StringBuilder.h"
using namespace ArduinoJson::Internals;
@ -77,7 +77,7 @@ namespace JsonGeneratorTests
{
StringBuilder sb(buffer, sizeof(buffer));
IndentedPrint indentedPrint(sb);
PrettyPrintDecorator decorator(indentedPrint);
JsonPrettyPrint decorator(indentedPrint);
returnValue = decorator.print(input);
}

4
JsonGeneratorTests/PrettyPrint_Object_Tests.cpp
View File

@ -4,7 +4,7 @@
*/
#include "CppUnitTest.h"
#include "PrettyPrintDecorator.h"
#include "JsonPrettyPrint.h"
#include "StringBuilder.h"
using namespace ArduinoJson::Internals;
@ -75,7 +75,7 @@ namespace JsonGeneratorTests
{
StringBuilder sb(buffer, sizeof(buffer));
IndentedPrint indentedPrint(sb);
PrettyPrintDecorator decorator(indentedPrint);
JsonPrettyPrint decorator(indentedPrint);
returnValue = decorator.print(input);
}

4
JsonGeneratorTests/PrettyPrint_String_Tests.cpp
View File

@ -4,7 +4,7 @@
*/
#include "CppUnitTest.h"
#include "PrettyPrintDecorator.h"
#include "JsonPrettyPrint.h"
#include "StringBuilder.h"
using namespace ArduinoJson::Internals;
@ -62,7 +62,7 @@ namespace JsonGeneratorTests
{
StringBuilder sb(buffer, sizeof(buffer));
IndentedPrint indentedPrint(sb);
PrettyPrintDecorator decorator(indentedPrint);
JsonPrettyPrint decorator(indentedPrint);
returnValue = decorator.print(input);
}