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

Fixed settings reverting properly

Browse Source
This commit is contained in:
Jesse Beder
2012-05-22 15:00:10 -05:00
parent bf07af52ff
commit 944ebb7d1e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/emitter.cpp
View File

@@ -402,7 +402,7 @@ namespace YAML
case EmitterNodeType::Scalar: case EmitterNodeType::Scalar:
case EmitterNodeType::FlowSeq: case EmitterNodeType::FlowSeq:
case EmitterNodeType::FlowMap: case EmitterNodeType::FlowMap:
SpaceOrIndentTo(m_pState->HasBegunContent(), curIndent); SpaceOrIndentTo(true, curIndent);
break; break;
case EmitterNodeType::BlockSeq: case EmitterNodeType::BlockSeq:
case EmitterNodeType::BlockMap: case EmitterNodeType::BlockMap:

3
src/emitterstate.cpp
View File

@@ -106,6 +106,7 @@ namespace YAML
void EmitterState::StartedScalar() void EmitterState::StartedScalar()
{ {
StartedNode(); StartedNode();
ClearModifiedSettings();
} }
void EmitterState::StartedGroup(GroupType::value type) void EmitterState::StartedGroup(GroupType::value type)
@@ -150,6 +151,8 @@ namespace YAML
// some global settings that we changed may have been overridden // some global settings that we changed may have been overridden
// by a local setting we just popped, so we need to restore them // by a local setting we just popped, so we need to restore them
m_globalModifiedSettings.restore(); m_globalModifiedSettings.restore();
ClearModifiedSettings();
} }
EmitterNodeType::value EmitterState::CurGroupNodeType() const EmitterNodeType::value EmitterState::CurGroupNodeType() const

5
util/sandbox.cpp
View File

@@ -5,10 +5,7 @@ int main()
{ {
YAML::Emitter out; YAML::Emitter out;
out << YAML::BeginMap; out << YAML::BeginMap;
out << YAML::BeginMap; out << YAML::LongKey << "a" << "b";
out << "a" << "b";
out << YAML::EndMap;
out << YAML::BeginMap;
out << "a" << "b"; out << "a" << "b";
out << YAML::EndMap; out << YAML::EndMap;
out << YAML::EndMap; out << YAML::EndMap;