Fixed bugs in definition of Project, added reference to Project to ParserContext

4 files changed, 36 insertions, 9 deletions

diff --git a/src/core/model/Project.cpp b/src/core/model/Project.cpp
index 6b6eef6..c491d4f 100644
--- a/src/core/model/Project.cpp
+++ b/src/core/model/Project.cpp
@@ -43,6 +43,11 @@ bool Project::doValidate(Logger &logger) const
 	       continueValidation(typesystems, logger);
 }
 
+Rooted<SystemTypesystem> Project::getSystemTypesystem()
+{
+	return systemTypesystem;
+}
+
 Rooted<Typesystem> Project::createTypesystem(const std::string &name)
 {
 	Rooted<Typesystem> typesystem{
@@ -82,6 +87,12 @@ void Project::addDomain(Handle<Domain> domain)
 	invalidate();
 	domains.push_back(domain);
 }
+
+const NodeVector<Document> &Project::getDocuments() { return documents; }
+
+const NodeVector<Domain> &Project::getDomains() { return domains; }
+
+const NodeVector<Typesystem> &Project::getTypesystems() { return typesystems; }
 }
 
 namespace RttiTypes {
diff --git a/src/core/model/Project.hpp b/src/core/model/Project.hpp
index 7f0672a..576bd60 100644
--- a/src/core/model/Project.hpp
+++ b/src/core/model/Project.hpp
@@ -35,11 +35,14 @@ namespace ousia {
 // Forward declarations
 class Logger;
 class Rtti;
-class SystemTypesystem;
-class Typesystem;
 
 namespace model {
 
+class SystemTypesystem;
+class Typesystem;
+class Document;
+class Domain;
+
 /**
  * The Project class constitutes the top-level node in which documents, domains,
  * typesystems and other resources are embedded.
@@ -88,7 +91,7 @@ public:
 	 *
 	 * @return a reference to the system typesystem.
 	 */
-	Rooted<SystemTypesystem> getSystemTypesystem() { return systemTypesystem; }
+	Rooted<SystemTypesystem> getSystemTypesystem();
 
 	/**
 	 * Returns a new typesystem with the given name adds it to the list of
@@ -141,21 +144,21 @@ public:
 	 *
 	 * @return a reference pointing at the document list.
 	 */
-	const NodeVector<Document> &getDocuments() { return documents; }
+	const NodeVector<Document> &getDocuments();
 
 	/**
 	 * Returns all domains of this project.
 	 *
 	 * @return a reference pointing at the domain list.
 	 */
-	const NodeVector<Domain> &getDomains() { return domains; }
+	const NodeVector<Domain> &getDomains();
 
 	/**
 	 * Returns all typesystems of this project.
 	 *
 	 * @return a reference pointing at the typesystem list.
 	 */
-	const NodeVector<Typesystem> &getTypesystems() { return typesystems; }
+	const NodeVector<Typesystem> &getTypesystems();
 };
 }
 
diff --git a/src/core/parser/Parser.hpp b/src/core/parser/Parser.hpp
index 63c57c3..049ee4e 100644
--- a/src/core/parser/Parser.hpp
+++ b/src/core/parser/Parser.hpp
@@ -37,6 +37,7 @@
 #include <core/common/Exceptions.hpp>
 #include <core/common/Logger.hpp>
 #include <core/model/Node.hpp>
+#include <core/model/Project.hpp>
 
 #include "Scope.hpp"
 
@@ -70,6 +71,11 @@ struct ParserContext {
 	Manager &manager;
 
 	/**
+	 * Project instance into which the new content should be parsed.
+	 */
+	Rooted<model::Project> project;
+
+	/**
 	 * Constructor of the ParserContext class.
 	 *
 	 * @param scope is a reference to the Scope instance that should be used to
@@ -80,11 +86,16 @@ struct ParserContext {
 	 * @param logger is a reference to the Logger instance that should be used
 	 * to log error messages and warnings that occur while parsing the document.
 	 * @param manager is a Reference to the Manager the parser should append
-	 *nodes to.
+	 * nodes to.
+	 * @param project is the project into which the content should be parsed.
 	 */
 	ParserContext(Scope &scope, Registry &registry, Logger &logger,
-	              Manager &manager)
-	    : scope(scope), registry(registry), logger(logger), manager(manager){};
+	              Manager &manager, Handle<model::Project> project)
+	    : scope(scope),
+	      registry(registry),
+	      logger(logger),
+	      manager(manager),
+	      project(project){};
 };
 
 /**
diff --git a/src/core/parser/ParserStack.hpp b/src/core/parser/ParserStack.hpp
index aa196e7..492ab9c 100644
--- a/src/core/parser/ParserStack.hpp
+++ b/src/core/parser/ParserStack.hpp
@@ -147,6 +147,8 @@ public:
 
 	Logger &logger() { return handlerData.ctx.logger; }
 
+	Rooted<model::Project> project() { return handlerData.ctx.project; }
+
 	State state() { return handlerData.state; }
 
 	State parentState() { return handlerData.parentState; }