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

Moved PrettyPrintDecorator into the namespace ArduinoJson::Generator

Browse Source
This commit is contained in:
Benoit Blanchon
2014-08-25 13:19:07 +02:00
parent 1df6cde026
commit d877d77b63
5 changed files with 59 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JsonGenerator/PrettyPrintDecorator.cpp
View File

@ -5,6 +5,8 @@
#include "PrettyPrintDecorator.h"
using namespace ArduinoJson::Generator;
size_t PrettyPrintDecorator::write(uint8_t c)
{
size_t n = inString ? handleStringChar(c) : handleMarkupChar(c);

103
JsonGenerator/PrettyPrintDecorator.h
View File

@ -8,55 +8,60 @@
#include "Print.h"
class PrettyPrintDecorator : public Print
namespace ArduinoJson
{
public:
PrettyPrintDecorator(Print& p)
: indent(0), sink(p)
namespace Generator
{
previousChar = 0;
inString = false;
class PrettyPrintDecorator : public Print
{
public:
PrettyPrintDecorator(Print& p)
: indent(0), sink(p)
{
previousChar = 0;
inString = false;
}
virtual size_t write(uint8_t);
private:
int indent;
uint8_t previousChar;
Print& sink;
bool inString;
bool inEmptyBlock()
{
return previousChar == '{' || previousChar == '[';
}
size_t handleStringChar(uint8_t);
size_t handleMarkupChar(uint8_t);
size_t handleBlockClose(uint8_t);
size_t handleBlockOpen(uint8_t);
size_t handleColumn();
size_t handleComma();
size_t handleQuoteOpen();
size_t handleNormalChar(uint8_t);
size_t breakAndIndent();
size_t breakThenWrite(uint8_t c)
{
return breakAndIndent() + writeChar(c);
}
size_t writeThenBreak(uint8_t c)
{
return writeChar(c) + breakAndIndent();
}
size_t writeChar(uint8_t c)
{
return sink.write(c);
}
};
}
virtual size_t write(uint8_t);
private:
int indent;
uint8_t previousChar;
Print& sink;
bool inString;
bool inEmptyBlock()
{
return previousChar == '{' || previousChar == '[';
}
size_t handleStringChar(uint8_t);
size_t handleMarkupChar(uint8_t);
size_t handleBlockClose(uint8_t);
size_t handleBlockOpen(uint8_t);
size_t handleColumn();
size_t handleComma();
size_t handleQuoteOpen();
size_t handleNormalChar(uint8_t);
size_t breakAndIndent();
size_t breakThenWrite(uint8_t c)
{
return breakAndIndent() + writeChar(c);
}
size_t writeThenBreak(uint8_t c)
{
return writeChar(c) + breakAndIndent();
}
size_t writeChar(uint8_t c)
{
return sink.write(c);
}
};
}

1
JsonGeneratorTests/PrettyPrint_Array_Tests.cpp
View File

@ -8,6 +8,7 @@
#include "StringBuilder.h"
using namespace ArduinoJson::Internals;
using namespace ArduinoJson::Generator;
using namespace Microsoft::VisualStudio::CppUnitTestFramework;
namespace JsonGeneratorTests

1
JsonGeneratorTests/PrettyPrint_Object_Tests.cpp
View File

@ -8,6 +8,7 @@
#include "StringBuilder.h"
using namespace ArduinoJson::Internals;
using namespace ArduinoJson::Generator;
using namespace Microsoft::VisualStudio::CppUnitTestFramework;
namespace JsonGeneratorTests

1
JsonGeneratorTests/PrettyPrint_String_Tests.cpp
View File

@ -8,6 +8,7 @@
#include "StringBuilder.h"
using namespace ArduinoJson::Internals;
using namespace ArduinoJson::Generator;
using namespace Microsoft::VisualStudio::CppUnitTestFramework;
namespace JsonGeneratorTests