diff options
Diffstat (limited to 'src/core/parser')
| -rw-r--r-- | src/core/parser/ParserContext.cpp | 2 | ||||
| -rw-r--r-- | src/core/parser/ParserContext.hpp | 12 | ||||
| -rw-r--r-- | src/core/parser/ParserScope.cpp | 14 | ||||
| -rw-r--r-- | src/core/parser/ParserScope.hpp | 43 |
4 files changed, 44 insertions, 27 deletions
diff --git a/src/core/parser/ParserContext.cpp b/src/core/parser/ParserContext.cpp index b4e2a9a..14b02df 100644 --- a/src/core/parser/ParserContext.cpp +++ b/src/core/parser/ParserContext.cpp @@ -39,7 +39,7 @@ ParserContext::ParserContext(Registry ®istry, { } -NodeVector<Node> ParserContext::import(const std::string &path, +Rooted<Node> ParserContext::import(const std::string &path, const std::string mimetype, const std::string rel, const RttiSet &supportedTypes) diff --git a/src/core/parser/ParserContext.hpp b/src/core/parser/ParserContext.hpp index 2787225..1b889b1 100644 --- a/src/core/parser/ParserContext.hpp +++ b/src/core/parser/ParserContext.hpp @@ -117,8 +117,8 @@ public: * checked, not the actual result. * @return the parsed node or nullptr if something goes wrong. */ - NodeVector<Node> import(const std::string &path, const std::string mimetype, - const std::string rel, const RttiSet &supportedTypes); + Rooted<Node> import(const std::string &path, const std::string mimetype, + const std::string rel, const RttiSet &supportedTypes); /** * Parses a file with ParserContext and the current ParserScope. In contrast @@ -136,10 +136,12 @@ public: * @param supportedTypes contains the types of the returned Node the caller * can deal with. Note that only the types the parser claims to return are * checked, not the actual result. - * @return the parsed node or nullptr if something goes wrong. + * @return the parsed nodes or an empty list if something goes wrong (or + * there were indeed no objects to be parsed). */ - NodeVector<Node> include(const std::string &path, const std::string mimetype, - const std::string rel, const RttiSet &supportedTypes); + NodeVector<Node> include(const std::string &path, + const std::string mimetype, const std::string rel, + const RttiSet &supportedTypes); /** * Clones the ParserContext instance but exchanges the ParserScope instance diff --git a/src/core/parser/ParserScope.cpp b/src/core/parser/ParserScope.cpp index 0e2350f..3d1ba78 100644 --- a/src/core/parser/ParserScope.cpp +++ b/src/core/parser/ParserScope.cpp @@ -168,6 +168,20 @@ Rooted<Node> ParserScope::getRoot() const { return nodes.front(); } Rooted<Node> ParserScope::getLeaf() const { return nodes.back(); } +Rooted<Node> ParserScope::select(RttiSet types, int maxDepth) +{ + ssize_t minDepth = 0; + if (maxDepth >= 0) { + minDepth = static_cast<ssize_t>(nodes.size()) - (maxDepth + 1); + } + for (ssize_t i = nodes.size() - 1; i >= minDepth; i--) { + if (nodes[i]->type().isOneOf(types)) { + return nodes[i]; + } + } + return nullptr; +} + void ParserScope::setFlag(ParserFlag flag, bool value) { // Fetch the current stack depth diff --git a/src/core/parser/ParserScope.hpp b/src/core/parser/ParserScope.hpp index 2c6093f..1191cbc 100644 --- a/src/core/parser/ParserScope.hpp +++ b/src/core/parser/ParserScope.hpp @@ -324,14 +324,24 @@ public: /** * Returns the bottom-most Node instance in the ParserScope hirarchy, e.g. - *the - * node that was pushed last onto the stack. + * the node that was pushed last onto the stack. * * @return a reference at the leaf node. */ Rooted<Node> getLeaf() const; /** + * Ascends in the stack starting with the leaf node, returns the first node + * that matches the type given in the RttiSet or nullptr if none matches. + * + * @param types is a set of Rtti types for which should be searched in the + * stack. + * @param maxDepth is the maximum number of stack entries the selection + * function may ascend. A negative value indicates no limitation. + */ + Rooted<Node> select(RttiSet types, int maxDepth = -1); + + /** * Sets a parser flag for the current stack depth. * * @param flag is the flag that should be set. @@ -353,12 +363,10 @@ public: * Tries to resolve a node for the given type and path for all nodes * currently on the stack, starting with the topmost node on the stack. * Calls the "imposterCallback" function for obtaining a temporary - *result if - * a node cannot be resolved right now. The "resultCallback" is at most - * called twice: Once when this method is called (probably with the + * result if a node cannot be resolved right now. The "resultCallback" is + * at most called twice: Once when this method is called (probably with the * temporary) and another time if the resolution turned out to be - *successful - * at a later point in time. + * successful at a later point in time. * * @param path is the path for which a node should be resolved. * @param type is the type of the node that should be resolved. @@ -367,24 +375,17 @@ public: * @param imposterCallback is the callback function that is called if * the node cannot be resolved at this moment. It gives the caller the * possibility to create an imposter (a temporary object) that may be - *used - * later in the resolution process. + * used later in the resolution process. * @param resultCallback is the callback function to which the result of * the resolution process is passed. This function is called at least - *once - * either with the imposter (if the resolution was not successful) or - *the - * resolved object directly when this function is called. If the - *resolution - * was not successful the first time, it may be called another time - *later - * in the context of the "performDeferredResolution" function. + * once either with the imposter (if the resolution was not successful) or + * the resolved object directly when this function is called. If the + * resolution was not successful the first time, it may be called another + * time later in the context of the "performDeferredResolution" function. * @param location is the location in the current source file in which - *the - * resolution was triggered. + * the resolution was triggered. * @return true if the resolution was immediately successful. This does - *not - * mean, that the resolved object does not exist, as it may be resolved + * not mean, that the resolved object does not exist, as it may be resolved * later. */ bool resolve(const std::vector<std::string> &path, const Rtti &type, |