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

Allowing “at” as a predicate name even though it is an expression identifier.

Browse Source
This commit is contained in:
Patrick Lühne
2017-06-21 22:54:07 +02:00
parent 08c55adfbd
commit 12e55da662
3 changed files with 197 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/pddlparse/src/pddlparse/detail/parsing/Fact.cpp
View File

@@ -26,8 +26,7 @@ std::experimental::optional<ast::Fact> parseFact(Context &context, ASTContext &a
tokenizer.expect<std::string>("(");
tokenizer.skipWhiteSpace();
if (tokenizer.testIdentifierAndReturn("=")
|| tokenizer.testIdentifierAndReturn("at"))
if (tokenizer.testIdentifierAndReturn("="))
{
tokenizer.seek(position);
return parseUnsupported(context);
@@ -39,12 +38,20 @@ std::experimental::optional<ast::Fact> parseFact(Context &context, ASTContext &a
std::experimental::optional<ast::Fact> fact;
if ((fact = parseNot<ast::Fact>(context, astContext, variableStack, parseAtomicFormula))
|| (fact = parseAtomicFormula(context, astContext, variableStack)))
|| (fact = parseAtomicFormula(context, astContext, variableStack)))
{
return std::move(fact.value());
}
return parseAtomicFormula(context, astContext, variableStack);
// Test for “at” expressions only now to allow “at” as a predicate name
// TODO: allow this in compatibility mode only?
if (tokenizer.testIdentifierAndReturn("at"))
{
tokenizer.seek(position);
return parseUnsupported(context);
}
return std::experimental::nullopt;
}
////////////////////////////////////////////////////////////////////////////////////////////////////