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

Moved implementation is a new folder

Browse Source
This commit is contained in:
Benoît Blanchon
2014-07-01 13:50:54 +02:00
parent 4d5a7114c1
commit a9b8e280fe
11 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
JsonGeneratorTests/JsonArray.h
View File

@ -1,61 +0,0 @@
/*
* Arduino JSON library
* Benoit Blanchon 2014 - MIT License
*/
#pragma once
#include "JsonObjectBase.h"
#include "StringBuilder.h"
template<int N>
class JsonArray : public JsonObjectBase
{
public:
JsonArray()
{
itemCount = 0;
}
template<typename T>
void add(T value)
{
add(JsonValue(value));
}
void add(JsonValue value)
{
if (itemCount >= N) return;
items[itemCount] = value;
itemCount++;
}
using JsonObjectBase::writeTo;
private:
JsonValue items[N];
int itemCount;
virtual size_t writeTo(Print& p) const
{
size_t n = 0;
n += p.write("[");
for (int i = 0; i < itemCount; i++)
{
if (i > 0)
{
n += p.write(",");
}
n += items[i].writeTo(p);
}
n += p.write("]");
return n;
}
};

20
JsonGeneratorTests/JsonGeneratorTests.vcxproj
View File

@ -43,9 +43,11 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(ProjectDir)/../JsonGenerator;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(ProjectDir)/../JsonGenerator;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@ -82,20 +84,20 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\JsonGenerator\JsonValue.cpp" />
<ClCompile Include="..\JsonGenerator\StringBuilder.cpp" />
<ClCompile Include="JsonArrayTests.cpp" />
<ClCompile Include="JsonHashTableTests.cpp" />
<ClCompile Include="JsonValue.cpp" />
<ClCompile Include="StringBuilder.cpp" />
<ClCompile Include="JsonValueTests.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="JsonArray.h" />
<ClInclude Include="JsonHashTable.h" />
<ClInclude Include="JsonObjectBase.h" />
<ClInclude Include="Print.h" />
<ClInclude Include="JsonValue.h" />
<ClInclude Include="Printable.h" />
<ClInclude Include="StringBuilder.h" />
<ClInclude Include="..\JsonGenerator\JsonArray.h" />
<ClInclude Include="..\JsonGenerator\JsonHashTable.h" />
<ClInclude Include="..\JsonGenerator\JsonObjectBase.h" />
<ClInclude Include="..\JsonGenerator\JsonValue.h" />
<ClInclude Include="..\JsonGenerator\Print.h" />
<ClInclude Include="..\JsonGenerator\Printable.h" />
<ClInclude Include="..\JsonGenerator\StringBuilder.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

26
JsonGeneratorTests/JsonGeneratorTests.vcxproj.filters
View File

@ -18,39 +18,39 @@
<ClCompile Include="JsonArrayTests.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="StringBuilder.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="JsonHashTableTests.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="JsonValue.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="JsonValueTests.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\JsonGenerator\JsonValue.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\JsonGenerator\StringBuilder.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="StringBuilder.h">
<ClInclude Include="..\JsonGenerator\JsonArray.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="JsonObjectBase.h">
<ClInclude Include="..\JsonGenerator\JsonHashTable.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="JsonHashTable.h">
<ClInclude Include="..\JsonGenerator\JsonObjectBase.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="JsonValue.h">
<ClInclude Include="..\JsonGenerator\JsonValue.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="JsonArray.h">
<ClInclude Include="..\JsonGenerator\Print.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Print.h">
<ClInclude Include="..\JsonGenerator\Printable.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Printable.h">
<ClInclude Include="..\JsonGenerator\StringBuilder.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>

73
JsonGeneratorTests/JsonHashTable.h
View File

@ -1,73 +0,0 @@
/*
* Arduino JSON library
* Benoit Blanchon 2014 - MIT License
*/
#pragma once
#include "JsonObjectBase.h"
template<int N>
class JsonHashTable : public JsonObjectBase
{
public:
JsonHashTable()
{
itemCount = 0;
}
template<typename T>
void add(const char* key, T value)
{
add(key, JsonValue(value));
}
void add(const char* key, JsonValue value)
{
if (itemCount >= N) return;
items[itemCount].key = key;
items[itemCount].value = value;
itemCount++;
}
using JsonObjectBase::writeTo;
private:
struct KeyValuePair
{
const char* key;
JsonValue value;
};
KeyValuePair items[N];
int itemCount;
virtual size_t writeTo(Print& p) const
{
size_t n = 0;
n += p.write('{');
for (int i = 0; i < itemCount; i++)
{
JsonValue key(items[i].key);
if (i > 0)
{
n += p.write(',');
}
n += key.writeTo(p);
n += p.write(':');
n += items[i].value.writeTo(p);
}
n += p.write('}');
return n;
}
};

