From f81fd1a1b4ccc65fc29140565a41d3ed302045d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20L=C3=BChne?= <patrick-github@luehne.de>
Date: Fri, 27 May 2016 19:25:59 +0200
Subject: [PATCH] =?UTF-8?q?Introduced=20alias=20for=20parser=E2=80=99s=20u?=
 =?UTF-8?q?nderlying=20character=20type.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/plasp/utils/Parser.h | 9 ++++++---
 src/plasp/utils/Parser.cpp   | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/plasp/utils/Parser.h b/include/plasp/utils/Parser.h
index e76b675..ae30750 100644
--- a/include/plasp/utils/Parser.h
+++ b/include/plasp/utils/Parser.h
@@ -17,6 +17,9 @@ namespace utils
 
 class Parser
 {
+	public:
+		using CharacterType = unsigned char;
+
 	public:
 		explicit Parser(std::istream &istream);
 
@@ -35,18 +38,18 @@ class Parser
 		std::string getLine();
 
 	private:
-		static const std::istream_iterator<unsigned char> EndOfFile;
+		static const std::istream_iterator<CharacterType> EndOfFile;
 
 	private:
 		void checkStream() const;
 		void advance();
 
-		bool advanceIf(unsigned char expectedCharacter);
+		bool advanceIf(CharacterType expectedCharacter);
 
 		uint64_t parseIntegerBody();
 
 		std::istream &m_istream;
-		std::istream_iterator<unsigned char> m_position;
+		std::istream_iterator<CharacterType> m_position;
 
 		size_t m_row;
 		size_t m_column;
diff --git a/src/plasp/utils/Parser.cpp b/src/plasp/utils/Parser.cpp
index 13be87a..b3df864 100644
--- a/src/plasp/utils/Parser.cpp
+++ b/src/plasp/utils/Parser.cpp
@@ -17,7 +17,7 @@ namespace utils
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-const std::istream_iterator<unsigned char> Parser::EndOfFile = std::istream_iterator<unsigned char>();
+const std::istream_iterator<Parser::CharacterType> Parser::EndOfFile = std::istream_iterator<Parser::CharacterType>();
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -84,7 +84,7 @@ void Parser::advance()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-bool Parser::advanceIf(unsigned char expectedCharacter)
+bool Parser::advanceIf(CharacterType expectedCharacter)
 {
 	checkStream();
 
@@ -198,7 +198,7 @@ uint64_t Parser::parseIntegerBody()
 
 	uint64_t value = 0;
 
-	while (m_position != std::istream_iterator<unsigned char>())
+	while (m_position != std::istream_iterator<CharacterType>())
 	{
 		const auto character = *m_position;