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

Added operator[]

Browse Source
This commit is contained in:
Benoit Blanchon
2014-07-31 20:11:55 +02:00
parent 13c386c7a3
commit 60c6f2db47
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JsonGenerator/JsonObjectBase.cpp
View File

@ -36,7 +36,7 @@ size_t JsonObjectBase::printTo(Print& p) const
return n;
}
JsonValue& JsonObjectBase::getValue(char const* key)
JsonValue& JsonObjectBase::operator[](char const* key)
{
for (int i = 0; i < count; ++i)
{

8
JsonGenerator/JsonObjectBase.h
View File

@ -16,16 +16,18 @@ namespace ArduinoJson
{
public:
JsonValue& operator[](const char*);
template<typename T>
void add(const char* key, T value)
{
getValue(key) = value;
operator[](key) = value;
}
template<int DIGITS>
void add(const char* key, double value)
{
getValue(key).set<DIGITS>(value);
operator[](key).set<DIGITS>(value);
}
using JsonPrintable::printTo;
@ -45,8 +47,6 @@ namespace ArduinoJson
{
}
JsonValue& getValue(const char* key);
private:
KeyValuePair* items;
int capacity, count;

7
JsonGeneratorTests/JsonHashTableTests.cpp
View File

@ -34,7 +34,6 @@ namespace JsonGeneratorTests
{
add("key1", "value1");
add("key2", "value2");
outputMustBe("{\"key1\":\"value1\",\"key2\":\"value2\"}");
}
@ -106,19 +105,19 @@ namespace JsonGeneratorTests
void addNested(const char* key, Printable& value)
{
hash.add<Printable&>(key, value);
hash[key] = value;
}
template<typename T>
void add(const char* key, T value)
{
hash.add(key, value);
hash[key] = value;
}
template<int DIGITS>
void add(const char* key, double value)
{
hash.add<DIGITS>(key, value);
hash[key].set<DIGITS>(value);
}
void outputMustBe(const char* expected)