bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-21 22:42:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use absolute instead of relative includes (fixes #1072)

Browse Source
This commit is contained in:
Benoit Blanchon
2019-08-26 11:57:57 +02:00
parent f5c25823bc
commit fcbec6eb6d
75 changed files with 246 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,6 +1,11 @@
ArduinoJson: change log ArduinoJson: change log
======================= =======================
HEAD
----
* Use absolute instead of relative includes (issue #1072)
v6.11.5 (2019-08-23) v6.11.5 (2019-08-23)
------- -------

54
scripts/build-single-header.sh
View File

@ -1,8 +1,14 @@
#!/bin/bash #!/bin/bash
set -e
TAG=$(git describe) TAG=$(git describe)
RE_INCLUDE='^#include[[:space:]]*["<](.*)[">]' RE_RELATIVE_INCLUDE='^#include[[:space:]]*"(.*)"'
RE_ABSOLUTE_INCLUDE='^#include[[:space:]]*<(ArduinoJson/.*)>'
RE_SYSTEM_INCLUDE='^#include[[:space:]]*<(.*)>'
RE_EMPTY='^(#pragma[[:space:]]+once)?[[:space:]]*(//.*)?$' RE_EMPTY='^(#pragma[[:space:]]+once)?[[:space:]]*(//.*)?$'
SRC_DIRECTORY="$(realpath "$(dirname $0)/../src")"
declare -A INCLUDED declare -A INCLUDED
@ -12,23 +18,33 @@ process()
local FOLDER=$(dirname $1) local FOLDER=$(dirname $1)
local SHOW_COMMENT=$2 local SHOW_COMMENT=$2
while IFS= read -r LINE; do while IFS= read -r LINE; do
if [[ $LINE =~ $RE_INCLUDE ]]; then if [[ $LINE =~ $RE_ABSOLUTE_INCLUDE ]]; then
local CHILD=${BASH_REMATCH[1]} local CHILD=${BASH_REMATCH[1]}
pushd "$FOLDER" > /dev/null local CHILD_PATH
if [[ -e $CHILD ]]; then CHILD_PATH=$(realpath "$SRC_DIRECTORY/$CHILD")
local CHILD_PATH=$(realpath $CHILD) echo "$PARENT -> $CHILD" >&2
if [[ ! ${INCLUDED[$CHILD_PATH]} ]]; then if [[ ! ${INCLUDED[$CHILD_PATH]} ]]; then
#echo "// $PARENT -> $CHILD"
INCLUDED[$CHILD_PATH]=true INCLUDED[$CHILD_PATH]=true
process "$CHILD" false process "$CHILD" false
fi fi
else elif [[ $LINE =~ $RE_RELATIVE_INCLUDE ]]; then
if [[ ! ${INCLUDED[$CHILD]} ]]; then local CHILD=${BASH_REMATCH[1]}
echo "$LINE" pushd "$FOLDER" > /dev/null
INCLUDED[$CHILD]=true local CHILD_PATH
fi CHILD_PATH=$(realpath "$CHILD")
echo "$PARENT -> $CHILD" >&2
if [[ ! ${INCLUDED[$CHILD_PATH]} ]]; then
INCLUDED[$CHILD_PATH]=true
process "$CHILD" false
fi fi
popd > /dev/null popd > /dev/null
elif [[ $LINE =~ $RE_SYSTEM_INCLUDE ]]; then
local CHILD=${BASH_REMATCH[1]}
echo "$PARENT -> <$CHILD>" >&2
if [[ ! ${INCLUDED[$CHILD]} ]]; then
echo "#include <$CHILD>"
INCLUDED[$CHILD]=true
fi
elif [[ "${SHOW_COMMENT}" = "true" ]] ; then elif [[ "${SHOW_COMMENT}" = "true" ]] ; then
echo "$LINE" echo "$LINE"
elif [[ ! $LINE =~ $RE_EMPTY ]]; then elif [[ ! $LINE =~ $RE_EMPTY ]]; then
@ -37,17 +53,29 @@ process()
done < $PARENT done < $PARENT
} }
simplify_namespaces() {
perl -p0i -e 's|\} // namespace ARDUINOJSON_NAMESPACE\r?\nnamespace ARDUINOJSON_NAMESPACE \{\r?\n||igs' "$1"
}
cd $(dirname $0)/../ cd $(dirname $0)/../
INCLUDED=() INCLUDED=()
process src/ArduinoJson.h true > ../ArduinoJson-$TAG.h process src/ArduinoJson.h true > ../ArduinoJson-$TAG.h
simplify_namespaces ../ArduinoJson-$TAG.h
g++ -x c++ -c -o ../smoketest.o - <<END g++ -x c++ -c -o ../smoketest.o - <<END
#include "../ArduinoJson-$TAG.h" #include "../ArduinoJson-$TAG.h"
int main() {} int main() {
StaticJsonDocument<300> doc;
deserializeJson(doc, "{}");
}
END END
INCLUDED=() INCLUDED=()
process src/ArduinoJson.hpp true > ../ArduinoJson-$TAG.hpp process src/ArduinoJson.hpp true > ../ArduinoJson-$TAG.hpp
simplify_namespaces ../ArduinoJson-$TAG.hpp
g++ -x c++ -c -o ../smoketest.o - <<END g++ -x c++ -c -o ../smoketest.o - <<END
#include "../ArduinoJson-$TAG.hpp" #include "../ArduinoJson-$TAG.hpp"
int main() {} int main() {
ArduinoJson::StaticJsonDocument<300> doc;
ArduinoJson::deserializeJson(doc, "{}");
}
END END

