Cleanup namespace definitions

Signed-off-by: yamacir-kit <[email protected]>
yamacir-kit · Nov 14, 2024 · 7121733 · 7121733
1 parent 6221714
commit 7121733
Show file tree

Hide file tree

Showing 107 changed files with 231 additions and 529 deletions.
diff --git a/README.md b/README.md
@@ -90,7 +90,7 @@ Procedures for each standard are provided by the following R7RS-style libraries:
 cmake -B build -DCMAKE_BUILD_TYPE=Release
 cd build
 make package
-sudo apt install build/meevax_0.5.269_amd64.deb
+sudo apt install build/meevax_0.5.270_amd64.deb
 ```
 
 or
@@ -122,9 +122,9 @@ sudo rm -rf /usr/local/share/meevax
 
 | Target Name | Description
 |-------------|-------------
-| `all`       | Build shared-library `libmeevax.0.5.269.so` and executable `meevax`
+| `all`       | Build shared-library `libmeevax.0.5.270.so` and executable `meevax`
 | `test`      | Test executable `meevax`
-| `package`   | Generate debian package `meevax_0.5.269_amd64.deb`
+| `package`   | Generate debian package `meevax_0.5.270_amd64.deb`
 | `install`   | Copy files into `/usr/local` directly
 
 ## Usage

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.5.269
+0.5.270
diff --git a/configure/version.cpp b/configure/version.cpp
@@ -17,9 +17,7 @@
 #include <meevax/kernel/version.hpp>
 #include <meevax/memory/model.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   auto help() noexcept -> std::string_view
   {
@@ -51,5 +49,4 @@ inline namespace kernel
     let static const version = make_symbol("${PROJECT_VERSION}");
     return version;
   }
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
diff --git a/include/meevax/kernel/binary_input_file_port.hpp b/include/meevax/kernel/binary_input_file_port.hpp
@@ -22,9 +22,7 @@
 #include <meevax/kernel/binary_input_port.hpp>
 #include <meevax/kernel/string.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   struct binary_input_file_port : public binary_input_port
   {
@@ -52,7 +50,6 @@ inline namespace kernel
   };
 
   auto operator <<(std::ostream &, binary_input_file_port const&) -> std::ostream &;
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_BINARY_INPUT_FILE_PORT_HPP
diff --git a/include/meevax/kernel/binary_input_port.hpp b/include/meevax/kernel/binary_input_port.hpp
@@ -21,9 +21,7 @@
 #include <meevax/kernel/input_port.hpp>
 #include <meevax/kernel/pair.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   struct binary_input_port : public virtual binary_port, public virtual input_port
   {
@@ -35,7 +33,6 @@ inline namespace kernel
 
     virtual auto peek() -> object = 0;
   };
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_BINARY_INPUT_PORT_HPP
diff --git a/include/meevax/kernel/binary_output_file_port.hpp b/include/meevax/kernel/binary_output_file_port.hpp
@@ -22,9 +22,7 @@
 #include <meevax/kernel/binary_output_port.hpp>
 #include <meevax/kernel/string.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   struct binary_output_file_port : public binary_output_port
   {
@@ -50,7 +48,6 @@ inline namespace kernel
   };
 
   auto operator <<(std::ostream &, binary_output_file_port const&) -> std::ostream &;
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_BINARY_OUTPUT_FILE_PORT_HPP
diff --git a/include/meevax/kernel/binary_output_port.hpp b/include/meevax/kernel/binary_output_port.hpp
@@ -21,17 +21,14 @@
 #include <meevax/kernel/homogeneous_vector.hpp>
 #include <meevax/kernel/output_port.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   struct binary_output_port : public virtual binary_port, public virtual output_port
   {
     virtual auto put(exact_integer const&) -> void = 0;
 
     virtual auto put(u8vector const&) -> void = 0;
   };
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_BINARY_OUTPUT_PORT_HPP
diff --git a/include/meevax/kernel/binary_port.hpp b/include/meevax/kernel/binary_port.hpp
@@ -19,13 +19,10 @@
 
 #include <meevax/kernel/port.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   struct binary_port : public virtual port
   {};
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_BINARY_PORT_HPP
diff --git a/include/meevax/kernel/boolean.hpp b/include/meevax/kernel/boolean.hpp
@@ -19,14 +19,11 @@
 
 #include <meevax/kernel/pair.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   let extern const t;
 
   let extern const f;
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_BOOLEAN_HPP
diff --git a/include/meevax/kernel/boot.hpp b/include/meevax/kernel/boot.hpp
@@ -20,9 +20,7 @@
 #include <meevax/kernel/environment.hpp>
 #include <meevax/kernel/interaction_environment.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   auto boot() -> void;
 
@@ -37,7 +35,6 @@ inline namespace kernel
       }
     }
   }
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_BOOT_HPP
diff --git a/include/meevax/kernel/box.hpp b/include/meevax/kernel/box.hpp
@@ -19,17 +19,14 @@
 
 #include <meevax/kernel/pair.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   struct box : public virtual pair // (value . null)
   {
     using pair::pair;
   };
 
   auto operator <<(std::ostream &, box const&) -> std::ostream &;
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_BOX_HPP
diff --git a/include/meevax/kernel/character.hpp b/include/meevax/kernel/character.hpp
@@ -22,9 +22,7 @@
 #include <optional>
 #include <string>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   struct character
   {
@@ -212,7 +210,6 @@ inline namespace kernel
   };
 
   auto operator <<(std::ostream &, character const&) -> std::ostream &; // write
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_CHARACTER_HPP
diff --git a/include/meevax/kernel/closure.hpp b/include/meevax/kernel/closure.hpp
@@ -19,17 +19,14 @@
 
 #include <meevax/kernel/pair.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   struct closure : public virtual pair
   {
     using pair::pair;
   };
 
   auto operator <<(std::ostream &, closure const&) -> std::ostream &;
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_CLOSURE_HPP
diff --git a/include/meevax/kernel/comparator.hpp b/include/meevax/kernel/comparator.hpp
@@ -19,9 +19,7 @@
 
 #include <meevax/kernel/pair.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   inline auto eq = [](auto const& x, auto const& y) constexpr
   {
@@ -34,7 +32,6 @@ inline namespace kernel
   };
 
   auto equal(object const&, object const&) -> bool;
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_COMPARATOR_HPP
diff --git a/include/meevax/kernel/complex.hpp b/include/meevax/kernel/complex.hpp
@@ -21,9 +21,7 @@
 
 #include <meevax/kernel/pair.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   struct complex : public virtual pair // (<real> . <imaginary>)
   {
@@ -49,7 +47,6 @@ inline namespace kernel
   auto magnitude(object const&) -> object;
 
   auto angle(object const&) -> object;
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_COMPLEX_HPP
diff --git a/include/meevax/kernel/conditional_expand.hpp b/include/meevax/kernel/conditional_expand.hpp
@@ -19,12 +19,9 @@
 
 #include <meevax/kernel/pair.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   auto conditional_expand(object const&) -> object;
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_CONDITIONAL_EXPAND_HPP
diff --git a/include/meevax/kernel/configurator.hpp b/include/meevax/kernel/configurator.hpp
@@ -24,9 +24,7 @@
 #include <meevax/kernel/procedure.hpp>
 #include <meevax/kernel/version.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   template <typename Environment>
   struct configurator
@@ -158,7 +156,6 @@ inline namespace kernel
       }
     }
   };
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_CONFIGURATOR_HPP
diff --git a/include/meevax/kernel/continuation.hpp b/include/meevax/kernel/continuation.hpp
@@ -19,17 +19,14 @@
 
 #include <meevax/kernel/list.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   struct continuation : public virtual pair
   {
     using pair::pair;
   };
 
   auto operator <<(std::ostream &, continuation const&) -> std::ostream &;
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_CONTINUATION_HPP
diff --git a/include/meevax/kernel/describable.hpp b/include/meevax/kernel/describable.hpp
@@ -19,9 +19,7 @@
 
 #include <meevax/kernel/symbol.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   struct describable
   {
@@ -32,7 +30,6 @@ inline namespace kernel
       : name { std::forward<decltype(xs)>(xs)... }
     {}
   };
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_DESCRIBABLE_HPP
diff --git a/include/meevax/kernel/dynamic_environment.hpp b/include/meevax/kernel/dynamic_environment.hpp
@@ -19,9 +19,7 @@
 
 #include <meevax/kernel/list.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   struct dynamic_environment
   {
@@ -83,7 +81,6 @@ inline namespace kernel
 
     auto run() -> object;
   };
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_DYNAMIC_ENVIRONMENT_HPP
diff --git a/include/meevax/kernel/environment.hpp b/include/meevax/kernel/environment.hpp
@@ -21,9 +21,7 @@
 #include <meevax/kernel/dynamic_environment.hpp>
 #include <meevax/kernel/syntactic_environment.hpp>
 
-namespace meevax
-{
-inline namespace kernel
+namespace meevax::inline kernel
 {
   struct environment : public configurator<environment>
                      , public dynamic_environment
@@ -43,7 +41,6 @@ inline namespace kernel
   extern template struct configurator<environment>;
 
   extern template struct syntactic_environment<environment>;
-} // namespace kernel
-} // namespace meevax
+} // namespace meevax::kernel
 
 #endif // INCLUDED_MEEVAX_KERNEL_ENVIRONMENT_HPP