bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-18 13:02:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Extracted base class JsonObjectBase

Browse Source
This commit is contained in:
Benoît Blanchon
2014-06-25 13:23:08 +02:00
parent d57234e92c
commit 4c387e9062
5 changed files with 74 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
JsonGeneratorTests/JsonArray.h
View File

@ -5,33 +5,12 @@
#pragma once
#include "JsonObjectBase.h"
#include "StringBuilder.h"
enum JsonObjectType
{
JSON_STRING,
JSON_NUMBER,
JSON_BOOLEAN,
};
union JsonObjectValue
{
const char* string;
double number;
bool boolean;
};
struct JsonObject
{
JsonObjectType type;
JsonObjectValue value;
};
template<int N>
class JsonArray
class JsonArray : public JsonObjectBase
{
public:
JsonArray()
{
@ -69,34 +48,14 @@ private:
JsonObject items[N];
int itemCount;
void writeTo(StringBuilder& sb)
virtual void writeTo(StringBuilder& sb)
{
sb.append("[");
for (int i = 0; i < itemCount; i++)
{
if (i>0)
sb.append(",");
JsonObjectValue value = items[i].value;
switch (items[i].type)
{
case JSON_STRING:
if (value.string)
sb.append("\"%s\"", value.string);
else
sb.append("null");
break;
case JSON_NUMBER:
sb.append("%lg", value.number);
break;
case JSON_BOOLEAN:
sb.append(value.boolean ? "true" : "false");
break;
}
if (i>0) sb.append(",");
writeObjectTo(items[i], sb);
}
sb.append("]");

2
JsonGeneratorTests/JsonGeneratorTests.vcxproj
View File

@ -84,10 +84,12 @@
<ItemGroup>
<ClCompile Include="JsonArray.cpp" />
<ClCompile Include="JsonArrayTests.cpp" />
<ClCompile Include="JsonObjectBase.cpp" />
<ClCompile Include="StringBuilder.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="JsonArray.h" />
<ClInclude Include="JsonObjectBase.h" />
<ClInclude Include="StringBuilder.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

6
JsonGeneratorTests/JsonGeneratorTests.vcxproj.filters
View File

@ -24,6 +24,9 @@
<ClCompile Include="StringBuilder.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="JsonObjectBase.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="JsonArray.h">
@ -32,5 +35,8 @@
<ClInclude Include="StringBuilder.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="JsonObjectBase.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

1
JsonGeneratorTests/JsonObjectBase.cpp Normal file
View File

@ -0,0 +1 @@
#include "JsonObjectBase.h"

60
JsonGeneratorTests/JsonObjectBase.h Normal file
View File

@ -0,0 +1,60 @@
/*
* Arduino JSON library
* Benoit Blanchon 2014 - MIT License
*/
#pragma once
#include "StringBuilder.h"
class JsonObjectBase
{
public:
protected:
virtual void writeTo(StringBuilder& sb) = 0;
enum JsonObjectType
{
JSON_STRING,
JSON_NUMBER,
JSON_BOOLEAN,
};
union JsonObjectValue
{
const char* string;
double number;
bool boolean;
};
struct JsonObject
{
JsonObjectType type;
JsonObjectValue value;
};
void writeObjectTo(const JsonObject& obj, StringBuilder& sb)
{
switch (obj.type)
{
case JSON_STRING:
if (obj.value.string)
sb.append("\"%s\"", obj.value.string);
else
sb.append("null");
break;
case JSON_NUMBER:
sb.append("%lg", obj.value.number);
break;
case JSON_BOOLEAN:
sb.append(obj.value.boolean ? "true" : "false");
break;
}
}
};