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

Simplified Parser interface.

Browse Source
This commit is contained in:
Patrick Lühne
2016-05-29 15:08:10 +02:00
parent 2c564f47d3
commit 42fda5925d
3 changed files with 58 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,15 +27,20 @@ class Parser
size_t row() const;
size_t column() const;
CharacterType currentCharacter() const;
template<typename Type>
Type parse();
template<class CharacterCondition>
void parseUntil(std::vector<std::string> &container, CharacterCondition characterCondition);
template<class WhiteSpacePredicate, class CharacterPredicate>
std::string parseIdentifier(WhiteSpacePredicate whiteSpacePredicate, CharacterPredicate characterPredicate);
template<typename Type>
void expect(const Type &expectedValue);
template<class WhiteSpacePredicate>
void skipWhiteSpace(WhiteSpacePredicate whiteSpacePredicate);
void skipWhiteSpace();
void skipLine();
@@ -63,38 +68,38 @@ class Parser
////////////////////////////////////////////////////////////////////////////////////////////////////
template<class CharacterCondition>
void Parser::parseUntil(std::vector<std::string> &container, CharacterCondition characterCondition)
template<class WhiteSpacePredicate, class CharacterPredicate>
std::string Parser::parseIdentifier(WhiteSpacePredicate whiteSpacePredicate, CharacterPredicate characterPredicate)
{
skipWhiteSpace(whiteSpacePredicate);
std::string value;
while (true)
{
skipWhiteSpace();
const auto character = *m_position;
std::string value;
if (!characterPredicate(character))
return value;
while (true)
{
const auto character = *m_position;
if (characterCondition(character))
{
container.emplace_back(std::move(value));
return;
}
if (std::isspace(character))
break;
value.push_back(character);
advance();
}
container.emplace_back(std::move(value));
value.push_back(character);
advance();
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////
template<class WhiteSpacePredicate>
void Parser::skipWhiteSpace(WhiteSpacePredicate whiteSpacePredicate)
{
checkStream();
while (whiteSpacePredicate(*m_position))
advance();
}
////////////////////////////////////////////////////////////////////////////////////////////////////
}
}