update spec; fix default copy

4 files changed, 56 insertions, 22 deletions

diff --git a/srfi-225.html b/srfi-225.html
index e4bbca2..9d5736f 100644
--- a/srfi-225.html
+++ b/srfi-225.html
@@ -282,22 +282,32 @@ in the sample implementation; the procedures referred to are also in
 that file.<p>
 <blockquote><pre>
   (make-dtd
-    make-dictionary-index '()
-    dictionary?-index plist?
-    dict-search-index plist-search
-    dict-search!-index plist-search!
-    dict-size-index plist-size
-    dict-for-each-index plist-foreach
-    dict->alist-index plist->alist)) =&gt; a DTD for plists
+     make-dictionary-index make-plist
+     dictionary?-index plist?
+     dict-map-index plist-map
+     dict-map!-index plist-map!
+     dict-filter-index plist-filter
+     dict-filter!-index plist-filter!
+     dict-search-index plist-search
+     dict-search!-index plist-search!
+     dict-copy-index plist-copy
+     dict-size-index plist-size
+     dict-for-each-index plist-foreach
+     dict-comparator-index plist-comparator)) =&gt; a DTD for plists
 
   (dtd
-    (make-dictionary-index '())
-    (dictionary?-index plist?)
-    (dict-search-index plist-search)
-    (dict-search!-index plist-search!)
-    (dict-size-index plist-size)
-    (dict-for-each-index plist-foreach)
-    (dict->alist-index plist->alist)) =&gt; a DTD for plists
+     (make-dictionary-index make-plist)
+     (dictionary?-index plist?)
+     (dict-map-index plist-map)
+     (dict-map!-index plist-map!)
+     (dict-filter-index plist-filter)
+     (dict-filter!-index plist-filter!)
+     (dict-search-index plist-search)
+     (dict-search!-index plist-search!)
+     (dict-copy-index plist-copy)
+     (dict-size-index plist-size)
+     (dict-for-each-index plist-foreach)
+     (dict-comparator-index plist-comparator)) =&gt; a DTD for plists
 </pre></blockquote>
 <p><code>(make-modified-dtd</code>&nbsp;<em>dtd obj</em> ...<code>)</code></p>
 <p>Returns a DTD that is equivalent to <em>dtd</em>
@@ -381,18 +391,33 @@ new dictionary types that may not have complete dictionary APIs:</p>
 <ul>
 <li><code>dict-empty?</code> depends on <code>dict-size</code></li>
 <li><code>dict-contains?</code> depends on <code>dict-ref</code></li>
-<li><code>dict-ref</code> depends on <code>dict-search!</code></li>
+<li><code>dict-ref</code> depends on <code>dict-search</code></li>
 <li><code>dict-ref/default</code> depends on <code>dict-ref</code></li>
 <li><code>dict-set!</code> depends on <code>dict-search!</code></li>
+<li><code>dict-set</code> depends on <code>dict-search</code></li>
 <li><code>dict-adjoin!</code> depends on <code>dict-search!</code></li>
+<li><code>dict-adjoin</code> depends on <code>dict-search</code></li>
 <li><code>dict-delete!</code> depends on <code>dict-delete-all!</code></li>
+<li><code>dict-delete</code> depends on <code>dict-delete-all</code></li>
 <li><code>dict-delete-all!</code> depends on <code>dict-search!</code></li>
+<li><code>dict-delete-all</code> depends on <code>dict-search</code></li>
 <li><code>dict-replace!</code> depends on <code>dict-search!</code></li>
+<li><code>dict-replace</code> depends on <code>dict-search</code></li>
 <li><code>dict-intern!</code> depends on <code>dict-search!</code></li>
+<li><code>dict-intern</code> depends on <code>dict-search</code></li>
 <li><code>dict-update!</code> depends on <code>dict-search!</code></li>
+<li><code>dict-update</code> depends on <code>dict-search</code></li>
 <li><code>dict-update/default!</code> depends on <code>dict-update!</code></li>
+<li><code>dict-update/default</code> depends on <code>dict-update</code></li>
 <li><code>dict-pop!</code> depends on <code>dict-for-each</code>, <code>dict-delete!</code>, <code>dict-empty?</code></li>
+<li><code>dict-pop</code> depends on <code>dict-for-each</code>, <code>dict-delete</code>, <code>dict-empty?</code></li>
+<li><code>dict-map</code> depends on <code>dict-keys</code> and <code>dict-repalce</code></li>
+<li><code>dict-map!</code> depends on <code>dict-keys</code> and <code>dict-repalce!</code></li>
+<li><code>dict-filter</code> depends on <code>dict-keys</code>, <code>dict-ref</code> and <code>dict-delete-all</code></li>
+<li><code>dict-filter!</code> depends on <code>dict-keys</code>, <code>dict-ref</code> and <code>dict-delete-all!</code></li>
 <li><code>dict-remove!</code> depends on <code>dict-filter!</code></li>
+<li><code>dict-remove</code> depends on <code>dict-filter</code></li>
+<li><code>dict-copy</code> depends on <code>make-dictionary</code>, <code>dict-comparator</code>, <code>dict-for-each</code> and <code>dict-set!</code></li>
 <li><code>dict-count</code> depends on <code>dict-fold</code></li>
 <li><code>dict-any</code> depends on <code>dict-for-each</code></li>
 <li><code>dict-every</code> depends on <code>dict-for-each</code></li>
diff --git a/srfi/alist-impl.scm b/srfi/alist-impl.scm
index 4463d1c..e64dc97 100644
--- a/srfi/alist-impl.scm
+++ b/srfi/alist-impl.scm
@@ -96,8 +96,14 @@
       (proc (car e) (cdr e)))
     (for-each proc* alist))
 
+  (define (alist-copy dtd alist)
+    (map
+     (lambda (e)
+       (cons (car e) (cdr e)))
+     alist))
+
   (define (alist->alist dtd alist)
-    alist)
+    (alist-copy dtd alist))
 
   (define (alist-comparator dtd dictionary)
     (make-comparator (lambda args #t)
@@ -117,7 +123,8 @@
    dict-size-index alist-size
    dict-for-each-index alist-foreach
    dict->alist-index alist->alist
-   dict-comparator-index alist-comparator))
+   dict-comparator-index alist-comparator
+   dict-copy-index alist-copy))
 
 (define alist-eqv-dtd (make-alist-dtd eqv?))
 (define alist-equal-dtd (make-alist-dtd equal?))
diff --git a/srfi/default-impl.scm b/srfi/default-impl.scm
index 649b6be..4253f6a 100644
--- a/srfi/default-impl.scm
+++ b/srfi/default-impl.scm
@@ -219,9 +219,12 @@
       (default-dict-remove* dtd dict-filter! pred dictionary))
 
     (define (default-dict-copy dtd dictionary)
-      (dict-map dtd
-                (lambda (key value) value)
-                dictionary))
+      (define dict (make-dictionary (dict-comparator dtd dictionary)))
+      (dict-for-each dtd
+                     (lambda (key value)
+                       (set! dict (dict-set! dtd key value)))
+                     dictionary)
+      dict)
 
     (define (default-dict-count dtd pred dictionary)
       (dict-fold dtd
diff --git a/srfi/plist-impl.scm b/srfi/plist-impl.scm
index e73bc94..dbec747 100644
--- a/srfi/plist-impl.scm
+++ b/srfi/plist-impl.scm
@@ -120,5 +120,4 @@
      dict-copy-index plist-copy
      dict-size-index plist-size
      dict-for-each-index plist-foreach
-     dict-comparator-index plist-comparator)
-    ))
+     dict-comparator-index plist-comparator)))