From eb6ecdcc85ece4eb84b90f3c9bb920dc1ad2b6d1 Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Tue, 27 Jan 2015 16:01:53 +0100 Subject: Parsers do no longer return the node they have parsed (as this may be ill-defined -- if a parser only parses a partial document via include, there may be many to no nodes that are returned). Parsers should just use the ParserScope.push funciton. All nodes pushed onto the top-level of the ParserScope are added treated as the nodes the parser has parsed. Adapted all code and all tests accordingly. --- src/plugins/xml/XmlParser.cpp | 3 +-- src/plugins/xml/XmlParser.hpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/plugins/xml') diff --git a/src/plugins/xml/XmlParser.cpp b/src/plugins/xml/XmlParser.cpp index bb9d678..51c52bc 100644 --- a/src/plugins/xml/XmlParser.cpp +++ b/src/plugins/xml/XmlParser.cpp @@ -289,7 +289,7 @@ static void xmlCharacterDataHandler(void *p, const XML_Char *s, int len) /* Class XmlParser */ -Rooted XmlParser::doParse(CharReader &reader, ParserContext &ctx) +void XmlParser::doParse(CharReader &reader, ParserContext &ctx) { // Create the parser object ScopedExpatXmlParser p{"UTF-8"}; @@ -335,7 +335,6 @@ Rooted XmlParser::doParse(CharReader &reader, ParserContext &ctx) break; } } - return nullptr; } } diff --git a/src/plugins/xml/XmlParser.hpp b/src/plugins/xml/XmlParser.hpp index 3c0ffb7..c8b6302 100644 --- a/src/plugins/xml/XmlParser.hpp +++ b/src/plugins/xml/XmlParser.hpp @@ -46,7 +46,7 @@ protected: * @param ctx is a reference to the ParserContext instance that should be * used. */ - Rooted doParse(CharReader &reader, ParserContext &ctx) override; + void doParse(CharReader &reader, ParserContext &ctx) override; }; } -- cgit v1.2.3