diff options
Diffstat (limited to 'src/core/parser')
| -rw-r--r-- | src/core/parser/ParserContext.cpp | 4 | ||||
| -rw-r--r-- | src/core/parser/ParserContext.hpp | 6 | 
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/parser/ParserContext.cpp b/src/core/parser/ParserContext.cpp index cc09b5e..b4e2a9a 100644 --- a/src/core/parser/ParserContext.cpp +++ b/src/core/parser/ParserContext.cpp @@ -39,12 +39,12 @@ ParserContext::ParserContext(Registry ®istry,  {  } -NodeVector<Node> ParserContext::link(const std::string &path, +NodeVector<Node> ParserContext::import(const std::string &path,                                   const std::string mimetype,                                   const std::string rel,                                   const RttiSet &supportedTypes)  { -	return resourceManager.link(*this, path, mimetype, rel, supportedTypes); +	return resourceManager.import(*this, path, mimetype, rel, supportedTypes);  }  NodeVector<Node> ParserContext::include(const std::string &path, diff --git a/src/core/parser/ParserContext.hpp b/src/core/parser/ParserContext.hpp index f6ae89c..2787225 100644 --- a/src/core/parser/ParserContext.hpp +++ b/src/core/parser/ParserContext.hpp @@ -99,7 +99,7 @@ public:  	/**  	 * Parses a file with ParserContext and an empty ParserScope. The parsed -	 * object graph of files that are parsed using the "link" function is +	 * object graph of files that are parsed using the "import" function is  	 * cached (in contrast to the "include" function). A copy of this parser  	 * context will be passed to the called parser, with the ParserScope  	 * reference stored in the "scope" variable exchanged by an empty scope. @@ -117,12 +117,12 @@ public:  	 * checked, not the actual result.  	 * @return the parsed node or nullptr if something goes wrong.  	 */ -	NodeVector<Node> link(const std::string &path, const std::string mimetype, +	NodeVector<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 -	 * to the "link" function, include() does not cache the parsed node (as it +	 * to the "import" function, include() does not cache the parsed node (as it  	 * depends on the current ParserScope).  	 *  	 * @param path is the path of the file that should be parsed.  | 
