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

Started parsing action effects.

This commit is contained in:
Patrick Lühne 2016-06-02 21:53:10 +02:00
parent 7271a5e52b
commit 8134c6af80
5 changed files with 89 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/plasp/pddl/Expression.h
View File

@ -35,6 +35,8 @@ class Expression
std::unique_ptr<Expression> parsePreconditionExpression(utils::Parser &parser, Context &context, const Variables &parameters);
std::unique_ptr<Expression> parseExpression(utils::Parser &parser, Context &context, const Variables &parameters);
std::unique_ptr<Expression> parseEffectExpression(utils::Parser &parser, Context &context, const Variables &parameters);
////////////////////////////////////////////////////////////////////////////////////////////////////
}

2
include/plasp/pddl/expressions/NAryExpression.h
View File

@ -40,8 +40,6 @@ class NAryExpression: public Expression
template<typename ExpressionParser>
void NAryExpression::parse(utils::Parser &parser, Context &context, const Variables &parameters, ExpressionParser parseExpression)
{
std::cout << "Parsing n-ary predicate" << std::endl;
parser.skipWhiteSpace();
// Assume that expression identifier (and, or, etc.) is already parsed

3
src/plasp/pddl/Action.cpp
View File

@ -54,8 +54,7 @@ Action &Action::parseDeclaration(utils::Parser &parser, Context &context)
if (sectionIdentifier == "precondition")
action->m_precondition = parsePreconditionExpression(parser, context, action->m_parameters);
else if (sectionIdentifier == "effect")
throw utils::ParserException(parser.row(), parser.column(), "Action effects are currently unsupported");
// action->m_effect = parseEffectExpression(parser, context);
action->m_effect = parseEffectExpression(parser, context, action->m_parameters);
}
parser.expect<std::string>(")");

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

