libAthena/athena
2
0
Fork 0
mirror of https://github.com/libAthena/athena.git synced 2025-12-10 05:57:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

YAML emitter/parser ownership refinement

Browse Source
This commit is contained in:
Jack Andersen
2016-01-04 14:00:12 -10:00
parent 9c880813ac
commit cf3739fced
2 changed files with 98 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Athena/DNAYaml.cpp
View File

@@ -93,12 +93,12 @@ static inline void InsertNode(std::vector<YAMLNode*>& nodeStack,
}
}
std::unique_ptr<YAMLNode> YAMLDocReader::ParseEvents(yaml_parser_t* doc)
std::unique_ptr<YAMLNode> YAMLDocReader::ParseEvents()
{
yaml_event_t event;
if (!yaml_parser_parse(doc, &event))
if (!yaml_parser_parse(&m_parser, &event))
{
HandleYAMLParserError(doc);
HandleYAMLParserError(&m_parser);
return std::unique_ptr<YAMLNode>();
}
@@ -106,13 +106,13 @@ std::unique_ptr<YAMLNode> YAMLDocReader::ParseEvents(yaml_parser_t* doc)
std::unique_ptr<YAMLNode> mapKey;
std::unique_ptr<YAMLNode> retVal;
int result;
for (result = yaml_parser_parse(doc, &event);
for (result = yaml_parser_parse(&m_parser, &event);
event.type != YAML_STREAM_END_EVENT;
result = yaml_parser_parse(doc, &event))
result = yaml_parser_parse(&m_parser, &event))
{
if (!result)
{
HandleYAMLParserError(doc);
HandleYAMLParserError(&m_parser);
return std::unique_ptr<YAMLNode>();
}
switch (event.type)