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

Fixed basic block seq indentation

Browse Source
This commit is contained in:
Jesse Beder
2012-05-21 21:11:03 -05:00
parent b5d8241dfa
commit 23fb2dc811
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/emitter.cpp
View File

@@ -313,12 +313,14 @@ namespace YAML
void Emitter::BlockSeqPrepareNode() void Emitter::BlockSeqPrepareNode()
{ {
const unsigned curIndent = m_pState->CurIndent(); const unsigned curIndent = m_pState->CurIndent();
if(m_stream.col() > curIndent) { if(!m_pState->HasTag() && !m_pState->HasAnchor()) {
m_stream << "\n"; if(m_pState->CurGroupChildCount() > 0) {
m_stream << "\n";
}
m_stream << IndentTo(curIndent);
m_stream << "-";
m_stream << IndentTo(curIndent + m_pState->CurGroupIndent());
} }
m_stream << IndentTo(curIndent);
m_stream << "-";
m_stream << IndentTo(curIndent + m_pState->CurGroupIndent());
} }
void Emitter::FlowMapPrepareNode() void Emitter::FlowMapPrepareNode()

5
src/emitterstate.cpp
View File

@@ -119,6 +119,11 @@ namespace YAML
return m_groups.empty() ? 0 : m_groups.top().indent; return m_groups.empty() ? 0 : m_groups.top().indent;
} }
std::size_t EmitterState::CurGroupChildCount() const
{
return m_groups.empty() ? 0 : m_groups.top().childCount;
}
void EmitterState::ClearModifiedSettings() void EmitterState::ClearModifiedSettings()
{ {
m_modifiedSettings.clear(); m_modifiedSettings.clear();

1
src/emitterstate.h
View File

@@ -40,6 +40,7 @@ namespace YAML
GroupType::value CurGroupType() const; GroupType::value CurGroupType() const;
FlowType::value CurGroupFlowType() const; FlowType::value CurGroupFlowType() const;
int CurGroupIndent() const; int CurGroupIndent() const;
std::size_t CurGroupChildCount() const;
int CurIndent() const { return m_curIndent; } int CurIndent() const { return m_curIndent; }
bool HasAnchor() const { return m_hasAnchor; } bool HasAnchor() const { return m_hasAnchor; }
bool HasTag() const { return m_hasTag; } bool HasTag() const { return m_hasTag; }