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

2 files changed, 20 insertions, 6 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();
 };
 }