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

Refactoring to reuse term parsing code.

Browse Source
This commit is contained in:
Patrick Lühne 2017-08-31 18:37:43 +02:00
parent 89f3eb0306
commit 7de9980c10
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/pddl/src/pddl/detail/parsing/Predicate.cpp
View File

@ -3,9 +3,7 @@
#include <pddl/AST.h> #include <pddl/AST.h>
#include <pddl/Exception.h> #include <pddl/Exception.h>
#include <pddl/detail/SignatureMatching.h> #include <pddl/detail/SignatureMatching.h>
#include <pddl/detail/parsing/Constant.h> #include <pddl/detail/parsing/Term.h>
#include <pddl/detail/parsing/Variable.h>
#include <pddl/detail/parsing/VariableDeclaration.h>
namespace pddl namespace pddl
{ {
@ -39,29 +37,17 @@ std::experimental::optional<ast::PredicatePointer> parsePredicate(Context &conte
// Parse arguments // Parse arguments
while (tokenizer.currentCharacter() != ')') while (tokenizer.currentCharacter() != ')')
{ {
// Parse argument if it is a variable auto term = parseTerm(context, astContext, variableStack);
auto variable = testParsingVariable(context, variableStack);
if (variable) if (term)
{ {
arguments.emplace_back(std::move(variable.value())); arguments.emplace_back(std::move(term.value()));
tokenizer.skipWhiteSpace(); tokenizer.skipWhiteSpace();
continue; continue;
} }
// Parse argument if it is a constant // If the term couldn’t be parsed, this is not a valid predicate
auto constant = testParsingConstant(context, astContext);
if (constant)
{
arguments.emplace_back(std::move(constant.value()));
tokenizer.skipWhiteSpace();
continue;
}
// If argument is neither variable nor constant, this is not a valid predicate
tokenizer.seek(previousPosition); tokenizer.seek(previousPosition);
return std::experimental::nullopt; return std::experimental::nullopt;
} }