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

Parse booleans

Browse Source
This commit is contained in:
Benoit Blanchon
2014-10-15 23:10:52 +02:00
parent 086d07151f
commit c61ee09d26
5 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
srcs/Internals/JsonParser.cpp
View File

@ -60,6 +60,11 @@ bool JsonParser::isComma()
return *_ptr == ','; return *_ptr == ',';
} }
bool JsonParser::isBoolean()
{
return *_ptr == 't' || *_ptr == 'f';
}
void JsonParser::skipOneChar() void JsonParser::skipOneChar()
{ {
_ptr++; _ptr++;
@ -83,6 +88,9 @@ JsonNode* JsonParser::parseAnything()
if (isDouble()) if (isDouble())
return parseDouble(); return parseDouble();
if (isBoolean())
return parseBoolean();
return 0; return 0;
} }
@ -133,3 +141,14 @@ JsonNode *JsonParser::parseDouble()
return _buffer->createDoubleNode(value, decimals); return _buffer->createDoubleNode(value, decimals);
} }
JsonNode *JsonParser::parseBoolean()
{
bool value = *_ptr == 't';
_ptr += value ? 4 : 5;
// 4 = strlen("true")
// 5 = strlen("false");
return _buffer->createBoolNode(value);
}

2
srcs/Internals/JsonParser.h
View File

@ -27,12 +27,14 @@ private:
inline bool isDouble(); inline bool isDouble();
inline bool isSpace(); inline bool isSpace();
inline bool isComma(); inline bool isComma();
inline bool isBoolean();
inline void skipOneChar(); inline void skipOneChar();
inline void skipSpaces(); inline void skipSpaces();
inline JsonNode* parseArray(); inline JsonNode* parseArray();
inline JsonNode* parseLong(); inline JsonNode* parseLong();
inline JsonNode* parseBoolean();
JsonNode *parseDouble(); JsonNode *parseDouble();
}; };

10
srcs/JsonBuffer.cpp
View File

@ -64,3 +64,13 @@ JsonNode *JsonBuffer::createDoubleNode(double value, int decimals)
return node; return node;
} }
JsonNode *JsonBuffer::createBoolNode(bool value)
{
JsonNode* node = createNode();
if (node)
node->setAsBoolean(value);
return node;
}

2
srcs/JsonBuffer.h
View File

@ -38,5 +38,7 @@ private:
JsonNode* createObjectNode(); JsonNode* createObjectNode();
JsonNode* createLongNode(long value); JsonNode* createLongNode(long value);
JsonNode *createDoubleNode(double value, int decimals); JsonNode *createDoubleNode(double value, int decimals);
JsonNode *createBoolNode(bool value);
}; };

19
tests/JsonArray_Parser_Tests.cpp
View File

@ -117,15 +117,6 @@ TEST_F(JsonArray_Parser_Tests, TwoIntegers)
secondElementMustBe(84); secondElementMustBe(84);
} }
TEST_F(JsonArray_Parser_Tests, OneDouble)
{
whenInputIs("[4.2]");
parseMustSucceed();
sizeMustBe(1);
firstElementMustBe(4.2);
}
TEST_F(JsonArray_Parser_Tests, TwoDoubles) TEST_F(JsonArray_Parser_Tests, TwoDoubles)
{ {
whenInputIs("[4.2,8.4]"); whenInputIs("[4.2,8.4]");
@ -135,3 +126,13 @@ TEST_F(JsonArray_Parser_Tests, TwoDoubles)
firstElementMustBe(4.2); firstElementMustBe(4.2);
secondElementMustBe(8.4); secondElementMustBe(8.4);
} }
TEST_F(JsonArray_Parser_Tests, TwoBooleans)
{
whenInputIs("[true,false]");
parseMustSucceed();
sizeMustBe(2);
firstElementMustBe(true);
secondElementMustBe(false);
}