generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 18:42:41 +01:00
Code Issues Projects Releases Wiki Activity

JSON fixes/refactoring

Browse Source
This commit is contained in:
Aleksandar Fabijanic
2013-05-20 23:36:58 -05:00
parent 9b6db2e75d
commit 41a07c15bf
6 changed files with 225 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
JSON/src/PrintHandler.cpp
View File

@@ -46,7 +46,8 @@ namespace JSON {
PrintHandler::PrintHandler(unsigned indent):
_out(std::cout),
_indent(indent),
_array(false)
_array(false),
_value(false)
{
}
@@ -54,7 +55,8 @@ PrintHandler::PrintHandler(unsigned indent):
PrintHandler::PrintHandler(std::ostream& out, unsigned indent):
_out(out),
_indent(indent),
_array(false)
_array(false),
_value(false)
{
}
@@ -107,6 +109,7 @@ void PrintHandler::startArray()
_out << '[' << endLine();
_tab.append(indent(), ' ');
_array = true;
_value = false;
}
@@ -115,11 +118,17 @@ void PrintHandler::endArray()
_tab.erase(_tab.length() - indent());
_out << endLine() << _tab << ']';
_array = false;
_value = false;
}
void PrintHandler::key(const std::string& k)
{
if (_value)
{
comma();
_value = false;
}
_out << _tab << '"' << k << '"';
if (!printFlat()) _out << ' ';
_out << ':';
@@ -129,60 +138,68 @@ void PrintHandler::key(const std::string& k)
void PrintHandler::null()
{
if (_array) _out << _tab;
arrayValue();
_out << "null";
_value = true;
}
void PrintHandler::value(int v)
{
if (_array) _out << _tab;
arrayValue();
_out << v;
_value = true;
}
void PrintHandler::value(unsigned v)
{
if (_array) _out << _tab;
arrayValue();
_out << v;
_value = true;
}
#if defined(POCO_HAVE_INT64)
void PrintHandler::value(Int64 v)
{
if (_array) _out << _tab;
arrayValue();
_out << v;
_value = true;
}
void PrintHandler::value(UInt64 v)
{
if (_array) _out << _tab;
arrayValue();
_out << v;
_value = true;
}
#endif
void PrintHandler::value(const std::string& value)
{
if (_array) _out << _tab;
arrayValue();
Stringifier::formatString(value, _out);
_value = true;
}
void PrintHandler::value(double d)
{
if (_array) _out << _tab;
arrayValue();
_out << d;
_value = true;
}
void PrintHandler::value(bool b)
{
if (_array) _out << _tab;
arrayValue();
_out << b;
_value = true;
}
@@ -192,4 +209,12 @@ void PrintHandler::comma()
}
void PrintHandler::arrayValue()
{
if (_array)
{
if (_value) comma();
_out << _tab;
}
}
} } // namespace Poco::JSON