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

Refactored parsing variable lists to reuse it with quantified expressions.

Browse Source
This commit is contained in:
Patrick Lühne 2016-09-06 16:28:38 +02:00
parent 6f3769f364
commit ca6664feb2
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/plasp/pddl/expressions/Binary.h
View File

@ -58,7 +58,6 @@ boost::intrusive_ptr<Derived> Binary<Derived>::parse(Context &context,
auto expression = boost::intrusive_ptr<Derived>(new Derived); auto expression = boost::intrusive_ptr<Derived>(new Derived);
// Assume that expression identifier (imply, exists, etc.) is already parsed
// Parse arguments of the expression // Parse arguments of the expression
expression->Binary<Derived>::setArgument(0, parseExpression(context, expressionContext)); expression->Binary<Derived>::setArgument(0, parseExpression(context, expressionContext));
expression->Binary<Derived>::setArgument(1, parseExpression(context, expressionContext)); expression->Binary<Derived>::setArgument(1, parseExpression(context, expressionContext));

1
include/plasp/pddl/expressions/NAry.h
View File

@ -63,7 +63,6 @@ boost::intrusive_ptr<Derived> NAry<Derived>::parse(Context &context,
parser.skipWhiteSpace(); parser.skipWhiteSpace();
// Assume that expression identifier (and, or, etc.) is already parsed
// Parse arguments of the expression // Parse arguments of the expression
while (parser.currentCharacter() != ')') while (parser.currentCharacter() != ')')
{ {

6
include/plasp/pddl/expressions/Variable.h
View File

@ -21,8 +21,10 @@ class Variable: public ExpressionCRTP<Variable>
public: public:
static const Expression::Type ExpressionType = Expression::Type::Variable; static const Expression::Type ExpressionType = Expression::Type::Variable;
static void parseTypedDeclaration(Context &context, ExpressionContext &expressionContext); static void parseTypedDeclaration(Context &context, ExpressionContext &expressionContext,
static void parseTypedDeclarations(Context &context, ExpressionContext &expressionContext); Variables &variables);
static void parseTypedDeclarations(Context &context, ExpressionContext &expressionContext,
Variables &variables);
static VariablePointer parseAndFind(Context &context, static VariablePointer parseAndFind(Context &context,
const ExpressionContext &expressionContext); const ExpressionContext &expressionContext);

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

@ -32,7 +32,7 @@ void Action::parseDeclaration(Context &context, Domain &domain)
ExpressionContext expressionContext(domain, action->m_parameters); ExpressionContext expressionContext(domain, action->m_parameters);
// Read parameters // Read parameters
expressions::Variable::parseTypedDeclarations(context, expressionContext); expressions::Variable::parseTypedDeclarations(context, expressionContext, action->m_parameters);
parser.expect<std::string>(")"); parser.expect<std::string>(")");

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

@ -42,7 +42,7 @@ void PredicateDeclaration::parse(Context &context, Domain &domain)
ExpressionContext expressionContext(domain, predicate->m_parameters); ExpressionContext expressionContext(domain, predicate->m_parameters);
// Parse arguments // Parse arguments
expressions::Variable::parseTypedDeclarations(context, expressionContext); expressions::Variable::parseTypedDeclarations(context, expressionContext, predicate->m_parameters);
context.parser.expect<std::string>(")"); context.parser.expect<std::string>(")");

13
src/plasp/pddl/expressions/Variable.cpp
View File

@ -63,10 +63,10 @@ void Variable::parseDeclaration(Context &context, Variables &parameters)
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
void Variable::parseTypedDeclaration(Context &context, ExpressionContext &expressionContext) void Variable::parseTypedDeclaration(Context &context, ExpressionContext &expressionContext,
Variables &variables)
{ {
auto &parser = context.parser; auto &parser = context.parser;
auto &variables = expressionContext.parameters;
// Parse and store variable itself // Parse and store variable itself
parseDeclaration(context, variables); parseDeclaration(context, variables);
@ -108,22 +108,23 @@ void Variable::parseTypedDeclaration(Context &context, ExpressionContext &expres
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
void Variable::parseTypedDeclarations(Context &context, ExpressionContext &expressionContext) void Variable::parseTypedDeclarations(Context &context, ExpressionContext &expressionContext,
Variables &variables)
{ {
auto &parser = context.parser; auto &parser = context.parser;
while (parser.currentCharacter() != ')') while (parser.currentCharacter() != ')')
{ {
parseTypedDeclaration(context, expressionContext); parseTypedDeclaration(context, expressionContext, variables);
parser.skipWhiteSpace(); parser.skipWhiteSpace();
} }
if (expressionContext.parameters.empty()) if (variables.empty())
return; return;
// Check correct use of typing requirement // Check correct use of typing requirement
const auto typingUsed = (expressionContext.parameters.back()->type() != nullptr); const auto typingUsed = (variables.back()->type() != nullptr);
// If types are given, check that typing is a requirement // If types are given, check that typing is a requirement
if (typingUsed) if (typingUsed)