diff --git a/include/yaml-cpp/null.h b/include/yaml-cpp/null.h index 5dbda9a..b9521d4 100644 --- a/include/yaml-cpp/null.h +++ b/include/yaml-cpp/null.h @@ -8,6 +8,7 @@ #endif #include "yaml-cpp/dll.h" +#include namespace YAML { class Node; @@ -17,6 +18,7 @@ inline bool operator==(const _Null&, const _Null&) { return true; } inline bool operator!=(const _Null&, const _Null&) { return false; } YAML_CPP_API bool IsNull(const Node& node); // old API only +YAML_CPP_API bool IsNullString(const std::string& str); extern YAML_CPP_API _Null Null; } diff --git a/src/emitterutils.cpp b/src/emitterutils.cpp index 4a4c982..42c2a39 100644 --- a/src/emitterutils.cpp +++ b/src/emitterutils.cpp @@ -9,6 +9,7 @@ #include "stringsource.h" #include "yaml-cpp/binary.h" // IWYU pragma: keep #include "yaml-cpp/ostream_wrapper.h" +#include "yaml-cpp/null.h" namespace YAML { namespace Utils { @@ -152,12 +153,8 @@ void WriteCodePoint(ostream_wrapper& out, int codePoint) { bool IsValidPlainScalar(const std::string& str, FlowType::value flowType, bool allowOnlyAscii) { - if (str.empty()) { - return false; - } - // check against null - if (str == "null") { + if (IsNullString(str)) { return false; } diff --git a/src/null.cpp b/src/null.cpp index 1b24b70..7158bd4 100644 --- a/src/null.cpp +++ b/src/null.cpp @@ -2,4 +2,8 @@ namespace YAML { _Null Null; + +bool IsNullString(const std::string& str) { + return str.empty() || str == "~" || str == "null" || str == "Null" || str == "NULL"; +} } diff --git a/src/singledocparser.cpp b/src/singledocparser.cpp index cde1d20..a27c1c3 100644 --- a/src/singledocparser.cpp +++ b/src/singledocparser.cpp @@ -11,6 +11,7 @@ #include "yaml-cpp/eventhandler.h" #include "yaml-cpp/exceptions.h" // IWYU pragma: keep #include "yaml-cpp/mark.h" +#include "yaml-cpp/null.h" namespace YAML { SingleDocParser::SingleDocParser(Scanner& scanner, const Directives& directives) @@ -75,7 +76,7 @@ void SingleDocParser::HandleNode(EventHandler& eventHandler) { const Token& token = m_scanner.peek(); - if (token.type == Token::PLAIN_SCALAR && token.value == "null") { + if (token.type == Token::PLAIN_SCALAR && IsNullString(token.value)) { eventHandler.OnNull(mark, anchor); m_scanner.pop(); return;