2
src/ArduinoJson/Array/ArrayFunctions.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "../Collection/CollectionData.hpp" #include <ArduinoJson/Collection/CollectionData.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

4
src/ArduinoJson/Array/ArrayImpl.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#include "../Object/ObjectRef.hpp" #include <ArduinoJson/Array/ArrayRef.hpp>
#include "ArrayRef.hpp" #include <ArduinoJson/Object/ObjectRef.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

4
src/ArduinoJson/Array/ArrayIterator.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#include "../Variant/SlotFunctions.hpp" #include <ArduinoJson/Variant/SlotFunctions.hpp>
#include "../Variant/VariantRef.hpp" #include <ArduinoJson/Variant/VariantRef.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

6
src/ArduinoJson/Array/ArrayRef.hpp
View File

@ -4,9 +4,9 @@
#pragma once #pragma once
#include "../Variant/VariantData.hpp" #include <ArduinoJson/Array/ArrayFunctions.hpp>
#include "ArrayFunctions.hpp" #include <ArduinoJson/Array/ArrayIterator.hpp>
#include "ArrayIterator.hpp" #include <ArduinoJson/Variant/VariantData.hpp>
// Returns the size (in bytes) of an array with n elements. // Returns the size (in bytes) of an array with n elements.
// Can be very handy to determine the size of a StaticMemoryPool. // Can be very handy to determine the size of a StaticMemoryPool.

4
src/ArduinoJson/Array/ArrayShortcuts.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#include "../Polyfills/attributes.hpp" #include <ArduinoJson/Polyfills/attributes.hpp>
#include "../Polyfills/type_traits.hpp" #include <ArduinoJson/Polyfills/type_traits.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {
// Forward declarations. // Forward declarations.

5
src/ArduinoJson/Array/ElementProxy.hpp
View File

@ -4,8 +4,9 @@
#pragma once #pragma once
#include "../Configuration.hpp" #include <ArduinoJson/Configuration.hpp>
#include "../Operators/VariantOperators.hpp" #include <ArduinoJson/Operators/VariantOperators.hpp>
#include <ArduinoJson/Variant/VariantTo.hpp>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #pragma warning(push)

2
src/ArduinoJson/Array/Utilities.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "ArrayRef.hpp" #include <ArduinoJson/Array/ArrayRef.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

2
src/ArduinoJson/Collection/CollectionData.hpp
View File

