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

Fix YAML::Newline in a sequence or map.

Browse Source 
Inside of a sequence or map, `YAML::Newline` wouldn't reset the collection state, which would cause behavior like this:

```
nodeA:   
    k: [{i: 0},
 {i:1},
  ]NodeB:
    k: [{i: 0},
 {i:1},
  ]
```
This commit is contained in:
Raffaello Bertini 2020-07-02 04:31:51 +01:00 committed by GitHub
parent 3f381f13a0
commit 1c2e767347
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 221 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/emitterstate.cpp
View File

@ -179,6 +179,9 @@ void EmitterState::EndedGroup(GroupType::value type) {
m_globalModifiedSettings.restore();
ClearModifiedSettings();
m_hasAnchor = false;
m_hasTag = false;
m_hasNonContent = false;
}
EmitterNodeType::value EmitterState::CurGroupNodeType() const {

218
test/integration/emitter_test.cpp
View File

@ -1251,6 +1251,224 @@ TEST_F(EmitterTest, NaN) {
"bar: .nan");
}
TEST_F(EmitterTest, ComplexFlowSeqEmbeddingAMapWithNewLine) {
out << YAML::BeginMap;
out << YAML::Key << "NodeA" << YAML::Value << YAML::BeginMap;
out << YAML::Key << "k" << YAML::Value << YAML::Flow << YAML::BeginSeq;
out << YAML::BeginMap << YAML::Key << "i" << YAML::Value << 0 << YAML::EndMap
<< YAML::Newline;
out << YAML::BeginMap << YAML::Key << "i" << YAML::Value << 1 << YAML::EndMap
<< YAML::Newline;
out << YAML::EndSeq;
out << YAML::EndMap;
out << YAML::Key << "NodeB" << YAML::Value << YAML::BeginMap;
out << YAML::Key << "k" << YAML::Value << YAML::Flow << YAML::BeginSeq;
out << YAML::BeginMap << YAML::Key << "i" << YAML::Value << 0 << YAML::EndMap
<< YAML::Newline;
out << YAML::BeginMap << YAML::Key << "i" << YAML::Value << 1 << YAML::EndMap
<< YAML::Newline;
out << YAML::EndSeq;
out << YAML::EndMap;
out << YAML::EndMap;
ExpectEmit(R"(NodeA:
k: [{i: 0},
{i: 1},
]
NodeB:
k: [{i: 0},
{i: 1},
])");
}
TEST_F(EmitterTest, ComplexFlowSeqEmbeddingAMapWithNewLineUsingAliases) {
out << BeginMap;
out << Key << "Node" << Anchor("Node") << Value << BeginMap;
out << Key << "k" << Value << Flow << BeginSeq;
out << BeginMap << Key << "i" << Value << 0 << EndMap;
out << YAML::Newline;
out << BeginMap << Key << "i" << Value << 1 << EndMap;
out << YAML::Newline;
out << EndSeq << EndMap;
out << Key << "NodeA" << Alias("Node");
out << Key << "NodeB" << Alias("Node");
out << EndMap;
ExpectEmit(R"(Node: &Node
k: [{i: 0},
{i: 1},
]
NodeA: *Node
NodeB: *Node)");
}
TEST_F(EmitterTest, ComplexFlowSeqEmbeddingAMapUsingAliases) {
out << BeginMap;
out << Key << "Node" << Anchor("Node") << Value << BeginMap;
out << Key << "k" << Value << Flow << BeginSeq;
out << BeginMap << Key << "i" << Value << 0 << EndMap;
out << BeginMap << Key << "i" << Value << 1 << EndMap;
out << EndSeq << EndMap;
out << Key << "NodeA" << Alias("Node");
out << Key << "NodeB" << Alias("Node");
out << EndMap;
ExpectEmit(R"(Node: &Node
k: [{i: 0}, {i: 1}]
NodeA: *Node
NodeB: *Node)");
}
TEST_F(EmitterTest, ComplexFlowSeqEmbeddingAMapWithNewLineUsingAliases2) {
out << BeginMap;
out << Key << "Seq" << Anchor("Seq") << Flow << BeginSeq;
out << BeginMap << Key << "i" << Value << 0 << EndMap;
out << YAML::Newline;
out << BeginMap << Key << "i" << Value << 1 << EndMap;
out << YAML::Newline;
out << EndSeq;
out << Key << "NodeA" << Value << BeginMap;
out << Key << "k" << Value << Alias("Seq") << EndMap;
out << Key << "NodeB" << Value << BeginMap;
out << Key << "k" << Value << Alias("Seq") << EndMap;
out << EndMap;
ExpectEmit(R"(Seq: &Seq [{i: 0},
{i: 1},
]
NodeA:
k: *Seq
NodeB:
k: *Seq)");
}
TEST_F(EmitterTest, ComplexFlowSeqEmbeddingAMapUsingAliases2) {
out << BeginMap;
out << Key << "Seq" << Anchor("Seq") << Value << Flow << BeginSeq;
out << BeginMap << Key << "i" << Value << 0 << EndMap;
out << BeginMap << Key << "i" << Value << 1 << EndMap;
out << EndSeq;
out << Key << "NodeA" << Value << BeginMap;
out << Key << "k" << Value << Alias("Seq") << EndMap;
out << Key << "NodeB" << Value << BeginMap;
out << Key << "k" << Value << Alias("Seq") << EndMap;
out << EndMap;
ExpectEmit(R"(Seq: &Seq [{i: 0}, {i: 1}]
NodeA:
k: *Seq
NodeB:
k: *Seq)");
}
TEST_F(EmitterTest, ComplexFlowSeqEmbeddingAMapWithNewLineUsingAliases3) {
out << BeginMap;
out << Key << "Keys" << Value << Flow << BeginSeq;
out << Anchor("k0") << BeginMap << Key << "i" << Value << 0 << EndMap
<< Newline;
out << Anchor("k1") << BeginMap << Key << "i" << Value << 1 << EndMap
<< Newline;
out << EndSeq;
out << Key << "NodeA" << Value << BeginMap;
out << Key << "k" << Value << Flow << BeginSeq;
out << Alias("k0") << Newline << Alias("k1") << Newline;
out << EndSeq << EndMap;
out << Key << "NodeB" << Value << BeginMap;
out << Key << "k" << Value << Flow << BeginSeq;
out << Alias("k0") << Newline << Alias("k1") << Newline;
out << EndSeq << EndMap;
out << EndMap;
ExpectEmit(R"(Keys: [&k0 {i: 0},
&k1 {i: 1},
]
NodeA:
k: [*k0,
*k1,
]
NodeB:
k: [*k0,
*k1,
])");
}
TEST_F(EmitterTest, ComplexFlowSeqEmbeddingAMapUsingAliases3a) {
out << BeginMap;
out << Key << "Keys" << Value << BeginSeq;
out << Anchor("k0") << BeginMap << Key << "i" << Value << 0 << EndMap;
out << Anchor("k1") << BeginMap << Key << "i" << Value << 1 << EndMap;
out << EndSeq;
out << Key << "NodeA" << Value << BeginMap;
out << Key << "k" << Value << Flow << BeginSeq;
out << Alias("k0") << Alias("k1");
out << EndSeq << EndMap;
out << Key << "NodeB" << Value << BeginMap;
out << Key << "k" << Value << Flow << BeginSeq;
out << Alias("k0") << Alias("k1");
out << EndSeq << EndMap;
out << EndMap;
ExpectEmit(R"(Keys:
- &k0
i: 0
- &k1
i: 1
NodeA:
k: [*k0, *k1]
NodeB:
k: [*k0, *k1])");
}
TEST_F(EmitterTest, ComplexFlowSeqEmbeddingAMapUsingAliases3b) {
out << BeginMap;
out << Key << "Keys" << Value << Flow << BeginSeq;
out << Anchor("k0") << BeginMap << Key << "i" << Value << 0 << EndMap;
out << Anchor("k1") << BeginMap << Key << "i" << Value << 1 << EndMap;
out << EndSeq;
out << Key << "NodeA" << Value << BeginMap;
out << Key << "k" << Value << Flow << BeginSeq;
out << Alias("k0") << Alias("k1");
out << EndSeq << EndMap;
out << Key << "NodeB" << Value << BeginMap;
out << Key << "k" << Value << Flow << BeginSeq;
out << Alias("k0") << Alias("k1");
out << EndSeq << EndMap;
out << EndMap;
ExpectEmit(R"(Keys: [&k0 {i: 0}, &k1 {i: 1}]
NodeA:
k: [*k0, *k1]
NodeB:
k: [*k0, *k1])");
}
class EmitterErrorTest : public ::testing::Test {
protected:
void ExpectEmitError(const std::string& expectedError) {