Merge pull request #370 from yamacir-kit/let-syntax

Let syntax

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.791.so` and executable `meevax`.
+| `all` (default)    | Build shared-library `libmeevax.0.3.818.so` and executable `meevax`.
 | `test`             | Test executable `meevax`.
-| `package`          | Generate debian package `meevax_0.3.791_amd64.deb`.
+| `package`          | Generate debian package `meevax_0.3.818_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.791
+Meevax Lisp System, version 0.3.818
 
 Usage: meevax [OPTION...] [FILE...]
 

VERSION

@@ -1 +1 @@
-0.3.791
+0.3.818

basis/overture.ss

@@ -9,15 +9,6 @@
     (lambda (import . import-sets)
       (list quote (cons 'import import-sets)))))
 
-(define define-syntax
-  (fork/csc
-    (lambda (define-syntax keyword . transformer)
-      (if (pair? keyword)
-          (list define (car keyword)
-            (list fork/csc
-              (list lambda keyword . transformer)))
-          (list define keyword . transformer)))))
-
 (define-syntax (syntax datum)
   (if (pair? datum)
       (list fork/csc (list lambda '() datum))

example/example.cpp

@@ -1,4 +1,4 @@
-#include <meevax/library/standard.hpp>
+#include <meevax/kernel/environment.hpp>
 
 using namespace meevax; // NOTE: DIRTY HACK
 

include/meevax/iostream/escape_sequence.hpp

@@ -71,6 +71,7 @@ inline namespace iostream
     return escape_sequence(COMMAND, std::forward<decltype(xs)>(xs)...); \
   }
 
+  DEFINE("0m", normal);
   DEFINE("1m", bold);
   DEFINE("2m", faint);
   DEFINE("3m", italic); // Not widely supported. Sometimes treated as inverse.

include/meevax/kernel/boolean.hpp

@@ -44,7 +44,7 @@ inline namespace kernel
   let extern const t;
   let extern const f;
 
-  auto if_(const_reference x) -> bool;
+  auto select(const_reference) -> bool;
 } // namespace kernel
 } // namespace meevax
 

include/meevax/kernel/configurator.hpp

@@ -293,7 +293,7 @@ inline namespace kernel
     #define BOILERPLATE(NAME)                                                  \
     auto is_##NAME##_mode() const -> bool                                      \
     {                                                                          \
-      return if_(NAME);                                                        \
+      return select(NAME);                                                     \
     }                                                                          \
     static_assert(true)
 

include/meevax/kernel/environment.hpp

@@ -21,6 +21,7 @@
 #include <meevax/kernel/machine.hpp>
 #include <meevax/kernel/reader.hpp>
 #include <meevax/kernel/writer.hpp>
+#include <meevax/utility/integer_sequence.hpp>
 
 namespace meevax
 {
@@ -46,7 +47,11 @@ inline namespace kernel
     using writer::debug_port;
     using writer::write;
 
-    template <typename... Ts>
+    explicit environment(environment &&) = default;
+
+    explicit environment(environment const&) = default;
+
+    template <typename... Ts, REQUIRES(is_integer_sequence<Ts>...)>
     explicit environment(Ts&&... xs)
     {
       import(), (import(xs), ...);
@@ -70,12 +75,14 @@ inline namespace kernel
 
     auto execute() -> object;
 
+    auto execute(const_reference) -> object;
+
     auto global() noexcept -> reference;
 
     auto global() const noexcept -> const_reference;
 
-    template <typename T>
-    auto import(T) -> void;
+    template <typename T, T... xs>
+    auto import(std::integer_sequence<T, xs...>) -> void;
 
     auto import() -> void;
 

include/meevax/kernel/instruction.hpp

@@ -32,7 +32,9 @@ inline namespace kernel
     dummy,             // a.k.a DUM
     fork,              //
     join,              //
+    let_syntax,        //
     letrec,            // a.k.a RAP
+    letrec_syntax,     //
     load_absolute,     // a.k.a LDG
     load_closure,      // a.k.a LDF
     load_constant,     // a.k.a LDC