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

Made conditional effect variant more concise.

Browse Source
This commit is contained in:
Patrick Lühne
2017-06-27 17:43:00 +02:00
parent 0eff8e5dcf
commit 4622f31fa4
3 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,6 +150,24 @@ class AtomicFormula : public detail::AtomicFormulaT
////////////////////////////////////////////////////////////////////////////////////////////////////
namespace detail
{
using LiteralT = Variant<
AtomicFormula,
NotPointer<AtomicFormula>>;
}
class Literal : public detail::LiteralT
{
Literal() = delete;
using detail::LiteralT::LiteralT;
};
using Literals = std::vector<Literal>;
////////////////////////////////////////////////////////////////////////////////////////////////////
class Precondition;
namespace detail
@@ -182,9 +200,8 @@ namespace detail
{
// TODO: add missing types
using ConditionalEffectT = Variant<
AtomicFormula,
AndPointer<ConditionalEffect>,
NotPointer<ConditionalEffect>>;
Literal,
AndPointer<Literal>>;
}
class ConditionalEffect : public detail::ConditionalEffectT
@@ -234,24 +251,6 @@ class Type : public detail::TypeT
////////////////////////////////////////////////////////////////////////////////////////////////////
namespace detail
{
using LiteralT = Variant<
AtomicFormula,
NotPointer<AtomicFormula>>;
}
class Literal : public detail::LiteralT
{
Literal() = delete;
using detail::LiteralT::LiteralT;
};
using Literals = std::vector<Literal>;
////////////////////////////////////////////////////////////////////////////////////////////////////
class Fact;
namespace detail