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

Set shouldExpectKey after finishing radius; clean up asserts in ObjectParser

Browse source
This commit is contained in:
Eryn Wells 2014-07-19 15:46:06 -07:00
parent 0ed3b524f4
commit 575ed822b4
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/yaml/objectParser.cc
View file

@ -76,6 +76,7 @@ void
ObjectParser::HandleColorEvent(yaml_event_t& event) ObjectParser::HandleColorEvent(yaml_event_t& event)
{ {
if (event.type != YAML_SEQUENCE_START_EVENT) { if (event.type != YAML_SEQUENCE_START_EVENT) {
/* TODO: Clean this up. */
assert(event.type != YAML_SEQUENCE_START_EVENT); assert(event.type != YAML_SEQUENCE_START_EVENT);
return; return;
} }
@ -102,7 +103,8 @@ ObjectParser::HandleOriginEvent(yaml_event_t& event)
{ {
if (event.type != YAML_SEQUENCE_START_EVENT) { if (event.type != YAML_SEQUENCE_START_EVENT) {
/* TODO: Clean this up. */ /* TODO: Clean this up. */
assert(false); assert(event.type != YAML_SEQUENCE_START_EVENT);
return;
} }
auto onDone = [this](std::vector<double> origin) { auto onDone = [this](std::vector<double> origin) {
@ -136,6 +138,7 @@ ObjectParser::HandleRadiusEvent(yaml_event_t& event)
} }
mObject->set_radius(radius); mObject->set_radius(radius);
mSection = NoSection; mSection = NoSection;
SetShouldExpectKey(true);
} }
} /* namespace yaml */ } /* namespace yaml */