Removed dependency between "Project" model class and parser/resources. This reduces coupling and was stupid beforehand.

1 files changed, 7 insertions, 5 deletions

diff --git a/src/plugins/xml/XmlParser.cpp b/src/plugins/xml/XmlParser.cpp
index 3831b3d..bb9d678 100644
--- a/src/plugins/xml/XmlParser.cpp
+++ b/src/plugins/xml/XmlParser.cpp
@@ -57,13 +57,13 @@ public:
 
 	void start(Variant::mapType &args) override
 	{
-		scope().push(project()->createTypesystem(args["name"].asString()));
+		Rooted<Typesystem> typesystem =
+		    project()->createTypesystem(args["name"].asString());
+		typesystem->setLocation(location());
+		scope().push(typesystem);
 	}
 
-	void end() override
-	{
-		scope().pop();
-	}
+	void end() override { scope().pop(); }
 
 	static Handler *create(const HandlerData &handlerData)
 	{
@@ -84,6 +84,7 @@ public:
 		// Fetch the current typesystem and create the struct node
 		Rooted<Typesystem> typesystem = scope().getLeaf().cast<Typesystem>();
 		Rooted<StructType> structType = typesystem->createStructType(name);
+		structType->setLocation(location());
 
 		// Try to resolve the parent type and set it as parent structure
 		if (!parent.empty()) {
@@ -128,6 +129,7 @@ public:
 		Rooted<StructType> structType = scope().getLeaf().cast<StructType>();
 		Rooted<Attribute> attribute =
 		    structType->createAttribute(name, defaultValue, optional, logger());
+		attribute->setLocation(location());
 
 		// Try to resolve the type
 		scope().resolve<Type>(