From 57e9de6b05432a5fc60916ace3628fe5a3a245b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Tue, 14 Jun 2016 15:12:45 +0200 Subject: [PATCH] =?UTF-8?q?Renamed=20method=20to=20=C2=BBlogWarning.=C2=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/plasp-app/main.cpp | 1 - include/plasp/pddl/expressions/NAry.h | 2 +- include/plasp/utils/Logger.h | 2 +- src/plasp/pddl/Domain.cpp | 2 +- src/plasp/pddl/Problem.cpp | 2 +- src/plasp/pddl/Requirement.cpp | 2 +- src/plasp/pddl/expressions/PrimitiveType.cpp | 2 +- src/plasp/pddl/expressions/Unsupported.cpp | 2 +- src/plasp/utils/Logger.cpp | 2 +- 9 files changed, 8 insertions(+), 9 deletions(-) diff --git a/apps/plasp-app/main.cpp b/apps/plasp-app/main.cpp index 71e50a3..1468d87 100644 --- a/apps/plasp-app/main.cpp +++ b/apps/plasp-app/main.cpp @@ -9,7 +9,6 @@ #include #include #include -#include #include int main(int argc, char **argv) diff --git a/include/plasp/pddl/expressions/NAry.h b/include/plasp/pddl/expressions/NAry.h index 9cbbb6c..74470e8 100644 --- a/include/plasp/pddl/expressions/NAry.h +++ b/include/plasp/pddl/expressions/NAry.h @@ -71,7 +71,7 @@ std::unique_ptr NAry::parse(Context &context, } if (expression->m_arguments.empty()) - context.logger.parserWarning(context.parser, "“" + Derived::Identifier + "” expressions should not be empty"); + context.logger.logWarning(context.parser, "“" + Derived::Identifier + "” expressions should not be empty"); parser.expect(")"); diff --git a/include/plasp/utils/Logger.h b/include/plasp/utils/Logger.h index a91f3dd..d917dea 100644 --- a/include/plasp/utils/Logger.h +++ b/include/plasp/utils/Logger.h @@ -40,7 +40,7 @@ class Logger void logError(const std::string &message); void logError(const Parser::Coordinate &coordinate, const std::string &message); - void parserWarning(const Parser &parser, const std::string &message); + void logWarning(const Parser &parser, const std::string &message); private: WarningLevel m_warningLevel; diff --git a/src/plasp/pddl/Domain.cpp b/src/plasp/pddl/Domain.cpp index d77d4b5..6d80d08 100644 --- a/src/plasp/pddl/Domain.cpp +++ b/src/plasp/pddl/Domain.cpp @@ -94,7 +94,7 @@ void Domain::findSections() const auto sectionIdentifier = parser.parseIdentifier(isIdentifier); - m_context.logger.parserWarning(parser, "Section type “" + sectionIdentifier + "” currently unsupported"); + m_context.logger.logWarning(parser, "Section type “" + sectionIdentifier + "” currently unsupported"); parser.seek(sectionIdentifierPosition); } diff --git a/src/plasp/pddl/Problem.cpp b/src/plasp/pddl/Problem.cpp index 8976cb7..6a76967 100644 --- a/src/plasp/pddl/Problem.cpp +++ b/src/plasp/pddl/Problem.cpp @@ -89,7 +89,7 @@ void Problem::findSections() const auto sectionIdentifier = parser.parseIdentifier(isIdentifier); - m_context.logger.parserWarning(parser, "Section type “" + sectionIdentifier + "” currently unsupported"); + m_context.logger.logWarning(parser, "Section type “" + sectionIdentifier + "” currently unsupported"); parser.seek(sectionIdentifierPosition); } diff --git a/src/plasp/pddl/Requirement.cpp b/src/plasp/pddl/Requirement.cpp index ae00069..7583807 100644 --- a/src/plasp/pddl/Requirement.cpp +++ b/src/plasp/pddl/Requirement.cpp @@ -94,7 +94,7 @@ Requirement Requirement::parse(Context &context) const auto requirementType = match->second; if (requirementType == Requirement::Type::GoalUtilities) - context.logger.parserWarning(context.parser, "Requirement “goal-utilities” is not part of the PDDL 3.1 specification"); + context.logger.logWarning(context.parser, "Requirement “goal-utilities” is not part of the PDDL 3.1 specification"); return Requirement(match->second); } diff --git a/src/plasp/pddl/expressions/PrimitiveType.cpp b/src/plasp/pddl/expressions/PrimitiveType.cpp index 11e9cbf..5e55d39 100644 --- a/src/plasp/pddl/expressions/PrimitiveType.cpp +++ b/src/plasp/pddl/expressions/PrimitiveType.cpp @@ -122,7 +122,7 @@ PrimitiveType *PrimitiveType::parseAndFind(Context &context, Domain &domain) // Only "object" is allowed as an implicit type if (typeName == "object" || typeName == "objects") { - context.logger.parserWarning(context.parser, "Primitive type “" + typeName + "” should be declared"); + context.logger.logWarning(context.parser, "Primitive type “" + typeName + "” should be declared"); types.emplace_back(std::make_unique(typeName)); } else diff --git a/src/plasp/pddl/expressions/Unsupported.cpp b/src/plasp/pddl/expressions/Unsupported.cpp index 72d06c3..4072afa 100644 --- a/src/plasp/pddl/expressions/Unsupported.cpp +++ b/src/plasp/pddl/expressions/Unsupported.cpp @@ -26,7 +26,7 @@ UnsupportedPointer Unsupported::parse(Context &context) expression->m_type = parser.parseIdentifier(isIdentifier); - context.logger.parserWarning(context.parser, "Expression type “" + expression->m_type + "” currently unsupported in this context"); + context.logger.logWarning(context.parser, "Expression type “" + expression->m_type + "” currently unsupported in this context"); skipSection(parser); diff --git a/src/plasp/utils/Logger.cpp b/src/plasp/utils/Logger.cpp index 6819606..ba045d2 100644 --- a/src/plasp/utils/Logger.cpp +++ b/src/plasp/utils/Logger.cpp @@ -111,7 +111,7 @@ void Logger::logError(const Parser::Coordinate &coordinate, const std::string &m //////////////////////////////////////////////////////////////////////////////////////////////////// -void Logger::parserWarning(const Parser &parser, const std::string &message) +void Logger::logWarning(const Parser &parser, const std::string &message) { if (m_warningLevel == WarningLevel::Ignore) return;