Restructures parser classes a little, removed Registry from ParserContext, gave a ResourceManager instance to the Project, using ResourceRequest when including or linking files, thought through how "including" and "linking" are handled

1 files changed, 7 insertions, 5 deletions

diff --git a/test/core/parser/StandaloneParserContext.hpp b/test/core/parser/StandaloneParserContext.hpp
index 51cd1e6..cae843f 100644
--- a/test/core/parser/StandaloneParserContext.hpp
+++ b/test/core/parser/StandaloneParserContext.hpp
@@ -34,19 +34,21 @@ public:
 	Manager manager;
 	Logger logger;
 	Registry registry;
+	Rooted<Project> project;
 	ParserScope scope;
-	Rooted<model::Project> project;
 	ParserContext context;
 
 	StandaloneParserContext()
-	    : project(new model::Project(manager)),
-	      context(scope, registry, logger, manager, project)
+	    : project(new Project(manager, registry)),
+	      context(project, scope, logger)
 	{
 	}
 
 	StandaloneParserContext(Logger &externalLogger)
-	    : project(new model::Project(manager)),
-	      context(scope, registry, externalLogger, manager, project){};
+	    : project(new Project(manager, registry)),
+	      context(project, scope, externalLogger)
+	{
+	}
 };
 }