forked from bblanchon/ArduinoJson
Parse booleans
This commit is contained in:
@ -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);
|
||||||
|
}
|
||||||
|
@ -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();
|
||||||
};
|
};
|
@ -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;
|
||||||
|
}
|
||||||
|
@ -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);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -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);
|
||||||
|
}
|
Reference in New Issue
Block a user