@ -4,6 +4,8 @@
#pragma once #pragma once
#include <stddef.h> // size_t
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {
class MemoryPool; class MemoryPool;

4
src/ArduinoJson/Collection/CollectionImpl.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#include "../Variant/VariantData.hpp" #include <ArduinoJson/Collection/CollectionData.hpp>
#include "CollectionData.hpp" #include <ArduinoJson/Variant/VariantData.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

2
src/ArduinoJson/Deserialization/NestingLimit.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "../Configuration.hpp" #include <ArduinoJson/Configuration.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

16
src/ArduinoJson/Deserialization/deserialize.hpp
View File

@ -4,14 +4,14 @@
#pragma once #pragma once
#include "../StringStorage/StringStorage.hpp" #include <ArduinoJson/Deserialization/ArduinoStreamReader.hpp>
#include "ArduinoStreamReader.hpp" #include <ArduinoJson/Deserialization/CharPointerReader.hpp>
#include "CharPointerReader.hpp" #include <ArduinoJson/Deserialization/DeserializationError.hpp>
#include "DeserializationError.hpp" #include <ArduinoJson/Deserialization/FlashStringReader.hpp>
#include "FlashStringReader.hpp" #include <ArduinoJson/Deserialization/IteratorReader.hpp>
#include "IteratorReader.hpp" #include <ArduinoJson/Deserialization/NestingLimit.hpp>
#include "NestingLimit.hpp" #include <ArduinoJson/Deserialization/StdStreamReader.hpp>
#include "StdStreamReader.hpp" #include <ArduinoJson/StringStorage/StringStorage.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

2
src/ArduinoJson/Document/BasicJsonDocument.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "JsonDocument.hpp" #include <ArduinoJson/Document/JsonDocument.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

2
src/ArduinoJson/Document/DynamicJsonDocument.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "BasicJsonDocument.hpp" #include <ArduinoJson/Document/BasicJsonDocument.hpp>
#include <stdlib.h> // malloc, free #include <stdlib.h> // malloc, free

13
src/ArduinoJson/Document/JsonDocument.hpp
View File

@ -4,13 +4,12 @@
#pragma once #pragma once
#include "../Memory/MemoryPool.hpp" #include <ArduinoJson/Array/ElementProxy.hpp>
#include "../Object/ObjectRef.hpp" #include <ArduinoJson/Memory/MemoryPool.hpp>
#include "../Variant/VariantRef.hpp" #include <ArduinoJson/Object/MemberProxy.hpp>
#include "../Variant/VariantTo.hpp" #include <ArduinoJson/Object/ObjectRef.hpp>
#include <ArduinoJson/Variant/VariantRef.hpp>
#include "../Array/ElementProxy.hpp" #include <ArduinoJson/Variant/VariantTo.hpp>
#include "../Object/MemberProxy.hpp"
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

2
src/ArduinoJson/Document/StaticJsonDocument.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "JsonDocument.hpp" #include <ArduinoJson/Document/JsonDocument.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

14
src/ArduinoJson/Json/JsonDeserializer.hpp
View File

@ -4,13 +4,13 @@
#pragma once #pragma once
#include "../Deserialization/deserialize.hpp" #include <ArduinoJson/Deserialization/deserialize.hpp>
#include "../Memory/MemoryPool.hpp" #include <ArduinoJson/Json/EscapeSequence.hpp>
#include "../Numbers/parseNumber.hpp" #include <ArduinoJson/Json/Utf8.hpp>
#include "../Polyfills/type_traits.hpp" #include <ArduinoJson/Memory/MemoryPool.hpp>
#include "../Variant/VariantData.hpp" #include <ArduinoJson/Numbers/parseNumber.hpp>
#include "EscapeSequence.hpp" #include <ArduinoJson/Polyfills/type_traits.hpp>
#include "Utf8.hpp" #include <ArduinoJson/Variant/VariantData.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

8
src/ArduinoJson/Json/JsonSerializer.hpp
View File

@ -4,10 +4,10 @@
#pragma once #pragma once
#include "../Misc/Visitable.hpp" #include <ArduinoJson/Json/TextFormatter.hpp>
#include "../Serialization/measure.hpp" #include <ArduinoJson/Misc/Visitable.hpp>
#include "../Serialization/serialize.hpp" #include <ArduinoJson/Serialization/measure.hpp>
#include "TextFormatter.hpp" #include <ArduinoJson/Serialization/serialize.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

8
src/ArduinoJson/Json/PrettyJsonSerializer.hpp
View File

@ -4,10 +4,10 @@
#pragma once #pragma once
#include "../Configuration.hpp" #include <ArduinoJson/Configuration.hpp>
#include "../Serialization/measure.hpp" #include <ArduinoJson/Json/JsonSerializer.hpp>
#include "../Serialization/serialize.hpp" #include <ArduinoJson/Serialization/measure.hpp>
#include "JsonSerializer.hpp" #include <ArduinoJson/Serialization/serialize.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

9
src/ArduinoJson/Json/TextFormatter.hpp
View File

@ -6,10 +6,11 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> // for strlen #include <string.h> // for strlen
#include "../Numbers/FloatParts.hpp"
#include "../Numbers/Integer.hpp" #include <ArduinoJson/Json/EscapeSequence.hpp>
#include "../Polyfills/attributes.hpp" #include <ArduinoJson/Numbers/FloatParts.hpp>
#include "EscapeSequence.hpp" #include <ArduinoJson/Numbers/Integer.hpp>
#include <ArduinoJson/Polyfills/attributes.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

11
src/ArduinoJson/Memory/MemoryPool.hpp
View File

@ -4,12 +4,11 @@
#pragma once #pragma once
#include "../Polyfills/assert.hpp" #include <ArduinoJson/Memory/Alignment.hpp>
#include "../Polyfills/mpl/max.hpp" #include <ArduinoJson/Memory/StringSlot.hpp>
#include "../Variant/VariantSlot.hpp" #include <ArduinoJson/Polyfills/assert.hpp>
#include "Alignment.hpp" #include <ArduinoJson/Polyfills/mpl/max.hpp>
#include "MemoryPool.hpp" #include <ArduinoJson/Variant/VariantSlot.hpp>
#include "StringSlot.hpp"
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

2
src/ArduinoJson/Memory/StringBuilder.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "MemoryPool.hpp" #include <ArduinoJson/Memory/MemoryPool.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

3
src/ArduinoJson/Memory/StringSlot.hpp
View File

@ -5,7 +5,8 @@
#pragma once #pragma once
#include <stddef.h> // for size_t #include <stddef.h> // for size_t
#include "../Configuration.hpp"
#include <ArduinoJson/Configuration.hpp>
#define JSON_STRING_SIZE(SIZE) (SIZE) #define JSON_STRING_SIZE(SIZE) (SIZE)

2
src/ArduinoJson/Misc/SerializedValue.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "../Strings/StringAdapters.hpp" #include <ArduinoJson/Strings/StringAdapters.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

2
src/ArduinoJson/Misc/Visitable.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "../Polyfills/type_traits.hpp" #include <ArduinoJson/Polyfills/type_traits.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

12
src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
View File

@ -4,12 +4,12 @@
#pragma once #pragma once
#include "../Deserialization/deserialize.hpp" #include <ArduinoJson/Deserialization/deserialize.hpp>
#include "../Memory/MemoryPool.hpp" #include <ArduinoJson/Memory/MemoryPool.hpp>
#include "../Polyfills/type_traits.hpp" #include <ArduinoJson/MsgPack/endianess.hpp>
#include "../Variant/VariantData.hpp" #include <ArduinoJson/MsgPack/ieee754.hpp>
#include "endianess.hpp" #include <ArduinoJson/Polyfills/type_traits.hpp>
#include "ieee754.hpp" #include <ArduinoJson/Variant/VariantData.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

10
src/ArduinoJson/MsgPack/MsgPackSerializer.hpp
View File

@ -4,11 +4,11 @@
#pragma once #pragma once
#include "../Polyfills/type_traits.hpp" #include <ArduinoJson/MsgPack/endianess.hpp>
#include "../Serialization/measure.hpp" #include <ArduinoJson/Polyfills/type_traits.hpp>
#include "../Serialization/serialize.hpp" #include <ArduinoJson/Serialization/measure.hpp>
#include "../Variant/VariantData.hpp" #include <ArduinoJson/Serialization/serialize.hpp>
#include "endianess.hpp" #include <ArduinoJson/Variant/VariantData.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

4
src/ArduinoJson/MsgPack/endianess.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#include "../Polyfills/type_traits.hpp" #include <ArduinoJson/Polyfills/type_traits.hpp>
#include "../Polyfills/utility.hpp" #include <ArduinoJson/Polyfills/utility.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

5
src/ArduinoJson/Namespace.hpp
View File

@ -4,9 +4,8 @@
#pragma once #pragma once
#include "version.hpp" #include <ArduinoJson/Configuration.hpp>
#include <ArduinoJson/version.hpp>
#include "Configuration.hpp"
#define ARDUINOJSON_DO_CONCAT(A, B) A##B #define ARDUINOJSON_DO_CONCAT(A, B) A##B
#define ARDUINOJSON_CONCAT2(A, B) ARDUINOJSON_DO_CONCAT(A, B) #define ARDUINOJSON_CONCAT2(A, B) ARDUINOJSON_DO_CONCAT(A, B)

2
src/ArduinoJson/Numbers/Float.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "../Configuration.hpp" #include <ArduinoJson/Configuration.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

6
src/ArduinoJson/Numbers/FloatParts.hpp
View File

@ -4,9 +4,9 @@
#pragma once #pragma once
#include "../Configuration.hpp" #include <ArduinoJson/Configuration.hpp>
#include "../Polyfills/math.hpp" #include <ArduinoJson/Numbers/FloatTraits.hpp>
#include "./FloatTraits.hpp" #include <ArduinoJson/Polyfills/math.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

7
src/ArduinoJson/Numbers/FloatTraits.hpp
View File

@ -6,9 +6,10 @@
#include <stddef.h> // for size_t #include <stddef.h> // for size_t
#include <stdint.h> #include <stdint.h>
#include "../Configuration.hpp"
#include "../Polyfills/alias_cast.hpp" #include <ArduinoJson/Configuration.hpp>
#include "../Polyfills/math.hpp" #include <ArduinoJson/Polyfills/alias_cast.hpp>
#include <ArduinoJson/Polyfills/math.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

2
src/ArduinoJson/Numbers/Integer.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "../Configuration.hpp" #include <ArduinoJson/Configuration.hpp>
#include <stdint.h> // int64_t #include <stdint.h> // int64_t

8
src/ArduinoJson/Numbers/convertNumber.hpp
View File

@ -14,10 +14,10 @@
#pragma GCC diagnostic ignored "-Wconversion" #pragma GCC diagnostic ignored "-Wconversion"
#endif #endif
#include "../Polyfills/limits.hpp" #include <ArduinoJson/Numbers/Float.hpp>
#include "Float.hpp" #include <ArduinoJson/Numbers/FloatTraits.hpp>
#include "FloatTraits.hpp" #include <ArduinoJson/Numbers/Integer.hpp>
#include "Integer.hpp" #include <ArduinoJson/Polyfills/limits.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

4
src/ArduinoJson/Numbers/parseFloat.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#include "convertNumber.hpp" #include <ArduinoJson/Numbers/convertNumber.hpp>
#include "parseNumber.hpp" #include <ArduinoJson/Numbers/parseNumber.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

6
src/ArduinoJson/Numbers/parseInteger.hpp
View File

@ -4,9 +4,9 @@
#pragma once #pragma once
#include "../Polyfills/type_traits.hpp" #include <ArduinoJson/Numbers/convertNumber.hpp>
#include "convertNumber.hpp" #include <ArduinoJson/Numbers/parseNumber.hpp>
#include "parseNumber.hpp" #include <ArduinoJson/Polyfills/type_traits.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {
template <typename T> template <typename T>

14
src/ArduinoJson/Numbers/parseNumber.hpp
View File

@ -4,13 +4,13 @@
#pragma once #pragma once
#include "../Polyfills/assert.hpp" #include <ArduinoJson/Numbers/FloatTraits.hpp>
#include "../Polyfills/ctype.hpp" #include <ArduinoJson/Numbers/convertNumber.hpp>
#include "../Polyfills/math.hpp" #include <ArduinoJson/Polyfills/assert.hpp>
#include "../Polyfills/type_traits.hpp" #include <ArduinoJson/Polyfills/ctype.hpp>
#include "../Variant/VariantContent.hpp" #include <ArduinoJson/Polyfills/math.hpp>
#include "FloatTraits.hpp" #include <ArduinoJson/Polyfills/type_traits.hpp>
#include "convertNumber.hpp" #include <ArduinoJson/Variant/VariantContent.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

6
src/ArduinoJson/Object/MemberProxy.hpp
View File

@ -4,9 +4,9 @@
#pragma once #pragma once
#include "../Configuration.hpp" #include <ArduinoJson/Configuration.hpp>
#include "../Operators/VariantOperators.hpp" #include <ArduinoJson/Operators/VariantOperators.hpp>
#include "../Polyfills/type_traits.hpp" #include <ArduinoJson/Polyfills/type_traits.hpp>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #pragma warning(push)

2
src/ArduinoJson/Object/ObjectFunctions.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "../Collection/CollectionData.hpp" #include <ArduinoJson/Collection/CollectionData.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

4
src/ArduinoJson/Object/ObjectImpl.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#include "../Array/ArrayRef.hpp" #include <ArduinoJson/Array/ArrayRef.hpp>
#include "ObjectRef.hpp" #include <ArduinoJson/Object/ObjectRef.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

4
src/ArduinoJson/Object/ObjectIterator.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#include "../Variant/SlotFunctions.hpp" #include <ArduinoJson/Object/Pair.hpp>
#include "Pair.hpp" #include <ArduinoJson/Variant/SlotFunctions.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

4
src/ArduinoJson/Object/ObjectRef.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#include "ObjectFunctions.hpp" #include <ArduinoJson/Object/ObjectFunctions.hpp>
#include "ObjectIterator.hpp" #include <ArduinoJson/Object/ObjectIterator.hpp>
// Returns the size (in bytes) of an object with n elements. // Returns the size (in bytes) of an object with n elements.
// Can be very handy to determine the size of a StaticMemoryPool. // Can be very handy to determine the size of a StaticMemoryPool.

6
src/ArduinoJson/Object/ObjectShortcuts.hpp
View File

@ -4,9 +4,9 @@
#pragma once #pragma once
#include "../Polyfills/attributes.hpp" #include <ArduinoJson/Polyfills/attributes.hpp>
#include "../Polyfills/type_traits.hpp" #include <ArduinoJson/Polyfills/type_traits.hpp>
#include "../Strings/StringAdapters.hpp" #include <ArduinoJson/Strings/StringAdapters.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {
template <typename TParent, typename TStringRef> template <typename TParent, typename TStringRef>

4
src/ArduinoJson/Object/Pair.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#include "../Strings/String.hpp" #include <ArduinoJson/Strings/String.hpp>
#include "../Variant/VariantRef.hpp" #include <ArduinoJson/Variant/VariantRef.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {
// A key value pair for CollectionData. // A key value pair for CollectionData.

2
src/ArduinoJson/Operators/VariantCasts.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "../Polyfills/attributes.hpp" #include <ArduinoJson/Polyfills/attributes.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

2
src/ArduinoJson/Operators/VariantComparisons.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "../Variant/VariantRef.hpp" #include <ArduinoJson/Variant/VariantRef.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

8
src/ArduinoJson/Operators/VariantOperators.hpp
View File

@ -4,10 +4,10 @@
#pragma once #pragma once
#include "VariantCasts.hpp" #include <ArduinoJson/Operators/VariantCasts.hpp>
#include "VariantComparisons.hpp" #include <ArduinoJson/Operators/VariantComparisons.hpp>
#include "VariantOr.hpp" #include <ArduinoJson/Operators/VariantOr.hpp>
#include "VariantShortcuts.hpp" #include <ArduinoJson/Operators/VariantShortcuts.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

6
src/ArduinoJson/Operators/VariantOr.hpp
View File

@ -4,9 +4,9 @@
#pragma once #pragma once
#include "../Polyfills/attributes.hpp" #include <ArduinoJson/Polyfills/attributes.hpp>
#include "../Polyfills/type_traits.hpp" #include <ArduinoJson/Polyfills/type_traits.hpp>
#include "../Variant/VariantAs.hpp" #include <ArduinoJson/Variant/VariantAs.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

4
src/ArduinoJson/Operators/VariantShortcuts.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#include "../Array/ArrayShortcuts.hpp" #include <ArduinoJson/Array/ArrayShortcuts.hpp>
#include "../Object/ObjectShortcuts.hpp" #include <ArduinoJson/Object/ObjectShortcuts.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

5
src/ArduinoJson/Polyfills/alias_cast.hpp
View File

@ -6,8 +6,9 @@
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> // for size_t #include <stdlib.h> // for size_t
#include "../Configuration.hpp"
#include "../Polyfills/math.hpp" #include <ArduinoJson/Configuration.hpp>
#include "math.hpp"
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

2
src/ArduinoJson/Polyfills/gsl/not_null.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "../assert.hpp" #include <ArduinoJson/Polyfills/assert.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

2
src/ArduinoJson/Polyfills/limits.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "../Polyfills/type_traits.hpp" #include "type_traits.hpp"
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #pragma warning(push)

2
src/ArduinoJson/Polyfills/type_traits/is_integral.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "../../Configuration.hpp" #include <ArduinoJson/Configuration.hpp>
#include "is_same.hpp" #include "is_same.hpp"
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

2
src/ArduinoJson/Serialization/DynamicStringWriter.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "../Polyfills/type_traits.hpp" #include <ArduinoJson/Polyfills/type_traits.hpp>
#if ARDUINOJSON_ENABLE_ARDUINO_STRING #if ARDUINOJSON_ENABLE_ARDUINO_STRING
#include <WString.h> #include <WString.h>

2
src/ArduinoJson/Serialization/StreamWriter.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "../Configuration.hpp" #include <ArduinoJson/Configuration.hpp>
#if ARDUINOJSON_ENABLE_STD_STREAM #if ARDUINOJSON_ENABLE_STD_STREAM

2
src/ArduinoJson/Serialization/measure.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "./DummyWriter.hpp" #include <ArduinoJson/Serialization/DummyWriter.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

6
src/ArduinoJson/Serialization/serialize.hpp
View File

@ -4,11 +4,11 @@
#pragma once #pragma once
#include "./DynamicStringWriter.hpp" #include <ArduinoJson/Serialization/DynamicStringWriter.hpp>
#include "./StaticStringWriter.hpp" #include <ArduinoJson/Serialization/StaticStringWriter.hpp>
#if ARDUINOJSON_ENABLE_STD_STREAM #if ARDUINOJSON_ENABLE_STD_STREAM
#include "./StreamWriter.hpp" #include <ArduinoJson/Serialization/StreamWriter.hpp>
#endif #endif
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

4
src/ArduinoJson/StringStorage/StringCopier.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#include "../Memory/MemoryPool.hpp" #include <ArduinoJson/Memory/MemoryPool.hpp>
#include "../Memory/StringBuilder.hpp" #include <ArduinoJson/Memory/StringBuilder.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

4
src/ArduinoJson/StringStorage/StringStorage.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#include "./StringCopier.hpp" #include <ArduinoJson/StringStorage/StringCopier.hpp>
#include "./StringMover.hpp" #include <ArduinoJson/StringStorage/StringMover.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

3
src/ArduinoJson/Strings/ArduinoStringAdapter.hpp
View File

@ -5,7 +5,8 @@
#pragma once #pragma once
#include <WString.h> #include <WString.h>
#include "../Polyfills/safe_strcmp.hpp"
#include <ArduinoJson/Polyfills/safe_strcmp.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

3
src/ArduinoJson/Strings/ConstRamStringAdapter.hpp
View File

@ -6,7 +6,8 @@
#include <stddef.h> // size_t #include <stddef.h> // size_t
#include <string.h> // strcmp #include <string.h> // strcmp
#include "../Polyfills/safe_strcmp.hpp"
#include <ArduinoJson/Polyfills/safe_strcmp.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

2
src/ArduinoJson/Strings/FlashStringAdapter.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "../Polyfills/pgmspace.hpp" #include <ArduinoJson/Polyfills/pgmspace.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

2
src/ArduinoJson/Strings/RamStringAdapter.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "ConstRamStringAdapter.hpp" #include <ArduinoJson/Strings/ConstRamStringAdapter.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

2
src/ArduinoJson/Strings/String.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "ConstRamStringAdapter.hpp" #include <ArduinoJson/Strings/ConstRamStringAdapter.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

18
src/ArduinoJson/Strings/StringAdapters.hpp
View File

@ -4,8 +4,8 @@
#pragma once #pragma once
#include "../Memory/MemoryPool.hpp" #include <ArduinoJson/Memory/MemoryPool.hpp>
#include "../Polyfills/type_traits.hpp" #include <ArduinoJson/Polyfills/type_traits.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {
template <typename> template <typename>
@ -18,19 +18,19 @@ template <typename T>
struct IsString<T&> : IsString<T> {}; struct IsString<T&> : IsString<T> {};
} // namespace ARDUINOJSON_NAMESPACE } // namespace ARDUINOJSON_NAMESPACE
#include "ConstRamStringAdapter.hpp" #include <ArduinoJson/Strings/ConstRamStringAdapter.hpp>
#include "RamStringAdapter.hpp" #include <ArduinoJson/Strings/RamStringAdapter.hpp>
#include "SizedRamStringAdapter.hpp" #include <ArduinoJson/Strings/SizedRamStringAdapter.hpp>
#if ARDUINOJSON_ENABLE_STD_STRING #if ARDUINOJSON_ENABLE_STD_STRING
#include "StlStringAdapter.hpp" #include <ArduinoJson/Strings/StlStringAdapter.hpp>
#endif #endif
#if ARDUINOJSON_ENABLE_ARDUINO_STRING #if ARDUINOJSON_ENABLE_ARDUINO_STRING
#include "ArduinoStringAdapter.hpp" #include <ArduinoJson/Strings/ArduinoStringAdapter.hpp>
#endif #endif
#if ARDUINOJSON_ENABLE_PROGMEM #if ARDUINOJSON_ENABLE_PROGMEM
#include "FlashStringAdapter.hpp" #include <ArduinoJson/Strings/FlashStringAdapter.hpp>
#include "SizedFlashStringAdapter.hpp" #include <ArduinoJson/Strings/SizedFlashStringAdapter.hpp>
#endif #endif

