Merge pull request #369 from yamacir-kit/cleanup

Cleanup

Author: yamacir-kit

README.md

@@ -100,9 +100,9 @@ sudo rm -rf /usr/local/share/meevax
 
 | Target Name        | Description
 |:-------------------|:--
-| `all` (default)    | Build shared-library `libmeevax.0.3.783.so` and executable `meevax`.
+| `all` (default)    | Build shared-library `libmeevax.0.3.791.so` and executable `meevax`.
 | `test`             | Test executable `meevax`.
-| `package`          | Generate debian package `meevax_0.3.783_amd64.deb`.
+| `package`          | Generate debian package `meevax_0.3.791_amd64.deb`.
 | `install`          | Copy files into `/usr/local` __(1)__.
 | `install.deb`      | `all` + `package` + `sudo apt install <meevax>.deb`
 | `safe-install.deb` | `all` + `test` + `package` + `sudo apt install <meevax>.deb`
@@ -117,7 +117,7 @@ __(1)__ Meevax installed by `make install` cannot be uninstalled by the system's
 ## Usage
 
 ```
-Meevax Lisp System, version 0.3.783
+Meevax Lisp System, version 0.3.791
 
 Usage: meevax [OPTION...] [FILE...]
 

VERSION

@@ -1 +1 @@
-0.3.783
+0.3.791

include/meevax/iostream/escape_sequence.hpp

@@ -19,8 +19,9 @@
 
 #include <tuple>
 
+#include <meevax/functional/curry.hpp>
 #include <meevax/iostream/is_console.hpp>
-#include <meevax/utility/unwrap_reference_wrapper.hpp>
+#include <meevax/iostream/write.hpp>
 
 namespace meevax
 {
@@ -47,20 +48,15 @@ inline namespace iostream
 
     friend auto operator <<(std::ostream & os, escape_sequence const& sequence) -> std::ostream &
     {
-      auto print = [&](auto&& ... xs) -> std::ostream &
-      {
-        return (os << ... << unwrap_reference_wrapper(xs));
-      };
-
       if (is_console(os))
       {
         os << "\x1b[" << sequence.command;
-        std::apply(print, sequence.references);
+        std::apply(curry(write)(os), sequence.references);
         return os << "\x1b[0m";
       }
       else
       {
-        std::apply(print, sequence.references);
+        std::apply(curry(write)(os), sequence.references);
         return os;
       }
     }

include/meevax/iostream/write.hpp

@@ -19,17 +19,15 @@
 
 #include <iostream>
 
+#include <meevax/utility/unwrap_reference_wrapper.hpp>
+
 namespace meevax
 {
 inline namespace iostream
 {
-  struct write
+  auto write = [](std::ostream & os, auto&&... xs) -> std::ostream &
   {
-    template <typename... Ts>
-    constexpr auto operator ()(std::ostream & os, Ts&&... xs) const -> std::ostream &
-    {
-      return (os << ... << xs);
-    }
+    return (os << ... << unwrap_reference_wrapper(xs));
   };
 } // namespace iostream
 } // namespace meevax

include/meevax/kernel/heterogeneous.hpp

@@ -20,8 +20,8 @@
 #include <meevax/functional/compose.hpp>
 #include <meevax/iostream/escape_sequence.hpp>
 #include <meevax/iostream/write.hpp>
+#include <meevax/kernel/overview.hpp>
 #include <meevax/kernel/profiler.hpp>
-#include <meevax/type_traits/delay.hpp>
 #include <meevax/type_traits/is_equality_comparable.hpp>
 #include <meevax/utility/module.hpp>
 
@@ -69,7 +69,7 @@ inline namespace kernel
 
       auto write(std::ostream & os) const -> std::ostream & override
       {
-        return delay<iostream::write>().yield<decltype(os)>(os, static_cast<Bound const&>(*this));
+        return os << static_cast<Bound const&>(*this);
       }
     };
 
@@ -84,14 +84,9 @@ inline namespace kernel
       current_profiler()[typeid(typename std::decay<Bound>::type)].allocation++;
       #endif
 
-      if constexpr (std::is_same<Bound, Top>::value)
-      {
-        return static_cast<heterogeneous>(new (gc) Top(std::forward<decltype(xs)>(xs)...));
-      }
-      else
-      {
-        return static_cast<heterogeneous>(new (gc) binder<Bound>(std::forward<decltype(xs)>(xs)...));
-      }
+      return static_cast<heterogeneous>(
+        new (gc) typename std::conditional<std::is_same<Bound, Top>::value, Top, binder<Bound>>::type(
+          std::forward<decltype(xs)>(xs)...));
     }
 
     template <typename U>
@@ -143,13 +138,12 @@ inline namespace kernel
     {
       return *this ? get()->type() : typeid(null);
     }
-  };
 
-  template <template <typename...> typename Pointer, typename Top>
-  auto operator <<(std::ostream & os, heterogeneous<Pointer, Top> const& datum) -> std::ostream &
-  {
-    return datum.template is<null>() ? os << magenta("()") : datum->write(os);
-  }
+    friend auto operator <<(std::ostream & os, heterogeneous const& datum) -> std::ostream &
+    {
+      return datum.template is<null>() ? os << magenta("()") : datum->write(os);
+    }
+  };
 } // namespace kernel
 } // namespace meevax
 

include/meevax/kernel/object.hpp

@@ -26,11 +26,6 @@ inline namespace kernel
   template <typename T>
   struct top
   {
-    virtual auto type() const noexcept -> std::type_info const&
-    {
-      return typeid(T);
-    }
-
     virtual auto compare(heterogeneous<gc_pointer, T> const& x) const -> bool
     {
       if constexpr (is_equality_comparable<T>::value)
@@ -50,9 +45,14 @@ inline namespace kernel
       }
     }
 
+    virtual auto type() const noexcept -> std::type_info const&
+    {
+      return typeid(T);
+    }
+
     virtual auto write(std::ostream & os) const -> std::ostream &
     {
-      return delay<iostream::write>().yield<std::ostream &>(os, static_cast<T const&>(*this));
+      return os << static_cast<T const&>(*this);
     }
   };
 

include/meevax/kernel/overview.hpp

@@ -19,6 +19,7 @@
 
 #include <meevax/memory/gc_pointer.hpp>
 #include <meevax/type_traits/requires.hpp>
+#include <meevax/utility/demangle.hpp>
 
 #define NIL /* nothing */