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

Added support of long long (issue #171)

Browse Source 
Moved all build settings to `ArduinoJson/Configuration.hpp`
Added AppVeyor settings in source tree
This commit is contained in:
Benoit Blanchon
2016-02-14 16:18:13 +01:00
parent ce63e9c3c3
commit 8733f95e51
53 changed files with 945 additions and 869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
include/ArduinoJson/JsonVariant.ipp
View File

@ -7,7 +7,11 @@
#pragma once
#include "Configuration.hpp"
#include "JsonVariant.hpp"
#include "Internals/Parse.hpp"
#include <string.h>
namespace ArduinoJson {
@ -27,18 +31,6 @@ inline JsonVariant::JsonVariant(Internals::Unparsed value) {
_content.asString = value;
}
inline JsonVariant::JsonVariant(double value, uint8_t decimals) {
using namespace Internals;
_type = static_cast<JsonVariantType>(JSON_FLOAT_0_DECIMALS + decimals);
_content.asFloat = static_cast<JsonFloat>(value);
}
inline JsonVariant::JsonVariant(float value, uint8_t decimals) {
using namespace Internals;
_type = static_cast<JsonVariantType>(JSON_FLOAT_0_DECIMALS + decimals);
_content.asFloat = static_cast<JsonFloat>(value);
}
inline JsonVariant::JsonVariant(JsonArray &array) {
_type = Internals::JSON_ARRAY;
_content.asArray = &array;
@ -49,115 +41,6 @@ inline JsonVariant::JsonVariant(JsonObject &object) {
_content.asObject = &object;
}
inline JsonVariant::JsonVariant(signed char value) {
using namespace Internals;
_type = JSON_INTEGER;
_content.asInteger = static_cast<JsonInteger>(value);
}
inline JsonVariant::JsonVariant(signed int value) {
using namespace Internals;
_type = JSON_INTEGER;
_content.asInteger = static_cast<JsonInteger>(value);
}
inline JsonVariant::JsonVariant(signed long value) {
using namespace Internals;
_type = JSON_INTEGER;
_content.asInteger = static_cast<JsonInteger>(value);
}
inline JsonVariant::JsonVariant(signed short value) {
using namespace Internals;
_type = JSON_INTEGER;
_content.asInteger = static_cast<JsonInteger>(value);
}
inline JsonVariant::JsonVariant(unsigned char value) {
using namespace Internals;
_type = JSON_INTEGER;
_content.asInteger = static_cast<JsonInteger>(value);
}
inline JsonVariant::JsonVariant(unsigned int value) {
using namespace Internals;
_type = JSON_INTEGER;
_content.asInteger = static_cast<JsonInteger>(value);
}
inline JsonVariant::JsonVariant(unsigned long value) {
using namespace Internals;
_type = JSON_INTEGER;
_content.asInteger = static_cast<JsonInteger>(value);
}
inline JsonVariant::JsonVariant(unsigned short value) {
using namespace Internals;
_type = JSON_INTEGER;
_content.asInteger = static_cast<JsonInteger>(value);
}
template <>
String JsonVariant::as<String>() const;
template <>
const char *JsonVariant::as<const char *>() const;
template <>
inline bool JsonVariant::as<bool>() const {
return asInteger() != 0;
}
template <>
inline signed char JsonVariant::as<signed char>() const {
return static_cast<signed char>(asInteger());
}
template <>
inline unsigned char JsonVariant::as<unsigned char>() const {
return static_cast<unsigned char>(asInteger());
}
template <>
inline signed short JsonVariant::as<signed short>() const {
return static_cast<signed short>(asInteger());
}
template <>
inline unsigned short JsonVariant::as<unsigned short>() const {
return static_cast<unsigned short>(asInteger());
}
template <>
inline signed int JsonVariant::as<signed int>() const {
return static_cast<signed int>(asInteger());
}
template <>
inline unsigned int JsonVariant::as<unsigned int>() const {
return static_cast<unsigned int>(asInteger());
}
template <>
inline unsigned long JsonVariant::as<unsigned long>() const {
return static_cast<unsigned long>(asInteger());
}
template <>
inline signed long JsonVariant::as<signed long>() const {
return static_cast<unsigned long>(asInteger());
}
template <>
inline double JsonVariant::as<double>() const {
return static_cast<double>(asFloat());
}
template <>
inline float JsonVariant::as<float>() const {
return static_cast<float>(asFloat());
}
template <typename T>
inline T JsonVariant::invalid() {
return T();
@ -242,7 +125,23 @@ inline bool JsonVariant::is<unsigned short>() const {
return is<signed long>();
}
#ifdef ARDUINOJSON_ENABLE_STD_STREAM
inline Internals::JsonInteger JsonVariant::asInteger() const {
if (_type == Internals::JSON_INTEGER || _type == Internals::JSON_BOOLEAN)
return _content.asInteger;
if (_type >= Internals::JSON_FLOAT_0_DECIMALS)
return static_cast<Internals::JsonInteger>(_content.asFloat);
if ((_type == Internals::JSON_STRING || _type == Internals::JSON_UNPARSED) &&
_content.asString) {
if (!strcmp("true", _content.asString)) return 1;
return Internals::parse<Internals::JsonInteger>(_content.asString);
}
return 0L;
}
#if ARDUINOJSON_ENABLE_STD_STREAM
inline std::ostream &operator<<(std::ostream &os, const JsonVariant &source) {
return source.printTo(os);
}