patrick/plasp
Archived
1
0
Fork 0
Code Issues 12 Releases 8 Activity

Refactoring of Parser class with std::istreambuf_iterator.

Browse Source
This commit is contained in:
Patrick Lühne
2016-05-30 12:54:56 +02:00
parent 8d879344f2
commit 4d984d32c3
2 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/plasp/utils/Parser.h
View File

@@ -18,16 +18,13 @@ namespace utils
class Parser
{
public:
using CharacterType = unsigned char;
public:
explicit Parser(std::istream &istream);
size_t row() const;
size_t column() const;
CharacterType currentCharacter() const;
char currentCharacter() const;
void advance();
bool atEndOfFile() const;
@@ -52,17 +49,17 @@ class Parser
std::string getLine();
private:
static const std::istream_iterator<CharacterType> EndOfFile;
static const std::istreambuf_iterator<char> EndOfFile;
private:
void checkStream() const;
bool advanceIf(CharacterType expectedCharacter);
bool advanceIf(char expectedCharacter);
uint64_t parseIntegerBody();
std::istream &m_istream;
std::istream_iterator<CharacterType> m_position;
std::istreambuf_iterator<char> m_position;
size_t m_row;
size_t m_column;
@@ -81,7 +78,7 @@ std::string Parser::parseIdentifier(CharacterPredicate characterPredicate, White
while (true)
{
const auto character = *m_position;
const auto character = currentCharacter();
if (!characterPredicate(character))
return value;
@@ -110,7 +107,7 @@ void Parser::skipWhiteSpace(WhiteSpacePredicate whiteSpacePredicate)
{
checkStream();
while (m_position != EndOfFile && whiteSpacePredicate(*m_position))
while (!atEndOfFile() && whiteSpacePredicate(currentCharacter()))
advance();
}