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

All the event handling routines return bools

Browse source
This commit is contained in:
Eryn Wells 2014-07-28 15:31:05 -07:00
parent db6fe5af8b
commit 5aff8a2df2
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/yaml/parsers.cc
View file

@ -30,8 +30,8 @@ Parser::~Parser()
{ } { }
void bool
Parser::HandleEvent(yaml_event_t& event) Parser::HandleEvent(const yaml_event_t& event)
{ {
#define YAML_BOOL(x) ((x) != 0) #define YAML_BOOL(x) ((x) != 0)
#define YAML_STRING(x) ((char *)(x)) #define YAML_STRING(x) ((char *)(x))
@ -50,8 +50,8 @@ Parser::HandleEvent(yaml_event_t& event)
break; break;
case YAML_DOCUMENT_START_EVENT: case YAML_DOCUMENT_START_EVENT:
success = HandleDocumentStart(/* TODO: Version directive ,*/ success = HandleDocumentStart(*event.data.document_start.version_directive,
/* TODO: Tag directive list ,*/ TagDirectiveList(),
YAML_BOOL(event.data.document_start.implicit), YAML_BOOL(event.data.document_start.implicit),
event.start_mark, event.start_mark,
event.end_mark); event.end_mark);

16
src/yaml/parsers.hh
View file

@ -82,8 +82,10 @@ struct Parser
* Breaks out the event's data and calls the appropriate handler method. * Breaks out the event's data and calls the appropriate handler method.
* *
* @param [in] event A libyaml parser event object * @param [in] event A libyaml parser event object
* @return `true` or `false` indicating whether the event was successfully
* handled
*/ */
virtual void HandleEvent(yaml_event_t& event); virtual bool HandleEvent(const yaml_event_t& event);
/** /**
* Handle a STREAM-START event. * Handle a STREAM-START event.
@ -142,28 +144,28 @@ struct Parser
const Mark& startMark, const Mark& startMark,
const Mark& endMark); const Mark& endMark);
virtual void HandleMappingStart(const std::string& anchor, virtual bool HandleMappingStart(const std::string& anchor,
const std::string& tag, const std::string& tag,
bool implicit, bool implicit,
MappingStyle style, MappingStyle style,
const Mark& startMark, const Mark& startMark,
const Mark& endMark); const Mark& endMark);
virtual void HandleMappingEnd(const Mark& startMark, virtual bool HandleMappingEnd(const Mark& startMark,
const Mark& endMark); const Mark& endMark);
virtual void HandleSequenceStart(const std::string& anchor, virtual bool HandleSequenceStart(const std::string& anchor,
const std::string& tag, const std::string& tag,
bool implicit, bool implicit,
SequenceStyle style, SequenceStyle style,
const Mark& startMark, const Mark& startMark,
const Mark& endMark); const Mark& endMark);
virtual void HandleSequenceEnd(const Mark& startMark, virtual bool HandleSequenceEnd(const Mark& startMark,
const Mark& endMark); const Mark& endMark);
virtual void HandleAlias(const std::string& anchor, virtual bool HandleAlias(const std::string& anchor,
const Mark& startMark, const Mark& startMark,
const Mark& endMark); const Mark& endMark);
virtual void HandleScalar(const std::string& anchor, virtual bool HandleScalar(const std::string& anchor,
const std::string& tag, const std::string& tag,
const std::string& value, const std::string& value,
bool plainImplicit, bool plainImplicit,