diff --git a/src/emitter.cpp b/src/emitter.cpp index ca465e2..bec348c 100644 --- a/src/emitter.cpp +++ b/src/emitter.cpp @@ -212,7 +212,7 @@ namespace YAML PrepareNode(m_pState->NextGroupType(GroupType::Seq)); - m_pState->BeginGroup(GroupType::Seq); + m_pState->StartedGroup(GroupType::Seq); } // EmitEndSeq @@ -221,7 +221,7 @@ namespace YAML if(!good()) return; - m_pState->EndGroup(GroupType::Seq); + m_pState->EndedGroup(GroupType::Seq); } // EmitBeginMap @@ -232,7 +232,7 @@ namespace YAML PrepareNode(m_pState->NextGroupType(GroupType::Map)); - m_pState->BeginGroup(GroupType::Map); + m_pState->StartedGroup(GroupType::Map); } // EmitEndMap @@ -241,7 +241,7 @@ namespace YAML if(!good()) return; - m_pState->EndGroup(GroupType::Map); + m_pState->EndedGroup(GroupType::Map); } // EmitNewline @@ -438,7 +438,7 @@ namespace YAML break; } - m_pState->BeginScalar(); + m_pState->StartedScalar(); return *this; } @@ -493,7 +493,7 @@ namespace YAML if(!good()) return *this; - m_pState->BeginScalar(); + m_pState->StartedScalar(); return *this; } @@ -503,7 +503,7 @@ namespace YAML if(!good()) return *this; - m_pState->BeginScalar(); + m_pState->StartedScalar(); return *this; } @@ -525,7 +525,7 @@ namespace YAML return *this; } - m_pState->BeginScalar(); + m_pState->StartedScalar(); return *this; } @@ -592,7 +592,7 @@ namespace YAML if(!good()) return *this; - m_pState->BeginScalar(); + m_pState->StartedScalar(); return *this; } @@ -602,7 +602,7 @@ namespace YAML if(!good()) return *this; - m_pState->BeginScalar(); + m_pState->StartedScalar(); return *this; } @@ -614,7 +614,7 @@ namespace YAML if(!good()) return *this; - m_pState->BeginScalar(); + m_pState->StartedScalar(); return *this; } diff --git a/src/emitterstate.cpp b/src/emitterstate.cpp index bc15b1b..20f6581 100644 --- a/src/emitterstate.cpp +++ b/src/emitterstate.cpp @@ -58,7 +58,7 @@ namespace YAML m_hasNonContent = true; } - void EmitterState::BeginNode() + void EmitterState::StartedNode() { if(!m_groups.empty()) m_groups.top().childCount++; @@ -87,14 +87,14 @@ namespace YAML return EmitterNodeType::None; } - void EmitterState::BeginScalar() + void EmitterState::StartedScalar() { - BeginNode(); + StartedNode(); } - void EmitterState::BeginGroup(GroupType::value type) + void EmitterState::StartedGroup(GroupType::value type) { - BeginNode(); + StartedNode(); const int lastGroupIndent = (m_groups.empty() ? 0 : m_groups.top().indent); m_curIndent += lastGroupIndent; @@ -114,7 +114,7 @@ namespace YAML m_groups.push(pGroup); } - void EmitterState::EndGroup(GroupType::value type) + void EmitterState::EndedGroup(GroupType::value type) { if(m_groups.empty()) return SetError(ErrorMsg::UNMATCHED_GROUP_TAG); diff --git a/src/emitterstate.h b/src/emitterstate.h index 68e96af..8305b3d 100644 --- a/src/emitterstate.h +++ b/src/emitterstate.h @@ -37,9 +37,9 @@ namespace YAML void SetAnchor(); void SetTag(); void SetNonContent(); - void BeginScalar(); - void BeginGroup(GroupType::value type); - void EndGroup(GroupType::value type); + void StartedScalar(); + void StartedGroup(GroupType::value type); + void EndedGroup(GroupType::value type); EmitterNodeType::value NextGroupType(GroupType::value type) const; EmitterNodeType::value CurGroupNodeType() const; @@ -100,7 +100,7 @@ namespace YAML template void _Set(Setting& fmt, T value, FmtScope::value scope); - void BeginNode(); + void StartedNode(); private: // basic state ok?