peisongxiao/yaml-cpp
1
0
Fork 0
mirror of https://github.com/jbeder/yaml-cpp.git synced 2025-09-09 04:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where the string "null" (without quotes) is deserialized as a string, instead of null.

Browse Source
This commit is contained in:
Jesse Beder
2013-04-13 18:21:06 -05:00
parent e0ae477b8f
commit 2375f2c66b
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/singledocparser.cpp
View File

@@ -75,6 +75,12 @@ namespace YAML
ParseProperties(tag, anchor); ParseProperties(tag, anchor);
const Token& token = m_scanner.peek(); const Token& token = m_scanner.peek();
if(token.type == Token::PLAIN_SCALAR && token.value == "null") {
eventHandler.OnNull(mark, anchor);
m_scanner.pop();
return;
}
// add non-specific tags // add non-specific tags
if(tag.empty()) if(tag.empty())

13
test/core/parsertests.cpp
View File

@@ -28,6 +28,18 @@ namespace Test
EXPECT_DOC_END(); EXPECT_DOC_END();
DONE(); DONE();
} }
TEST NullStringScalar()
{
HANDLE("foo: null");
EXPECT_DOC_START();
EXPECT_MAP_START("?", 0);
EXPECT_SCALAR("?", 0, "foo");
EXPECT_NULL(0);
EXPECT_MAP_END();
EXPECT_DOC_END();
DONE();
}
} }
namespace { namespace {
@@ -57,6 +69,7 @@ namespace Test
int total = 0; int total = 0;
RunParserTest(&Parser::NoEndOfMapFlow, "No end of map flow", passed, total); RunParserTest(&Parser::NoEndOfMapFlow, "No end of map flow", passed, total);
RunParserTest(&Parser::PlainScalarStartingWithQuestionMark, "Plain scalar starting with question mark", passed, total); RunParserTest(&Parser::PlainScalarStartingWithQuestionMark, "Plain scalar starting with question mark", passed, total);
RunParserTest(&Parser::NullStringScalar, "Null string scalar", passed, total);
std::cout << "Parser tests: " << passed << "/" << total << " passed\n"; std::cout << "Parser tests: " << passed << "/" << total << " passed\n";
return passed == total; return passed == total;