From 72fc7493b2d104818b9ae7599775d49238e9eea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20L=C3=BChne?= <patrick-github@luehne.de>
Date: Sat, 28 Oct 2017 15:44:37 +0200
Subject: [PATCH] Removed Boost dependency in language distinction.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As Boost isn’t used in the rest of this project anymore, this commit
removes the unnecessary dependency to boost::bimap just for language
detection, and replaces it with a simple std::map instead.
---
 include/plasp/Language.h |  1 -
 src/CMakeLists.txt       |  2 --
 src/plasp/Language.cpp   | 36 ++++++++++--------------------------
 tests/CMakeLists.txt     |  2 --
 4 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/include/plasp/Language.h b/include/plasp/Language.h
index c5e15a9..5038111 100644
--- a/include/plasp/Language.h
+++ b/include/plasp/Language.h
@@ -23,7 +23,6 @@ class Language
 			SAS
 		};
 
-		static std::string toString(Type language);
 		static Language::Type fromString(const std::string &languageName);
 
 	public:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c09e5eb..8dfe5d4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,6 @@ file(GLOB sas_sources "plasp/sas/*.cpp")
 file(GLOB sas_headers "../include/plasp/sas/*.h")
 
 set(includes
-	${Boost_INCLUDE_DIRS}
 	${PROJECT_SOURCE_DIR}/include
 	${PROJECT_SOURCE_DIR}/lib/tokenize/include
 	${PROJECT_SOURCE_DIR}/lib/colorlog/include
@@ -48,7 +47,6 @@ set(sources
 )
 
 set(libraries
-	${Boost_LIBRARIES}
 	colorlog
 	pddl
 	pthread
diff --git a/src/plasp/Language.cpp b/src/plasp/Language.cpp
index a8c35f2..69aba11 100644
--- a/src/plasp/Language.cpp
+++ b/src/plasp/Language.cpp
@@ -1,7 +1,6 @@
 #include <plasp/Language.h>
 
-#include <boost/assign.hpp>
-#include <boost/bimap.hpp>
+#include <map>
 
 namespace plasp
 {
@@ -12,38 +11,23 @@ namespace plasp
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-using LanguageNames = boost::bimap<Language::Type, std::string>;
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-const LanguageNames languageNames = boost::assign::list_of<LanguageNames::relation>
-	(Language::Type::Automatic, "auto")
-	(Language::Type::PDDL, "pddl")
-	(Language::Type::SAS, "sas")
-	(Language::Type::Unknown, "unknown");
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-std::string Language::toString(Language::Type language)
-{
-	const auto match = languageNames.left.find(language);
-
-	if (match == languageNames.left.end())
-		return "unknown";
-
-	return match->second;
-}
+static const std::map<std::string, Language::Type> languageNames =
+	{
+		{"auto", Language::Type::Automatic},
+		{"pddl", Language::Type::PDDL},
+		{"sas", Language::Type::SAS},
+	};
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 Language::Type Language::fromString(const std::string &languageName)
 {
-	const auto match = languageNames.right.find(languageName);
+	const auto matchingLanguageName = languageNames.find(languageName);
 
-	if (match == languageNames.right.end())
+	if (matchingLanguageName == languageNames.cend())
 		return Language::Type::Unknown;
 
-	return match->second;
+	return matchingLanguageName->second;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8a80e0e..573f118 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -3,7 +3,6 @@ set(target tests)
 file(GLOB core_sources "*.cpp")
 
 set(includes
-	${Boost_INCLUDE_DIRS}
 	${PROJECT_SOURCE_DIR}/include
 	${PROJECT_SOURCE_DIR}/lib/catch/single_include
 	${PROJECT_SOURCE_DIR}/lib/tokenize/include
@@ -14,7 +13,6 @@ set(includes
 
 set(libraries
 	stdc++fs
-	${Boost_LIBRARIES}
 	plasp
 )