24
JsonGeneratorTests/JsonObjectBase.h
View File

@ -1,24 +0,0 @@
/*
* Arduino JSON library
* Benoit Blanchon 2014 - MIT License
*/
#pragma once
#include "JsonValue.h"
#include "Print.h"
#include "Printable.h"
class JsonObjectBase : public Printable
{
public:
size_t writeTo(char* buffer, size_t bufferSize)
{
StringBuilder sb(buffer, bufferSize);
return writeTo(sb);
}
virtual size_t writeTo(Print& p) const = 0;
};

89
JsonGeneratorTests/JsonValue.cpp
View File

@ -1,89 +0,0 @@
/*
* Arduino JSON library
* Benoit Blanchon 2014 - MIT License
*/
#include "JsonValue.h"
#include "JsonObjectBase.h"
#include <cstdio>
#include <cstring>
size_t JsonValue::writeBooleanTo(Print& p) const
{
return p.write(content.boolean ? "true" : "false");
}
size_t JsonValue::writeNumberTo(Print& p) const
{
char tmp[16];
_snprintf(tmp, sizeof(tmp), "%lg", content.number);
return p.write(tmp);
}
size_t JsonValue::writeObjectTo(Print& p) const
{
if (content.object)
return ((JsonObjectBase*)content.object)->writeTo(p);
else
return p.write("null");
}
size_t JsonValue::writeStringTo(Print& p) const
{
auto s = content.string;
if (!s)
{
return p.write("null");
}
size_t n = 0;
n += p.write('\"');
while (*s)
{
switch (*s)
{
case '"':
n += p.write("\\\"");
break;
case '\\':
n += p.write("\\\\");
break;
case '\b':
n += p.write("\\b");
break;
case '\f':
n += p.write("\\f");
break;
case '\n':
n += p.write("\\n");
break;
case '\r':
n += p.write("\\r");
break;
case '\t':
n += p.write("\\t");
break;
default:
n += p.write(*s);
break;
}
s++;
}
n += p.write('\"');
return n;
}

67
JsonGeneratorTests/JsonValue.h
View File

@ -1,67 +0,0 @@
/*
* Arduino JSON library
* Benoit Blanchon 2014 - MIT License
*/
#pragma once
#include "Printable.h"
#include "StringBuilder.h"
class JsonValue : public Printable
{
public:
JsonValue()
{
}
JsonValue(const char* value)
: implementation(&JsonValue::writeStringTo)
{
content.string = value;
}
JsonValue(double value)
: implementation(&JsonValue::writeNumberTo)
{
content.number = value;
}
JsonValue(bool value)
: implementation(&JsonValue::writeBooleanTo)
{
content.boolean = value;
}
JsonValue(Printable& value)
: implementation(&JsonValue::writeObjectTo)
{
content.object = &value;
}
virtual size_t writeTo(Print& p) const
{
// handmade polymorphism
return (this->*implementation)(p);
}
private:
union Content
{
bool boolean;
double number;
Printable* object;
const char* string;
};
Content content;
size_t(JsonValue::*implementation)(Print& p)const;
size_t writeBooleanTo(Print& p) const;
size_t writeNumberTo(Print& p) const;
size_t writeObjectTo(Print& p) const;
size_t writeStringTo(Print& p) const;
};

24
JsonGeneratorTests/Print.h
View File

@ -1,24 +0,0 @@
/*
* Arduino JSON library
* Benoit Blanchon 2014 - MIT License
*/
#pragma once
class Print
{
public:
virtual size_t write(char c) = 0;
size_t write(const char* s)
{
size_t n = 0;
while (*s)
{
n += write(*s++);
}
return n;
}
};

16
JsonGeneratorTests/Printable.h
View File

@ -1,16 +0,0 @@
/*
* Arduino JSON library
* Benoit Blanchon 2014 - MIT License
*/
#pragma once
class Print;
class Printable
{
public:
virtual size_t writeTo(Print& p) const = 0;
};

15
JsonGeneratorTests/StringBuilder.cpp
View File

@ -1,15 +0,0 @@
/*
* Arduino JSON library
* Benoit Blanchon 2014 - MIT License
*/
#include "StringBuilder.h"
size_t StringBuilder::write(char c)
{
if (length >= capacity) return 0;
buffer[length++] = c;
buffer[length] = 0;
return 1;
}

26
JsonGeneratorTests/StringBuilder.h
View File

@ -1,26 +0,0 @@
/*
* Arduino JSON library
* Benoit Blanchon 2014 - MIT License
*/
#pragma once
#include "Print.h"
class StringBuilder : public Print
{
public:
StringBuilder(char* buf, int size)
: buffer(buf), capacity(size-1), length(0)
{
buffer[0] = 0;
}
virtual size_t write(char c);
private:
char* buffer;
int capacity;
int length;
};