From 676e0b94ac14ad7564f99ccfbfb383d0b5396cf9 Mon Sep 17 00:00:00 2001 From: Jesse Beder Date: Tue, 22 May 2012 16:39:03 -0500 Subject: [PATCH] Fixed flow seq/map indentation --- src/emitter.cpp | 9 +++------ test/emittertests.cpp | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/emitter.cpp b/src/emitter.cpp index 9dfcb35..d0e3a53 100644 --- a/src/emitter.cpp +++ b/src/emitter.cpp @@ -339,7 +339,6 @@ namespace YAML void Emitter::FlowSeqPrepareNode(EmitterNodeType::value child) { - const unsigned curIndent = m_pState->CurIndent(); const unsigned lastIndent = m_pState->LastIndent(); if(!m_pState->HasBegunNode()) { @@ -359,7 +358,7 @@ namespace YAML case EmitterNodeType::Scalar: case EmitterNodeType::FlowSeq: case EmitterNodeType::FlowMap: - SpaceOrIndentTo(m_pState->HasBegunContent() || m_pState->CurGroupChildCount() > 0, curIndent); + SpaceOrIndentTo(m_pState->HasBegunContent() || m_pState->CurGroupChildCount() > 0, lastIndent); break; case EmitterNodeType::BlockSeq: case EmitterNodeType::BlockMap: @@ -431,7 +430,6 @@ namespace YAML void Emitter::FlowMapPrepareSimpleKey(EmitterNodeType::value child) { - const unsigned curIndent = m_pState->CurIndent(); const unsigned lastIndent = m_pState->LastIndent(); if(!m_pState->HasBegunNode()) { @@ -451,7 +449,7 @@ namespace YAML case EmitterNodeType::Scalar: case EmitterNodeType::FlowSeq: case EmitterNodeType::FlowMap: - SpaceOrIndentTo(m_pState->HasBegunContent() || m_pState->CurGroupChildCount() > 0, curIndent); + SpaceOrIndentTo(m_pState->HasBegunContent() || m_pState->CurGroupChildCount() > 0, lastIndent); break; case EmitterNodeType::BlockSeq: case EmitterNodeType::BlockMap: @@ -462,7 +460,6 @@ namespace YAML void Emitter::FlowMapPrepareSimpleKeyValue(EmitterNodeType::value child) { - const unsigned curIndent = m_pState->CurIndent(); const unsigned lastIndent = m_pState->LastIndent(); if(!m_pState->HasBegunNode()) { @@ -479,7 +476,7 @@ namespace YAML case EmitterNodeType::Scalar: case EmitterNodeType::FlowSeq: case EmitterNodeType::FlowMap: - SpaceOrIndentTo(m_pState->HasBegunContent() || m_pState->CurGroupChildCount() > 0, curIndent); + SpaceOrIndentTo(m_pState->HasBegunContent() || m_pState->CurGroupChildCount() > 0, lastIndent); break; case EmitterNodeType::BlockSeq: case EmitterNodeType::BlockMap: diff --git a/test/emittertests.cpp b/test/emittertests.cpp index 2c9b7a9..cadd1c7 100644 --- a/test/emittertests.cpp +++ b/test/emittertests.cpp @@ -205,7 +205,7 @@ namespace Test out << YAML::Value << "angel"; out << YAML::EndMap; - desiredOutput = "? - 1\n - 3\n: monster\n? [2, 0]\n: demon\nthe origin: angel"; + desiredOutput = "? - 1\n - 3\n: monster\n[2, 0]: demon\nthe origin: angel"; } void ScalarFormat(YAML::Emitter& out, std::string& desiredOutput)