6
src/ArduinoJson/Variant/SlotFunctions.hpp
View File

@ -4,10 +4,8 @@
#pragma once #pragma once
#include "../Memory/MemoryPool.hpp" #include <ArduinoJson/Polyfills/assert.hpp>
#include "../Polyfills/assert.hpp" #include <ArduinoJson/Variant/VariantData.hpp>
#include "../Strings/StringAdapters.hpp"
#include "VariantData.hpp"
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

2
src/ArduinoJson/Variant/VariantAs.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "../Serialization/DynamicStringWriter.hpp" #include <ArduinoJson/Serialization/DynamicStringWriter.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

6
src/ArduinoJson/Variant/VariantAsImpl.hpp
View File

@ -4,9 +4,9 @@
#pragma once #pragma once
#include "../Serialization/DynamicStringWriter.hpp" #include <ArduinoJson/Serialization/DynamicStringWriter.hpp>
#include "VariantFunctions.hpp" #include <ArduinoJson/Variant/VariantFunctions.hpp>
#include "VariantRef.hpp" #include <ArduinoJson/Variant/VariantRef.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

6
src/ArduinoJson/Variant/VariantContent.hpp
View File

@ -6,9 +6,9 @@
#include <stddef.h> // size_t #include <stddef.h> // size_t
#include "../Collection/CollectionData.hpp" #include <ArduinoJson/Collection/CollectionData.hpp>
#include "../Numbers/Float.hpp" #include <ArduinoJson/Numbers/Float.hpp>
#include "../Numbers/Integer.hpp" #include <ArduinoJson/Numbers/Integer.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

