1 files changed, 7 insertions, 52 deletions

diff --git a/src/core/parser/stack/DocumentHandler.hpp b/src/core/parser/stack/DocumentHandler.hpp
index 9a41508..d34c020 100644
--- a/src/core/parser/stack/DocumentHandler.hpp
+++ b/src/core/parser/stack/DocumentHandler.hpp
@@ -53,8 +53,7 @@ class DocumentHandler : public StaticHandler {
 public:
 	using StaticHandler::StaticHandler;
 
-	bool startCommand(const std::string &commandName,
-	                  Variant::mapType &args) override;
+	bool startCommand(Variant::mapType &args) override;
 	void end() override;
 
 	/**
@@ -92,55 +91,11 @@ public:
  * defined elements in an Ousía document.
  */
 class DocumentChildHandler : public Handler {
-public:
-	/**
-	 * Enum type used to represent the mode of the DocumentChildHandler.
-	 * TODO: Having to have such a type is actually quite stupid, it would be
-	 * nicer to have separate handler classes for each of these cases. But this
-	 * is a story for a different day.
-	 */
-	enum class Mode {
-		STRUCT,
-		EXPLICIT_FIELD,
-		ANNOTATION_START,
-		ANNOTATION_END,
-		TOKEN
-	};
-
 private:
 	/**
-	 * Internal Mode of the DocumentChildHandler.
-	 */
-	Mode mode;
-
-	/**
-	 * Contains the name of the command or the annotation that is represented
-	 * by this DocumentChildHandler.
-	 */
-	std::string name;
-
-	/**
-	 * Token represented by the document child handler.
+	 * If set to true, this handler represents an explicit field.
 	 */
-	Token token;
-
-	/**
-	 * Switches the mode to the given mode and copies the given name. Resets the
-	 * token.
-	 *
-	 * @param mode is the new mode.
-	 * @param name is the new name.
-	 */
-	void setMode(Mode mode, const std::string &name);
-
-	/**
-	 * Switches the mode to the given mode and copies the given token, sets the
-	 * name to the content of the token.
-	 *
-	 * @param mode is the new mode.
-	 * @param token is the new token.
-	 */
-	void setMode(Mode mode, const Token &token);
+	bool isExplicitField;
 
 	/**
 	 * Code shared by both the start(), fieldStart() and the data() method.
@@ -211,11 +166,10 @@ private:
 public:
 	DocumentChildHandler(const HandlerData &handlerData);
 
-	bool startCommand(const std::string &commandName,
-	                  Variant::mapType &args) override;
-	bool startAnnotation(const std::string &name, Variant::mapType &args,
+	bool startCommand(Variant::mapType &args) override;
+	bool startAnnotation(Variant::mapType &args,
 	                     AnnotationType annotationType) override;
-	bool startToken(const Token &token, Handle<Node> node) override;
+	bool startToken(Handle<Node> node) override;
 	EndTokenResult endToken(const Token &token, Handle<Node> node) override;
 	void end() override;
 	bool data() override;
@@ -257,3 +211,4 @@ extern const Rtti DocumentField;
 }
 
 #endif /* _OUSIA_PARSER_STACK_DOCUMENT_HANDLER_HPP_ */
+