Merge pull request #444 from yamacir-kit/miscellaneous

Miscellaneous

Author: yamacir-kit

.gitignore

@@ -1,2 +1,3 @@
 build
+src/kernel/basis.cpp
 src/kernel/version.cpp

CMakeLists.txt

@@ -10,28 +10,29 @@ project(meevax DESCRIPTION "A programmable programming language"
                LANGUAGES CXX
                VERSION ${CURRENT_VERSION})
 
-include(GNUInstallDirs)
-include(TestBigEndian)
-
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 
-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.
-  # "-mtune=native "
+string(JOIN " " AGGRESSIVE_OPTIMIZATION_OPTIONS
+  # "-fdata-sections"
+  # "-ffunction-sections"
+  # "-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.
+  # "-mtune=native"
   )
 
 # NOTE: The `-gdwarf-4` option is set due to the following issues with Clang 14 and Valgrind versions below 3.20: https://bugzilla.mozilla.org/show_bug.cgi?id=1758782
 set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wpedantic -pipe")
 set(CMAKE_CXX_FLAGS_DEBUG          "-Og -gdwarf-4")
 set(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os           -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -gdwarf-4 -DNDEBUG")
-set(CMAKE_CXX_FLAGS_RELEASE        "-O2           -DNDEBUG ${UNSTABLE_OPTIMIZATION_OPTIONS}")
+set(CMAKE_CXX_FLAGS_RELEASE        "-O2           -DNDEBUG ${AGGRESSIVE_OPTIMIZATION_OPTIONS}")
+
+include(GNUInstallDirs)
 
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
@@ -46,37 +47,32 @@ else()
   set(${PROJECT_NAME}_VERSION_EXACT "")
 endif()
 
+include(TestBigEndian)
+
 TEST_BIG_ENDIAN(IS_BIG_ENDIAN) # Use CMAKE_CXX_BYTE_ORDER if CMake >= 3.20
+
 if(${IS_BIG_ENDIAN})
   set(${PROJECT_NAME}_BYTE_ORDER "big-endian")
 else()
   set(${PROJECT_NAME}_BYTE_ORDER "little-endian")
 endif()
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/help.txt ${CMAKE_CURRENT_BINARY_DIR}/help.txt)
+
+file(READ ${CMAKE_CURRENT_BINARY_DIR}/help.txt ${PROJECT_NAME}_HELP_TEXT)
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/version.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/kernel/version.cpp)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/README.md   ${CMAKE_CURRENT_SOURCE_DIR}/README.md)
 
-# ---- Convert Basis-Library Sources to Binary ---------------------------------
-
 file(GLOB ${PROJECT_NAME}_BASIS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/basis/*.ss)
 
-set(${PROJECT_NAME}_BASIS "")
-
 foreach(EACH IN LISTS ${PROJECT_NAME}_BASIS_SOURCES)
   get_filename_component(FILENAME ${EACH} NAME)
-  get_filename_component(FILEPATH ${EACH} PATH)
-  add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}.o
-    WORKING_DIRECTORY ${FILEPATH}
-    COMMAND ${CMAKE_OBJCOPY}
-    ARGS -I binary
-         -O elf64-x86-64
-         -B i386
-         ${FILENAME}
-         ${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}.o)
-  list(APPEND ${PROJECT_NAME}_BASIS ${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}.o)
+  file(READ ${EACH} ${PROJECT_NAME}_BASIS_${FILENAME})
 endforeach()
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/basis.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/kernel/basis.cpp)
+
 # ---- Target kernel -----------------------------------------------------------
 
 add_library(kernel SHARED "")
@@ -85,8 +81,7 @@ add_library(${PROJECT_NAME}::kernel ALIAS kernel)
 
 file(GLOB_RECURSE ${PROJECT_NAME}_KERNEL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*/*.cpp)
 
