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

Added back support for parsing effects and even conditional effects.

Browse Source
This commit is contained in:
Patrick Lühne
2017-06-17 19:04:27 +02:00
parent 9c30e27875
commit 10e658a922
6 changed files with 237 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/pddlparse/include/pddlparse/ASTForward.h
View File

@@ -173,6 +173,24 @@ using Preconditions = std::vector<Precondition>;
////////////////////////////////////////////////////////////////////////////////////////////////////
class ConditionalEffect;
namespace detail
{
using ConditionalEffectT = Variant<
AtomicFormula,
AndPointer<ConditionalEffect>,
NotPointer<ConditionalEffect>,
UnsupportedPointer>;
}
class ConditionalEffect : public detail::ConditionalEffectT
{
using detail::ConditionalEffectT::ConditionalEffectT;
};
////////////////////////////////////////////////////////////////////////////////////////////////////
class Effect;
namespace detail
@@ -182,7 +200,7 @@ using EffectT = Variant<
AndPointer<Effect>,
ForAllPointer<Effect>,
NotPointer<Effect>,
WhenPointer<Precondition, Effect>,
WhenPointer<Precondition, ConditionalEffect>,
UnsupportedPointer>;
}

27
lib/pddlparse/include/pddlparse/detail/parsing/Effect.h Normal file
View File

@@ -0,0 +1,27 @@
#ifndef __PDDL_PARSE__DETAIL__PARSING__EFFECT_H
#define __PDDL_PARSE__DETAIL__PARSING__EFFECT_H
#include <pddlparse/ASTForward.h>
#include <pddlparse/Context.h>
#include <pddlparse/detail/ASTContext.h>
#include <pddlparse/detail/VariableStack.h>
namespace pddl
{
namespace detail
{
////////////////////////////////////////////////////////////////////////////////////////////////////
//
// Effect
//
////////////////////////////////////////////////////////////////////////////////////////////////////
std::experimental::optional<ast::Effect> parseEffect(Context &context, ASTContext &astContext, VariableStack &variableStack);
////////////////////////////////////////////////////////////////////////////////////////////////////
}
}
#endif

1
lib/pddlparse/include/pddlparse/detail/parsing/Precondition.h
View File

@@ -18,6 +18,7 @@ namespace detail
////////////////////////////////////////////////////////////////////////////////////////////////////
std::experimental::optional<ast::Precondition> parsePrecondition(Context &context, ASTContext &astContext, VariableStack &variableStack);
std::experimental::optional<ast::Precondition> parsePreconditionBody(Context &context, ASTContext &astContext, VariableStack &variableStack);
////////////////////////////////////////////////////////////////////////////////////////////////////