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, 25 insertions, 23 deletions

diff --git a/csc/sort-test.csc b/csc/sort-test.csc
index dec2a53..9c91d4a 100644
--- a/csc/sort-test.csc
+++ b/csc/sort-test.csc
@@ -1,35 +1,37 @@
-(import (scheme base)
-        (only (csc testing)
-          assert-equal
-          test)
-        (csc sort))
+(define-library (csc sort-test)
+  (import (scheme base)
+          (only (csc testing)
+            assert-equal
+            test)
+          (csc sort))
+  (begin
 
 
-(test sort-ten-elem
-  (assert-equal
-    '(-2 0 2 3 4 4 5 6 9 100)
-    (sort < '(9 4 5 100 3 2 4 6 0 -2))))
+    (test sort-ten-elem
+      (assert-equal
+        '(-2 0 2 3 4 4 5 6 9 100)
+        (sort < '(9 4 5 100 3 2 4 6 0 -2))))
 
 
-(test sort-empty
-  (assert-equal '() (sort < '())))
+    (test sort-empty
+      (assert-equal '() (sort < '())))
 
 
-(test sort-singleton
-  (assert-equal '(1) (sort < '(1))))
+    (test sort-singleton
+      (assert-equal '(1) (sort < '(1))))
 
 
-(test sort-two
-  (assert-equal '(1 2) (sort < '(2 1))))
+    (test sort-two
+      (assert-equal '(1 2) (sort < '(2 1))))
 
 
-(test sort-reversed
-  (assert-equal
-    '(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20)
-    (sort < '(20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1))))
+    (test sort-reversed
+      (assert-equal
+        '(1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20)
+        (sort < '(20 19 18 17 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1))))
 
 
-(test sort-already-sorted
-  (assert-equal
-    '(1 2 3 4 5 6 7 8 9 10)
-    (sort < '(1 2 3 4 5 6 7 8 9 10))))
+    (test sort-already-sorted
+      (assert-equal
+        '(1 2 3 4 5 6 7 8 9 10)
+        (sort < '(1 2 3 4 5 6 7 8 9 10))))))