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

Refactored emitter so that it emits the : for an implicit key right away

Browse Source
This commit is contained in:
Jesse Beder
2010-10-22 04:19:01 +00:00
parent 6b7cb45ac8
commit f1697dea15
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/emitter.cpp
View File

@@ -201,10 +201,6 @@ namespace YAML
m_pState->SetError(ErrorMsg::EXPECTED_VALUE_TOKEN); m_pState->SetError(ErrorMsg::EXPECTED_VALUE_TOKEN);
return true; return true;
case ES_WAITING_FOR_BLOCK_MAP_VALUE: case ES_WAITING_FOR_BLOCK_MAP_VALUE:
if(m_pState->CurrentlyInLongKey())
m_stream << IndentTo(curIndent);
m_stream << ':';
m_pState->RequireSeparation();
m_pState->SwitchState(ES_WRITING_BLOCK_MAP_VALUE); m_pState->SwitchState(ES_WRITING_BLOCK_MAP_VALUE);
return true; return true;
case ES_WRITING_BLOCK_MAP_VALUE: case ES_WRITING_BLOCK_MAP_VALUE:
@@ -286,6 +282,10 @@ namespace YAML
// block map // block map
case ES_WRITING_BLOCK_MAP_KEY: case ES_WRITING_BLOCK_MAP_KEY:
if(!m_pState->CurrentlyInLongKey()) {
m_stream << ':';
m_pState->RequireSeparation();
}
m_pState->SwitchState(ES_DONE_WITH_BLOCK_MAP_KEY); m_pState->SwitchState(ES_DONE_WITH_BLOCK_MAP_KEY);
break; break;
case ES_WRITING_BLOCK_MAP_VALUE: case ES_WRITING_BLOCK_MAP_VALUE:
@@ -499,8 +499,12 @@ namespace YAML
return m_pState->SetError(ErrorMsg::UNEXPECTED_VALUE_TOKEN); return m_pState->SetError(ErrorMsg::UNEXPECTED_VALUE_TOKEN);
if(flowType == FT_BLOCK) { if(flowType == FT_BLOCK) {
if(m_pState->CurrentlyInLongKey()) if(m_pState->CurrentlyInLongKey()) {
m_stream << '\n'; m_stream << '\n';
m_stream << IndentTo(m_pState->GetCurIndent());
m_stream << ':';
m_pState->RequireSeparation();
}
m_pState->SwitchState(ES_WAITING_FOR_BLOCK_MAP_VALUE); m_pState->SwitchState(ES_WAITING_FOR_BLOCK_MAP_VALUE);
} else if(flowType == FT_FLOW) { } else if(flowType == FT_FLOW) {
m_pState->SwitchState(ES_WAITING_FOR_FLOW_MAP_VALUE); m_pState->SwitchState(ES_WAITING_FOR_FLOW_MAP_VALUE);