9
src/ArduinoJson/Variant/VariantData.hpp
View File

@ -4,10 +4,11 @@
#pragma once #pragma once
#include "../Misc/SerializedValue.hpp" #include <ArduinoJson/Misc/SerializedValue.hpp>
#include "../Numbers/convertNumber.hpp" #include <ArduinoJson/Numbers/convertNumber.hpp>
#include "../Polyfills/gsl/not_null.hpp" #include <ArduinoJson/Polyfills/gsl/not_null.hpp>
#include "VariantContent.hpp" #include <ArduinoJson/Strings/RamStringAdapter.hpp>
#include <ArduinoJson/Variant/VariantContent.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

2
src/ArduinoJson/Variant/VariantFunctions.hpp
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "VariantData.hpp" #include <ArduinoJson/Variant/VariantData.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

10
src/ArduinoJson/Variant/VariantImpl.hpp
View File

@ -4,11 +4,11 @@
#pragma once #pragma once
#include "../Configuration.hpp" #include <ArduinoJson/Configuration.hpp>
#include "../Numbers/convertNumber.hpp" #include <ArduinoJson/Numbers/convertNumber.hpp>
#include "../Numbers/parseFloat.hpp" #include <ArduinoJson/Numbers/parseFloat.hpp>
#include "../Numbers/parseInteger.hpp" #include <ArduinoJson/Numbers/parseInteger.hpp>
#include "VariantRef.hpp" #include <ArduinoJson/Variant/VariantRef.hpp>
#include <string.h> // for strcmp #include <string.h> // for strcmp

