From 5b81f755a5303c3eab05c605711ecca32c071b6d Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Mon, 2 Mar 2015 11:46:47 +0100
Subject: Got Stack compiling again

---
 src/formats/osml/OsmlParser.cpp   |  2 +-
 src/formats/osxml/OsxmlParser.cpp | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'src/formats')

diff --git a/src/formats/osml/OsmlParser.cpp b/src/formats/osml/OsmlParser.cpp
index c25974f..36ef2b6 100644
--- a/src/formats/osml/OsmlParser.cpp
+++ b/src/formats/osml/OsmlParser.cpp
@@ -73,7 +73,7 @@ public:
 	    : logger(ctx.getLogger()),
 	      ctx(ctx),
 	      parser(reader, logger),
-	      stack(ctx, GenericParserStates)
+	      stack(parser, ctx, GenericParserStates)
 	{
 	}
 
diff --git a/src/formats/osxml/OsxmlParser.cpp b/src/formats/osxml/OsxmlParser.cpp
index afe0dc6..10cc77a 100644
--- a/src/formats/osxml/OsxmlParser.cpp
+++ b/src/formats/osxml/OsxmlParser.cpp
@@ -18,6 +18,7 @@
 
 #include <core/common/Variant.hpp>
 #include <core/common/CharReader.hpp>
+#include <core/parser/stack/Callbacks.hpp>
 #include <core/parser/stack/GenericParserStates.hpp>
 #include <core/parser/stack/Stack.hpp>
 #include <core/parser/ParserContext.hpp>
@@ -32,7 +33,7 @@ using namespace parser_stack;
 /**
  * Class containing the actual OsxmlParser implementation.
  */
-class OsxmlParserImplementation : public OsxmlEvents {
+class OsxmlParserImplementation : public OsxmlEvents, ParserCallbacks {
 private:
 	/**
 	 * Actual xml parser -- converts the xml stream into a set of events.
@@ -56,7 +57,7 @@ public:
 	 */
 	OsxmlParserImplementation(CharReader &reader, ParserContext &ctx)
 	    : parser(reader, *this, ctx.getLogger()),
-	      stack(ctx, GenericParserStates)
+	      stack(*this, ctx, GenericParserStates)
 	{
 	}
 
@@ -86,6 +87,16 @@ public:
 	void rangeEnd() override { stack.rangeEnd(); }
 
 	void data(const TokenizedData &data) override { stack.data(data); }
+
+	TokenId registerToken(const std::string &token) override
+	{
+		return Tokens::Empty;
+	}
+
+	void unregisterToken(TokenId id) override
+	{
+		// Do nothing here
+	}
 };
 
 /* Class OsxmlParser */
-- 
cgit v1.2.3