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

Renamed the inner types

Browse Source
This commit is contained in:
Benoît Blanchon
2014-06-25 13:33:19 +02:00
parent aa6cf308db
commit 5e4c4a4bdc
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
JsonGeneratorTests/JsonArray.h
View File

@ -19,28 +19,28 @@ public:
void add(const char* value) void add(const char* value)
{ {
JsonObjectValue v; ObjectValue v;
v.string = value; v.string = value;
addItem(JSON_STRING, v); addItem(JSON_STRING, v);
} }
void add(double value) void add(double value)
{ {
JsonObjectValue v; ObjectValue v;
v.number = value; v.number = value;
addItem(JSON_NUMBER, v); addItem(JSON_NUMBER, v);
} }
void add(bool value) void add(bool value)
{ {
JsonObjectValue v; ObjectValue v;
v.boolean = value; v.boolean = value;
addItem(JSON_BOOLEAN, v); addItem(JSON_BOOLEAN, v);
} }
void add(JsonObjectBase& value) void add(JsonObjectBase& value)
{ {
JsonObjectValue v; ObjectValue v;
v.object = &value; v.object = &value;
addItem(JSON_OBJECT, v); addItem(JSON_OBJECT, v);
} }
@ -52,7 +52,7 @@ public:
} }
private: private:
JsonObject items[N]; ObjectContainer items[N];
int itemCount; int itemCount;
virtual void writeTo(StringBuilder& sb) virtual void writeTo(StringBuilder& sb)
@ -68,7 +68,7 @@ private:
sb.append("]"); sb.append("]");
} }
void addItem(JsonObjectType type, JsonObjectValue value) void addItem(ObjectType type, ObjectValue value)
{ {
if (itemCount >= N) return; if (itemCount >= N) return;

12
JsonGeneratorTests/JsonObjectBase.h
View File

@ -16,7 +16,7 @@ protected:
virtual void writeTo(StringBuilder& sb) = 0; virtual void writeTo(StringBuilder& sb) = 0;
enum JsonObjectType enum ObjectType
{ {
JSON_STRING, JSON_STRING,
JSON_NUMBER, JSON_NUMBER,
@ -24,7 +24,7 @@ protected:
JSON_OBJECT, JSON_OBJECT,
}; };
union JsonObjectValue union ObjectValue
{ {
const char* string; const char* string;
double number; double number;
@ -32,13 +32,13 @@ protected:
JsonObjectBase* object; JsonObjectBase* object;
}; };
struct JsonObject struct ObjectContainer
{ {
JsonObjectType type; ObjectType type;
JsonObjectValue value; ObjectValue value;
}; };
void writeObjectTo(JsonObject& obj, StringBuilder& sb) void writeObjectTo(ObjectContainer& obj, StringBuilder& sb)
{ {
switch (obj.type) switch (obj.type)
{ {