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

Added “domain-axioms” as an ignored requirement to increase compatibility.

Browse Source
This commit is contained in:
Patrick Lühne 2017-06-15 23:58:11 +02:00
parent 216decafc1
commit 1e77a6b043
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
4 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pddlparse/include/pddlparse/detail/parsing/Requirement.h
View File

@ -15,7 +15,7 @@ namespace detail
// //
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
ast::Requirement parseRequirement(Context &context); std::experimental::optional<ast::Requirement> parseRequirement(Context &context);
const char *toString(const ast::Requirement &requirement); const char *toString(const ast::Requirement &requirement);
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

5
lib/pddlparse/src/pddlparse/detail/parsing/Domain.cpp
View File

@ -172,7 +172,10 @@ void DomainParser::parseRequirementSection(ast::Domain &domain)
{ {
tokenizer.expect<std::string>(":"); tokenizer.expect<std::string>(":");
domain.requirements.emplace_back(parseRequirement(m_context)); const auto requirement = parseRequirement(m_context);
if (requirement)
domain.requirements.emplace_back(requirement.value());
tokenizer.skipWhiteSpace(); tokenizer.skipWhiteSpace();
} }

5
lib/pddlparse/src/pddlparse/detail/parsing/Problem.cpp
View File

@ -183,7 +183,10 @@ void ProblemParser::parseRequirementSection(ast::Problem &problem)
{ {
tokenizer.expect<std::string>(":"); tokenizer.expect<std::string>(":");
problem.requirements.emplace_back(parseRequirement(m_context)); const auto requirement = parseRequirement(m_context);
if (requirement)
problem.requirements.emplace_back(requirement.value());
tokenizer.skipWhiteSpace(); tokenizer.skipWhiteSpace();
} }

29
lib/pddlparse/src/pddlparse/detail/parsing/Requirement.cpp
View File

@ -51,34 +51,25 @@ static const RequirementNameMap requirementNameMap =
{"preferences", ast::Requirement::Preferences}, {"preferences", ast::Requirement::Preferences},
{"constraints", ast::Requirement::Constraints}, {"constraints", ast::Requirement::Constraints},
{"action-costs", ast::Requirement::ActionCosts}, {"action-costs", ast::Requirement::ActionCosts},
{"goal-utilities", ast::Requirement::GoalUtilities},
}; };
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
ast::Requirement parseRequirement(Tokenizer &tokenizer) std::experimental::optional<ast::Requirement> parseRequirement(Context &context)
{
const auto requirementName = tokenizer.getIdentifier();
const auto matchingRequirement = requirementNameMap.find(requirementName.c_str());
if (matchingRequirement == requirementNameMap.cend())
throw ParserException(tokenizer.location(), "unknown PDDL requirement “" + requirementName + "”");
return matchingRequirement->second;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
ast::Requirement parseRequirement(Context &context)
{ {
auto &tokenizer = context.tokenizer; auto &tokenizer = context.tokenizer;
auto requirement = parseRequirement(tokenizer); const auto requirementName = tokenizer.getIdentifier();
if (requirement == ast::Requirement::GoalUtilities) const auto matchingRequirement = requirementNameMap.find(requirementName.c_str());
context.warningCallback(tokenizer.location(), "requirement “goal-utilities” is not part of the PDDL 3.1 specification");
return requirement; if (matchingRequirement != requirementNameMap.cend())
return matchingRequirement->second;
if (requirementName == "goal-utilities" || requirementName == "domain-axioms")
context.warningCallback(tokenizer.location(), "ignoring requirement “" + requirementName + "”, which is not part of the PDDL 3.1 specification");
return std::experimental::nullopt;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////