14
src/ArduinoJson/Variant/VariantRef.hpp
View File

@ -7,13 +7,13 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> // for uint8_t #include <stdint.h> // for uint8_t
#include "../Memory/MemoryPool.hpp" #include <ArduinoJson/Memory/MemoryPool.hpp>
#include "../Misc/Visitable.hpp" #include <ArduinoJson/Misc/Visitable.hpp>
#include "../Operators/VariantOperators.hpp" #include <ArduinoJson/Operators/VariantOperators.hpp>
#include "../Polyfills/type_traits.hpp" #include <ArduinoJson/Polyfills/type_traits.hpp>
#include "VariantAs.hpp" #include <ArduinoJson/Variant/VariantAs.hpp>
#include "VariantFunctions.hpp" #include <ArduinoJson/Variant/VariantFunctions.hpp>
#include "VariantRef.hpp" #include <ArduinoJson/Variant/VariantRef.hpp>
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {

8
src/ArduinoJson/Variant/VariantSlot.hpp
View File

@ -4,9 +4,9 @@
#pragma once #pragma once
#include "../Polyfills/gsl/not_null.hpp" #include <ArduinoJson/Polyfills/gsl/not_null.hpp>
#include "../Polyfills/type_traits.hpp" #include <ArduinoJson/Polyfills/type_traits.hpp>
#include "../Variant/VariantContent.hpp" #include <ArduinoJson/Variant/VariantContent.hpp>
#include <stdint.h> // int8_t, int16_t #include <stdint.h> // int8_t, int16_t
@ -14,6 +14,8 @@ namespace ARDUINOJSON_NAMESPACE {
typedef conditional<sizeof(void*) <= 2, int8_t, int16_t>::type VariantSlotDiff; typedef conditional<sizeof(void*) <= 2, int8_t, int16_t>::type VariantSlotDiff;
class VairantData;
class VariantSlot { class VariantSlot {
// CAUTION: same layout as VariantData // CAUTION: same layout as VariantData
// we cannot use composition because it adds padding // we cannot use composition because it adds padding