Merge pull request #432 from yamacir-kit/values

Values

Author: yamacir-kit

.github/workflows/build.yaml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         compiler: [ g++, clang++ ]
         configuration: [ Debug, Release ]
-        system: [ ubuntu-18.04, ubuntu-20.04, ubuntu-22.04 ]
+        system: [ ubuntu-20.04, ubuntu-22.04 ]
     steps:
       - uses: actions/checkout@v3
       - run: ./script/setup.sh --all

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10.2) # Ubuntu 18.04 LTS Default
+cmake_minimum_required(VERSION 3.16.3) # Ubuntu 20.04 LTS default
 
 execute_process(
   COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/VERSION
@@ -19,7 +19,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 
-string(CONCAT UNSTABLE_OPTIMIZATION_OPTIONS # JOIN available if VERSION > 3.12
+string(JOIN " " UNSTABLE_OPTIMIZATION_OPTIONS
   # "-flto " # This optimization causes a SEGV when compiling with Clang 10.
   # "-fmerge-all-constants " # This optimization is very effective in reducing binary size, but non-standard to the C++ standard.
   # "-march=native " # This optimization causes "Illegal instruction" error (is Valgrind's bug) on CI.
@@ -187,6 +187,7 @@ check(r5rs)
 check(r7rs)
 check(sicp-1)
 check(srfi-8)
+check(tail-call)
 check(transformer)
 check(with-exception-handler)
 

README.md

@@ -32,7 +32,7 @@ Latest release is [here](https://github.com/yamacir-kit/meevax/releases).
 
 ### Features
 
--   Architecture - TR-SECD virtual machine.
+-   Architecture - SECD machine.
 -   Modern C++ compatible dynamic typing - Meevax provides RTTI-based language runtime library.
 
 ### Standards
@@ -64,8 +64,8 @@ Subset of R7RS-small.
 
 ### Software
 
--   [GCC](https://gcc.gnu.org/) (>= 7.5.0) or [Clang](https://clang.llvm.org/) (>= 9.0.0)
--   [CMake](https://cmake.org/) (>= 3.10.2)
+-   [GCC](https://gcc.gnu.org/) (>= 9.4.0) or [Clang](https://clang.llvm.org/) (>= 11.0.0)
+-   [CMake](https://cmake.org/) (>= 3.16.3)
 -   [GNU Make](http://savannah.gnu.org/projects/make)
 -   [GNU Binutils](https://www.gnu.org/software/binutils/)
 -   [GNU Multiple Precision Arithmetic Library (GMP)](https://gmplib.org/)
@@ -105,9 +105,9 @@ sudo rm -rf /usr/local/share/meevax
 
 | Target Name        | Description
 |:-------------------|:--
-| `all` (default)    | Build shared-library `libmeevax.0.4.439.so` and executable `meevax`.
+| `all` (default)    | Build shared-library `libmeevax.0.4.465.so` and executable `meevax`.
 | `test`             | Test executable `meevax`.
-| `package`          | Generate debian package `meevax_0.4.439_amd64.deb`.
+| `package`          | Generate debian package `meevax_0.4.465_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`
@@ -122,7 +122,7 @@ __(1)__ Meevax installed by `make install` cannot be uninstalled by the system's
 ## Usage
 
 ```
-Meevax Lisp System, version 0.4.439
+Meevax Lisp System, version 0.4.465
 
 Usage: meevax [OPTION...] [FILE...]
 

VERSION

@@ -1 +1 @@
-0.4.439
+0.4.465

configure/README.md

@@ -32,7 +32,7 @@ Latest release is [here](https://github.com/yamacir-kit/meevax/releases).
 
 ### Features
 
--   Architecture - TR-SECD virtual machine.
+-   Architecture - SECD machine.
 -   Modern C++ compatible dynamic typing - Meevax provides RTTI-based language runtime library.
 
 ### Standards
@@ -64,7 +64,7 @@ Subset of R7RS-small.
 
 ### Software
 
--   [GCC](https://gcc.gnu.org/) (>= 7.5.0) or [Clang](https://clang.llvm.org/) (>= 9.0.0)
+-   [GCC](https://gcc.gnu.org/) (>= 9.4.0) or [Clang](https://clang.llvm.org/) (>= 11.0.0)
 -   [CMake](https://cmake.org/) (>= ${CMAKE_MINIMUM_REQUIRED_VERSION})
 -   [GNU Make](http://savannah.gnu.org/projects/make)
 -   [GNU Binutils](https://www.gnu.org/software/binutils/)

example/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10.2) # Ubuntu 18.04 LTS Default
+cmake_minimum_required(VERSION 3.16.3) # Ubuntu 20.04 LTS default
 
 project(example VERSION 0.0.0 LANGUAGES CXX)
 

include/meevax/kernel/disassemble.hpp

@@ -0,0 +1,30 @@
+/*
+   Copyright 2018-2022 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_KERNEL_DISASSEMBLE_HPP
+#define INCLUDED_MEEVAX_KERNEL_DISASSEMBLE_HPP
+
+#include <meevax/kernel/pair.hpp>
+
+namespace meevax
+{
+inline namespace kernel
+{
+  auto disassemble(std::ostream &, object const&, std::size_t = 1) -> void;
+} // namespace kernel
+} // namespace meevax
+
+#endif // INCLUDED_MEEVAX_KERNEL_DISASSEMBLE_HPP

include/meevax/kernel/heterogeneous.hpp

@@ -21,7 +21,6 @@
 #include <meevax/functional/compose.hpp>
 #include <meevax/iostream/escape_sequence.hpp>
 #include <meevax/iostream/lexical_cast.hpp>
-#include <meevax/kernel/mnemonic.hpp>
 #include <meevax/kernel/profiler.hpp>
 #include <meevax/kernel/type_index.hpp>
 #include <meevax/memory/gc_pointer.hpp>

include/meevax/kernel/identity.hpp

@@ -35,9 +35,9 @@ inline namespace kernel
 
     virtual auto load(object const&) const -> object const& = 0;
 
-    virtual auto make_load_mnemonic() const -> object = 0;
+    virtual auto make_load_instruction() const -> object = 0;
 
-    virtual auto make_store_mnemonic() const -> object = 0;
+    virtual auto make_store_instruction() const -> object = 0;
 
     virtual auto symbol() const -> object const&;
   };
@@ -56,9 +56,9 @@ inline namespace kernel
 
     auto load(object const& = unit) const -> object const& override;
 
-    auto make_load_mnemonic() const -> object override;
+    auto make_load_instruction() const -> object override;
 
-    auto make_store_mnemonic() const -> object override;
+    auto make_store_instruction() const -> object override;
   };
 
   struct keyword : public absolute
@@ -76,9 +76,9 @@ inline namespace kernel
 
     auto load(object const&) const -> object const& override;
 
-    auto make_load_mnemonic() const -> object override;
+    auto make_load_instruction() const -> object override;
 
-    auto make_store_mnemonic() const -> object override;
+    auto make_store_instruction() const -> object override;
   };
 
   auto operator ==(relative const&, relative const&) -> bool;
@@ -89,9 +89,9 @@ inline namespace kernel
 
     auto load(object const& e) const -> object const& override;
 
-    auto make_load_mnemonic() const -> object override;
+    auto make_load_instruction() const -> object override;
 
-    auto make_store_mnemonic() const -> object override;
+    auto make_store_instruction() const -> object override;
   };
 } // namespace kernel
 } // namespace meevax

include/meevax/kernel/instruction.hpp

@@ -17,13 +17,46 @@
 #ifndef INCLUDED_MEEVAX_KERNEL_INSTRUCTION_HPP
 #define INCLUDED_MEEVAX_KERNEL_INSTRUCTION_HPP
 
-#include <meevax/kernel/pair.hpp>
+#include <iostream>
 
 namespace meevax
 {
 inline namespace kernel
 {
-  auto disassemble(std::ostream &, object const&, std::size_t = 1) -> void;
+  enum class instruction : std::uint8_t
+  {
+    call,              // a.k.a APP
+    cons,              //
+    define,            //
+    define_syntax,     //
+    drop,              //
+    dummy,             // a.k.a DUM
+    join,              //
+    let_syntax,        //
+    letrec,            // a.k.a RAP
+    letrec_syntax,     //
+    load_absolute,     // a.k.a LDG
+    load_auxiliary,    //
+    load_closure,      // a.k.a LDF
+    load_constant,     // a.k.a LDC
+    load_continuation, //
+    load_relative,     // a.k.a LDL
+    load_variadic,     //
+    return_,           // a.k.a RTN
+    select,            // a.k.a SEL
+    stop,              //
+    store_absolute,    //
+    store_auxiliary,   //
+    store_relative,    //
+    store_variadic,    //
+    tail_call,         //
+    tail_letrec,       //
+    tail_select,       //
+  };
+
+  auto operator <<(std::ostream &, instruction const&) -> std::ostream &;
+
+  auto instruction_length(instruction const&) -> std::size_t;
 } // namespace kernel
 } // namespace meevax
 

include/meevax/kernel/list.hpp

@@ -28,11 +28,11 @@ inline namespace kernel
   template <auto N, typename T>
   auto get(T&& x) -> decltype(auto)
   {
-    if constexpr (std::is_same_v<std::decay_t<decltype(x)>, iterator>)
+    if constexpr (std::is_same_v<std::decay_t<T>, iterator>)
     {
       return std::get<N>(*x.get());
     }
-    else if constexpr (std::is_same_v<std::decay_t<decltype(x)>, object>)
+    else if constexpr (std::is_same_v<std::decay_t<T>, object>)
     {
       return x.template is_also<pair>() ? std::get<N>(*x) : unit;
     }
@@ -164,9 +164,9 @@ inline namespace kernel
   };
 
   template <typename T, typename K, REQUIRES(std::is_integral<K>)>
-  auto list_tail(T&& x, K const k) -> object const&
+  auto tail(T&& x, K const k) -> object const&
   {
-    return 0 < k ? list_tail(cdr(x), k - 1) : x;
+    return 0 < k ? tail(cdr(x), k - 1) : x;
   }
 
   auto take(object const&, std::size_t) -> object;