From 015c34fc2b863865ccce66dd316c035db8b8306f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Wed, 3 Aug 2016 00:33:20 +0200 Subject: [PATCH] Minor refactoring. --- include/plasp/pddl/Parser.h | 2 +- include/plasp/utils/Parser.h | 8 ++++---- include/plasp/utils/ParserPolicy.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/plasp/pddl/Parser.h b/include/plasp/pddl/Parser.h index aceb877..c00cb50 100644 --- a/include/plasp/pddl/Parser.h +++ b/include/plasp/pddl/Parser.h @@ -22,7 +22,7 @@ class PDDLParserPolicy return std::tolower(c); } - static bool isWhiteSpace(char c) + static bool isWhiteSpaceCharacter(char c) { return std::iswspace(c); } diff --git a/include/plasp/utils/Parser.h b/include/plasp/utils/Parser.h index 8a16e75..957d678 100644 --- a/include/plasp/utils/Parser.h +++ b/include/plasp/utils/Parser.h @@ -119,7 +119,7 @@ void Parser::skipWhiteSpace() { check(); - while (!atEnd() && ParserPolicy::isWhiteSpace(currentCharacter())) + while (!atEnd() && ParserPolicy::isWhiteSpaceCharacter(currentCharacter())) advance(); } @@ -229,7 +229,7 @@ bool Parser::probeNumber() skipWhiteSpace(); - while (!ParserPolicy::isWhiteSpace(currentCharacter())) + while (!ParserPolicy::isWhiteSpaceCharacter(currentCharacter())) if (!std::isdigit(currentCharacter())) { seek(previousPosition); @@ -351,7 +351,7 @@ std::string Parser::parseImpl(Tag) const auto startPosition = position(); - while (!ParserPolicy::isWhiteSpace(currentCharacter())) + while (!ParserPolicy::isWhiteSpaceCharacter(currentCharacter())) advance(); const auto endPosition = position(); @@ -475,7 +475,7 @@ bool Parser::parseImpl(Tag) template bool Parser::testImpl(const std::string &expectedValue) { - if (!ParserPolicy::isWhiteSpace(expectedValue.front())) + if (!ParserPolicy::isWhiteSpaceCharacter(expectedValue.front())) skipWhiteSpace(); const auto match = std::find_if(expectedValue.cbegin(), expectedValue.cend(), diff --git a/include/plasp/utils/ParserPolicy.h b/include/plasp/utils/ParserPolicy.h index 8532747..33c8baf 100644 --- a/include/plasp/utils/ParserPolicy.h +++ b/include/plasp/utils/ParserPolicy.h @@ -22,7 +22,7 @@ class CaseSensitiveParserPolicy return c; } - static bool isWhiteSpace(char c) + static bool isWhiteSpaceCharacter(char c) { return std::iswspace(c); } @@ -43,7 +43,7 @@ class CaseInsensitiveParserPolicy return std::tolower(c); } - static bool isWhiteSpace(char c) + static bool isWhiteSpaceCharacter(char c) { return std::iswspace(c); }