From 60c072a2b3ac68b76c91cce18e0d7bb1769de989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Sat, 4 Jun 2016 15:06:04 +0200 Subject: [PATCH] Clean-up. --- include/plasp/pddl/expressions/Type.h | 4 ++-- src/plasp/pddl/expressions/Type.cpp | 23 ++++------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/include/plasp/pddl/expressions/Type.h b/include/plasp/pddl/expressions/Type.h index a0ac7d8..4029760 100644 --- a/include/plasp/pddl/expressions/Type.h +++ b/include/plasp/pddl/expressions/Type.h @@ -20,8 +20,8 @@ namespace expressions // //////////////////////////////////////////////////////////////////////////////////////////////////// -ExpressionPointer parseExistingPrimitiveType(utils::Parser &parser, Context &context, const Variables ¶meters); -//ExpressionPointer parseExistingType(utils::Parser &parser, Context &context, const Variables ¶meters); +ExpressionPointer parseExistingPrimitiveType(utils::Parser &parser, Context &context, + const Variables ¶meters); //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/plasp/pddl/expressions/Type.cpp b/src/plasp/pddl/expressions/Type.cpp index 4490828..6f7e3ee 100644 --- a/src/plasp/pddl/expressions/Type.cpp +++ b/src/plasp/pddl/expressions/Type.cpp @@ -16,31 +16,16 @@ namespace expressions // //////////////////////////////////////////////////////////////////////////////////////////////////// -ExpressionPointer parseExistingPrimitiveType(utils::Parser &parser, Context &context, const Variables ¶meters) +ExpressionPointer parseExistingPrimitiveType(utils::Parser &parser, Context &context, + const Variables ¶meters) { - auto reference = std::make_unique>(PrimitiveType::parseExisting(parser, context)); + auto primitiveType = PrimitiveType::parseExisting(parser, context); - return reference; + return std::make_unique>(primitiveType); } //////////////////////////////////////////////////////////////////////////////////////////////////// -/*ExpressionPointer parseExistingType(utils::Parser &parser, Context &context, const Variables ¶meters) -{ - parser.skipWhiteSpace(); - - // Parse either type (always begins with opening parenthesis) - if (parser.currentCharacter() == '(') - return Either::parse(parser, context, parameters, parseExistingPrimitiveType); - - // Parse primitive type - auto type = std::make_unique>(PrimitiveType::parseExisting(parser, context)); - - return type; -}*/ - -//////////////////////////////////////////////////////////////////////////////////////////////////// - } } }