package for chicken1.0.0

2 files changed, 20 insertions, 63 deletions

diff --git a/srfi/225.sld b/srfi/225.sld
index 4b6f021..0c36a33 100644
--- a/srfi/225.sld
+++ b/srfi/225.sld
@@ -1,57 +1,18 @@
 (define-library
-  (srfi 225)
-
+    (srfi 225)
   (import
-    (scheme base)
-    (srfi 1)
-    (srfi 128)
-    (srfi 225 core)
-    (srfi 225 default-impl)
-    (srfi 225 indexes))
-
+   (scheme base)
+   (srfi 1)
+   (srfi 128)
+   (srfi 225 core)
+   (srfi 225 default-impl)
+   (srfi 225 indexes)
+   (srfi 225 alist-impl)
+   (srfi 225 srfi-69-impl)
+   (srfi 225 srfi-146-impl)
+   (srfi 225 srfi-146-hash-impl))
   (include-library-declarations "225/core-exports.scm")
   (include-library-declarations "225/indexes-exports.scm")
-  (export make-dto)
-
-  ;; common implementations
-  (import (srfi 225 alist-impl))
-  (export
-    make-alist-dto
-    eqv-alist-dto
-    equal-alist-dto)
-
-  ;; library-dependent DTO exports
-  ;; and implementations
-  ;;
-  ;;srfi-69-dto
-  ;;hash-table-dto
-  ;;srfi-126-dto
-  ;;mapping-dto
-  ;;hash-mapping-dto
-
-  (cond-expand
-    ((library (srfi 69))
-     (import (srfi 225 srfi-69-impl))
-     (export srfi-69-dto))
-    (else))
-
-  (cond-expand
-    ((library (srfi 125))
-     (import (srfi 225 srfi-125-impl))
-     (export hash-table-dto))
-    (else))
-
-  (cond-expand
-    ((library (srfi 126))
-     (import (srfi 225 srfi-126-impl))
-     (export srfi-126-dto))
-    (else))
-
-  (cond-expand
-    ((and (library (srfi 146))
-          (library (srfi 146 hash)))
-     (import (srfi 225 srfi-146-impl)
-             (srfi 225 srfi-146-hash-impl))
-     (export mapping-dto
-             hash-mapping-dto))
-    (else)))
+  (export make-dto srfi-69-dto
+          make-alist-dto eqv-alist-dto equal-alist-dto
+          mapping-dto hash-mapping-dto))
diff --git a/srfi/225/core.sld b/srfi/225/core.sld
index 573464d..b594eb6 100644
--- a/srfi/225/core.sld
+++ b/srfi/225/core.sld
@@ -1,18 +1,14 @@
 (define-library
-  (srfi 225 core)
-
+    (srfi 225 core)
   (import (scheme base)
           (scheme case-lambda)
           (srfi 1)
           (srfi 128)
-          (srfi 225 indexes))
-  (cond-expand
-    ((library (srfi 145)) (import (srfi 145)))
-    (else (include "assumptions.scm")))
-
-  (include "core-impl.scm")
-  (include-library-declarations "core-exports.scm")
+          (srfi 225 indexes)
+          (srfi 145))
   (export make-dto-private
           make-modified-dto
           procvec
-          dict-procedures-count))
+          dict-procedures-count)
+  (include-library-declarations "core-exports.scm")
+  (include "core-impl.scm"))