-target_sources(kernel PRIVATE ${${PROJECT_NAME}_BASIS}
-                      PRIVATE ${${PROJECT_NAME}_KERNEL_SOURCES})
+target_sources(kernel PRIVATE ${${PROJECT_NAME}_KERNEL_SOURCES})
 
 target_include_directories(kernel PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
@@ -161,38 +156,24 @@ include(CPack)
 
 enable_testing()
 
-macro(check TEST_NAME)
-  add_test(NAME ${TEST_NAME}
+file(GLOB ${PROJECT_NAME}_TEST_SS ${CMAKE_CURRENT_SOURCE_DIR}/test/*.ss)
+
+foreach(EACH IN LISTS ${PROJECT_NAME}_TEST_SS)
+  get_filename_component(FILENAME ${EACH} NAME_WE)
+  add_test(NAME ${FILENAME}
            COMMAND valgrind --error-exitcode=1 # = EXIT_FAILURE
                             --leak-check=full
                             --quiet
                             --show-leak-kinds=all
                    ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/meevax
-                   ${CMAKE_CURRENT_SOURCE_DIR}/test/${TEST_NAME}.ss)
-endmacro()
-
-check(abandoned)
-check(chibi-basic)
-check(identifier)
-check(internal-definition)
-check(library-declaration)
-check(macro-transformers)
-check(numerical-operations)
-check(parameterize)
-check(r4rs)
-check(r4rs-appendix)
-check(r5rs)
-check(r7rs)
-check(sicp-1)
-check(srfi-8)
-check(tail-call)
-check(values)
-check(with-exception-handler)
-
-file(GLOB ${PROJECT_NAME}_TEST_CXX ${CMAKE_CURRENT_SOURCE_DIR}/test/*.cpp)
-foreach(FILEPATH IN LISTS ${PROJECT_NAME}_TEST_CXX)
-  get_filename_component(FILENAME ${FILEPATH} NAME_WE)
-  add_executable(assert-${FILENAME} ${FILEPATH})
+                   ${EACH})
+endforeach()
+
+file(GLOB ${PROJECT_NAME}_TEST_CPP ${CMAKE_CURRENT_SOURCE_DIR}/test/*.cpp)
+
+foreach(EACH IN LISTS ${PROJECT_NAME}_TEST_CPP)
+  get_filename_component(FILENAME ${EACH} NAME_WE)
+  add_executable(assert-${FILENAME} ${EACH})
   target_link_libraries(assert-${FILENAME} PRIVATE kernel)
   add_test(NAME assert-${FILENAME}
            COMMAND valgrind --error-exitcode=1 # = EXIT_FAILURE

README.md

@@ -46,6 +46,7 @@ Subset of R7RS-small.
 | [  1](https://srfi.schemers.org/srfi-1/srfi-1.html)     | List Library                                           | [`(srfi 1)`](./basis/srfi-1.ss)                       |                   |
 | [  6](https://srfi.schemers.org/srfi-6/srfi-6.html)     | Basic String Ports                                     | [`(srfi 6)`](./basis/srfi-6.ss)                       | R7RS 6.13         |
 | [  8](https://srfi.schemers.org/srfi-8/srfi-8.html)     | receive: Binding to multiple values                    | [`(srfi 8)`](./basis/srfi-8.ss)                       |                   |
+| [  9](https://srfi.schemers.org/srfi-9/srfi-9.html)     | Defining Record Types                                  | [`(srfi 9)`](./basis/srfi-9.ss)                       | R7RS 5.5          |
 | [ 10](https://srfi.schemers.org/srfi-10/srfi-10.html)   | #, external form                                       |                                                       |                   |
 | [ 11](https://srfi.schemers.org/srfi-11/srfi-11.html)   | Syntax for receiving multiple values                   | [`(srfi 11)`](./basis/srfi-11.ss)                     | R7RS 4.2.2        |
 | [ 23](https://srfi.schemers.org/srfi-23/srfi-23.html)   | Error reporting mechanism                              | [`(srfi 23)`](./basis/srfi-23.ss)                     | R7RS 6.11         |
@@ -91,23 +92,14 @@ $ make install.deb
 ``` bash
 $ sudo apt remove meevax
 ```
-<!--
-or
-``` bash
-sudo rm -rf /usr/local/bin/meevax
-sudo rm -rf /usr/local/include/meevax
-sudo rm -rf /usr/local/lib/libmeevax*
-sudo rm -rf /usr/local/share/meevax
-```
--->
 
 ### CMake targets
 
 | Target Name        | Description
-|:-------------------|:--
-| `all` (default)    | Build shared-library `libmeevax.0.4.567.so` and executable `meevax`.
+|--------------------|---
+| `all` (default)    | Build shared-library `libmeevax.0.4.597.so` and executable `meevax`.
 | `test`             | Test executable `meevax`.
-| `package`          | Generate debian package `meevax_0.4.567_amd64.deb`.
+| `package`          | Generate debian package `meevax_0.4.597_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,17 +114,19 @@ __(1)__ Meevax installed by `make install` cannot be uninstalled by the system's
 ## Usage
 
 ```
-Meevax Lisp 0.4.567
+Meevax Lisp 0.4.597
 
-Usage: meevax [OPTION...] [FILE...]
+Usage:
+  meevax [option...] [file...]
 
 Options:
-  -e, --evaluate=STRING  Read and evaluate given STRING at configuration step.
-  -h, --help             Display this help text and exit.
-  -i, --interactive      Take over control of root environment.
-  -l, --load=FILENAME    Same as -e '(load FILENAME)'
-  -v, --version          Display version information and exit.
-  -w, --write=OBJECT     Same as -e '(write OBJECT)'
+  -e, --evaluate=<string>  read and evaluate <string> on interaction-environment
+  -h, --help               display this help and exit
+  -i, --interactive        enter an interactive session
+  -l, --load=<file>        load <file> into interaction-environment
+  -v, --version            display version information and exit
+  -w, --write=<string>     same as `(write (read <string>))`
+
 ```
 
 | Example                                    | Effects |

VERSION

@@ -1 +1 @@
-0.4.567
+0.4.597

basis/r7rs.ss

@@ -9,6 +9,7 @@
           (only (meevax write) put-char put-string)
           (scheme r5rs)
           (srfi 6)
+          (srfi 9)
           (srfi 11)
           (srfi 23)
           (srfi 34)
@@ -26,8 +27,7 @@
           letrec-syntax syntax-rules _ ... syntax-error
 
           ; 5.3. Variable definitions
-          define define-values define-syntax
-          ; define-record-type
+          define define-values define-syntax define-record-type
 
           ; 6.1. Equivalence predicates
           eqv? eq? equal?

basis/srfi-34.ss

@@ -65,11 +65,11 @@
          (define-syntax guard
            (syntax-rules ()
              ((guard (var clause ...) e1 e2 ...)
-              ((call/cc
+              ((call-with-current-continuation
                  (lambda (guard-k)
                    (with-exception-handler
                      (lambda (condition)
-                       ((call/cc
+                       ((call-with-current-continuation
                           (lambda (handler-k)
                             (guard-k
                               (lambda ()