From b9199ff3fe2e38225edbfc5f130d27d406930d8c Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Mon, 28 Jul 2014 15:31:29 -0700 Subject: [PATCH] Remove out-lined getters/settings; implement HandleStreamStart --- src/yaml/parsers.cc | 34 ++++++++-------------------------- src/yaml/parsers.hh | 8 ++++---- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/src/yaml/parsers.cc b/src/yaml/parsers.cc index c806288..c9bcc66 100644 --- a/src/yaml/parsers.cc +++ b/src/yaml/parsers.cc @@ -7,6 +7,7 @@ */ #include +#include #include "yaml.h" @@ -120,34 +121,15 @@ Parser::HandleEvent(const yaml_event_t& event) } -void -Parser::SetDone(bool done) -{ - mDone = done; -} - - bool -Parser::GetDone() - const +Parser::HandleStreamStart(Parser::Encoding encoding, + const Parser::Mark& startMark, + const Parser::Mark& endMark) { - return mDone; -} - - -Scene& -Parser::GetScene() - const -{ - return mScene; -} - - -Parser::Stack& -Parser::GetParsers() - const -{ - return mParsers; + std::cerr << startMark.line << ":" << startMark.column + << ": Unexpected STREAM-START event.\n"; + assert(false); + return false; } } /* namespace yaml */ diff --git a/src/yaml/parsers.hh b/src/yaml/parsers.hh index 6b78ae1..6d0beb4 100644 --- a/src/yaml/parsers.hh +++ b/src/yaml/parsers.hh @@ -174,12 +174,12 @@ struct Parser const Mark& startMark, const Mark& endMark); - void SetDone(bool done); - bool GetDone() const; + void SetDone(bool done) { mDone = done; } + bool GetDone() const { return mDone; } protected: - Scene& GetScene() const; - Stack& GetParsers() const; + Scene& GetScene() const { return mScene; } + Stack& GetParsers() const { return mParsers; } private: /** The Scene being described by the YAML this parser is parsing. */