Backup

Makefile

@@ -50,10 +50,10 @@ test-r7rs:
 	mkdir -p ${R7RSTMP}/libs
 	mkdir -p ${R7RSTMP}/libs/foo
 	mkdir -p ${R7RSTMP}/libs/hello
-	echo "(import (scheme base) (foo bar) (hello world) (srfi 9001)) (baz) (hello-word) (over-9000)" > ${R7RSTMP}/main.scm
+	echo "(import (scheme base) (foo bar) (hello world) (srfi 9001)) (baz) (hello-world) (over-9000)" > ${R7RSTMP}/main.scm
 	echo "(define baz (lambda () (display \"Test successfull\") (newline)))" > ${R7RSTMP}/libs/foo/bar.scm
 	echo "(define-library (foo bar) (import (scheme base) (scheme write) (hello world)) (export baz) (include \"bar.scm\"))" > ${R7RSTMP}/libs/foo/bar.sld
-	echo "(define hello-world (lambda ()  (+ 1 1)))" > ${R7RSTMP}/libs/hello/world.scm
+	echo "(define hello-world (lambda () (+ 1 1)))" > ${R7RSTMP}/libs/hello/world.scm
 	echo "(define-library (hello world) (import (scheme base) (scheme write)) (export hello-world) (include \"world.scm\"))" > ${R7RSTMP}/libs/hello/world.sld
 	mkdir -p ${R7RSTMP}/libs/srfi
 	echo "(define over-9000 (lambda () (+ 1 1)))" > ${R7RSTMP}/libs/srfi/9001.scm

compile-r7rs.scm

@@ -3,6 +3,7 @@
         (scheme read)
         (scheme write)
         (scheme process-context)
+	(scheme cxr)
         (foreign c)
         (libs util)
         (libs data)

libs/library-util.scm

@@ -13,14 +13,15 @@
     (if (null? dependencies)
       result
       (flatten-dependencies (append result
-                                    (list
+				    (list
-                                      (if (or (equal? (car (car dependencies)) 'only)
+				      (if (or (equal? (car (car dependencies)) 'only)
-                                              (equal? (car (car dependencies)) 'except)
+					      (equal? (car (car dependencies)) 'except)
-                                              (equal? (car (car dependencies)) 'prefix)
+					      (equal? (car (car dependencies)) 'prefix)
-                                              (equal? (car (car dependencies)) 'rename))
+					      (equal? (car (car dependencies)) 'rename))
-                                        (car (cdr (car dependencies)))
+					(car (cdr (car dependencies)))
-                                        (car dependencies))))
+					(car dependencies))))
-                            (cdr dependencies)))))
+			    (cdr dependencies)))))
+
 
 (define library-name->path
   (lambda (name)

libs/library-util.sld

@@ -4,6 +4,8 @@
           (scheme read)
           (scheme write)
           (scheme file)
+	  (scheme cxr)
+	  (scheme process-context)
           (libs util))
   (export library-dependencies)
   (include "library-util.scm"))