Domains an Typesystems can also be declared inline

2 files changed, 17 insertions, 0 deletions

diff --git a/src/core/parser/stack/DomainHandler.cpp b/src/core/parser/stack/DomainHandler.cpp
index 24a6f1a..a2c8eec 100644
--- a/src/core/parser/stack/DomainHandler.cpp
+++ b/src/core/parser/stack/DomainHandler.cpp
@@ -35,11 +35,21 @@ namespace parser_stack {
 
 bool DomainHandler::start(Variant::mapType &args)
 {
+	// Create the Domain node
 	Rooted<Domain> domain =
 	    context().getProject()->createDomain(args["name"].asString());
 	domain->setLocation(location());
 
+	// If the domain is defined inside a document, add the reference to the
+	// document
+	Rooted<Document> document = scope().select<Document>();
+	if (document != nullptr) {
+		document->reference(domain);
+	}
+
+	// Push the typesystem onto the scope, set the POST_HEAD flag to true
 	scope().push(domain);
+	scope().setFlag(ParserFlag::POST_HEAD, false);
 	return true;
 }
 
diff --git a/src/core/parser/stack/TypesystemHandler.cpp b/src/core/parser/stack/TypesystemHandler.cpp
index d053699..8fd9525 100644
--- a/src/core/parser/stack/TypesystemHandler.cpp
+++ b/src/core/parser/stack/TypesystemHandler.cpp
@@ -37,6 +37,13 @@ bool TypesystemHandler::start(Variant::mapType &args)
 	    context().getProject()->createTypesystem(args["name"].asString());
 	typesystem->setLocation(location());
 
+	// If the typesystem is defined inside a domain, add a reference to the
+	// typesystem to the domain
+	Rooted<Domain> domain = scope().select<Domain>();
+	if (domain != nullptr) {
+		domain->reference(typesystem);
+	}
+
 	// Push the typesystem onto the scope, set the POST_HEAD flag to true
 	scope().push(typesystem);
 	scope().setFlag(ParserFlag::POST_HEAD, false);