@ -18,7 +18,15 @@ namespace pddl
//
////////////////////////////////////////////////////////////////////////////////////////////////////
std::unique_ptr<Expression> parseExpressionBody(const std::string &expressionIdentifier, utils::Parser &parser, Context &context, const Variables &parameters);
std::unique_ptr<Expression> parseExpressionContent(const std::string &expressionIdentifier, utils::Parser &parser, Context &context, const Variables &parameters);
std::unique_ptr<Expression> parseEffectBodyExpressionContent(const std::string &expressionIdentifier, utils::Parser &parser, Context &context, const Variables &parameters);
////////////////////////////////////////////////////////////////////////////////////////////////////
void throwUnsupported(const utils::Parser &parser, const std::string &expressionIdentifier)
{
throw utils::ParserException(parser.row(), parser.column(), "Expression type \"" + expressionIdentifier + "\" currently unsupported");
}
////////////////////////////////////////////////////////////////////////////////////////////////////
@ -30,24 +38,17 @@ std::unique_ptr<Expression> parsePreconditionExpression(utils::Parser &parser, C
const auto expressionIdentifier = parser.parseIdentifier(isIdentifier);
std::cout << "Parsing precondition expression " << expressionIdentifier << std::endl;
std::unique_ptr<Expression> expression;
const auto throwUnsupported =
[&]()
{
throw utils::ParserException(parser.row(), parser.column(), "Expression type \"" + expressionIdentifier + "\" unsupported");
};
if (expressionIdentifier == "and")
expression = expressions::AndExpression::parse(parser, context, parameters, parsePreconditionExpression);
else if (expressionIdentifier == "forall")
throwUnsupported();
else if (expressionIdentifier == "preference")
throwUnsupported();
else if (expressionIdentifier == "forall"
|| expressionIdentifier == "preference")
{
throwUnsupported(parser, expressionIdentifier);
}
else
expression = parseExpressionBody(expressionIdentifier, parser, context, parameters);
expression = parseExpressionContent(expressionIdentifier, parser, context, parameters);
parser.expect<std::string>(")");
@ -64,7 +65,7 @@ std::unique_ptr<Expression> parseExpression(utils::Parser &parser, Context &cont
const auto expressionIdentifier = parser.parseIdentifier(isIdentifier);
auto expression = parseExpressionBody(expressionIdentifier, parser, context, parameters);
auto expression = parseExpressionContent(expressionIdentifier, parser, context, parameters);
parser.expect<std::string>(")");
@ -73,20 +74,12 @@ std::unique_ptr<Expression> parseExpression(utils::Parser &parser, Context &cont
////////////////////////////////////////////////////////////////////////////////////////////////////
std::unique_ptr<Expression> parseExpressionBody(const std::string &expressionIdentifier, utils::Parser &parser, Context &context, const Variables &parameters)
std::unique_ptr<Expression> parseExpressionContent(const std::string &expressionIdentifier, utils::Parser &parser, Context &context, const Variables &parameters)
{
parser.skipWhiteSpace();
std::cout << "Parsing expression " << expressionIdentifier << std::endl;
std::unique_ptr<Expression> expression;
const auto throwUnsupported =
[&]()
{
throw utils::ParserException(parser.row(), parser.column(), "Expression type \"" + expressionIdentifier + "\" unsupported");
};
if (expressionIdentifier == "and")
expression = expressions::AndExpression::parse(parser, context, parameters, parseExpression);
else if (expressionIdentifier == "or")
@ -107,7 +100,7 @@ std::unique_ptr<Expression> parseExpressionBody(const std::string &expressionIde
|| expressionIdentifier == ">="
|| expressionIdentifier == "<=")
{
throwUnsupported();
throwUnsupported(parser, expressionIdentifier);
}
else
{
@ -122,7 +115,73 @@ std::unique_ptr<Expression> parseExpressionBody(const std::string &expressionIde
if (match != context.predicates.cend())
expression = expressions::PredicateExpression::parse(expressionIdentifier, parser, context, parameters);
else
throw utils::ParserException(parser.row(), parser.column(), "Undeclared expression \"" + expressionIdentifier + "\"");
throw utils::ParserException(parser.row(), parser.column(), "Expression \"" + expressionIdentifier + "\" not allowed in this context");
}
return expression;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
std::unique_ptr<Expression> parseEffectExpression(utils::Parser &parser, Context &context, const Variables &parameters)
{
parser.skipWhiteSpace();
parser.expect<std::string>("(");
const auto expressionIdentifier = parser.parseIdentifier(isIdentifier);
std::cout << "Parsing effect expression " << expressionIdentifier << std::endl;
std::unique_ptr<Expression> expression;
if (expressionIdentifier == "and")
expression = expressions::AndExpression::parse(parser, context, parameters, parseEffectExpression);
else if (expressionIdentifier == "forall"
|| expressionIdentifier == "when")
{
throwUnsupported(parser, expressionIdentifier);
}
else
expression = parseEffectBodyExpressionContent(expressionIdentifier, parser, context, parameters);
parser.expect<std::string>(")");
return expression;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
std::unique_ptr<Expression> parseEffectBodyExpressionContent(const std::string &expressionIdentifier, utils::Parser &parser, Context &context, const Variables &parameters)
{
parser.skipWhiteSpace();
std::unique_ptr<Expression> expression;
if (expressionIdentifier == "not"
|| expressionIdentifier == "="
|| expressionIdentifier == "assign"
|| expressionIdentifier == "scale-up"
|| expressionIdentifier == "scale-down"
|| expressionIdentifier == "increase"
|| expressionIdentifier == "decrease")
{
throwUnsupported(parser, expressionIdentifier);
}
else
{
// Check if predicate with that name exists
const auto match = std::find_if(context.predicates.cbegin(), context.predicates.cend(),
[&](const auto &predicate)
{
return predicate->name() == expressionIdentifier;
});
// If predicate exists, parse it
if (match != context.predicates.cend())
expression = expressions::PredicateExpression::parse(expressionIdentifier, parser, context, parameters);
else
throw utils::ParserException(parser.row(), parser.column(), "Expression \"" + expressionIdentifier + "\" not allowed in this context");
}
return expression;

2
src/plasp/pddl/expressions/PredicateExpression.cpp
View File

@ -27,7 +27,7 @@ std::unique_ptr<PredicateExpression> PredicateExpression::parse(std::string name
while (parser.currentCharacter() != ')')
Variable::parseTyped(parser, context, expression->m_arguments);
std::cout << "Parsed " << expression->m_arguments.size() << " arguments" << std::endl;
// TODO: check that signature matches one of the declared ones
return expression;
}