diff options
| author | 2021-11-11 20:09:12 +0200 | |
|---|---|---|
| committer | 2021-11-11 20:09:12 +0200 | |
| commit | f1b1e37b57ff1ecf1e7dd18dbb9204c402edf3c2 (patch) | |
| tree | d9c2e182d0bdbe1790afdf693f15b4adf23720a6 /srfi | |
| parent | Merge remote-tracking branch 'arvyy/master' (diff) | |
remove min-key, max-key, plist; add dependencies list to html
Diffstat (limited to 'srfi')
| -rw-r--r-- | srfi/225.sld | 2 | ||||
| -rw-r--r-- | srfi/default-impl.scm | 23 | ||||
| -rw-r--r-- | srfi/externals.scm | 2 | ||||
| -rw-r--r-- | srfi/indexes.scm | 2 | ||||
| -rw-r--r-- | srfi/plist-impl.scm | 111 |
5 files changed, 0 insertions, 140 deletions
diff --git a/srfi/225.sld b/srfi/225.sld index 6e389a7..aee7c59 100644 --- a/srfi/225.sld +++ b/srfi/225.sld @@ -144,7 +144,6 @@ dict-adjoin-accumulator-id ;; basic DTDs - plist-dtd alist-eqv-dtd alist-equal-dtd) @@ -153,7 +152,6 @@ (include "externals.scm") (include "default-impl.scm") (include "alist-impl.scm") - (include "plist-impl.scm") ;; library-dependent DTD exports ;; and implementations diff --git a/srfi/default-impl.scm b/srfi/default-impl.scm index d5bfdec..72c1f7f 100644 --- a/srfi/default-impl.scm +++ b/srfi/default-impl.scm @@ -74,27 +74,6 @@ (lambda () default) (lambda (x) x))) - (define (default-dict-find-key dtd dict cmp-proc) - (define cmp (dict-comparator dtd dict)) - (define keys (dict-keys dtd dict)) - (when (not cmp) - (raise (dictionary-error "dictionary doesn't have comparator"))) - (when (null? keys) - (error "Cannot find min/max key in empty dictionary")) - (let loop ((best (car keys)) - (keys (cdr keys))) - (cond - ((null? keys) best) - ((cmp-proc cmp (car keys) best) - (loop (car keys) (cdr keys))) - (else (loop best (cdr keys)))))) - - (define (default-dict-min-key dtd dict) - (default-dict-find-key dtd dict <?)) - - (define (default-dict-max-key dtd dict) - (default-dict-find-key dtd dict >?)) - ;; private (define (default-dict-set* dtd dictionary use-old? objs) (let loop ((objs objs) @@ -387,8 +366,6 @@ dict-mutable?-id default-dict-mutable? dict-ref-id default-dict-ref dict-ref/default-id default-dict-ref/default - dict-min-key-id default-dict-min-key - dict-max-key-id default-dict-max-key dict-set-id default-dict-set dict-adjoin-id default-dict-adjoin dict-delete-id default-dict-delete diff --git a/srfi/externals.scm b/srfi/externals.scm index 5d77c86..519bccf 100644 --- a/srfi/externals.scm +++ b/srfi/externals.scm @@ -79,8 +79,6 @@ ((dtd-ref-stx dtd dict-ref-id) dtd dict key failure success)))) (define/dict-proc dict-ref/default dict-ref/default-id) -(define/dict-proc dict-min-key dict-min-key-id) -(define/dict-proc dict-max-key dict-max-key-id) (define/dict-proc-pair dict-set dict-set! dict-set-id) (define/dict-proc-pair dict-adjoin dict-adjoin! dict-adjoin-id) (define/dict-proc-pair dict-delete dict-delete! dict-delete-id) diff --git a/srfi/indexes.scm b/srfi/indexes.scm index f71a76e..a353de8 100644 --- a/srfi/indexes.scm +++ b/srfi/indexes.scm @@ -12,8 +12,6 @@ (define dict-mutable?-id (proc-id-inc)) (define dict-ref-id (proc-id-inc)) (define dict-ref/default-id (proc-id-inc)) -(define dict-min-key-id (proc-id-inc)) -(define dict-max-key-id (proc-id-inc)) (define dict-set-id (proc-id-inc)) (define dict-adjoin-id (proc-id-inc)) (define dict-delete-id (proc-id-inc)) diff --git a/srfi/plist-impl.scm b/srfi/plist-impl.scm deleted file mode 100644 index d291870..0000000 --- a/srfi/plist-impl.scm +++ /dev/null @@ -1,111 +0,0 @@ -(define plist-dtd - (let () - - (define (plist? dtd l) - (and (list? l) - (or (null? l) - (symbol? (car l))))) - - (define (plist-map dtd proc plist) - (let loop ((pl plist) - (new-pl/rev '())) - (cond - ((null? pl) (reverse new-pl/rev)) - ((null? (cdr pl)) (error "Malformed plist" plist)) - (else - (let ((key (car pl)) - (value (cadr pl)) - (rest (cddr pl))) - (loop rest - (append (list (proc key value) key) new-pl/rev))))))) - - (define (plist-filter dtd pred plist) - (let loop ((pl plist) - (new-pl/rev '())) - (cond - ((null? pl) (reverse new-pl/rev)) - ((null? (cdr pl)) (error "Malformed plist" plist)) - (else - (let ((key (car pl)) - (value (cadr pl)) - (rest (cddr pl))) - (if (pred key value) - (loop rest - (append (list value key) new-pl/rev)) - (loop rest - new-pl/rev))))))) - - (define (find-plist-entry key plist) - (cond - ((null? plist) #f) - ((eq? key (car plist)) plist) - (else (find-plist-entry key (cddr plist))))) - - (define (plist-delete key-to-delete plist) - (let loop ((pl plist) - (new-pl/rev '())) - (cond - ((null? pl) (reverse new-pl/rev)) - ((null? (cdr pl)) (error "Malformed plist")) - (else (let ((key (car pl)) - (value (cadr pl)) - (rest (cddr pl))) - (if (eq? key-to-delete key) - (loop rest new-pl/rev) - (loop rest (append (list value key) new-pl/rev)))))))) - - (define (plist-alter dtd plist key failure success) - (define (handle-success pair) - (define old-key (car pair)) - (define old-value (cadr pair)) - (define (update new-key new-value) - (cond - ((and (eq? old-key - new-key) - (eq? old-value - new-value)) - plist) - (else - (let ((new-list - (append (list new-key new-value) - (plist-delete old-key plist)))) - new-list)))) - (define (remove) - (plist-delete old-key plist)) - (success old-key old-value update remove)) - - (define (handle-failure) - (define (insert value) - (append (list key value) plist)) - (define (ignore) - plist) - (failure insert ignore)) - (cond - ((find-plist-entry key plist) => handle-success) - (else (handle-failure)))) - - (define (plist-size dtd plist) - (/ (length plist) 2)) - - (define (plist-foreach dtd proc plist) - (let loop ((pl plist)) - (if (null? pl) #t - (begin - (proc (car pl) (cadr pl)) - (loop (cddr pl)))))) - - (define (plist-mutable? dtd plist) - #f) - - (define (plist-comparator dtd plist) - #f) - - (make-dtd - dictionary?-id plist? - dict-mutable?-id plist-mutable? - dict-map-id plist-map - dict-filter-id plist-filter - dict-alter-id plist-alter - dict-size-id plist-size - dict-for-each-id plist-foreach - dict-comparator-id plist-comparator))) |
