From f83f9edbef96fdee1e211bfd59cbb05143180766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20L=C3=BChne?= <patrick-github@luehne.de>
Date: Sat, 17 Jun 2017 20:21:26 +0200
Subject: [PATCH] Reimplemented goal parser.

---
 lib/pddlparse/src/pddlparse/detail/parsing/Problem.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/pddlparse/src/pddlparse/detail/parsing/Problem.cpp b/lib/pddlparse/src/pddlparse/detail/parsing/Problem.cpp
index b307cdb..4f9bef6 100644
--- a/lib/pddlparse/src/pddlparse/detail/parsing/Problem.cpp
+++ b/lib/pddlparse/src/pddlparse/detail/parsing/Problem.cpp
@@ -4,6 +4,7 @@
 #include <pddlparse/detail/Requirements.h>
 #include <pddlparse/detail/parsing/ConstantDeclaration.h>
 #include <pddlparse/detail/parsing/InitialState.h>
+#include <pddlparse/detail/parsing/Precondition.h>
 #include <pddlparse/detail/parsing/Requirement.h>
 #include <pddlparse/detail/parsing/Utils.h>
 
@@ -285,13 +286,10 @@ void ProblemParser::parseGoalSection(ast::Problem &problem)
 	tokenizer.expect<std::string>(":");
 	tokenizer.expect<std::string>("goal");
 
-	ASTContext expressionContext(problem);
+	ASTContext astContext(problem);
+	VariableStack variableStack;
 
-	m_context.warningCallback(tokenizer.location(), "goal parser under construction, section is currently ignored");
-
-	// TODO: reimplement
-	//problem.goal = parsePreconditionExpression(m_context, expressionContext);
-	//tokenizer.expect<std::string>(")");
+	problem.goal = parsePrecondition(m_context, astContext, variableStack);
 
 	skipSection(tokenizer);
 }