Commit Graph

659 Commits

Author SHA1 Message Date
348357eb04 Merge branch '4.0'
Conflicts:
	JsonGenerator.cpp
	JsonGenerator.h
	JsonGenerator/EscapedString.cpp
	JsonGenerator/EscapedString.h
	JsonGenerator/IndentedPrint.cpp
	JsonGenerator/IndentedPrint.h
	JsonGenerator/JsonArray.h
	JsonGenerator/JsonArrayBase.cpp
	JsonGenerator/JsonArrayBase.h
	JsonGenerator/JsonObject.h
	JsonGenerator/JsonObjectBase.cpp
	JsonGenerator/JsonObjectBase.h
	JsonGenerator/JsonPrettyPrint.cpp
	JsonGenerator/JsonPrettyPrint.h
	JsonGenerator/JsonPrintable.cpp
	JsonGenerator/JsonPrintable.h
	JsonGenerator/JsonValue.cpp
	JsonGenerator/JsonValue.h
	JsonGenerator/Print.cpp
	JsonGenerator/Print.h
	JsonGenerator/Printable.h
	JsonGenerator/StringBuilder.cpp
	JsonGenerator/StringBuilder.h
	JsonGeneratorTests/EscapedStringTests.cpp
	JsonGeneratorTests/Issue10.cpp
	JsonGeneratorTests/JsonArrayTests.cpp
	JsonGeneratorTests/JsonObject_Indexer_Tests.cpp
	JsonGeneratorTests/JsonObject_PrintTo_Tests.cpp
	JsonGeneratorTests/JsonValue_Cast_Tests.cpp
	JsonGeneratorTests/JsonValue_PrintTo_Tests.cpp
	JsonGeneratorTests/PrettyPrint_Array_Tests.cpp
	JsonGeneratorTests/PrettyPrint_Object_Tests.cpp
	JsonGeneratorTests/PrettyPrint_String_Tests.cpp
	JsonGeneratorTests/StringBuilderTests.cpp
	JsonParser.cpp
	JsonParser.h
	JsonParser/JsonArray.cpp
	JsonParser/JsonArray.h
	JsonParser/JsonArrayIterator.h
	JsonParser/JsonObject.cpp
	JsonParser/JsonObject.h
	JsonParser/JsonObjectIterator.h
	JsonParser/JsonPair.h
	JsonParser/JsonParser.h
	JsonParser/JsonParserBase.cpp
	JsonParser/JsonParserBase.h
	JsonParser/JsonToken.cpp
	JsonParser/JsonToken.h
	JsonParser/JsonValue.cpp
	JsonParser/JsonValue.h
	JsonParser/README.md
	JsonParserTests/GbathreeBug.cpp
	JsonParserTests/JsonArrayIteratorTests.cpp
	JsonParserTests/JsonArrayTests.cpp
	JsonParserTests/JsonObjectIteratorTests.cpp
	JsonParserTests/JsonObjectTests.cpp
	JsonParserTests/JsonStringTests.cpp
	JsonParserTests/TestHashGenerator.cpp
	README.md
	library.json
