eryn/charles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ScalarMappingParser::mShouldExpectKey should be true to start/end the top-level mapping

Browse source
This commit is contained in:
Eryn Wells 2014-07-19 15:44:29 -07:00
parent 49e3395a4c
commit 523eaef902
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/yaml/scalarMappingParser.cc
View file

@ -28,7 +28,12 @@ ScalarMappingParser::~ScalarMappingParser()
void void
ScalarMappingParser::HandleEvent(yaml_event_t& event) ScalarMappingParser::HandleEvent(yaml_event_t& event)
{ {
if (event.type == YAML_MAPPING_END_EVENT) { if (mShouldExpectKey && event.type == YAML_MAPPING_START_EVENT) {
printf("%s: start scalar mapping: tag = %s\n", __PRETTY_FUNCTION__,
event.data.mapping_start.tag);
return;
}
else if (mShouldExpectKey && event.type == YAML_MAPPING_END_EVENT) {
SetDone(true); SetDone(true);
return; return;
} }
@ -36,6 +41,7 @@ ScalarMappingParser::HandleEvent(yaml_event_t& event)
if (mShouldExpectKey && event.type == YAML_SCALAR_EVENT) { if (mShouldExpectKey && event.type == YAML_SCALAR_EVENT) {
HandleKeyEvent(std::string((char*)event.data.scalar.value, HandleKeyEvent(std::string((char*)event.data.scalar.value,
event.data.scalar.length)); event.data.scalar.length));
mShouldExpectKey = false;
} }
else { else {
HandleValueEvent(event); HandleValueEvent(event);