Update kernel/basis.hpp to be header only

Signed-off-by: yamacir-kit <[email protected]>

.gitignore

@@ -1,4 +1,4 @@
 build
+include/meevax/kernel/basis.hpp
 include/meevax/unicode
-src/kernel/basis.cpp
 src/kernel/version.cpp

CMakeLists.txt

@@ -70,7 +70,7 @@ foreach(EACH IN LISTS ${PROJECT_NAME}_BASIS_SOURCES)
 endforeach()
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/README.md   ${CMAKE_CURRENT_SOURCE_DIR}/README.md)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/basis.cpp   ${CMAKE_CURRENT_SOURCE_DIR}/src/kernel/basis.cpp)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/basis.hpp   ${CMAKE_CURRENT_SOURCE_DIR}/include/meevax/kernel/basis.hpp)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/version.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/kernel/version.cpp)
 
 # ---- Target kernel -----------------------------------------------------------

README.md

@@ -74,7 +74,7 @@ Subset of R7RS-small.
 cmake -B build -DCMAKE_BUILD_TYPE=Release
 cd build
 make package
-sudo apt install build/meevax_0.4.813_amd64.deb
+sudo apt install build/meevax_0.4.814_amd64.deb
 ```
 
 or
@@ -106,9 +106,9 @@ sudo rm -rf /usr/local/share/meevax
 
 | Target Name | Description
 |-------------|-------------
-| `all`       | Build shared-library `libmeevax.0.4.813.so` and executable `meevax`
+| `all`       | Build shared-library `libmeevax.0.4.814.so` and executable `meevax`
 | `test`      | Test executable `meevax`
-| `package`   | Generate debian package `meevax_0.4.813_amd64.deb`
+| `package`   | Generate debian package `meevax_0.4.814_amd64.deb`
 | `install`   | Copy files into `/usr/local` directly
 
 ## Usage

VERSION

@@ -1 +1 @@
-0.4.813
+0.4.814

configure/basis.cpp → configure/basis.hpp

@@ -14,18 +14,24 @@
    limitations under the License.
 */
 
-#include <meevax/kernel/basis.hpp>
-#include <meevax/kernel/environment.hpp>
-#include <meevax/kernel/input_string_port.hpp>
-#include <meevax/kernel/interaction_environment.hpp>
+#ifndef INCLUDED_MEEVAX_KERNEL_BASIS_HPP
+#define INCLUDED_MEEVAX_KERNEL_BASIS_HPP
+
+#include <array>
 
 namespace meevax
 {
 inline namespace kernel
 {
-  auto basis() -> std::vector<char const*>
+  template <typename... Ts>
+  constexpr auto make_array(Ts&&... xs) -> std::array<std::decay_t<std::common_type_t<Ts...>>, sizeof...(Ts)>
+  {
+    return { std::forward<decltype(xs)>(xs)... };
+  }
+
+  constexpr auto basis()
   {
-    return {
+    return make_array(
       R"##(${${PROJECT_NAME}_BASIS_meevax.ss})##",
       R"##(${${PROJECT_NAME}_BASIS_r4rs-essential.ss})##",
       R"##(${${PROJECT_NAME}_BASIS_r4rs.ss})##",
@@ -48,19 +54,9 @@ inline namespace kernel
       R"##(${${PROJECT_NAME}_BASIS_srfi-78.ss})##",
       R"##(${${PROJECT_NAME}_BASIS_srfi-98.ss})##",
       R"##(${${PROJECT_NAME}_BASIS_srfi-111.ss})##",
-      R"##(${${PROJECT_NAME}_BASIS_srfi-149.ss})##",
-    };
-  }
-
-  auto boot(std::vector<char const*> const& libraries) -> void
-  {
-    for (auto&& library : libraries)
-    {
-      for (let const& x : input_string_port(library))
-      {
-        interaction_environment().as<environment>().evaluate(x);
-      }
-    }
+      R"##(${${PROJECT_NAME}_BASIS_srfi-149.ss})##");
   }
 } // namespace kernel
 } // namespace meevax
+
+#endif // INCLUDED_MEEVAX_KERNEL_BASIS_HPP

include/meevax/kernel/boot.hpp

@@ -17,11 +17,26 @@
 #ifndef INCLUDED_MEEVAX_KERNEL_BOOT_HPP
 #define INCLUDED_MEEVAX_KERNEL_BOOT_HPP
 
+#include <meevax/kernel/environment.hpp>
+#include <meevax/kernel/interaction_environment.hpp>
+
 namespace meevax
 {
 inline namespace kernel
 {
   auto boot() -> void;
+
+  template <typename Sources>
+  auto boot(Sources const& sources) -> void
+  {
+    for (auto&& source : sources)
+    {
+      for (let const& x : input_string_port(source))
+      {
+        interaction_environment().as<environment>().evaluate(x);
+      }
+    }
+  }
 } // namespace kernel
 } // namespace meevax
 

include/meevax/kernel/syntactic_environment.hpp

@@ -20,7 +20,6 @@
 #include <meevax/kernel/identity.hpp>
 #include <meevax/kernel/implementation_dependent.hpp>
 #include <meevax/kernel/include.hpp>
-#include <meevax/kernel/list.hpp>
 #include <meevax/kernel/transformer.hpp>
 
 namespace meevax