Merge pull request #386 from potassco/feature/ordered_set

Feature/ordered set

.gitmodules

@@ -5,3 +5,18 @@
 [submodule "third_party/catch"]
 	path = third_party/catch
 	url = ../../catchorg/Catch2.git
+[submodule "third_party/ordered-map"]
+	path = third_party/ordered-map
+	url = ../../Tessil/ordered-map.git
+[submodule "third_party/hopscotch-map"]
+	path = third_party/hopscotch-map
+	url = ../../Tessil/hopscotch-map.git
+[submodule "third_party/sparse-map"]
+	path = third_party/sparse-map
+	url = ../../Tessil/sparse-map.git
+[submodule "third_party/optional"]
+	path = third_party/optional
+	url = ../../TartanLlama/optional.git
+[submodule "third_party/variant"]
+	path = third_party/variant
+	url = ../../mpark/variant.git

CMakeLists.txt

@@ -25,9 +25,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 # build targets
-option(CLINGO_BUILD_WEB 
+option(CLINGO_BUILD_WEB
 "Enable the web target. This option is meant to be used with emscripten to \
-compile a library exporting just one function to run clingo." 
+compile a library exporting just one function to run clingo."
 OFF)
 option(CLINGO_BUILD_TESTS
 "Enable unit and system tests."
@@ -66,6 +66,8 @@ ON)
 option(CLINGO_USE_LOCAL_CATCH
 "Advanced option to build against bundled or installed catch."
 ON)
+set(CLINGO_MAP_TYPE "hopscotch" CACHE STRING
+"Select hash table implementation. (sparse, hopscotch)")
 
 
 # Python configuration
@@ -201,7 +203,7 @@ else()
             set_property(TARGET Python::Python PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${PYTHON_INCLUDE_DIRS}")
             set_property(TARGET Python::Module PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${PYTHON_INCLUDE_DIRS}")
             set_property(TARGET Python::Python PROPERTY INTERFACE_LINK_LIBRARIES "${PYTHON_LIBRARIES}")
-            if (MSVC) 
+            if (MSVC)
                 set_property(TARGET Python::Module PROPERTY INTERFACE_LINK_LIBRARIES "${PYTHON_LIBRARIES}")
             endif()
         endif()

libclingo/CMakeLists.txt

@@ -10,9 +10,7 @@ set(header-group-clingo
     "${CMAKE_CURRENT_SOURCE_DIR}/clingo/clingocontrol.hh"
     "${CMAKE_CURRENT_SOURCE_DIR}/clingo/control.hh"
     "${CMAKE_CURRENT_SOURCE_DIR}/clingo/incmode.hh"
-    "${CMAKE_CURRENT_SOURCE_DIR}/clingo/optional.hh"
-    "${CMAKE_CURRENT_SOURCE_DIR}/clingo/scripts.hh"
-    "${CMAKE_CURRENT_SOURCE_DIR}/clingo/variant.hh")
+    "${CMAKE_CURRENT_SOURCE_DIR}/clingo/scripts.hh")
 source_group("${ide_header_group}\\clingo" FILES ${header-group-clingo})
 set(header
     ${header-group}

libclingo/clingo/astv2.hh

@@ -27,8 +27,9 @@
 
 #include <gringo/input/programbuilder.hh>
 #include <clingo.h>
-#include <clingo/variant.hh>
-#include <clingo/optional.hh>
+
+#include <mpark/variant.hpp>
+#include <tl/optional.hpp>
 
 // TODO:
 // - the way OAST and SAST are handled is really realy ugly