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

Renamed union members

Browse Source
This commit is contained in:
Benoît Blanchon
2014-07-02 12:51:27 +02:00
parent e8831c28d9
commit 621068260d
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
JsonGenerator/JsonValue.cpp
View File

@ -9,29 +9,29 @@
size_t JsonValue::printBooleanTo(Print& p) const
{
return p.write(content.boolean ? "true" : "false");
return p.write(content.asBool ? "true" : "false");
}
size_t JsonValue::printNumberTo(Print& p) const
{
char tmp[16];
sprintf(tmp, "%lg", content.number);
sprintf(tmp, "%lg", content.asDouble);
return p.write(tmp);
}
size_t JsonValue::printObjectTo(Print& p) const
{
if (content.object)
return ((Printable*) content.object)->printTo(p);
if (content.asPrintable)
return ((Printable*) content.asPrintable)->printTo(p);
else
return p.write("null");
}
size_t JsonValue::printStringTo(Print& p) const
{
const char* s = content.string;
const char* s = content.asString;
if (!s)
{

16
JsonGenerator/JsonValue.h
View File

@ -19,25 +19,25 @@ public:
JsonValue(const char* value)
: implementation(&JsonValue::printStringTo)
{
content.string = value;
content.asString = value;
}
JsonValue(double value)
: implementation(&JsonValue::printNumberTo)
{
content.number = value;
content.asDouble = value;
}
JsonValue(bool value)
: implementation(&JsonValue::printBooleanTo)
{
content.boolean = value;
content.asBool = value;
}
JsonValue(Printable& value)
: implementation(&JsonValue::printObjectTo)
{
content.object = &value;
content.asPrintable = &value;
}
virtual size_t printTo(Print& p) const
@ -50,10 +50,10 @@ private:
union Content
{
bool boolean;
double number;
Printable* object;
const char* string;
bool asBool;
double asDouble;
Printable* asPrintable;
const char* asString;
};
Content content;