From 0beab67bd46ed5f2c7878c3b4bd07d85bed8c5ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20L=C3=BChne?= <patrick-github@luehne.de>
Date: Tue, 27 Jun 2017 17:50:42 +0200
Subject: [PATCH] Made effect variant more concise.

---
 lib/pddlparse/include/pddlparse/ASTForward.h   |  3 +--
 .../src/pddlparse/detail/parsing/Effect.cpp    |  2 +-
 .../tests/TestOfficialPDDLInstances.cpp        | 18 +++++++++---------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/pddlparse/include/pddlparse/ASTForward.h b/lib/pddlparse/include/pddlparse/ASTForward.h
index 762a37f..280259b 100644
--- a/lib/pddlparse/include/pddlparse/ASTForward.h
+++ b/lib/pddlparse/include/pddlparse/ASTForward.h
@@ -219,10 +219,9 @@ namespace detail
 {
 // TODO: add missing types
 using EffectT = Variant<
-	AtomicFormula,
+	Literal,
 	AndPointer<Effect>,
 	ForAllPointer<Effect>,
-	NotPointer<Effect>,
 	WhenPointer<Precondition, ConditionalEffect>>;
 }
 
diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Effect.cpp b/lib/pddlparse/src/pddlparse/detail/parsing/Effect.cpp
index 7b927e1..9090439 100644
--- a/lib/pddlparse/src/pddlparse/detail/parsing/Effect.cpp
+++ b/lib/pddlparse/src/pddlparse/detail/parsing/Effect.cpp
@@ -72,7 +72,7 @@ std::experimental::optional<ast::Effect> parseEffectBody(Context &context, ASTCo
 	// Now, test supported expressions
 	std::experimental::optional<ast::Effect> effect;
 
-	if ((effect = parseNot<ast::Effect>(context, astContext, variableStack, parseAtomicFormula))
+	if ((effect = parseNot<ast::AtomicFormula>(context, astContext, variableStack, parseAtomicFormula))
 		|| (effect = parseAtomicFormula(context, astContext, variableStack)))
 	{
 		return std::move(effect.value());
diff --git a/lib/pddlparse/tests/TestOfficialPDDLInstances.cpp b/lib/pddlparse/tests/TestOfficialPDDLInstances.cpp
index 93f70c3..90c45c6 100644
--- a/lib/pddlparse/tests/TestOfficialPDDLInstances.cpp
+++ b/lib/pddlparse/tests/TestOfficialPDDLInstances.cpp
@@ -87,25 +87,25 @@ TEST_CASE("[PDDL instances] The official PDDL instances are parsed correctly", "
 		REQUIRE(precondition2->arguments.empty());
 
 		const auto &effectAnd = actions[3]->effect.value().get<pddl::ast::AndPointer<pddl::ast::Effect>>();
-		const auto &effect0 = effectAnd->arguments[0].get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>();
+		const auto &effect0 = effectAnd->arguments[0].get<pddl::ast::Literal>().get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>();
 		// TODO: check declaration once implemented
 		REQUIRE(effect0->arguments.size() == 1);
 		CHECK(effect0->arguments[0].get<pddl::ast::VariablePointer>()->declaration->name == "x");
 		CHECK(effect0->arguments[0].get<pddl::ast::VariablePointer>()->declaration->type.value().get<pddl::ast::PrimitiveTypePointer>()->declaration == typeBlock.get());
-		const auto &effect1 = effectAnd->arguments[1].get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>();
+		const auto &effect1 = effectAnd->arguments[1].get<pddl::ast::Literal>().get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>();
 		// TODO: check declaration once implemented
 		REQUIRE(effect1->arguments.size() == 1);
 		CHECK(effect1->arguments[0].get<pddl::ast::VariablePointer>()->declaration->name == "y");
 		CHECK(effect1->arguments[0].get<pddl::ast::VariablePointer>()->declaration->type.value().get<pddl::ast::PrimitiveTypePointer>()->declaration == typeBlock.get());
-		const auto &effectNot2 = effectAnd->arguments[2].get<pddl::ast::NotPointer<pddl::ast::Effect>>()->argument.get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>();
+		const auto &effectNot2 = effectAnd->arguments[2].get<pddl::ast::Literal>().get<pddl::ast::NotPointer<pddl::ast::AtomicFormula>>()->argument.get<pddl::ast::PredicatePointer>();
 		// TODO: check declaration once implemented
 		REQUIRE(effectNot2->arguments.size() == 1);
 		CHECK(effectNot2->arguments[0].get<pddl::ast::VariablePointer>()->declaration->name == "x");
 		CHECK(effectNot2->arguments[0].get<pddl::ast::VariablePointer>()->declaration->type.value().get<pddl::ast::PrimitiveTypePointer>()->declaration == typeBlock.get());
-		const auto &effectNot3 = effectAnd->arguments[3].get<pddl::ast::NotPointer<pddl::ast::Effect>>()->argument.get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>();
+		const auto &effectNot3 = effectAnd->arguments[3].get<pddl::ast::Literal>().get<pddl::ast::NotPointer<pddl::ast::AtomicFormula>>()->argument.get<pddl::ast::PredicatePointer>();
 		// TODO: check declaration once implemented
 		REQUIRE(effectNot3->arguments.empty());
-		const auto &effectNot4 = effectAnd->arguments[4].get<pddl::ast::NotPointer<pddl::ast::Effect>>()->argument.get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>();
+		const auto &effectNot4 = effectAnd->arguments[4].get<pddl::ast::Literal>().get<pddl::ast::NotPointer<pddl::ast::AtomicFormula>>()->argument.get<pddl::ast::PredicatePointer>();
 		// TODO: check declaration once implemented
 		REQUIRE(effectNot4->arguments.size() == 2);
 		CHECK(effectNot4->arguments[0].get<pddl::ast::VariablePointer>()->declaration->name == "x");
@@ -351,10 +351,10 @@ TEST_CASE("[PDDL instances] The official PDDL instances are parsed correctly", "
 		CHECK(actions[1]->name == "do-roll");
 		const auto &effectAnd = actions[1]->effect.value().get<pddl::ast::AndPointer<pddl::ast::Effect>>();
 		REQUIRE(effectAnd->arguments.size() == 10);
-		CHECK(effectAnd->arguments[0].get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>()->arguments[0].get<pddl::ast::ConstantPointer>()->declaration->name == "roller");
-		CHECK(effectAnd->arguments[1].get<pddl::ast::AtomicFormula>().is<pddl::ast::PredicatePointer>());
-		CHECK(effectAnd->arguments[2].get<pddl::ast::AtomicFormula>().is<pddl::ast::PredicatePointer>());
-		CHECK(effectAnd->arguments[3].get<pddl::ast::AtomicFormula>().is<pddl::ast::PredicatePointer>());
+		CHECK(effectAnd->arguments[0].get<pddl::ast::Literal>().get<pddl::ast::AtomicFormula>().get<pddl::ast::PredicatePointer>()->arguments[0].get<pddl::ast::ConstantPointer>()->declaration->name == "roller");
+		CHECK(effectAnd->arguments[1].get<pddl::ast::Literal>().get<pddl::ast::AtomicFormula>().is<pddl::ast::PredicatePointer>());
+		CHECK(effectAnd->arguments[2].get<pddl::ast::Literal>().get<pddl::ast::AtomicFormula>().is<pddl::ast::PredicatePointer>());
+		CHECK(effectAnd->arguments[3].get<pddl::ast::Literal>().get<pddl::ast::AtomicFormula>().is<pddl::ast::PredicatePointer>());
 		const auto &effectWhen4 = effectAnd->arguments[4].get<pddl::ast::WhenPointer<pddl::ast::Precondition, pddl::ast::ConditionalEffect>>();
 		// TODO: check name of declaration
 		CHECK(effectWhen4->argumentLeft.get<pddl::ast::NotPointer<pddl::ast::Precondition>>()->argument.get<pddl::ast::AtomicFormula>().is<pddl::ast::PredicatePointer>());