Updated signature of Parser::GetNextDocument (issue 45)

This commit is contained in:
jbeder
2009-09-29 18:25:11 +00:00
parent 60fce621e8
commit fb443b3056
3 changed files with 7 additions and 6 deletions

View File

@@ -25,7 +25,7 @@ namespace YAML
operator bool() const; operator bool() const;
void Load(std::istream& in); void Load(std::istream& in);
void GetNextDocument(Node& document); bool GetNextDocument(Node& document);
void PrintTokens(std::ostream& out); void PrintTokens(std::ostream& out);
private: private:

View File

@@ -33,7 +33,7 @@ namespace YAML
// GetNextDocument // GetNextDocument
// . Reads the next document in the queue (of tokens). // . Reads the next document in the queue (of tokens).
// . Throws a ParserException on error. // . Throws a ParserException on error.
void Parser::GetNextDocument(Node& document) bool Parser::GetNextDocument(Node& document)
{ {
// clear node // clear node
document.Clear(); document.Clear();
@@ -43,7 +43,7 @@ namespace YAML
// we better have some tokens in the queue // we better have some tokens in the queue
if(m_pScanner->empty()) if(m_pScanner->empty())
return; return false;
// first eat doc start (optional) // first eat doc start (optional)
if(m_pScanner->peek().type == Token::DOC_START) if(m_pScanner->peek().type == Token::DOC_START)
@@ -58,6 +58,8 @@ namespace YAML
// clear anchors from the scanner, which are no longer relevant // clear anchors from the scanner, which are no longer relevant
m_pScanner->ClearAnchors(); m_pScanner->ClearAnchors();
return true;
} }
// ParseDirectives // ParseDirectives

View File

@@ -11,9 +11,8 @@ int main(int argc, char **argv)
std::istream& input = (argc > 1 ? fin : std::cin); std::istream& input = (argc > 1 ? fin : std::cin);
try { try {
YAML::Parser parser(input); YAML::Parser parser(input);
while(parser) { YAML::Node doc;
YAML::Node doc; while(parser.GetNextDocument(doc)) {
parser.GetNextDocument(doc);
YAML::Emitter emitter; YAML::Emitter emitter;
emitter << doc; emitter << doc;
std::cout << emitter.c_str() << "\n"; std::cout << emitter.c_str() << "\n";