1 files changed, 35 insertions, 34 deletions

diff --git a/src/core/parser/stack/DomainHandler.hpp b/src/core/parser/stack/DomainHandler.hpp
index 7398812..5e8ea60 100644
--- a/src/core/parser/stack/DomainHandler.hpp
+++ b/src/core/parser/stack/DomainHandler.hpp
@@ -26,18 +26,19 @@
 #define _OUSIA_DOMAIN_HANDLER_HPP_
 
 #include <core/common/Variant.hpp>
-#include <core/parser/ParserStack.hpp>
+
+#include "Handler.hpp"
 
 namespace ousia {
 
 // Forward declarations
 class Rtti;
 
-class DomainHandler : public Handler {
+class DomainHandler : public StaticHandler {
 public:
-	using Handler::Handler;
+	using StaticHandler::StaticHandler;
 
-	void start(Variant::mapType &args) override;
+	bool start(Variant::mapType &args) override;
 
 	void end() override;
 
@@ -47,11 +48,11 @@ public:
 	}
 };
 
-class DomainStructHandler : public Handler {
+class DomainStructHandler : public StaticHandler {
 public:
-	using Handler::Handler;
+	using StaticHandler::StaticHandler;
 
-	void start(Variant::mapType &args) override;
+	bool start(Variant::mapType &args) override;
 
 	void end() override;
 
@@ -61,11 +62,11 @@ public:
 	}
 };
 
-class DomainAnnotationHandler : public Handler {
+class DomainAnnotationHandler : public StaticHandler {
 public:
-	using Handler::Handler;
+	using StaticHandler::StaticHandler;
 
-	void start(Variant::mapType &args) override;
+	bool start(Variant::mapType &args) override;
 
 	void end() override;
 
@@ -75,11 +76,11 @@ public:
 	}
 };
 
-class DomainAttributesHandler : public Handler {
+class DomainAttributesHandler : public StaticHandler {
 public:
-	using Handler::Handler;
+	using StaticHandler::StaticHandler;
 
-	void start(Variant::mapType &args) override;
+	bool start(Variant::mapType &args) override;
 
 	void end() override;
 
@@ -89,11 +90,11 @@ public:
 	}
 };
 
-class DomainFieldHandler : public Handler {
+class DomainFieldHandler : public StaticHandler {
 public:
-	using Handler::Handler;
+	using StaticHandler::StaticHandler;
 
-	void start(Variant::mapType &args) override;
+	bool start(Variant::mapType &args) override;
 
 	void end() override;
 
@@ -103,11 +104,11 @@ public:
 	}
 };
 
-class DomainFieldRefHandler : public Handler {
+class DomainFieldRefHandler : public StaticHandler {
 public:
-	using Handler::Handler;
+	using StaticHandler::StaticHandler;
 
-	void start(Variant::mapType &args) override;
+	bool start(Variant::mapType &args) override;
 
 	void end() override;
 
@@ -117,11 +118,11 @@ public:
 	}
 };
 
-class DomainPrimitiveHandler : public Handler {
+class DomainPrimitiveHandler : public StaticHandler {
 public:
-	using Handler::Handler;
+	using StaticHandler::StaticHandler;
 
-	void start(Variant::mapType &args) override;
+	bool start(Variant::mapType &args) override;
 
 	void end() override;
 
@@ -131,11 +132,11 @@ public:
 	}
 };
 
-class DomainChildHandler : public Handler {
+class DomainChildHandler : public StaticHandler {
 public:
-	using Handler::Handler;
+	using StaticHandler::StaticHandler;
 
-	void start(Variant::mapType &args) override;
+	bool start(Variant::mapType &args) override;
 
 	void end() override;
 
@@ -154,11 +155,11 @@ namespace RttiTypes {
 extern const Rtti DomainParent;
 }
 
-class DomainParentHandler : public Handler {
+class DomainParentHandler : public StaticHandler {
 public:
-	using Handler::Handler;
+	using StaticHandler::StaticHandler;
 
-	void start(Variant::mapType &args) override;
+	bool start(Variant::mapType &args) override;
 
 	void end() override;
 
@@ -168,11 +169,11 @@ public:
 	}
 };
 
-class DomainParentFieldHandler : public Handler {
+class DomainParentFieldHandler : public StaticHandler {
 public:
-	using Handler::Handler;
+	using StaticHandler::StaticHandler;
 
-	void start(Variant::mapType &args) override;
+	bool start(Variant::mapType &args) override;
 
 	void end() override;
 
@@ -182,11 +183,11 @@ public:
 	}
 };
 
-class DomainParentFieldRefHandler : public Handler {
+class DomainParentFieldRefHandler : public StaticHandler {
 public:
-	using Handler::Handler;
+	using StaticHandler::StaticHandler;
 
-	void start(Variant::mapType &args) override;
+	bool start(Variant::mapType &args) override;
 
 	void end() override;