Added long key

src/emitter.cpp

@@ -358,22 +358,22 @@ namespace YAML
 
     void Emitter::BlockMapPrepareNode(EmitterNodeType::value child)
     {
-        const std::size_t childCount = m_pState->CurGroupChildCount();
-        
-       if(childCount % 2 == 0) {
-           if(m_pState->GetMapKeyFormat() == LongKey || child == EmitterNodeType::BlockSeq || child == EmitterNodeType::BlockMap)
-               m_pState->SetLongKey();
-           
-           if(m_pState->CurGroupLongKey())
-               BlockMapPrepareLongKey(child);
-           else
-               BlockMapPrepareSimpleKey(child);
-       } else {
-           if(m_pState->CurGroupLongKey())
-               BlockMapPrepareLongKeyValue(child);
-           else
-               BlockMapPrepareSimpleKeyValue(child);
-       }
+        if(m_pState->CurGroupChildCount() % 2 == 0) {
+            if(m_pState->GetMapKeyFormat() == LongKey)
+                m_pState->SetLongKey();
+            if(child == EmitterNodeType::BlockSeq || child == EmitterNodeType::BlockMap)
+                m_pState->SetLongKey();
+            
+            if(m_pState->CurGroupLongKey())
+                BlockMapPrepareLongKey(child);
+            else
+                BlockMapPrepareSimpleKey(child);
+        } else {
+            if(m_pState->CurGroupLongKey())
+                BlockMapPrepareLongKeyValue(child);
+            else
+                BlockMapPrepareSimpleKeyValue(child);
+        }
     }
     
     void Emitter::BlockMapPrepareLongKey(EmitterNodeType::value child)
@@ -410,18 +410,18 @@ namespace YAML
         }
     }
 
-    void Emitter::BlockMapPrepareSimpleKey(EmitterNodeType::value child)
+    void Emitter::BlockMapPrepareLongKeyValue(EmitterNodeType::value child)
     {
         const unsigned curIndent = m_pState->CurIndent();
-        const std::size_t childCount = m_pState->CurGroupChildCount();
+        const unsigned nextIndent = curIndent + m_pState->CurGroupIndent();
         
         if(child == EmitterNodeType::None)
             return;
-        
-        if(!m_pState->HasBegunNode()) {
-            if(childCount > 0) {
-                m_stream << "\n";
-            }
+
+        if(!m_pState->HasBegunContent()) {
+            m_stream << "\n";
+            m_stream << IndentTo(curIndent);
+            m_stream << ":";
         }
         
         switch(child) {
@@ -431,20 +431,25 @@ namespace YAML
             case EmitterNodeType::Scalar:
             case EmitterNodeType::FlowSeq:
             case EmitterNodeType::FlowMap:
-                SpaceOrIndentTo(m_pState->HasBegunContent(), curIndent);
-                break;
             case EmitterNodeType::BlockSeq:
             case EmitterNodeType::BlockMap:
+                SpaceOrIndentTo(true, nextIndent);
                 break;
         }
     }
 
-    void Emitter::BlockMapPrepareLongKeyValue(EmitterNodeType::value child)
+    void Emitter::BlockMapPrepareSimpleKey(EmitterNodeType::value child)
     {
         const unsigned curIndent = m_pState->CurIndent();
-        const unsigned nextIndent = curIndent + m_pState->CurGroupIndent();
-
+        const std::size_t childCount = m_pState->CurGroupChildCount();
+        
+        if(child == EmitterNodeType::None)
+            return;
+        
         if(!m_pState->HasBegunNode()) {
+            if(childCount > 0) {
+                m_stream << "\n";
+            }
         }
         
         switch(child) {
@@ -454,15 +459,14 @@ namespace YAML
             case EmitterNodeType::Scalar:
             case EmitterNodeType::FlowSeq:
             case EmitterNodeType::FlowMap:
-                SpaceOrIndentTo(true, nextIndent);
+                SpaceOrIndentTo(m_pState->HasBegunContent(), curIndent);
                 break;
             case EmitterNodeType::BlockSeq:
             case EmitterNodeType::BlockMap:
-                m_stream << "\n";
                 break;
         }
     }
-
+    
     void Emitter::BlockMapPrepareSimpleKeyValue(EmitterNodeType::value child)
     {
         const unsigned curIndent = m_pState->CurIndent();

util/sandbox.cpp

@@ -8,7 +8,9 @@ int main()
     out << YAML::BeginMap;
     out << "a" << "b";
     out << YAML::EndMap;
-    out << "c";
+    out << YAML::BeginMap;
+    out << "a" << "b";
+    out << YAML::EndMap;
     out << YAML::EndMap;
     
     std::cout << out.c_str() << "\n";