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

Allowing universal quantifiers in effect expressions.

This commit is contained in:
Patrick Lühne 2016-09-06 22:36:48 +02:00
parent 104f7165cd
commit 2e52357dd2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plasp/pddl/Expression.cpp
View File

@ -85,11 +85,11 @@ ExpressionPointer parsePreconditionExpression(Context &context,
ExpressionPointer expression;
if ((expression = expressions::And::parse(context, expressionContext, parsePreconditionExpression)))
return expression;
if ((expression = expressions::ForAll::parse(context, expressionContext, parsePreconditionExpression)))
if ((expression = expressions::And::parse(context, expressionContext, parsePreconditionExpression))
|| (expression = expressions::ForAll::parse(context, expressionContext, parsePreconditionExpression)))
{
return expression;
}
const auto position = parser.position();
@ -172,8 +172,11 @@ ExpressionPointer parseEffectExpression(Context &context, ExpressionContext &exp
ExpressionPointer expression;
if ((expression = expressions::And::parse(context, expressionContext, parseEffectExpression)))
if ((expression = expressions::And::parse(context, expressionContext, parseEffectExpression))
|| (expression = expressions::ForAll::parse(context, expressionContext, parseEffectExpression)))
{
return expression;
}
const auto position = parser.position();
@ -181,8 +184,7 @@ ExpressionPointer parseEffectExpression(Context &context, ExpressionContext &exp
const auto expressionIdentifierPosition = parser.position();
if (parser.testIdentifierAndSkip("forall")
|| parser.testIdentifierAndSkip("when"))
if (parser.testIdentifierAndSkip("when"))
{
parser.seek(expressionIdentifierPosition);
const auto expressionIdentifier = parser.parseIdentifier();