merge, add unfold

1 files changed, 51 insertions, 50 deletions

diff --git a/srfi/indexes.scm b/srfi/indexes.scm
index da99b57..958f5a0 100644
--- a/srfi/indexes.scm
+++ b/srfi/indexes.scm
@@ -1,53 +1,54 @@
 ;; procedure index definitions
 
-(define proc-index 0)
-(define (proc-index-inc)
-  (define v proc-index)
-  (set! proc-index (+ 1 proc-index))
+(define proc-id 0)
+(define (proc-id-inc)
+  (define v proc-id)
+  (set! proc-id (+ 1 proc-id))
   v)
-(define make-dictionary-index (proc-index-inc))
-(define dictionary?-index (proc-index-inc))
-(define dict-empty?-index (proc-index-inc))
-(define dict-contains?-index (proc-index-inc))
-(define dict-ref-index (proc-index-inc))
-(define dict-ref/default-index (proc-index-inc))
-(define dict-set-index (proc-index-inc))
-(define dict-set!-index (proc-index-inc))
-(define dict-adjoin-index (proc-index-inc))
-(define dict-adjoin!-index (proc-index-inc))
-(define dict-delete-index (proc-index-inc))
-(define dict-delete!-index (proc-index-inc))
-(define dict-delete-all-index (proc-index-inc))
-(define dict-delete-all!-index (proc-index-inc))
-(define dict-replace-index (proc-index-inc))
-(define dict-replace!-index (proc-index-inc))
-(define dict-intern-index (proc-index-inc))
-(define dict-intern!-index (proc-index-inc))
-(define dict-update-index (proc-index-inc))
-(define dict-update!-index (proc-index-inc))
-(define dict-update/default-index (proc-index-inc))
-(define dict-update/default!-index (proc-index-inc))
-(define dict-pop-index (proc-index-inc))
-(define dict-pop!-index (proc-index-inc))
-(define dict-map-index (proc-index-inc))
-(define dict-map!-index (proc-index-inc))
-(define dict-filter-index (proc-index-inc))
-(define dict-filter!-index (proc-index-inc))
-(define dict-remove-index (proc-index-inc))
-(define dict-remove!-index (proc-index-inc))
-(define dict-search-index (proc-index-inc))
-(define dict-search!-index (proc-index-inc))
-(define dict-copy-index (proc-index-inc))
-(define dict-size-index (proc-index-inc))
-(define dict-for-each-index (proc-index-inc))
-(define dict-count-index (proc-index-inc))
-(define dict-any-index (proc-index-inc))
-(define dict-every-index (proc-index-inc))
-(define dict-keys-index (proc-index-inc))
-(define dict-values-index (proc-index-inc))
-(define dict-entries-index (proc-index-inc))
-(define dict-fold-index (proc-index-inc))
-(define dict-map->list-index (proc-index-inc))
-(define dict->alist-index (proc-index-inc))
-(define dict-comparator-index (proc-index-inc))
-(define dict-procedures-count (proc-index-inc))
+(define make-dictionary-id (proc-id-inc))
+(define dict-unfold-id (proc-id-inc))
+(define dictionary?-id (proc-id-inc))
+(define dict-empty?-id (proc-id-inc))
+(define dict-contains?-id (proc-id-inc))
+(define dict-ref-id (proc-id-inc))
+(define dict-ref/default-id (proc-id-inc))
+(define dict-set-id (proc-id-inc))
+(define dict-set!-id (proc-id-inc))
+(define dict-adjoin-id (proc-id-inc))
+(define dict-adjoin!-id (proc-id-inc))
+(define dict-delete-id (proc-id-inc))
+(define dict-delete!-id (proc-id-inc))
+(define dict-delete-all-id (proc-id-inc))
+(define dict-delete-all!-id (proc-id-inc))
+(define dict-replace-id (proc-id-inc))
+(define dict-replace!-id (proc-id-inc))
+(define dict-intern-id (proc-id-inc))
+(define dict-intern!-id (proc-id-inc))
+(define dict-update-id (proc-id-inc))
+(define dict-update!-id (proc-id-inc))
+(define dict-update/default-id (proc-id-inc))
+(define dict-update/default!-id (proc-id-inc))
+(define dict-pop-id (proc-id-inc))
+(define dict-pop!-id (proc-id-inc))
+(define dict-map-id (proc-id-inc))
+(define dict-map!-id (proc-id-inc))
+(define dict-filter-id (proc-id-inc))
+(define dict-filter!-id (proc-id-inc))
+(define dict-remove-id (proc-id-inc))
+(define dict-remove!-id (proc-id-inc))
+(define dict-search-id (proc-id-inc))
+(define dict-search!-id (proc-id-inc))
+(define dict-copy-id (proc-id-inc))
+(define dict-size-id (proc-id-inc))
+(define dict-for-each-id (proc-id-inc))
+(define dict-count-id (proc-id-inc))
+(define dict-any-id (proc-id-inc))
+(define dict-every-id (proc-id-inc))
+(define dict-keys-id (proc-id-inc))
+(define dict-values-id (proc-id-inc))
+(define dict-entries-id (proc-id-inc))
+(define dict-fold-id (proc-id-inc))
+(define dict-map->list-id (proc-id-inc))
+(define dict->alist-id (proc-id-inc))
+(define dict-comparator-id (proc-id-inc))
+(define dict-procedures-count (proc-id-inc))