Makefile

@@ -1,4 +1,3 @@
-.SILENT: test-r6rs test-r6rs-docker test-r7rs test-r7rs-docker
 PREFIX=/usr/local
 SCHEME=chibi
 VERSION=1.0.0
@@ -101,14 +100,26 @@ test-r6rs:
 	rm -rf ${R6RSTMP}
 	mkdir -p ${R6RSTMP}
 	cp -r r6rs-testfiles/* ${R6RSTMP}/
-	cd ${R6RSTMP} && COMPILE_R7RS=${SCHEME} compile-scheme -I ./libs -o main --debug main.sps
+	cd ${R6RSTMP} && COMPILE_R7RS=${SCHEME} compile-scheme -I ./libs -o main main.sps
 	cd ${R6RSTMP} && ./main 1 2 3 > test-result.txt
 	@grep "Test successfull (\"1\" \"2\" \"3\")" ${R6RSTMP}/test-result.txt || (echo "Test failed, output: " && cat ${R6RSTMP}/test-result.txt && exit 1)
 
 test-r6rs-docker:
-	docker build -f Dockerfile.test --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=${DOCKERTAG} --quiet . > /dev/null
+	docker build -f Dockerfile.test --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=${DOCKERTAG} .
 	docker run -v "${PWD}":/workdir -w /workdir -t ${DOCKERTAG} sh -c "make SCHEME=${SCHEME} test-r6rs"
 
+test-r6rs-php:
+	rm -rf ${R6RSTMP}
+	mkdir -p ${R6RSTMP}
+	cp -r r6rs-php-testfiles/* ${R6RSTMP}/
+	cd ${R6RSTMP} && COMPILE_R7RS=${SCHEME} compile-scheme -t php -o main.php main.sps
+	-cd ${R6RSTMP} && php main.php > test-result.txt 2>&1
+	@grep "Test successfull" ${R6RSTMP}/test-result.txt || (echo "Test failed, output: " && cat ${R6RSTMP}/test-result.txt && exit 1)
+
+test-r6rs-php-docker:
+	docker build -f Dockerfile.test --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=${DOCKERTAG} .
+	docker run -v "${PWD}":/workdir -w /workdir -t ${DOCKERTAG} sh -c "make SCHEME=${SCHEME} test-r6rs-php"
+
 test-r7rs:
 	rm -rf ${R7RSTMP}
 	mkdir -p ${R7RSTMP}
@@ -118,7 +129,7 @@ test-r7rs:
 	@grep "Test successfull (\"1\" \"2\" \"3\")" ${R7RSTMP}/test-result.txt || (echo "Test failed, output: " && cat ${R7RSTMP}/test-result.txt && exit 1)
 
 test-r7rs-docker:
-	docker build -f Dockerfile.test --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=${DOCKERTAG} --quiet . > /dev/null
+	docker build -f Dockerfile.test --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=${DOCKERTAG} .
 	docker run -v "${PWD}":/workdir -w /workdir -t ${DOCKERTAG} sh -c "make SCHEME=${SCHEME} test-r7rs"
 
 test-r7rs-wine:
@@ -130,8 +141,20 @@ test-r7rs-wine:
 	@grep "Test successfull (\"1\" \"2\" \"3\")" ${R7RSTMP}/test-result.txt || (echo "Test failed, output: " && cat ${R7RSTMP}/test-result.txt && exit 1)
 
 test-r7rs-wine-docker:
-	docker build -f Dockerfile.test --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=${DOCKERTAG} --quiet . > /dev/null
+	docker build -f Dockerfile.test --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=${DOCKERTAG} .
 	docker run -v "${PWD}":/workdir -w /workdir -t ${DOCKERTAG} sh -c "make SCHEME=${SCHEME} test-r7rs-wine"
 
+test-r7rs-php:
+	rm -rf ${R7RSTMP}
+	mkdir -p ${R7RSTMP}
+	cp -r r7rs-php-testfiles/* ${R7RSTMP}/
+	cd ${R7RSTMP} && COMPILE_R7RS=${SCHEME} COMPILE_R7RS_TARGET=php compile-scheme -o main.php main.scm
+	-cd ${R7RSTMP} && php main.php > test-result.txt 2>&1
+	@grep "Test successfull" ${R7RSTMP}/test-result.txt || (echo "Test failed, output: " && cat ${R7RSTMP}/test-result.txt && exit 1)
+
+test-r7rs-php-docker:
+	docker build -f Dockerfile.test --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=${DOCKERTAG} .
+	docker run -v "${PWD}":/workdir -w /workdir -t ${DOCKERTAG} sh -c "make SCHEME=${SCHEME} test-r7rs-php"
+
 clean:
 	git clean -X -f

README.md

@@ -53,8 +53,12 @@ OPTIONS
 
        --list-r6rs List supported R6RS implementations.
 
+       --list-r6rs-except List supported R6RS implementations, except ones given.
+
        --list-r7rs List supported R7RS implementations.
 
+       --list-r7rs-except List supported R7RS implementations, except ones given.
+
        --list-all List all supported implementations.
 
        --version Show the software version.
@@ -87,29 +91,29 @@ CAVEATS
 EXAMPLES
        Compile R6RS file with all dependencies in the same directory.
 
-              COMPILE_SCHEME=SCHEME compile-scheme main.sps
+              COMPILE_SCHEME=<SCHEME> compile-scheme main.sps
 
        Compile R7RS file with all dependencies in the same directory.
 
-              COMPILE_SCHEME=SCHEME compile-scheme main.scm
+              COMPILE_SCHEME=<SCHEME> compile-scheme main.scm
 
        Compile R6RS file with dependencies in libs directory.
 
-              COMPILE_SCHEME=SCHEME compile-scheme -I ./libs main.sps
+              COMPILE_SCHEME=<SCHEME> compile-scheme -I ./libs main.sps
 
        Compile R7RS file with dependencies in libs directory.
 
-              COMPILE_SCHEME=SCHEME compile-scheme -I ./libs main.scm
+              COMPILE_SCHEME=<SCHEME> compile-scheme -I ./libs main.scm
 
        Compile R6RS file with dependencies in libs directory, to  output  named
        foo.
 
-              COMPILE_SCHEME=SCHEME compile-scheme -I ./libs -o foo main.sps
+              COMPILE_SCHEME=<SCHEME> compile-scheme -I ./libs -o foo main.sps
 
        Compile  R7RS  file with dependencies in libs directory, to output named
        foo.
 
-              COMPILE_SCHEME=SCHEME compile-scheme -I ./libs -o foo main.scm
+              COMPILE_SCHEME=<SCHEME> compile-scheme -I ./libs -o foo main.scm
 
                                                               compile-scheme(1)
 </pre>

compile-scheme.scm

@@ -8,11 +8,7 @@
         (libs library-util)
         (srfi 170))
 
-(define debug?
+(define debug? (if (member "--debug" (command-line)) #t #f))
-  (if (or (member "--debug" (command-line))
-          (get-environment-variable "SCHEME_COMPILE_DEBUG"))
-    #t
-    #f))
 
 (when (member "--help" (command-line))
   (display "For help see: man compile-scheme")
@@ -71,12 +67,10 @@
     ((get-environment-variable "COMPILE_SCHEME")
      (string->symbol (get-environment-variable "COMPILE_SCHEME")))
     (else #f)))
-
 (when (not scheme)
   (display "Either environment variable COMPILE_R7RS or COMPILE_SCHEME is not set." (current-error-port))
   (newline (current-error-port))
   (exit 1))
-
 (when (not (assoc scheme data)) (error "Unsupported implementation" scheme))
 
 (define input-file
@@ -169,14 +163,42 @@
   (newline)
   (exit 0))
 
-(define library-files
+#;(define search-library-files
-  (library-dependencies scheme
+  (lambda (directory)
-                        (append prepend-directories append-directories)
+    (let ((result (list)))
-                        (if input-file
+      (for-each
-                          input-file
+        (lambda (file)
-                          single-library-input-file)
+          (let* ((path (string-append directory "/" file))
-                        (list)
+                 (info (file-info path #f)))
-                        (list)))
+            (when (and (not r6rs?)
+                       (string-ends-with? path ".sld"))
+              (set! result (append result (list path))))
+            (when (and r6rs?
+                       (string-ends-with? path ".sls"))
+              (set! result (append result (list path))))
+            (if (file-info-directory? info)
+              (set! result (append result (search-library-files path))))))
+        (directory-files directory))
+      result)))
+
+#;(define library-files
+  (cond (single-library-input-file (list single-library-input-file))
+        (else
+          (apply append
+                 (map
+                   (lambda (directory)
+                     (if (file-exists? directory)
+                       (search-library-files directory)
+                       (list)))
+                   (append prepend-directories append-directories))))))
+
+(define library-files (library-dependencies scheme
+                               (append prepend-directories append-directories)
+                               (if input-file
+                                 input-file
+                                 single-library-input-file)
+                               (list)
+                               (list)))
 
 (define scheme-command
   (apply (cdr (assoc 'command (cdr (assoc scheme data))))
@@ -198,11 +220,22 @@
            r6rs?
            compilation-target)))
 
+(when debug?
+  (display "[debug] scheme-command: ")
+  (write scheme-command)
+  (newline))
+
 (define scheme-library-command
   (lambda (library-file)
     (apply (cdr (assoc 'library-command (cdr (assoc scheme data))))
       (list library-file prepend-directories append-directories r6rs?))))
 
+(when debug?
+  (display "[debug] scheme-library-command: ")
+  (write scheme-library-command)
+  (newline))
+
+
 (define list-of-features
   (letrec ((looper (lambda (rest result)
                      (if (null? rest)
@@ -216,25 +249,16 @@
 
 (when (not (null? library-files))
   (when (assoc 'library-command (cdr (assoc scheme data)))
-    (for-each
+         (for-each
-      (lambda (file)
+           (lambda (file)
-        (let* ((library-command (scheme-library-command file)))
+             (let* ((library-command (scheme-library-command file)))
-          (when debug?
+               (for-each
-            (display "[DEBUG] library-command: ")
+                 (lambda (command)
-            (write library-command)
+                   (let ((exit-code (system command)))
-            (newline))
+                     (when (not (= exit-code 0))
-          (for-each
+                       (exit exit-code))))
-            (lambda (command)
+                 library-command)))
-              (let ((exit-code (system command)))
+           library-files)))
-                (when (not (= exit-code 0))
-                  (exit exit-code))))
-            library-command)))
-      library-files)))
-
-(when debug?
-  (display "[DEBUG] scheme-command: ")
-  (write scheme-command)
-  (newline))
 
 (when (and (equal? scheme-type 'interpreter) input-file)
   (when (and output-file (file-exists? output-file))
@@ -274,3 +298,4 @@
         (when (not (= exit-code 0))
           (exit exit-code))))
     scheme-command))
+

doc/compile-scheme.1

@@ -102,24 +102,24 @@ Only supports one input-file.
 .P
 Compile R6RS file with all dependencies in the same directory.
 .IP
-COMPILE_SCHEME=SCHEME compile-scheme main.sps
+COMPILE_SCHEME=<SCHEME> compile-scheme main.sps
 .P
 Compile R7RS file with all dependencies in the same directory.
 .IP
-COMPILE_SCHEME=SCHEME compile-scheme main.scm
+COMPILE_SCHEME=<SCHEME> compile-scheme main.scm
 .P
 Compile R6RS file with dependencies in libs directory.
 .IP
-COMPILE_SCHEME=SCHEME compile-scheme -I ./libs main.sps
+COMPILE_SCHEME=<SCHEME> compile-scheme -I ./libs main.sps
 .P
 Compile R7RS file with dependencies in libs directory.
 .IP
-COMPILE_SCHEME=SCHEME compile-scheme -I ./libs main.scm
+COMPILE_SCHEME=<SCHEME> compile-scheme -I ./libs main.scm
 .P
 Compile R6RS file with dependencies in libs directory, to output named foo.
 .IP
-COMPILE_SCHEME=SCHEME compile-scheme -I ./libs -o foo main.sps
+COMPILE_SCHEME=<SCHEME> compile-scheme -I ./libs -o foo main.sps
 .P
 Compile R7RS file with dependencies in libs directory, to output named foo.
 .IP
-COMPILE_SCHEME=SCHEME compile-scheme -I ./libs -o foo main.scm
+COMPILE_SCHEME=<SCHEME> compile-scheme -I ./libs -o foo main.scm

libs/util.sld

@@ -16,6 +16,8 @@
               (scheme process-context)
               (foreign c))))
   (export system
+          echo
+          cat
           r6rs-schemes
           r7rs-schemes
           all-schemes
@@ -51,6 +53,9 @@
         (define-c-procedure c-system c-stdlib 'system 'int '(pointer))
         (define (system cmd)
           (c-system (string->c-utf8 cmd)))))
+
+    (define (echo text) (display text) (newline))
+    (define (cat path) (for-each (lambda (line) (echo line)) (file->list path)))
     (define r6rs-schemes '(capyscheme
                             chezscheme
                             guile