Merge pull request #344 from yamacir-kit/cleanup

Cleanup

Author: yamacir-kit

CMakeLists.txt

@@ -28,15 +28,13 @@ set(CMAKE_CXX_FLAGS_RELEASE        "-O3    -DNDEBUG -pipe") # NOTE: -march=nativ
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
 
-# ---- Configure README --------------------------------------------------------
+# ---- Configure ---------------------------------------------------------------
 
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/configure/README.md)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/README.md
                  ${CMAKE_CURRENT_SOURCE_DIR}/README.md)
 endif()
 
-# ---- Configure Headers -------------------------------------------------------
-
 string(TIMESTAMP ${PROJECT_NAME}_BUILD_DATE "%Y/%m/%d-%H:%M:%S")
 
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
@@ -96,7 +94,7 @@ target_include_directories(kernel PUBLIC
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 
 target_link_libraries(kernel PRIVATE stdc++fs
-                             PUBLIC ${CMAKE_DL_LIBS}
+                             PRIVATE ${CMAKE_DL_LIBS}
                              PUBLIC gmp)
 
 set_target_properties(
@@ -146,14 +144,6 @@ install(EXPORT ${PROJECT_NAME}-config
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
         DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME})
 
-# ---- Target uninstall --------------------------------------------------------
-
-add_custom_target(uninstall
-  COMMAND sudo rm -rf ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/${PROJECT_NAME}
-  COMMAND sudo rm -rf ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
-  COMMAND sudo rm -rf ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME}*
-  COMMAND sudo rm -rf ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME})
-
 # ---- Target package ----------------------------------------------------------
 
 set(CPACK_GENERATOR DEB)
@@ -171,23 +161,42 @@ include(CPack)
 
 enable_testing()
 
-set(MEMCHECK valgrind --error-exitcode=1 # = EXIT_FAILURE
-                      --leak-check=full
-                      --quiet
-                      --show-leak-kinds=all)
-
-macro(define_test TEST_NAME)
+macro(check TEST_NAME)
   add_test(NAME ${TEST_NAME}
-           COMMAND ${MEMCHECK}
-                   ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/meevax
+           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()
 
-define_test(abandoned)
-define_test(chibi-basic)
-define_test(low-level-macro-facility)
-define_test(numerical-operations)
-define_test(r4rs)
-define_test(r4rs-appendix)
-define_test(r7rs)
-define_test(sicp-1)
+check(abandoned)
+check(chibi-basic)
+check(low-level-macro-facility)
+check(numerical-operations)
+check(r4rs)
+check(r4rs-appendix)
+check(r7rs)
+check(sicp-1)
+
+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})
+  target_link_libraries(assert-${FILENAME} PRIVATE kernel)
+  add_test(NAME assert-${FILENAME}
+           COMMAND valgrind --error-exitcode=1 # = EXIT_FAILURE
+                            --leak-check=full
+                            --quiet
+                            --show-leak-kinds=all
+                   ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/assert-${FILENAME})
+endforeach()
+
+# ---- Target all+ -------------------------------------------------------------
+
+execute_process(COMMAND nproc OUTPUT_VARIABLE NPROC)
+
+add_custom_target(all+ COMMAND make all -j ${NPROC}
+                       COMMAND ${CMAKE_CTEST_COMMAND} -j ${NPROC}
+                       COMMAND ${CMAKE_CPACK_COMMAND})

LICENSE

@@ -176,3 +176,27 @@
 
    END OF TERMS AND CONDITIONS
 
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.

README.md

@@ -47,7 +47,7 @@ subset of **R7RS Scheme** implementation.
 
 There is no stable version.
 
-Development HEAD: 0.3.517.
+Development HEAD: 0.3.545.
 
 ### Characteristic Features
 
@@ -90,7 +90,6 @@ An subset of R7RS-small.
 -   GNU Make
 -   GNU Binutils
 -   [**GNU Multiple Precision Arithmetic Library** (GMP)](https://gmplib.org/)
--   [**Boost C++ Libraries**](https://www.boost.org/) (1.65.1 or later)
 
 <br/>
 

VERSION

@@ -1 +1 @@
-0.3.517
+0.3.545

benchmark/ack.ss

@@ -3,9 +3,6 @@
         ((= n 0) (ack (- m 1) 1))
         (else (ack (- m 1) (ack m (- n 1))))))
 
-(define m 3)
-(define n 7)
-
-(ack m n)
+(ack 3 7)
 
 (exit)

benchmark/tarai.ss

