diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-27 16:01:53 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-27 16:01:53 +0100 |
| commit | eb6ecdcc85ece4eb84b90f3c9bb920dc1ad2b6d1 (patch) | |
| tree | caaaaa969471552a13f5315a3de6e9db15b02a8b /src/core/parser/ParserContext.hpp | |
| parent | 07d326d02415467ba7f5f238a8e72a9e4b7f1549 (diff) | |
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.
Diffstat (limited to 'src/core/parser/ParserContext.hpp')
| -rw-r--r-- | src/core/parser/ParserContext.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/parser/ParserContext.hpp b/src/core/parser/ParserContext.hpp index 9b6eca0..f6ae89c 100644 --- a/src/core/parser/ParserContext.hpp +++ b/src/core/parser/ParserContext.hpp @@ -30,6 +30,7 @@ #include <core/common/Location.hpp> #include <core/common/Rtti.hpp> +#include <core/model/Node.hpp> #include <core/model/Project.hpp> namespace ousia { @@ -116,7 +117,7 @@ public: * checked, not the actual result. * @return the parsed node or nullptr if something goes wrong. */ - Rooted<Node> link(const std::string &path, const std::string mimetype, + NodeVector<Node> link(const std::string &path, const std::string mimetype, const std::string rel, const RttiSet &supportedTypes); /** @@ -137,7 +138,7 @@ public: * checked, not the actual result. * @return the parsed node or nullptr if something goes wrong. */ - Rooted<Node> include(const std::string &path, const std::string mimetype, + NodeVector<Node> include(const std::string &path, const std::string mimetype, const std::string rel, const RttiSet &supportedTypes); /** |