Merge from core

This commit is contained in:
Jesse Beder
2015-01-24 12:26:16 -06:00
29 changed files with 1498 additions and 1376 deletions

View File

@@ -76,14 +76,15 @@ void NodeEvents::Emit(const detail::node& node, EventHandler& handler,
handler.OnScalar(Mark(), node.tag(), anchor, node.scalar());
break;
case NodeType::Sequence:
handler.OnSequenceStart(Mark(), node.tag(), anchor);
handler.OnSequenceStart(Mark(), node.tag(), anchor,
EmitterStyle::Default);
for (detail::const_node_iterator it = node.begin(); it != node.end();
++it)
Emit(**it, handler, am);
handler.OnSequenceEnd();
break;
case NodeType::Map:
handler.OnMapStart(Mark(), node.tag(), anchor);
handler.OnMapStart(Mark(), node.tag(), anchor, EmitterStyle::Default);
for (detail::const_node_iterator it = node.begin(); it != node.end();
++it) {
Emit(*it->first, handler, am);