Removed obsolete Variable class.

include/plasp/pddl/Expression.h

@@ -5,7 +5,6 @@
 
 #include <boost/variant.hpp>
 
-#include <plasp/pddl/Variable.h>
 #include <plasp/utils/Parser.h>
 
 namespace plasp

include/plasp/pddl/Predicate.h

@@ -3,7 +3,7 @@
 
 #include <boost/functional/hash.hpp>
 
-#include <plasp/pddl/Variable.h>
+#include <plasp/pddl/expressions/Variable.h>
 #include <plasp/utils/Parser.h>
 
 namespace plasp
@@ -39,7 +39,7 @@ class Predicate
 
 	public:
 		const std::string &name() const;
-		const Variables &arguments() const;
+		const expressions::Variables &arguments() const;
 
 		bool isDeclared() const;
 
@@ -51,7 +51,7 @@ class Predicate
 		bool m_isDeclared;
 
 		std::string m_name;
-		Variables m_arguments;
+		expressions::Variables m_arguments;
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////

include/plasp/pddl/Variable.h

@@ -1,57 +0,0 @@
-#ifndef __PLASP__PDDL__VARIABLE_H
-#define __PLASP__PDDL__VARIABLE_H
-
-#include <vector>
-
-#include <plasp/pddl/Type.h>
-#include <plasp/utils/Parser.h>
-
-namespace plasp
-{
-namespace pddl
-{
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// Variable
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class Context;
-
-class Variable;
-using Variables = std::vector<Variable>;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class Variable
-{
-	public:
-		static Variable parse(utils::Parser &parser);
-		static void parseTyped(utils::Parser &parser, Context &context, std::vector<Variable> &variables);
-
-	public:
-		const std::string &name() const;
-		TypePtr type() const;
-
-		void setDirty(bool isDirty = true);
-		bool isDirty() const;
-
-		void setType(TypePtr type);
-
-	private:
-		Variable(std::string name);
-
-		bool m_isDirty;
-
-		std::string m_name;
-
-		TypePtr m_type;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-}
-}
-
-#endif

include/plasp/pddl/expressions/Variable.h

@@ -2,6 +2,7 @@
 #define __PLASP__PDDL__EXPRESSION__VARIABLE_H
 
 #include <plasp/pddl/Expression.h>
+#include <plasp/pddl/Type.h>
 
 namespace plasp
 {