Fix a potential R7RS issue.

I was using the load procedure to load a program, but by a strict
reading of R7RS, load can only handle expressions and definitions, not
imports. So instead I'm defining each test as a library, and using the
environment procedure to load them at runtime.

1 files changed, 69 insertions, 67 deletions

diff --git a/csc/list-test.csc b/csc/list-test.csc
index e16feee..dd5d640 100644
--- a/csc/list-test.csc
+++ b/csc/list-test.csc
@@ -1,121 +1,123 @@
-(import (scheme base)
-        (only (csc testing) assert assert-equal test)
-        (csc list))
+(define-library (csc list-test)
+  (import (scheme base)
+          (only (csc testing) assert assert-equal test)
+          (csc list))
+  (begin
 
 
-(test take-simple
-  (assert-equal '(1 2 3) (take 3 '(1 2 3 4 5))))
+    (test take-simple
+      (assert-equal '(1 2 3) (take 3 '(1 2 3 4 5))))
 
 
-(test take-negative
-  (assert-equal '() (take -5 '(1 2 3))))
+    (test take-negative
+      (assert-equal '() (take -5 '(1 2 3))))
 
 
-(test take-zero
-  (assert-equal '() (take 0 '(1 2 3))))
+    (test take-zero
+      (assert-equal '() (take 0 '(1 2 3))))
 
 
-(test take-short-list
-  (assert-equal '(1 2 3) (take 5 '(1 2 3))))
+    (test take-short-list
+      (assert-equal '(1 2 3) (take 5 '(1 2 3))))
 
 
-(test take-whole-list
-  (assert-equal '(1 2 3) (take 3 '(1 2 3))))
+    (test take-whole-list
+      (assert-equal '(1 2 3) (take 3 '(1 2 3))))
 
 
-(define-syntax values=
-  (syntax-rules ()
-    ((values= x y)
-     (let-values (((x-a x-b) x)
-                  ((y-a y-b) y))
-       (and (equal? x-a y-a) (equal? x-b y-b))))))
+    (define-syntax values=
+      (syntax-rules ()
+        ((values= x y)
+         (let-values (((x-a x-b) x)
+                      ((y-a y-b) y))
+           (and (equal? x-a y-a) (equal? x-b y-b))))))
 
 
-(test split-at-simple
-  (assert (values= (values '(1 2) '(3 4)) (split-at 2 '(1 2 3 4)))))
+    (test split-at-simple
+      (assert (values= (values '(1 2) '(3 4)) (split-at 2 '(1 2 3 4)))))
 
 
-(test split-at-negative
-  (assert (values= (values '() '(1 2 3)) (split-at -5 '(1 2 3)))))
+    (test split-at-negative
+      (assert (values= (values '() '(1 2 3)) (split-at -5 '(1 2 3)))))
 
 
-(test split-at-zero
-  (assert (values= (values '() '(1 2 3)) (split-at 0 '(1 2 3)))))
+    (test split-at-zero
+      (assert (values= (values '() '(1 2 3)) (split-at 0 '(1 2 3)))))
 
 
-(test split-at-short-list
-  (assert (values= (values '(1 2 3) '()) (split-at 5 '(1 2 3)))))
+    (test split-at-short-list
+      (assert (values= (values '(1 2 3) '()) (split-at 5 '(1 2 3)))))
 
 
-(test split-at-whole-list
-  (assert (values= (values '(1 2 3) '()) (split-at 3 '(1 2 3)))))
+    (test split-at-whole-list
+      (assert (values= (values '(1 2 3) '()) (split-at 3 '(1 2 3)))))
 
 
-(test revappend-threes
-  (assert-equal '(1 2 3 4 5 6) (revappend '(3 2 1) '(4 5 6))))
+    (test revappend-threes
+      (assert-equal '(1 2 3 4 5 6) (revappend '(3 2 1) '(4 5 6))))
 
 
-(test revappend-empty-first-list
-  (assert-equal '(1 2 3) (revappend '() '(1 2 3))))
+    (test revappend-empty-first-list
+      (assert-equal '(1 2 3) (revappend '() '(1 2 3))))
 
 
-(test revappend-empty-second-list
-  (assert-equal '(1 2 3) (revappend '(3 2 1) '())))
+    (test revappend-empty-second-list
+      (assert-equal '(1 2 3) (revappend '(3 2 1) '())))
 
 
-(test intercalate-simple
-  (assert-equal '("a" "," "b" "," "c") (intercalate "," '("a" "b" "c"))))
+    (test intercalate-simple
+      (assert-equal '("a" "," "b" "," "c") (intercalate "," '("a" "b" "c"))))
 
 
-(test intercalate-empty
-  (assert-equal '() (intercalate "," '())))
+    (test intercalate-empty
+      (assert-equal '() (intercalate "," '())))
 
 
-(test intercalate-singleton
-  (assert-equal '(1) (intercalate "," '(1))))
+    (test intercalate-singleton
+      (assert-equal '(1) (intercalate "," '(1))))
 
 
-(test enumerate-simple
-  (assert-equal '((0 . a) (1 . b) (2 . c) (3 . d)) (enumerate '(a b c d))))
+    (test enumerate-simple
+      (assert-equal '((0 . a) (1 . b) (2 . c) (3 . d)) (enumerate '(a b c d))))
 
 
-(test enumerate-nil
-  (assert-equal '() (enumerate '())))
+    (test enumerate-nil
+      (assert-equal '() (enumerate '())))
 
 
-(test enumerate-singleton
-  (assert-equal '((0 . "test")) (enumerate '("test"))))
+    (test enumerate-singleton
+      (assert-equal '((0 . "test")) (enumerate '("test"))))
 
 
-(test filter-even
-  (assert-equal '(0 2 4 6 8) (filter even? '(0 1 2 3 4 5 6 7 8 9))))
+    (test filter-even
+      (assert-equal '(0 2 4 6 8) (filter even? '(0 1 2 3 4 5 6 7 8 9))))
 
 
-(test filter-odd
-  (assert-equal '(1 3 5 7 9) (filter odd? '(0 1 2 3 4 5 6 7 8 9))))
+    (test filter-odd
+      (assert-equal '(1 3 5 7 9) (filter odd? '(0 1 2 3 4 5 6 7 8 9))))
 
 
-(test unzip-empty
-  (assert (values= (values '() '()) (unzip '()))))
+    (test unzip-empty
+      (assert (values= (values '() '()) (unzip '()))))
 
 
-(test unzip-simple
-  (assert (values= (values '(1 2 3) '(4 5 6)) (unzip '((1 . 4) (2 . 5) (3 . 6))))))
+    (test unzip-simple
+      (assert (values= (values '(1 2 3) '(4 5 6)) (unzip '((1 . 4) (2 . 5) (3 . 6))))))
 
 
-(test all-even
-  (assert-equal
-    #t
-    (all (lambda (x) (= 0 (remainder x 2))) '(2 12 8))))
+    (test all-even
+      (assert-equal
+        #t
+        (all (lambda (x) (= 0 (remainder x 2))) '(2 12 8))))
 
 
-(test some-odd
-  (assert-equal
-    #f
-    (all (lambda (x) (= 0 (remainder x 2))) '(2 13 8))))
+    (test some-odd
+      (assert-equal
+        #f
+        (all (lambda (x) (= 0 (remainder x 2))) '(2 13 8))))
 
 
-(test all-equal
-  (assert-equal
-    #t
-    (all = '(1 2 3) '(1 2 3))))
+    (test all-equal
+      (assert-equal
+        #t
+        (all = '(1 2 3) '(1 2 3))))))