Formated code with clang-format

include/ArduinoJson/Internals/CompactJsonWriter.hpp

@@ -2,47 +2,23 @@
 
 #include "ArduinoJson/Internals/JsonWriter.hpp"
 
-namespace ArduinoJson
-{
-    namespace Internals
-    {
-        class CompactJsonWriter : public JsonWriter
-        {
-        public:
-            explicit CompactJsonWriter(Print* sink)
-            : JsonWriter(sink)
-            {
-            }
+namespace ArduinoJson {
+namespace Internals {
+class CompactJsonWriter : public JsonWriter {
+public:
+  explicit CompactJsonWriter(Print *sink) : JsonWriter(sink) {}
 
-            virtual void beginArray()
-            {
-                _length += _sink->write('[');
-            }
+  virtual void beginArray() { _length += _sink->write('['); }
 
-            virtual void endArray()
-            {
-                _length += _sink->write(']');
-            }
+  virtual void endArray() { _length += _sink->write(']'); }
 
-            virtual void writeColon()
-            {
-                _length += _sink->write(':');
-            }
+  virtual void writeColon() { _length += _sink->write(':'); }
 
-            virtual void writeComma()
-            {
-                _length += _sink->write(',');
-            }
+  virtual void writeComma() { _length += _sink->write(','); }
 
-            virtual void beginObject()
-            {
-                _length += _sink->write('{');
-            }
+  virtual void beginObject() { _length += _sink->write('{'); }
 
-            virtual void endObject()
-            {
-                _length += _sink->write('}');
-            }
-        };       
-    }
+  virtual void endObject() { _length += _sink->write('}'); }
+};
+}
 }

include/ArduinoJson/Internals/IndentedPrint.hpp

@@ -7,47 +7,40 @@
 
 #include "../Arduino/Print.hpp"
 
-namespace ArduinoJson
-{
-    namespace Internals
-    {
-        // Decorator on top of Print to allow indented output.
-        // This class is used by JsonPrintable::prettyPrintTo() but can also be used
-        // for your own purpose, like logging.
-        class IndentedPrint : public Print
-        {
-        public:
+namespace ArduinoJson {
+namespace Internals {
+// Decorator on top of Print to allow indented output.
+// This class is used by JsonPrintable::prettyPrintTo() but can also be used
+// for your own purpose, like logging.
+class IndentedPrint : public Print {
+public:
+  IndentedPrint(Print &p) : sink(&p) {
+    level = 0;
+    tabSize = 2;
+    isNewLine = true;
+  }
 
-            IndentedPrint(Print& p)
-                : sink(&p)
-            {
-                level = 0;
-                tabSize = 2;
-                isNewLine = true;
-            }
+  virtual size_t write(uint8_t);
 
-            virtual size_t write(uint8_t);
+  // Adds one level of indentation
+  void indent();
 
-            // Adds one level of indentation
-            void indent();
+  // Removes one level of indentation
+  void unindent();
 
-            // Removes one level of indentation
-            void unindent();
+  // Set the number of space printed for each level of indentation
+  void setTabSize(uint8_t n);
 
-            // Set the number of space printed for each level of indentation
-            void setTabSize(uint8_t n);
+private:
+  Print *sink;
+  uint8_t level : 4;
+  uint8_t tabSize : 3;
+  bool isNewLine : 1;
 
-        private:
-            Print* sink;
-            uint8_t level : 4;
-            uint8_t tabSize : 3;
-            bool isNewLine : 1;
-            
-            size_t writeTabs();
+  size_t writeTabs();
 
-            static const int MAX_LEVEL = 15; // because it's only 4 bits
-            static const int MAX_TAB_SIZE = 7; // because it's only 3 bits
-        };
-    }
+  static const int MAX_LEVEL = 15;   // because it's only 4 bits
+  static const int MAX_TAB_SIZE = 7; // because it's only 3 bits
+};
+}
 }
-

include/ArduinoJson/Internals/JsonNode.hpp

@@ -1,191 +1,159 @@
 #pragma once
 
-namespace ArduinoJson
-{
-    class JsonBuffer;
+namespace ArduinoJson {
+class JsonBuffer;
 
-    namespace Internals
-    {
-        class JsonWriter;
+namespace Internals {
+class JsonWriter;
 
-        class JsonNode
-        {
-            enum JsonNodeType
-            {
-                JSON_UNDEFINED,
-                JSON_NULL,
-                JSON_ARRAY,
-                JSON_OBJECT,
-                JSON_KEY_VALUE,
-                JSON_BOOLEAN,
-                JSON_STRING,
-                JSON_LONG,
-                JSON_PROXY,
-                JSON_DOUBLE_0_DECIMALS,
-                JSON_DOUBLE_1_DECIMAL,
-                JSON_DOUBLE_2_DECIMALS
-                // etc.
-            };
+class JsonNode {
+  enum JsonNodeType {
+    JSON_UNDEFINED,
+    JSON_NULL,
+    JSON_ARRAY,
+    JSON_OBJECT,
+    JSON_KEY_VALUE,
+    JSON_BOOLEAN,
+    JSON_STRING,
+    JSON_LONG,
+    JSON_PROXY,
+    JSON_DOUBLE_0_DECIMALS,
+    JSON_DOUBLE_1_DECIMAL,
+    JSON_DOUBLE_2_DECIMALS
+    // etc.
+  };
 
-            union JsonNodeContent
-            {
-                bool asBoolean;
-                double asDouble;
-                long asInteger;
-                const char* asString;
+  union JsonNodeContent {
+    bool asBoolean;
+    double asDouble;
+    long asInteger;
+    const char *asString;
 
-                struct
-                {
-                    const char* key;
-                    JsonNode* value;
-                } asKeyValue;
+    struct {
+      const char *key;
+      JsonNode *value;
+    } asKeyValue;
 
-                struct
-                {
-                    JsonNode* child;
-                    JsonBuffer* buffer;
-                } asContainer;
+    struct {
+      JsonNode *child;
+      JsonBuffer *buffer;
+    } asContainer;
 
-                struct
-                {
-                    JsonNode* target;
-                } asProxy;
+    struct {
+      JsonNode *target;
+    } asProxy;
+  };
 
-            };
+public:
+  JsonNode() : next(0), type(JSON_UNDEFINED) {}
 
-        public:
-            JsonNode()
-                : next(0), type(JSON_UNDEFINED)
-            {
+  JsonNode *next;
 
-            }
+  void writeTo(JsonWriter &); // TODO: <- move in JsonNodeSerializer
 
-            JsonNode* next;
+  void setAsArray(JsonBuffer *buffer) {
+    type = JSON_ARRAY;
+    content.asContainer.child = 0;
+    content.asContainer.buffer = buffer;
+  }
 
-            void writeTo(JsonWriter&); // TODO: <- move in JsonNodeSerializer
+  void setAsBoolean(bool value) {
+    type = JSON_BOOLEAN;
+    content.asBoolean = value;
+  }
 
-            void setAsArray(JsonBuffer* buffer)
-            {
-                type = JSON_ARRAY;
-                content.asContainer.child = 0;
-                content.asContainer.buffer = buffer;
-            }
+  void setAsLong(int value) {
+    type = JSON_LONG;
+    content.asInteger = value;
+  }
 
-            void setAsBoolean(bool value)
-            {
-                type = JSON_BOOLEAN;
-                content.asBoolean = value;
-            }
+  void setAsString(char const *value) {
+    type = JSON_STRING;
+    content.asString = value;
+  }
 
-            void setAsLong(int value)
-            {
-                type = JSON_LONG;
-                content.asInteger = value;
-            }
+  void setAsDouble(double value, int decimals) {
+    type = static_cast<JsonNodeType>(JSON_DOUBLE_0_DECIMALS + decimals);
+    content.asDouble = value;
+  }
 
-            void setAsString(char const* value)
-            {
-                type = JSON_STRING;
-                content.asString = value;
-            }
+  void setAsObject(JsonBuffer *buffer) {
+    type = JSON_OBJECT;
+    content.asContainer.child = 0;
+    content.asContainer.buffer = buffer;
+  }
 
-            void setAsDouble(double value, int decimals)
-            {
-                type = static_cast<JsonNodeType>(JSON_DOUBLE_0_DECIMALS + decimals);
-                content.asDouble = value;
-            }
+  void setAsObjectKeyValue(const char *key, JsonNode *value) {
+    type = JSON_KEY_VALUE;
+    content.asKeyValue.key = key;
+    content.asKeyValue.value = value;
+  }
 
-            void setAsObject(JsonBuffer* buffer)
-            {
-                type = JSON_OBJECT;
-                content.asContainer.child = 0;
-                content.asContainer.buffer = buffer;
-            }
+  bool getAsBoolean() {
+    return type == JSON_BOOLEAN ? content.asBoolean : false;
+  }
 
-            void setAsObjectKeyValue(const char* key, JsonNode* value)
-            {
-                type = JSON_KEY_VALUE;
-                content.asKeyValue.key = key;
-                content.asKeyValue.value = value;
-            }
+  double getAsDouble() {
+    return type >= JSON_DOUBLE_0_DECIMALS ? content.asDouble : 0;
+  }
 
-            bool getAsBoolean()
-            {
-                return type == JSON_BOOLEAN ? content.asBoolean : false;
-            }
+  long getAsInteger() { return type == JSON_LONG ? content.asInteger : 0; }
 
-            double getAsDouble()
-            {
-                return type >= JSON_DOUBLE_0_DECIMALS ? content.asDouble : 0;
-            }
+  const char *getAsString() {
+    return type == JSON_STRING ? content.asString : 0;
+  }
 
-            long getAsInteger()
-            {
-                return type == JSON_LONG ? content.asInteger : 0;
-            }
+  JsonBuffer *getContainerBuffer() {
+    if (type == JSON_PROXY)
+      return content.asProxy.target->getContainerBuffer();
+    return type == JSON_ARRAY || type == JSON_OBJECT
+               ? content.asContainer.buffer
+               : 0;
+  }
 
-            const char* getAsString()
-            {
-                return type == JSON_STRING ? content.asString : 0;
-            }
+  JsonNode *getContainerChild() {
+    if (type == JSON_PROXY)
+      return content.asProxy.target->getContainerChild();
+    return type == JSON_ARRAY || type == JSON_OBJECT ? content.asContainer.child
+                                                     : 0;
+  }
 
-            JsonBuffer* getContainerBuffer()
-            {
-                if (type == JSON_PROXY) return content.asProxy.target->getContainerBuffer();
-                return type == JSON_ARRAY || type == JSON_OBJECT ? content.asContainer.buffer : 0;
-            }
+  const char *getAsObjectKey() {
+    return type == JSON_KEY_VALUE ? content.asKeyValue.key : 0;
+  }
 
-            JsonNode* getContainerChild()
-            {
-                if (type == JSON_PROXY) return content.asProxy.target->getContainerChild();
-                return type == JSON_ARRAY || type == JSON_OBJECT ? content.asContainer.child : 0;
-            }
+  JsonNode *getAsObjectValue() {
+    return type == JSON_KEY_VALUE ? content.asKeyValue.value : 0;
+  }
 
-            const char* getAsObjectKey()
-            {
-                return type == JSON_KEY_VALUE ? content.asKeyValue.key : 0;
-            }
+  JsonNode *getProxyTarget() {
+    return type == JSON_PROXY ? content.asProxy.target : this;
+  }
 
-            JsonNode* getAsObjectValue()
-            {
-                return type == JSON_KEY_VALUE ? content.asKeyValue.value : 0;
-            }
+  bool isArray() { return type == JSON_ARRAY; }
 
-            JsonNode* getProxyTarget()
-            {        
-                return type == JSON_PROXY ? content.asProxy.target : this;
-            }
+  bool isObject() { return type == JSON_OBJECT; }
 
-            bool isArray()
-            {
-                return type == JSON_ARRAY;
-            }
+  void addChild(JsonNode *childToAdd);
 
-            bool isObject()
-            {
-                return type == JSON_OBJECT;
-            }
+  void removeChild(JsonNode *childToRemove);
 
-            void addChild(JsonNode* childToAdd);
+  void duplicate(JsonNode *other);
 
-            void removeChild(JsonNode* childToRemove);
+private:
+  JsonNodeType type;
+  JsonNodeContent content;
 
-            void duplicate(JsonNode* other);
+  inline void writeArrayTo(JsonWriter &); // TODO: <- move in JsonNodeSerializer
+  inline void
+  writeObjectTo(JsonWriter &); // TODO: <- move in JsonNodeSerializer
 
-        private:
-            JsonNodeType type;
-            JsonNodeContent content;
+  void setAsProxyOfSelf();
 
-            inline void writeArrayTo(JsonWriter&);// TODO: <- move in JsonNodeSerializer
-            inline void writeObjectTo(JsonWriter&);// TODO: <- move in JsonNodeSerializer
-
-            void setAsProxyOfSelf();
-
-            void setAsProxyOf(JsonNode* target)
-            {
-                type = JSON_PROXY;
-                content.asProxy.target = target;
-            }
-        };
-    }
+  void setAsProxyOf(JsonNode *target) {
+    type = JSON_PROXY;
+    content.asProxy.target = target;
+  }
+};
+}
 }

include/ArduinoJson/Internals/JsonNodeIterator.hpp

@@ -2,42 +2,25 @@
 
 #include "JsonNode.hpp"
 
-namespace ArduinoJson
-{
-    namespace Internals
-    {
-        // TODO: replace by JsonArrayIterator and JsonObjectIterator
-        class JsonNodeIterator
-        {
-        public:
+namespace ArduinoJson {
+namespace Internals {
+// TODO: replace by JsonArrayIterator and JsonObjectIterator
+class JsonNodeIterator {
+public:
+  explicit JsonNodeIterator(JsonNode *node) : _node(node) {}
 
-            explicit JsonNodeIterator(JsonNode* node)
-                : _node(node)
-            {
-            }
+  bool operator!=(const JsonNodeIterator &other) const {
+    return _node != other._node;
+  }
 
-            bool operator!= (const JsonNodeIterator& other) const
-            {
-                return _node != other._node;
-            }
+  void operator++() { _node = _node->next; }
 
-            void operator++()
-            {
-                _node = _node->next;
-            }
+  JsonNode *operator*() const { return _node; }
 
-            JsonNode* operator*() const
-            {
-                return _node;
-            }
+  JsonNode *operator->() const { return _node; }
 
-            JsonNode* operator->() const
-            {
-                return _node;
-            }
-
-        private:
-            JsonNode* _node;
-        };
-    }
+private:
+  JsonNode *_node;
+};
+}
 }

include/ArduinoJson/Internals/JsonNodeWrapper.hpp

@@ -2,42 +2,28 @@
 
 #include "JsonNode.hpp"
 
-namespace ArduinoJson
-{
-    class JsonValue ;
-    
-    namespace Internals
-    {
-        class JsonNodeWrapper
-        {
-            friend class JsonValue;
+namespace ArduinoJson {
+class JsonValue;
 
-        public:
-            JsonNodeWrapper()
-            : _node(0)
-            {
-            }
+namespace Internals {
+class JsonNodeWrapper {
+  friend class JsonValue;
 
-            explicit JsonNodeWrapper(JsonNode* node)
-            : _node(node)
-            {
-            }
+public:
+  JsonNodeWrapper() : _node(0) {}
 
-        protected:
+  explicit JsonNodeWrapper(JsonNode *node) : _node(node) {}
 
-            void duplicate(const JsonNodeWrapper& other)
-            {
-                if (!_node)
-                {
-                    _node = other._node;
-                }
-                else
-                {
-                    _node->duplicate(other._node);
-                }
-            }
-
-            JsonNode* _node;
-        };
+protected:
+  void duplicate(const JsonNodeWrapper &other) {
+    if (!_node) {
+      _node = other._node;
+    } else {
+      _node->duplicate(other._node);
     }
+  }
+
+  JsonNode *_node;
+};
+}
 }

include/ArduinoJson/Internals/JsonParser.hpp

@@ -2,44 +2,34 @@
 
 #include "JsonNode.hpp"
 
-namespace ArduinoJson
-{
-    class JsonBuffer;
+namespace ArduinoJson {
+class JsonBuffer;
 
-    namespace Internals
-    {
-        class JsonNode;
+namespace Internals {
+class JsonNode;
 
-        class JsonParser
-        {
-        public:
-            JsonParser(JsonBuffer* buffer, char* json)
-            : _buffer(buffer), _ptr(json)
-            {
+class JsonParser {
+public:
+  JsonParser(JsonBuffer *buffer, char *json) : _buffer(buffer), _ptr(json) {}
 
-            }
+  JsonNode *parseAnything();
 
-            JsonNode* parseAnything();
+private:
+  JsonBuffer *_buffer;
+  char *_ptr;
 
-        private:
-            JsonBuffer* _buffer;
-            char* _ptr;
+  bool isEnd() { return *_ptr == 0; }
 
-            bool isEnd()
-            {
-                return *_ptr == 0;
-            }
+  bool skip(char charToSkip);
+  void skipSpaces();
 
-            bool skip(char charToSkip);
-            void skipSpaces();
-
-            inline JsonNode* parseArray();
-            inline JsonNode* parseBoolean();
-            inline JsonNode* parseNull();
-            inline JsonNode* parseNumber();
-            inline JsonNode* parseObject();
-            inline JsonNode* parseObjectKeyValue();
-            inline JsonNode* parseString();
-        };
-    }
+  inline JsonNode *parseArray();
+  inline JsonNode *parseBoolean();
+  inline JsonNode *parseNull();
+  inline JsonNode *parseNumber();
+  inline JsonNode *parseObject();
+  inline JsonNode *parseObjectKeyValue();
+  inline JsonNode *parseString();
+};
+}
 }

include/ArduinoJson/Internals/JsonWriter.hpp

@@ -2,53 +2,38 @@
 
 #include "../Arduino/Print.hpp"
 
-namespace ArduinoJson
-{
-    namespace Internals
-    {
-        class JsonWriter
-        {
-        public:
-            explicit JsonWriter(Print* sink)
-            : _sink(sink), _length(0)
-            {
-            }
+namespace ArduinoJson {
+namespace Internals {
+class JsonWriter {
+public:
+  explicit JsonWriter(Print *sink) : _sink(sink), _length(0) {}
 
-            size_t bytesWritten()
-            {
-                return _length;
-            }
+  size_t bytesWritten() { return _length; }
 
-            virtual void beginArray() = 0;
+  virtual void beginArray() = 0;
 
-            virtual void endArray() = 0;
+  virtual void endArray() = 0;
 
-            virtual void beginObject() = 0;
+  virtual void beginObject() = 0;
 
-            virtual void endObject() = 0;
+  virtual void endObject() = 0;
 
-            void writeString(const char* value);
-            void writeInteger(long value);
-            void writeBoolean(bool value);
-            void writeDouble(double value, int decimals);
+  void writeString(const char *value);
+  void writeInteger(long value);
+  void writeBoolean(bool value);
+  void writeDouble(double value, int decimals);
 
-            virtual void writeColon() = 0;
+  virtual void writeColon() = 0;
 
-            virtual void writeComma() = 0;
+  virtual void writeComma() = 0;
 
-            void writeEmptyArray()
-            {
-                _length += _sink->print("[]");
-            }
+  void writeEmptyArray() { _length += _sink->print("[]"); }
 
-            void writeEmptyObject()
-            {
-                _length += _sink->print("{}");
-            }
+  void writeEmptyObject() { _length += _sink->print("{}"); }
 
-        protected:
-            Print* _sink;
-            size_t _length;
-        };
-    }
+protected:
+  Print *_sink;
+  size_t _length;
+};
+}
 }

include/ArduinoJson/Internals/PrettyJsonWriter.hpp

@@ -3,67 +3,52 @@
 #include "JsonWriter.hpp"
 #include "IndentedPrint.hpp"
 
-namespace ArduinoJson
-{
-    namespace Internals
-    {
-        class PrettyJsonWriter : public JsonWriter
-        {
-        public:
-            explicit PrettyJsonWriter(IndentedPrint* sink)
-            : JsonWriter(sink), _indenter(sink)
-            {
-            }
+namespace ArduinoJson {
+namespace Internals {
+class PrettyJsonWriter : public JsonWriter {
+public:
+  explicit PrettyJsonWriter(IndentedPrint *sink)
+      : JsonWriter(sink), _indenter(sink) {}
 
-            virtual void beginArray()
-            {
-                _length += _sink->write('[');
-                indent();
-            }
+  virtual void beginArray() {
+    _length += _sink->write('[');
+    indent();
+  }
 
-            virtual void endArray()
-            {
-                unindent();
-                _length += _sink->write(']');
-            }
+  virtual void endArray() {
+    unindent();
+    _length += _sink->write(']');
+  }
 
-            virtual void writeColon()
-            {
-                _length += _sink->print(": ");
-            }
+  virtual void writeColon() { _length += _sink->print(": "); }
 
-            virtual void writeComma()
-            {
-                _length += _sink->write(',');
-                _length += _indenter->println();
-            }
+  virtual void writeComma() {
+    _length += _sink->write(',');
+    _length += _indenter->println();
+  }
 
-            virtual void beginObject()
-            {
-                _length += _sink->write('{');
-                indent();
-            }
+  virtual void beginObject() {
+    _length += _sink->write('{');
+    indent();
+  }
 
-            virtual void endObject()
-            {
-                unindent();
-                _length += _sink->write('}');
-            }
+  virtual void endObject() {
+    unindent();
+    _length += _sink->write('}');
+  }
 
-        private:
-            IndentedPrint* _indenter;
+private:
+  IndentedPrint *_indenter;
 
-            void indent()
-            {
-                _indenter->indent();
-                _length += _indenter->println();
-            }
+  void indent() {
+    _indenter->indent();
+    _length += _indenter->println();
+  }
 
-            void unindent()
-            {
-                _length += _indenter->println();
-                _indenter->unindent();
-            }
-        };
-    }
+  void unindent() {
+    _length += _indenter->println();
+    _indenter->unindent();
+  }
+};
+}
 }

include/ArduinoJson/Internals/QuotedString.hpp

@@ -7,16 +7,13 @@
 
 #include "../Arduino/Print.hpp"
 
-namespace ArduinoJson
-{
-    namespace Internals
-    {
-        class QuotedString
-        {
-        public:
-            static size_t printTo(const char*, Print*);
+namespace ArduinoJson {
+namespace Internals {
+class QuotedString {
+public:
+  static size_t printTo(const char *, Print *);
 
-            static char* extractFrom(char* input, char** end);
-        };
-    }
+  static char *extractFrom(char *input, char **end);
+};
+}
 }

include/ArduinoJson/Internals/StringBuilder.hpp

@@ -7,25 +7,21 @@
 
 #include "../Arduino/Print.hpp"
 
-namespace ArduinoJson
-{
-    namespace Internals
-    {
-        class StringBuilder : public Print
-        {
-        public:
-            StringBuilder(char* buf, int size)
-                : buffer(buf), capacity(size - 1), length(0)
-            {
-                buffer[0] = 0;
-            }
+namespace ArduinoJson {
+namespace Internals {
+class StringBuilder : public Print {
+public:
+  StringBuilder(char *buf, int size)
+      : buffer(buf), capacity(size - 1), length(0) {
+    buffer[0] = 0;
+  }
 
-            virtual size_t write(uint8_t c);
+  virtual size_t write(uint8_t c);
 
-        private:
-            char* buffer;
-            int capacity;
-            int length;
-        };
-    }
+private:
+  char *buffer;
+  int capacity;
+  int length;
+};
+}
 }