add depends; custom alist-delete; fix srfi-126 based impl

1 files changed, 22 insertions, 20 deletions

diff --git a/dictionaries-test.scm b/dictionaries-test.scm
index 309c97e..099229b 100644
--- a/dictionaries-test.scm
+++ b/dictionaries-test.scm
@@ -3,16 +3,32 @@
         (srfi 1))
 
 (cond-expand
+  (kawa (import (srfi 69 basic-hash-tables)))
+  ((library (srfi 125))
+   (import (srfi 125)))
+  ((library (srfi 69))
+   (import (srfi 69)))
+  (else))
+
+(cond-expand
+  ((library (srfi 126))
+   (import (srfi 126)))
+  (else))
+
+(cond-expand
   ((library (srfi 64)) 
    (import (srfi 64)))
   (chibi 
-    (begin
-      (import (except (chibi test) test-equal))
-      (define-syntax test-equal
-        (syntax-rules ()
-          ((_ args ...) (test args ...))))))
+    (import (except (chibi test) test-equal)))
   (else (error "No testing framework")))
 
+(cond-expand
+  (chibi
+    (define-syntax test-equal
+        (syntax-rules ()
+          ((_ args ...) (test args ...)))))
+  (else))
+
 ; use include instead of import
 ; so that registering is done in isolated way
 (include "indexes.scm")
@@ -22,19 +38,6 @@
 (define (clear-registry!)
   (set! registry '()))
 
-(cond-expand
-  (kawa (import (srfi 69 basic-hash-tables)))
-  ((library (srfi 125))
-   (import (srfi 125)))
-  ((library (srfi 69))
-   (import (srfi 69)))
-  (else))
-
-(cond-expand
-  ((library (srfi 126))
-   (import (srfi 126)))
-  (else))
-
 (define (do-test alist->dict)
 
   (test-group
@@ -397,8 +400,7 @@
                   alist)))))
 
 (cond-expand
-  ((or kawa
-       (library (srfi 69))
+  ((or (library (srfi 69))
        (library (srfi 125)))
    (test-group
      "srfi-69"