From 0a104d222c2e0d2994869ecadbf0f36d3a68e3b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Thu, 31 Aug 2017 18:51:27 +0200 Subject: [PATCH] Removed unneeded constant parsing functions. --- lib/pddl/include/pddl/detail/parsing/Constant.h | 3 +-- lib/pddl/src/pddl/detail/parsing/Constant.cpp | 17 +---------------- lib/pddl/src/pddl/detail/parsing/Term.cpp | 2 +- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/lib/pddl/include/pddl/detail/parsing/Constant.h b/lib/pddl/include/pddl/detail/parsing/Constant.h index dd19039..854bb81 100644 --- a/lib/pddl/include/pddl/detail/parsing/Constant.h +++ b/lib/pddl/include/pddl/detail/parsing/Constant.h @@ -16,8 +16,7 @@ namespace detail // //////////////////////////////////////////////////////////////////////////////////////////////////// -std::experimental::optional testParsingConstant(Context &context, ASTContext &astContext); -ast::ConstantPointer parseConstant(Context &context, ASTContext &astContext); +std::experimental::optional parseConstant(Context &context, ASTContext &astContext); //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/lib/pddl/src/pddl/detail/parsing/Constant.cpp b/lib/pddl/src/pddl/detail/parsing/Constant.cpp index ce6632b..367f33c 100644 --- a/lib/pddl/src/pddl/detail/parsing/Constant.cpp +++ b/lib/pddl/src/pddl/detail/parsing/Constant.cpp @@ -50,7 +50,7 @@ std::experimental::optional findConstant(const std::string //////////////////////////////////////////////////////////////////////////////////////////////////// -std::experimental::optional testParsingConstant(Context &context, ASTContext &astContext) +std::experimental::optional parseConstant(Context &context, ASTContext &astContext) { auto &tokenizer = context.tokenizer; @@ -65,20 +65,5 @@ std::experimental::optional testParsingConstant(Context &c //////////////////////////////////////////////////////////////////////////////////////////////////// -ast::ConstantPointer parseConstant(Context &context, ASTContext &astContext) -{ - auto &tokenizer = context.tokenizer; - - const auto constantName = tokenizer.getIdentifier(); - auto constant = findConstant(constantName, astContext); - - if (!constant) - throw ParserException(tokenizer.location(), "undeclared constant “" + constantName + "”"); - - return std::move(constant.value()); -} - -//////////////////////////////////////////////////////////////////////////////////////////////////// - } } diff --git a/lib/pddl/src/pddl/detail/parsing/Term.cpp b/lib/pddl/src/pddl/detail/parsing/Term.cpp index 386ee64..977c5d1 100644 --- a/lib/pddl/src/pddl/detail/parsing/Term.cpp +++ b/lib/pddl/src/pddl/detail/parsing/Term.cpp @@ -28,7 +28,7 @@ std::experimental::optional parseTerm(Context &context, ASTContext &a return std::move(variable.value()); // Parse argument if it is a constant - auto constant = testParsingConstant(context, astContext); + auto constant = parseConstant(context, astContext); if (constant) return std::move(constant.value());