@@ -0,0 +1,9 @@
+(define (tarai x y z)
+  (if (not (< y x)) y
+      (tarai (tarai (- x 1) y z)
+             (tarai (- y 1) z x)
+             (tarai (- z 1) x y))))
+
+(tarai 10 5 0)
+
+(exit)

configure/README.md

@@ -90,7 +90,6 @@ An subset of R7RS-small.
 -   GNU Make
 -   GNU Binutils
 -   [**GNU Multiple Precision Arithmetic Library** (GMP)](https://gmplib.org/)
--   [**Boost C++ Libraries**](https://www.boost.org/) (1.65.1 or later)
 
 <br/>
 

example/CMakeLists.txt

@@ -1,43 +1,17 @@
 cmake_minimum_required(VERSION 3.10.2) # Ubuntu 18.04 LTS Default
 
-project(test VERSION 0.0.0 LANGUAGES CXX)
+project(example VERSION 0.0.0 LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 17)
 
-find_package(Boost  REQUIRED)
 find_package(Meevax REQUIRED) # NOTE: case-insensitive
 
-set(MEMCHECK valgrind --error-exitcode=1
-                      --leak-check=full
-                      --quiet
-                      --show-leak-kinds=all)
+add_library(${PROJECT_NAME} SHARED ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.cpp)
 
-macro(define_library LIBRARY_NAME)
-  add_library(${LIBRARY_NAME} SHARED ${CMAKE_CURRENT_SOURCE_DIR}/lib/${LIBRARY_NAME}.cpp)
-  target_link_libraries(${LIBRARY_NAME} PRIVATE Meevax::kernel)
-endmacro()
-
-define_library(example-1)
-
-macro(define_cxx_example TEST_NAME)
-  add_executable(${TEST_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/src/${TEST_NAME}.cpp)
-  target_link_libraries(${TEST_NAME} PRIVATE Boost::boost
-                                     PRIVATE Meevax::kernel)
-  add_test(NAME ${TEST_NAME}
-           WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-           COMMAND ${MEMCHECK} ./${TEST_NAME})
-endmacro()
+target_link_libraries(${PROJECT_NAME} PRIVATE Meevax::kernel)
 
 enable_testing()
 
-define_cxx_example(test-collector)
-define_cxx_example(test-list)
-define_cxx_example(test-r7rs)
-
-macro(define_meevax_example EXAMPLE_NAME)
-  add_test(NAME ${EXAMPLE_NAME}
-           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-           COMMAND ${MEMCHECK} meevax ${EXAMPLE_NAME}.ss)
-endmacro()
-
-define_meevax_example(foreign-function)
+add_test(NAME ${PROJECT_NAME}
+         COMMAND meevax ${PROJECT_NAME}.ss
+         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

example/lib/example-1.cpp example/example.cpp

@@ -4,28 +4,31 @@ using namespace meevax; // NOTE: DIRTY HACK
 
 extern "C"
 {
-  PROCEDURE(length_of_arguments)
+  let length_of_arguments(let const& xs)
   {
     return make<exact_integer>(length(xs));
   }
 
-  PROCEDURE(dummy_procedure)
+  let dummy_procedure(let const& xs)
   {
     std::cout << "\n; calling C++ function via foreign-function-interface." << std::endl;
 
-    std::size_t count { 0 };
+    std::size_t count = 0;
 
     for (let const& each : xs)
     {
       std::cout << "; [" << count++ << "] is " << each << " (C++ typename " << each.type().name() << ")" << std::endl;
     }
 
-    for (let const& each : xs)
+    for (let const& x : xs)
     {
-      if (each.is<exact_integer>())
+      if (x.is<exact_integer>())
       {
         std::cout << "; return incremented left-most integer object." << std::endl;
-        return make<exact_integer>(static_cast<int>(each.as<exact_integer>()) + 1);
+
+        auto value = static_cast<int>(x.as<exact_integer>());
+
+        return make<exact_integer>(++value);
       }
     }
 

example/example.ss

@@ -0,0 +1,11 @@
+(define dummy-procedure (foreign-function "build/libexample.so" "dummy_procedure"))
+
+(check (foreign-function? dummy-procedure) => #t)
+(check (dummy-procedure 'hoge 42 #(1 2 3) 3.14) => 43)
+
+(define length-of-arguments (foreign-function "build/libexample.so" "length_of_arguments"))
+
+(check (foreign-function? length-of-arguments) => #t)
+(check (length-of-arguments 'hoge 42 #(1 2 3) 3.14) => 4)
+
+(exit (check-passed? check:correct))