Merge pull request #350 from yamacir-kit/cleanup

Cleanup

Author: yamacir-kit

.gitignore

@@ -1,3 +1,2 @@
-benchmark/gmon.*
 build
-include/meevax/kernel/version.hpp
+src/kernel/version.cpp

CMakeLists.txt

@@ -52,9 +52,9 @@ else()
   set(${PROJECT_NAME}_BYTE_ORDER "little-endian")
 endif()
 
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/configure/version.hpp)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/version.hpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}/kernel/version.hpp)
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/configure/version.cpp)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/version.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/src/kernel/version.cpp)
 endif()
 
 # ---- Convert Basis-Library Sources to Binary ---------------------------------
@@ -84,8 +84,7 @@ add_library(kernel SHARED "")
 
 add_library(${PROJECT_NAME}::kernel ALIAS kernel)
 
-file(GLOB_RECURSE ${PROJECT_NAME}_KERNEL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*/*.cpp
-                                                 ${CMAKE_CURRENT_SOURCE_DIR}/src/standard.cpp)
+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})

README.md

@@ -100,9 +100,9 @@ sudo rm -rf /usr/local/share/meevax
 
 | Target Name        | Description
 |:-------------------|:--
-| `all` (default)    | Build shared-library `libmeevax.0.3.597.so` and executable `meevax`.
+| `all` (default)    | Build shared-library `libmeevax.0.3.629.so` and executable `meevax`.
 | `test`             | Test executable `meevax`.
-| `package`          | Generate debian package `meevax_0.3.597_amd64.deb`.
+| `package`          | Generate debian package `meevax_0.3.629_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.597
+Meevax Lisp System, version 0.3.629
 
 Usage: meevax [OPTION...] [FILE...]
 

VERSION

@@ -1 +1 @@
-0.3.597
+0.3.629

basis/overture.ss

@@ -32,13 +32,6 @@
     (lambda form
       (transform form (current-evaluator) free-identifier=?))))
 
-(define (null? x) (eqv? x '()))
-
-(define (caar x) (car (car x)))
-(define (cadr x) (car (cdr x)))
-(define (cdar x) (cdr (car x)))
-(define (cddr x) (cdr (cdr x)))
-
 (define (unspecified) (if #f #f))
 
 (define-syntax (cond . clauses)
@@ -149,27 +142,24 @@
 (define-syntax (unless test . body) `(,if (,not ,test) (,begin ,@body))) ; TODO MOVE INTO (scheme base)
 
 (define (map f x . xs) ; map-unorder
-    (define (map-1 f x xs)
-      (if (pair? x)
-          (map-1 f
-                 (cdr x)
-                 (cons (f (car x)) xs))
-          (reverse xs)))
-
-    (define (map-2+ f xs xss)
-      (if (every pair? xs)
-          (map-2+ f
-                  (map-1 cdr xs '())
-                  (cons (apply f (map-1 car xs '())) xss))
-          (reverse xss)))
-
-    (if (null? xs)
-        (map-1  f       x     '())
-        (map-2+ f (cons x xs) '())))
+  (define (map-1 f x xs)
+    (if (pair? x)
+        (map-1 f
+               (cdr x)
+               (cons (f (car x)) xs))
+        (reverse xs)))
+  (define (map-2+ f xs xss)
+    (if (every pair? xs)
+        (map-2+ f
+                (map-1 cdr xs '())
+                (cons (apply f (map-1 car xs '())) xss))
+        (reverse xss)))
+  (if (null? xs)
+      (map-1  f       x     '())
+      (map-2+ f (cons x xs) '())))
 
 (define (apply f x . xs) ; for map
   (define (apply-1 f xs) (f . xs))
-
   (if (null? xs)
       (apply-1 f x)
       ((lambda (rxs)
@@ -185,7 +175,6 @@
         (if (f (car x))
             (every-1 f (cdr x))
             #f)))
-
   (if (null? xs)
       (if (pair? x)
           (every-1 f x)
@@ -202,14 +191,12 @@
            (if result result (any-1 f (cdr x))))
          (f (car x)))
         (f (car x))))
-
   (define (any-2+ f xs)
     (if (every pair? xs)
         ((lambda (result)
            (if result result (any-2+ f (map cdr xs))))
          (apply f (map car xs)))
         #f))
-
   (if (null? xs)
       (if (pair? x)
           (any-1 f x)
@@ -589,6 +576,8 @@
                                                     (windup! %current-dynamic-extents current-dynamic-extents)
                                                     (k1 k2)))))))
 
+(define call/cc call-with-current-continuation)
+
 ; (define values
 ;   (lambda xs
 ;     (call-with-current-continuation
@@ -651,70 +640,34 @@
 (define (call-with-output-file path procedure)
   (call-with-port (open-output-file path) procedure))
 
-(define (standard-input-port? x)
-  (eq? x (standard-input-port)))
-
-(define (standard-output-port? x)
-  (eq? x (standard-output-port)))
-
-(define (standard-error-port? x)
-  (eq? x (standard-error-port)))
-
-(define (standard-port? x)
-  (or (standard-input-port? x)
-      (standard-output-port? x)
-      (standard-error-port? x)))
-
-(define (input-port? x)
-  (or (input-file-port? x)
-      (input-string-port? x)
-      (standard-input-port? x)))
-
-(define (output-port? x)
-  (or (output-file-port? x)
-      (output-string-port? x)
-      (standard-output-port? x)
-      (standard-error-port? x)))
-
 (define (close-port x)
   (cond ((input-port? x) (close-input-port x))
         ((output-port? x) (close-output-port x))
         (else (unspecified))))
 
-(define (close-input-port x)
-  (cond ((input-file-port? x)
-         (close-input-file-port x))
-        (else (unspecified))))
-
-(define (close-output-port x)
-  (cond ((output-file-port? x)
-         (close-output-file-port x))
-        (else (unspecified))))
-
 (define (read        . x) (%read        (if (pair? x) (car x) (current-input-port))))
 (define (read-char   . x) (%read-char   (if (pair? x) (car x) (current-input-port))))
 (define (peek-char   . x) (%peek-char   (if (pair? x) (car x) (current-input-port))))
 (define (char-ready? . x) (%char-ready? (if (pair? x) (car x) (current-input-port))))
 
 (define (write-simple x . port) (%write-simple x (if (pair? port) (car port) (current-output-port))))
-(define (write-char   x . port) (%write-char   x (if (pair? port) (car port) (current-output-port))))
+(define (write-char   x . port) (put-char      x (if (pair? port) (car port) (current-output-port))))
 
 (define write write-simple)
 
 (define (display datum . port)
   (cond ((char?   datum) (apply write-char    datum port))
         ((string? datum) (apply write-string  datum port))
-        ((path?   datum) (apply write-path    datum port))
         (else            (apply write         datum port))))
 
 (define (newline . port)
   (apply write-char #\newline port))
 
 (define (write-string string . xs)
   (case (length xs)
-    ((0)  (%write-string string (current-output-port)))
-    ((1)  (%write-string string (car xs)))
-    (else (%write-string (apply string-copy string (cadr xs)) (car xs)))))
+    ((0)  (put-string string (current-output-port)))
+    ((1)  (put-string string (car xs)))
+    (else (put-string (apply string-copy string (cadr xs)) (car xs)))))
 
 (define (flush-output-port . port)
   (%flush-output-port (if (pair? port)

basis/r7rs.ss

@@ -319,8 +319,6 @@ parameterize ; is defined in srfi-39.ss
 ; TODO string-for-each
 ; TODO vector-for-each
 
-(define call/cc call-with-current-continuation)
-
 ; ---- 6.11. Exceptions --------------------------------------------------------
 
 ; ---- 6.12. Environments and evaluation ---------------------------------------
@@ -331,34 +329,6 @@ parameterize ; is defined in srfi-39.ss
 
 ; ---- 6.13. Input and output --------------------------------------------------
 
-(define (textual-port? x)
-  (or (input-file-port? x)
-      (input-string-port? x)
-      (output-file-port? x)
-      (output-string-port? x)
-      (standard-port? x)))
-
-(define (binary-port? x) #f)
-
-(define (port? x)
-  (or (input-port? x)
-      (output-port? x)))
-
-(define (input-port-open? x)
-  (cond ((input-file-port? x)
-         (input-file-port-open? x))
-        ((input-string-port? x) #t)
-        ((standard-input-port? x) #t)
-        (else #f)))
-
-(define (output-port-open? x)
-  (cond ((output-file-port? x)
-         (output-file-port-open? x))
-        ((output-string-port? x) #t)
-        ((standard-output-port? x) #t)
-        ((standard-error-port? x) #t)
-        (else #f)))
-
 (define current-input-port
   (make-parameter (standard-input-port)
     (lambda (x)
@@ -398,11 +368,6 @@ parameterize ; is defined in srfi-39.ss
 ; TODO open-output-bytevector
 ; TODO get-output-bytevector
 
-(define (write-path path . x)
-  (%write-path path (if (pair? x)
-                        (car x)
-                        (current-output-port))))
-
 ; TODO write-u8
 ; TODO write-bytevector
 
@@ -440,48 +405,13 @@ parameterize ; is defined in srfi-39.ss
             %current-dynamic-extents)
   (apply emergency-exit normally?))
 
-; (dynamic-wind
-;   (lambda () (display "before\n"))
-;   (lambda () (exit))
-;   (lambda () (display "after\n")))
-
 ; TODO get-environment-variable
 ; TODO get-environment-variables
 
 ; TODO current-second
 ; TODO current-jiffy
 ; TODO jiffies-per-second
 
-; ------------------------------------------------------------------------------
-;       ...          =>
-;
-;
-;
-;
-;
-;
-;
-;
-;
-;                         else
-;
-;
-; interaction-environment                            let-syntax
-; letrec-syntax
-;
-;                                            null-environment
-;
-;
-;
-; scheme-report-environment
-;
-;
-;
-;                                  syntax-rules
-;
-;
-; ------------------------------------------------------------------------------
-
 (define interaction-environment
   (let ((e (fork/csc identity)))
     (lambda () e)))

basis/srfi-1.ss

@@ -150,31 +150,31 @@
 ; (define (cdar x) (cdr (car x)))
 ; (define (cddr x) (cdr (cdr x)))
 
-(define (caaar x) (car (car (car x))))
-(define (caadr x) (car (car (cdr x))))
-(define (cadar x) (car (cdr (car x))))
-(define (caddr x) (car (cdr (cdr x))))
-(define (cdaar x) (cdr (car (car x))))
-(define (cdadr x) (cdr (car (cdr x))))
-(define (cddar x) (cdr (cdr (car x))))
-(define (cdddr x) (cdr (cdr (cdr x))))
-
-(define (caaaar x) (car (car (car (car x)))))
-(define (caaadr x) (car (car (car (cdr x)))))
-(define (caadar x) (car (car (cdr (car x)))))
-(define (caaddr x) (car (car (cdr (cdr x)))))
-(define (cadaar x) (car (cdr (car (car x)))))
-(define (cadadr x) (car (cdr (car (cdr x)))))
-(define (caddar x) (car (cdr (cdr (car x)))))
-(define (cadddr x) (car (cdr (cdr (cdr x)))))
-(define (cdaaar x) (cdr (car (car (car x)))))
-(define (cdaadr x) (cdr (car (car (cdr x)))))
-(define (cdadar x) (cdr (car (cdr (car x)))))
-(define (cdaddr x) (cdr (car (cdr (cdr x)))))
-(define (cddaar x) (cdr (cdr (car (car x)))))
-(define (cddadr x) (cdr (cdr (car (cdr x)))))
-(define (cdddar x) (cdr (cdr (cdr (car x)))))
-(define (cddddr x) (cdr (cdr (cdr (cdr x)))))
+; (define (caaar x) (car (car (car x))))
+; (define (caadr x) (car (car (cdr x))))
+; (define (cadar x) (car (cdr (car x))))
+; (define (caddr x) (car (cdr (cdr x))))
+; (define (cdaar x) (cdr (car (car x))))
+; (define (cdadr x) (cdr (car (cdr x))))
+; (define (cddar x) (cdr (cdr (car x))))
+; (define (cdddr x) (cdr (cdr (cdr x))))
+
+; (define (caaaar x) (car (car (car (car x)))))
+; (define (caaadr x) (car (car (car (cdr x)))))
+; (define (caadar x) (car (car (cdr (car x)))))
+; (define (caaddr x) (car (car (cdr (cdr x)))))
+; (define (cadaar x) (car (cdr (car (car x)))))
+; (define (cadadr x) (car (cdr (car (cdr x)))))
+; (define (caddar x) (car (cdr (cdr (car x)))))
+; (define (cadddr x) (car (cdr (cdr (cdr x)))))
+; (define (cdaaar x) (cdr (car (car (car x)))))
+; (define (cdaadr x) (cdr (car (car (cdr x)))))
+; (define (cdadar x) (cdr (car (cdr (car x)))))
+; (define (cdaddr x) (cdr (car (cdr (cdr x)))))
+; (define (cddaar x) (cdr (cdr (car (car x)))))
+; (define (cddadr x) (cdr (cdr (car (cdr x)))))
+; (define (cdddar x) (cdr (cdr (cdr (car x)))))
+; (define (cddddr x) (cdr (cdr (cdr (cdr x)))))
 
 (define (first   x) (car x))
 (define (second  x) (car (cdr x)))