Merge pull request #359 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.682.so` and executable `meevax`.
+| `all` (default)    | Build shared-library `libmeevax.0.3.727.so` and executable `meevax`.
 | `test`             | Test executable `meevax`.
-| `package`          | Generate debian package `meevax_0.3.682_amd64.deb`.
+| `package`          | Generate debian package `meevax_0.3.727_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.682
+Meevax Lisp System, version 0.3.727
 
 Usage: meevax [OPTION...] [FILE...]
 

VERSION

@@ -1 +1 @@
-0.3.682
+0.3.727

basis/r7rs.ss

@@ -264,12 +264,6 @@ parameterize ; is defined in srfi-39.ss
 
 ; ---- 6.2. Numbers ------------------------------------------------------------
 
-(define (finite? z) (not (infinite? z)))
-
-(define (infinite? z)
-  (or (= +inf.0 z)
-      (= -inf.0 z)))
-
 ; TODO exact-integer-sqrt
 
 ; ---- 6.3. Booleans -----------------------------------------------------------

basis/srfi-78.ss

@@ -64,7 +64,7 @@
           ((report)        100)
           (else (error "unrecognized mode" mode)))))
 
-(check-set-mode! 'report-failed)
+(check-set-mode! 'report)
 
 ; -- state --
 

example/example.cpp

@@ -32,6 +32,6 @@ extern "C"
       }
     }
 
-    return unspecified;
+    return unspecified_object;
   }
 }

include/meevax/functional/arithmetic_operation.hpp

@@ -0,0 +1,58 @@
+/*
+   Copyright 2018-2021 Tatsuya Yamasaki.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+#ifndef INCLUDED_MEEVAX_FUNCTIONAL_ARITHMETIC_OPERATION_HPP
+#define INCLUDED_MEEVAX_FUNCTIONAL_ARITHMETIC_OPERATION_HPP
+
+#include <functional>
+#include <numeric>
+#include <ostream>
+
+namespace meevax
+{
+inline namespace functional
+{
+  #define DEFINE(TYPENAME, BASE, ...)                                          \
+  struct TYPENAME : public std::BASE<void> {} constexpr __VA_ARGS__;           \
+  auto operator <<(std::ostream &, TYPENAME const&) -> std::ostream &
+
+  DEFINE(addition,       plus      , add);
+  DEFINE(division,       divides   , div);
+  DEFINE(modulo,         modulus   , mod);
+  DEFINE(multiplication, multiplies, mul);
+  DEFINE(subtraction,    minus     , sub);
+
+  #undef DEFINE
+
+  #define DEFINE(TYPENAME, FUNCTION, ...)                                      \
+  struct TYPENAME                                                              \
+  {                                                                            \
+    template <typename... Ts>                                                  \
+    constexpr auto operator ()(Ts&&... xs) const                               \
+      -> decltype(std::FUNCTION(std::forward<decltype(xs)>(xs)...))            \
+    {                                                                          \
+      return FUNCTION(std::forward<decltype(xs)>(xs)...);                      \
+    }                                                                          \
+  } constexpr __VA_ARGS__
+
+  DEFINE(greatest_common_divisor, gcd, gcd);
+  DEFINE(least_common_multiple  , lcm, lcm);
+
+  #undef DEFINE
+} // namespace functional
+} // namespace meevax
+
+#endif // INCLUDED_MEEVAX_FUNCTIONAL_ARITHMETIC_OPERATION_HPP