Update procedure procedure? to built-in

Signed-off-by: yamacir-kit <[email protected]>

README.md

@@ -99,7 +99,7 @@ Procedures for each standard are provided by the following R7RS-style libraries:
 cmake -B build -DCMAKE_BUILD_TYPE=Release
 cd build
 make package
-sudo apt install build/meevax_0.5.4_amd64.deb
+sudo apt install build/meevax_0.5.5_amd64.deb
 ```
 
 or
@@ -131,9 +131,9 @@ sudo rm -rf /usr/local/share/meevax
 
 | Target Name | Description
 |-------------|-------------
-| `all`       | Build shared-library `libmeevax.0.5.4.so` and executable `meevax`
+| `all`       | Build shared-library `libmeevax.0.5.5.so` and executable `meevax`
 | `test`      | Test executable `meevax`
-| `package`   | Generate debian package `meevax_0.5.4_amd64.deb`
+| `package`   | Generate debian package `meevax_0.5.5_amd64.deb`
 | `install`   | Copy files into `/usr/local` directly
 
 ## Usage

VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

basis/r4rs.ss

@@ -37,11 +37,11 @@
 (define-library (scheme r4rs)
   (import (only (meevax boolean) boolean? not)
           (meevax character)
-          (meevax core)
+          (only (meevax core) begin define define-syntax if lambda letrec quote set!)
           (only (meevax comparator) eq? eqv? equal?)
-          (meevax continuation)
-          (prefix (meevax environment) %)
-          (meevax function)
+          (only (meevax continuation) call-with-current-continuation)
+          (prefix (only (meevax environment) load) %)
+          (only (meevax function) procedure?)
           (meevax inexact)
           (meevax list)
           (only (meevax macro-transformer) er-macro-transformer identifier?)
@@ -549,11 +549,6 @@
                    (begin (string-set! s k c)
                           (rec (- k 1)))))))
 
-         (define (procedure? x)
-           (or (closure? x)
-               (continuation? x)
-               (foreign-function? x)))
-
          (define (for-each f x . xs) ; Chibi-Scheme
            (if (null? xs)
                (letrec ((for-each (lambda (f x)

example/example.ss

@@ -1,4 +1,4 @@
-(import (meevax function)
+(import (only (meevax function) foreign-function? foreign-function)
         (scheme base)
         (scheme process-context)
         (scheme write)

src/kernel/boot.cpp

@@ -315,6 +315,12 @@ inline namespace kernel
 
     define<library>("(meevax function)", [](library & library)
     {
+      library.define<predicate>("procedure?", [](let const& xs)
+      {
+        let const& x = xs[0];
+        return x.is<closure>() or x.is<continuation>() or x.is_also<procedure>();
+      });
+
       library.define<predicate>("closure?", [](let const& xs)
       {
         return xs[0].is<closure>();
@@ -325,14 +331,14 @@ inline namespace kernel
         return xs[0].is<continuation>();
       });
 
-      library.define<function>("foreign-function", [](let const& xs)
+      library.define<predicate>("foreign-function?", [](let const& xs)
       {
-        return make<function>(xs[1].as<string>(), xs[0].as<string>());
+        return xs[0].is_also<procedure>();
       });
 
-      library.define<predicate>("foreign-function?", [](let const& xs)
+      library.define<function>("foreign-function", [](let const& xs)
       {
-        return xs[0].is_also<procedure>();
+        return make<function>(xs[1].as<string>(), xs[0].as<string>());
       });
     });