From 3f62168ed0b088eec3cb2903f03966f7d501f564 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Thu, 11 Dec 2014 15:26:50 +0100
Subject: moved to CharReader everywhere

---
 src/plugins/css/CSSParser.cpp | 18 +++++++++---------
 src/plugins/css/CSSParser.hpp |  2 +-
 src/plugins/xml/XmlParser.cpp |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/css/CSSParser.cpp b/src/plugins/css/CSSParser.cpp
index 4cbe93f..5985047 100644
--- a/src/plugins/css/CSSParser.cpp
+++ b/src/plugins/css/CSSParser.cpp
@@ -18,7 +18,7 @@
 
 #include "CSSParser.hpp"
 
-#include <core/variant/Reader.hpp>
+#include <core/common/VariantReader.hpp>
 
 namespace ousia {
 namespace parser {
@@ -77,7 +77,7 @@ static const std::map<int, CodeTokenDescriptor> CSS_DESCRIPTORS = {
 
 Rooted<Node> CSSParser::parse(std::istream &is, ParserContext &ctx)
 {
-	BufferedCharReader input{is};
+	CharReader input{is};
 	CodeTokenizer tokenizer{input, CSS_ROOT, CSS_DESCRIPTORS};
 	tokenizer.ignoreComments = true;
 	tokenizer.ignoreLinebreaks = true;
@@ -228,14 +228,14 @@ Rooted<SelectorNode> CSSParser::parsePrimitiveSelector(CodeTokenizer &tokenizer,
 			Variant::arrayType args;
 			// we require at least one argument, if parantheses are used
 			// XXX
-			/*args.push_back(variant::Reader::parseGeneric(tokenizer.getInput(),
+			args.push_back(VariantReader::parseGeneric(tokenizer.getInput(),
 			                                             ctx.logger,
-			                                             {',', ')'}).second);*/
+			                                             {',', ')'}).second);
 			while (expect(COMMA, tokenizer, t, false, ctx)) {
 				// as long as we find commas we expect new arguments.
-				/*args.push_back(
-				    variant::Reader::parseGeneric(
-				        tokenizer.getInput(), ctx.logger, {',', ')'}).second);*/
+				args.push_back(
+				    VariantReader::parseGeneric(
+				        tokenizer.getInput(), ctx.logger, {',', ')'}).second);
 			}
 			expect(PAREN_CLOSE, tokenizer, t, true, ctx);
 			// and we return with the finished Selector.
@@ -334,8 +334,8 @@ bool CSSParser::parseRule(CodeTokenizer &tokenizer, ParserContext &ctx,
 	expect(COLON, tokenizer, t, true, ctx);
 	// then the value
 	// TODO: Resolve key for appropriate parsing function here.
-	/*value = variant::Reader::parseGeneric(tokenizer.getInput(), ctx.logger,
-	                                      {';'}).second;*/
+	value = VariantReader::parseGeneric(tokenizer.getInput(), ctx.logger,
+	                                      {';'}).second;
 	// and a ;
 	expect(SEMICOLON, tokenizer, t, true, ctx);
 	return true;
diff --git a/src/plugins/css/CSSParser.hpp b/src/plugins/css/CSSParser.hpp
index 82f0cd1..eeb5b2c 100644
--- a/src/plugins/css/CSSParser.hpp
+++ b/src/plugins/css/CSSParser.hpp
@@ -22,9 +22,9 @@
 #include <vector>
 #include <utility>
 
-#include <core/BufferedCharReader.hpp>
 #include <core/CodeTokenizer.hpp>
 #include <core/CSS.hpp>
+#include <core/common/CharReader.hpp>
 #include <core/parser/Parser.hpp>
 
 namespace ousia {
diff --git a/src/plugins/xml/XmlParser.cpp b/src/plugins/xml/XmlParser.cpp
index ce2857e..9a7b4d8 100644
--- a/src/plugins/xml/XmlParser.cpp
+++ b/src/plugins/xml/XmlParser.cpp
@@ -20,7 +20,7 @@
 
 #include <expat.h>
 
-#include <core/Utils.hpp>
+#include <core/common/Utils.hpp>
 #include <core/parser/ParserStack.hpp>
 
 #include "XmlParser.hpp"
-- 
cgit v1.2.3