v4.0
2014-11-29 14:30:23 +01:00
69f6967ad4 Merge branch '4.0' of github.com:bblanchon/ArduinoJson into 4.0 2014-11-29 14:09:29 +01:00
4e3f554b68 Made script executable on unix 2014-11-29 14:03:32 +01:00
79f6f0dd86 Minor changes in doc 2014-11-29 13:53:18 +01:00
02f6fab025 Minor changes in the docs 2014-11-29 10:36:15 +01:00
a61fc5b836 Minor corrections to the doc 2014-11-29 09:30:11 +01:00
f3a84857d9 Removed unused function 2014-11-22 18:54:40 +01:00
95eb16233c Added tests of JsonArray::invalid() and JsonObject::invalid() 2014-11-22 18:52:46 +01:00
33654a480b Added Build Status badge 2014-11-15 15:22:37 +01:00
c296f27640 Disabled threading in googletest 2014-11-15 15:09:48 +01:00
4f55f63a77 Improved Travis configuration 2014-11-15 15:02:48 +01:00
a66299a936 Replaced -Wpedantic by -pedantic 2014-11-15 14:58:29 +01:00
a2cbb68a40 Added missing argument to cmake 2014-11-15 14:46:00 +01:00
4163debdd9 Added Travis configuration file 2014-11-15 14:42:23 +01:00
c92ff81ddd Updated for v4.0 v4.0-beta-1 2014-11-11 18:34:13 +01:00
783add8357 Added Arduino 1.0.6 requirement 2014-11-11 18:34:04 +01:00
3b77dbbed7 Fixed warnings in Visual Studio 2014-11-11 18:18:26 +01:00
160ff0961e Added PlatformIO manifest file 2014-11-11 18:09:58 +01:00
06909c451f Added donation link 2014-11-11 17:50:40 +01:00
b7d8b45e5a Synchronized with master 2014-11-11 17:35:20 +01:00
88bfaac7e6 Changed expected output from "0.0" to "0.00" 2014-11-11 17:33:54 +01:00
3c51017e4a Added tests fo JsonVariant::printTo() 2014-11-11 17:26:51 +01:00
33f6376122 Fixed is<T>() 2014-11-11 17:26:13 +01:00
2beb87136b Fixed writeTo() of invalid and undefined value 2014-11-11 17:15:53 +01:00
f6f8a63b99 Added a header to simplify library usage 2014-11-11 16:56:02 +01:00
e0ce711eb4 Fixed cpplint warnings 2014-11-11 16:43:35 +01:00
0911d8d796 Fixed cpplint warnings 2014-11-11 16:41:45 +01:00
99e5ff78f3 Removed empty document 2014-11-11 15:17:20 +01:00
5236de1433 Added memory usage 2014-11-11 14:46:23 +01:00
0c9451fd5f Updated for v4.0 2014-11-11 14:26:57 +01:00
dfac1cf71a Updated for v4.0 2014-11-11 14:11:49 +01:00
1e20e6ef77 Renamed file 2014-11-11 14:11:40 +01:00
a7b366e74f Updated for v4.0 2014-11-11 14:05:54 +01:00
3cfd36a5ce Reduced size by 16 bytes by inlining indent() and unindent() 2014-11-09 16:10:30 +01:00
3919f07890 Reduced size by 22 bytes by removing writeEmptyArray() and writeEmptyObject() 2014-11-09 13:54:03 +01:00
12e374d0da Reduced size by 2 bytes 2014-11-08 21:37:02 +01:00
36ee4876c6 Reduced sze by 26 bytes by inlining getOrCreateNodeAt() 2014-11-08 21:32:30 +01:00
05db56760f Reduced size by 38 bytes by inlining addNode() 2014-11-08 21:22:03 +01:00
e94089ca56 Reduced size by 52 bytes by inlining createNode() 2014-11-08 21:16:47 +01:00
dc1d0ca698 Added #include <ListNode.hpp> 2014-11-08 21:16:14 +01:00
627d85ce23 Added #pragma once 2014-11-08 21:15:34 +01:00
f6133f2d36 Reduced size by 300 bytes by reusing the JsonPrettyPrint from v3 2014-11-08 19:40:07 +01:00
d8dbfe6e6d Reduced size by 706 bytes by removing virtual destructors. 2014-11-08 17:13:41 +01:00
1c450fd3aa Fixed floating point value parsing in the form "4e2" or "4E2". 2014-11-08 15:56:40 +01:00
2e47d546b2 Writing documentation... 2014-11-08 15:48:51 +01:00
01f13c1b11 Writing documentation... 2014-11-07 22:12:40 +01:00
9dc7c2a031 Writing documentation... 2014-11-07 21:41:42 +01:00
fe779dace4 Writing documentation... 2014-11-07 20:14:09 +01:00
6eef52cc9c Writing documentation... 2014-11-07 18:21:34 +01:00
d38131d495 Added JsonObject::containsKey() 2014-11-07 17:27:30 +01:00