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, 21 insertions, 19 deletions

diff --git a/csc/vec-test.csc b/csc/vec-test.csc
index 8a19b3e..761b259 100644
--- a/csc/vec-test.csc
+++ b/csc/vec-test.csc
@@ -1,33 +1,35 @@
-(import (scheme base)
-        (only (csc testing)
-          assert-equal
-          test)
-        (csc vec))
+(define-library (csc vec-test)
+  (import (scheme base)
+          (only (csc testing)
+            assert-equal
+            test)
+          (csc vec))
+  (begin
 
 
-(test vec-empty
-  (assert-equal '() (vec->list (vec))))
+    (test vec-empty
+      (assert-equal '() (vec->list (vec))))
 
 
-(test vec-singleton
-  (assert-equal '(1) (vec->list (vec 1))))
+    (test vec-singleton
+      (assert-equal '(1) (vec->list (vec 1))))
 
 
-(test vec-append-to-empty
-  (assert-equal '(1) (vec->list (vec-append (vec) 1))))
+    (test vec-append-to-empty
+      (assert-equal '(1) (vec->list (vec-append (vec) 1))))
 
 
-(test vec-append-to-singleton
-  (assert-equal '(1 2) (vec->list (vec-append (vec 1) 2))))
+    (test vec-append-to-singleton
+      (assert-equal '(1 2) (vec->list (vec-append (vec 1) 2))))
 
 
-(test vec-append-to-2-elem
-  (assert-equal '(1 2 3) (vec->list (vec-append (vec 1 2) 3))))
+    (test vec-append-to-2-elem
+      (assert-equal '(1 2 3) (vec->list (vec-append (vec 1 2) 3))))
 
 
-(test vec-ref-1
-  (assert-equal 2 (vec-ref (vec 1 2) 1)))
+    (test vec-ref-1
+      (assert-equal 2 (vec-ref (vec 1 2) 1)))
 
 
-(test vec-ref-singleton
-  (assert-equal 1 (vec-ref (vec 1) 0)))
+    (test vec-ref-singleton
+      (assert-equal 1 (vec-ref (vec 1) 0)))))