External/yaml-cpp
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 3b73aa8bcd into edadfecdc6

Browse Source
This commit is contained in:
Michał Sawicz 2022-03-29 09:42:39 +09:00 committed by GitHub
commit 1fca858a83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emitterutils.cpp
View File

@ -176,11 +176,11 @@ bool IsValidPlainScalar(const std::string& str, FlowType::value flowType,
static const RegEx& disallowed_flow = static const RegEx& disallowed_flow =
Exp::EndScalarInFlow() | (Exp::BlankOrBreak() + Exp::Comment()) | Exp::EndScalarInFlow() | (Exp::BlankOrBreak() + Exp::Comment()) |
Exp::NotPrintable() | Exp::Utf8_ByteOrderMark() | Exp::Break() | Exp::NotPrintable() | Exp::Utf8_ByteOrderMark() | Exp::Break() |
Exp::Tab(); Exp::Tab() | Exp::Colon();
static const RegEx& disallowed_block = static const RegEx& disallowed_block =
Exp::EndScalar() | (Exp::BlankOrBreak() + Exp::Comment()) | Exp::EndScalar() | (Exp::BlankOrBreak() + Exp::Comment()) |
Exp::NotPrintable() | Exp::Utf8_ByteOrderMark() | Exp::Break() | Exp::NotPrintable() | Exp::Utf8_ByteOrderMark() | Exp::Break() |
Exp::Tab(); Exp::Tab() | Exp::Colon();
const RegEx& disallowed = const RegEx& disallowed =
flowType == FlowType::Flow ? disallowed_flow : disallowed_block; flowType == FlowType::Flow ? disallowed_flow : disallowed_block;

4
src/exp.h
View File

@ -32,6 +32,10 @@ inline const RegEx& Tab() {
static const RegEx e = RegEx('\t'); static const RegEx e = RegEx('\t');
return e; return e;
} }
inline const RegEx& Colon() {
static const RegEx e = RegEx(':');
return e;
}
inline const RegEx& Blank() { inline const RegEx& Blank() {
static const RegEx e = Space() | Tab(); static const RegEx e = Space() | Tab();
return e; return e;

4
test/integration/load_node_test.cpp
View File

@ -276,12 +276,12 @@ TEST(NodeTest, SpecialFlow) {
std::vector<SingleNodeTestCase> tests = { std::vector<SingleNodeTestCase> tests = {
{"[:]", NodeType::Sequence, 1, "[{~: ~}]"}, {"[:]", NodeType::Sequence, 1, "[{~: ~}]"},
{"[a:]", NodeType::Sequence, 1, "[{a: ~}]"}, {"[a:]", NodeType::Sequence, 1, "[{a: ~}]"},
{"[:a]", NodeType::Sequence, 1, "[:a]"}, {"[:a]", NodeType::Sequence, 1, "[\":a\"]"},
{"[,]", NodeType::Sequence, 1, "[~]"}, {"[,]", NodeType::Sequence, 1, "[~]"},
{"[a:,]", NodeType::Sequence, 1, "[{a: ~}]"}, {"[a:,]", NodeType::Sequence, 1, "[{a: ~}]"},
{"{:}", NodeType::Map, 1, "{~: ~}"}, {"{:}", NodeType::Map, 1, "{~: ~}"},
{"{a:}", NodeType::Map, 1, "{a: ~}"}, {"{a:}", NodeType::Map, 1, "{a: ~}"},
{"{:a}", NodeType::Map, 1, "{:a: ~}"}, {"{:a}", NodeType::Map, 1, "{\":a\": ~}"},
{"{,}", NodeType::Map, 1, "{~: ~}"}, {"{,}", NodeType::Map, 1, "{~: ~}"},
{"{a:,}", NodeType::Map, 1, "{a: ~}"}, {"{a:,}", NodeType::Map, 1, "{a: ~}"},
//testcase for the trailing TAB of scalar //testcase for the trailing TAB of scalar

6
test/node/node_test.cpp
View File

@ -692,6 +692,12 @@ class NodeEmitterTest : public ::testing::Test {
} }
}; };
TEST_F(NodeEmitterTest, StringWithColons) {
Node node{"String:with:colons"};
ExpectOutput("\"String:with:colons\"", node);
}
TEST_F(NodeEmitterTest, SimpleFlowSeqNode) { TEST_F(NodeEmitterTest, SimpleFlowSeqNode) {
Node node; Node node;
node.SetStyle(EmitterStyle::Flow); node.SetStyle(EmitterStyle::Flow);