Skip to content

Added support for char, unsigned char, short, unsigned short and unsigned int. #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 10, 2022
Merged

Added support for char, unsigned char, short, unsigned short and unsigned int. #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcbe463
Added support for char, unsigned char, short, unsigned short and unsi…
MartinMueller2003 May 25, 2021
5bccd3d
Merge branch 'arduino-libraries:master' into master
MartinMueller2003 Oct 17, 2022
53ed894
Merge branch 'master' into master
aentinger Nov 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 99 additions & 5 deletions src/JSONVar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,42 @@ JSONVar::JSONVar(bool b) :
*this = b;
}

JSONVar::JSONVar (char i) :
JSONVar ()
{
*this = i;
}

JSONVar::JSONVar (unsigned char i) :
JSONVar ()
{
*this = i;
}

JSONVar::JSONVar (short i) :
JSONVar ()
{
*this = i;
}

JSONVar::JSONVar (unsigned short i) :
JSONVar ()
{
*this = i;
}

JSONVar::JSONVar(int i) :
JSONVar()
{
*this = i;
}

JSONVar::JSONVar (unsigned int i) :
JSONVar ()
{
*this = i;
}

JSONVar::JSONVar(long l) :
JSONVar()
{
Expand Down Expand Up @@ -132,14 +162,44 @@ JSONVar::operator bool() const
return cJSON_IsBool(_json) && cJSON_IsTrue(_json);
}

JSONVar::operator int() const
JSONVar::operator char () const
{
return cJSON_IsNumber(_json) ? _json->valueint : 0;
return cJSON_IsNumber (_json) ? _json->valueint : 0;
}

JSONVar::operator long() const
JSONVar::operator unsigned char () const
{
return cJSON_IsNumber(_json) ? _json->valueint : 0;
return cJSON_IsNumber (_json) ? _json->valueint : 0;
}

JSONVar::operator short () const
{
return cJSON_IsNumber (_json) ? _json->valueint : 0;
}

JSONVar::operator unsigned short () const
{
return cJSON_IsNumber (_json) ? _json->valueint : 0;
}

JSONVar::operator int () const
{
return cJSON_IsNumber (_json) ? _json->valueint : 0;
}

JSONVar::operator unsigned int () const
{
return cJSON_IsNumber (_json) ? _json->valueint : 0;
}

JSONVar::operator long () const
{
return cJSON_IsNumber (_json) ? _json->valueint : 0;
}

JSONVar::operator unsigned long () const
{
return cJSON_IsNumber (_json) ? _json->valueint : 0;
}

JSONVar::operator unsigned long() const
Expand All @@ -161,6 +221,15 @@ JSONVar::operator const char*() const
return NULL;
}

JSONVar::operator const String () const
{
if (cJSON_IsString (_json)) {
return String(_json->valuestring);
}

return String();
}

void JSONVar::operator=(const JSONVar& v)
{
if (&v == &undefined) {
Expand Down Expand Up @@ -201,9 +270,34 @@ void JSONVar::operator=(bool b)
replaceJson(b ? cJSON_CreateTrue() : cJSON_CreateFalse());
}

void JSONVar::operator=(char i)
{
replaceJson (cJSON_CreateNumber (i));
}

void JSONVar::operator=(unsigned char i)
{
replaceJson (cJSON_CreateNumber (i));
}

void JSONVar::operator=(short i)
{
replaceJson (cJSON_CreateNumber (i));
}

void JSONVar::operator=(unsigned short i)
{
replaceJson (cJSON_CreateNumber (i));
}

void JSONVar::operator=(int i)
{
replaceJson(cJSON_CreateNumber(i));
replaceJson (cJSON_CreateNumber (i));
}

void JSONVar::operator=(unsigned int i)
{
replaceJson (cJSON_CreateNumber (i));
}

void JSONVar::operator=(long l)
Expand Down
22 changes: 19 additions & 3 deletions src/JSONVar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ class JSONVar : public Printable {
public:
JSONVar();
JSONVar(bool b);
JSONVar(char i);
JSONVar(unsigned char i);
JSONVar(short i);
JSONVar(unsigned short i);
JSONVar(int i);
JSONVar(unsigned int i);
JSONVar(long l);
JSONVar(unsigned long ul);
JSONVar(double d);
Expand All @@ -47,18 +52,29 @@ class JSONVar : public Printable {
virtual size_t printTo(Print& p) const;

operator bool() const;
operator char() const;
operator unsigned char() const;
operator short() const;
operator unsigned short() const;
operator int() const;
operator long() const;
operator unsigned long() const;
operator unsigned int() const;
operator long () const;
operator unsigned long () const;
operator double() const;
operator const char*() const;
operator const char* () const;
operator const String () const;

void operator=(const JSONVar& v);
#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
JSONVar& operator=(JSONVar&& v);
#endif
void operator=(bool b);
void operator=(char i);
void operator=(unsigned char i);
void operator=(short i);
void operator=(unsigned short i);
void operator=(int i);
void operator=(unsigned int i);
void operator=(long l);
void operator=(unsigned long ul);
void operator=(double d);
Expand Down