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

Extracting a common base class for JsonArray and JsonObject...

Browse Source
This commit is contained in:
Benoit Blanchon
2014-11-05 11:28:19 +01:00
parent 31dea656d5
commit ebb591ef28
2 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
include/ArduinoJson/Internals/List.hpp Normal file
View File

@ -0,0 +1,38 @@
// Copyright Benoit Blanchon 2014
// MIT License
//
// Arduino JSON library
// https://github.com/bblanchon/ArduinoJson
#pragma once
#include "NodeIterator.hpp"
#include "NodeConstIterator.hpp"
#include "../JsonBuffer.hpp"
namespace ArduinoJson {
namespace Internals {
template <typename T>
class List {
public:
typedef Node<T> node_type;
typedef NodeIterator<T> iterator;
typedef NodeConstIterator<T> const_iterator;
List(JsonBuffer *buffer) : _buffer(buffer), _firstNode(NULL) {}
bool success() const { return _buffer != NULL; }
iterator begin() { return iterator(_firstNode); }
iterator end() { return iterator(NULL); }
const_iterator begin() const { return const_iterator(_firstNode); }
const_iterator end() const { return const_iterator(NULL); }
protected:
JsonBuffer *_buffer;
node_type *_firstNode;
};
}
}

20
include/ArduinoJson/JsonObject.hpp
View File

@ -6,9 +6,8 @@
#pragma once
#include "Internals/NodeIterator.hpp"
#include "Internals/NodeConstIterator.hpp"
#include "Internals/JsonPrintable.hpp"
#include "Internals/List.hpp"
#include "Internals/Node.hpp"
#include "Internals/ReferenceType.hpp"
#include "JsonPair.hpp"
@ -22,17 +21,14 @@ class JsonArray;
class JsonBuffer;
class JsonObject : public Internals::JsonPrintable<JsonObject>,
public Internals::ReferenceType {
public Internals::ReferenceType,
public Internals::List<JsonPair> {
friend class JsonBuffer;
public:
typedef const char *key_type;
typedef JsonPair value_type;
typedef Internals::Node<JsonPair> node_type;
typedef Internals::NodeIterator<JsonPair> iterator;
typedef Internals::NodeConstIterator<JsonPair> const_iterator;
bool success() const { return _buffer != NULL; }
int size() const;
JsonVariant &at(key_type key);
@ -52,12 +48,6 @@ class JsonObject : public Internals::JsonPrintable<JsonObject>,
JsonArray &createNestedArray(key_type key);
JsonObject &createNestedObject(key_type key);
iterator begin() { return iterator(_firstNode); }
iterator end() { return iterator(NULL); }
const_iterator begin() const { return const_iterator(_firstNode); }
const_iterator end() const { return const_iterator(NULL); }
static JsonObject &invalid() { return _invalid; }
template <typename T>
@ -65,7 +55,7 @@ class JsonObject : public Internals::JsonPrintable<JsonObject>,
private:
// constructor is private, instance must be created via JsonBuffer
JsonObject(JsonBuffer *buffer) : _buffer(buffer), _firstNode(NULL) {}
JsonObject(JsonBuffer *buffer) : List(buffer) {}
JsonVariant &add(key_type key) { return (*this)[key]; }
node_type *createNode();
@ -75,8 +65,6 @@ class JsonObject : public Internals::JsonPrintable<JsonObject>,
node_type *getNodeAt(key_type key) const;
node_type *getOrCreateNodeAt(key_type key);
JsonBuffer *_buffer;
node_type *_firstNode;
static JsonObject _invalid;
};
}