[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.7-120-g72ad0
From: |
Andy Wingo |
Subject: |
[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.7-120-g72ad03f |
Date: |
Sun, 24 Feb 2013 14:11:38 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".
http://git.savannah.gnu.org/cgit/guile.git/commit/?id=72ad03fcbddb3b87de5577b7225f6dc6f892ac93
The branch, stable-2.0 has been updated
via 72ad03fcbddb3b87de5577b7225f6dc6f892ac93 (commit)
via 1746b8ffdba174fde4a8e293309a18d112750588 (commit)
from 7a17979ea4ae769c60ca4ca291cca877701c08e1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 72ad03fcbddb3b87de5577b7225f6dc6f892ac93
Author: Andy Wingo <address@hidden>
Date: Sun Feb 24 15:11:14 2013 +0100
deprecate (ice-9 mapping)
* module/ice-9/mapping.scm: Add deprecation warning.
commit 1746b8ffdba174fde4a8e293309a18d112750588
Author: Daniel Hartwig <address@hidden>
Date: Thu Nov 29 00:17:26 2012 +0800
fix and update (ice-9 mapping)
* module/ice-9/mapping.scm (mapping-create-handle!): INIT is required.
(mapping-ref): Rewrite. Fix problem with DFLT.
(hash-table-mapping-hooks): Drop DELETE-PROC, hash-table accessors
only use ASSOC-PROC. Add INIT to create-handle hook. Use correct
hash-table accessors.
(make-hash-table-mapping): Drop DELETE-PROC.
(hash-table-mapping): Rewrite. Drop DELETE-PROC.
-----------------------------------------------------------------------
Summary of changes:
module/ice-9/mapping.scm | 82 ++++++++++++++++++++--------------------------
1 files changed, 36 insertions(+), 46 deletions(-)
diff --git a/module/ice-9/mapping.scm b/module/ice-9/mapping.scm
index 2907a8d..bd4dbfb 100644
--- a/module/ice-9/mapping.scm
+++ b/module/ice-9/mapping.scm
@@ -1,6 +1,6 @@
;;; installed-scm-file
-;;;; Copyright (C) 1996, 2001, 2006 Free Software Foundation, Inc.
+;;;; Copyright (C) 1996, 2001, 2006, 2013 Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@@ -29,6 +29,9 @@
mapping-ref mapping-set! hash-table-mapping-hooks
make-hash-table-mapping hash-table-mapping))
+(issue-deprecation-warning
+ "(ice-9 mapping) is deprecated. Use srfi-69 or rnrs hash tables instead.")
+
(define mapping-hooks-type (make-record-type 'mapping-hooks '(get-handle
create-handle
remove)))
@@ -50,16 +53,15 @@
(define (mapping-get-handle map key)
((mapping-hooks-get-handle (mapping-hooks map)) map key))
-(define (mapping-create-handle! map key . opts)
- (apply (mapping-hooks-create-handle (mapping-hooks map)) map key opts))
+(define (mapping-create-handle! map key init)
+ ((mapping-hooks-create-handle (mapping-hooks map)) map key init))
(define (mapping-remove! map key)
((mapping-hooks-remove (mapping-hooks map)) map key))
-(define (mapping-ref map key . dflt)
+(define* (mapping-ref map key #:optional dflt)
(cond
- ((mapping-get-handle map key) => cdr)
- (dflt => car)
- (else #f)))
+ ((mapping-get-handle map key) => cdr)
+ (else dflt)))
(define (mapping-set! map key val)
(set-cdr! (mapping-create-handle! map key #f) val))
@@ -70,18 +72,18 @@
(let ((wrap (lambda (proc) (lambda (1st . rest) (apply proc (mapping-data
1st) rest)))))
(perfect-funcq 17
- (lambda (hash-proc assoc-proc delete-proc)
- (let ((procs (list hash-proc assoc-proc delete-proc)))
+ (lambda (hash-proc assoc-proc)
+ (let ((procs (list hash-proc assoc-proc)))
(cond
- ((equal? procs `(,hashq ,assq ,delq!))
+ ((equal? procs `(,hashq ,assq))
(make-mapping-hooks (wrap hashq-get-handle)
(wrap hashq-create-handle!)
(wrap hashq-remove!)))
- ((equal? procs `(,hashv ,assv ,delv!))
+ ((equal? procs `(,hashv ,assv))
(make-mapping-hooks (wrap hashv-get-handle)
(wrap hashv-create-handle!)
(wrap hashv-remove!)))
- ((equal? procs `(,hash ,assoc ,delete!))
+ ((equal? procs `(,hash ,assoc))
(make-mapping-hooks (wrap hash-get-handle)
(wrap hash-create-handle!)
(wrap hash-remove!)))
@@ -90,39 +92,27 @@
(lambda (table key)
(hashx-get-handle hash-proc
assoc-proc table key)))
(wrap
- (lambda (table key)
- (hashx-create-handle hash-proc
assoc-proc table key)))
+ (lambda (table key init)
+ (hashx-create-handle! hash-proc
assoc-proc table key init)))
(wrap
(lambda (table key)
- (hashx-get-handle hash-proc
assoc-proc delete-proc table key)))))))))))
-
-(define (make-hash-table-mapping table hash-proc assoc-proc delete-proc)
- (make-mapping (hash-table-mapping-hooks hash-proc assoc-proc delete-proc)
table))
-
-(define (hash-table-mapping . options)
- (let* ((size (or (and options (number? (car options)) (car options))
- 71))
- (hash-proc (or (kw-arg-ref options #:hash-proc) hash))
- (assoc-proc (or (kw-arg-ref options #:assoc-proc)
- (cond
- ((eq? hash-proc hash) assoc)
- ((eq? hash-proc hashv) assv)
- ((eq? hash-proc hashq) assq)
- (else (error 'hash-table-mapping
- "Hash-procedure specified with no known
assoc function."
- hash-proc)))))
- (delete-proc (or (kw-arg-ref options #:delete-proc)
- (cond
- ((eq? hash-proc hash) delete!)
- ((eq? hash-proc hashv) delv!)
- ((eq? hash-proc hashq) delq!)
- (else (error 'hash-table-mapping
- "Hash-procedure specified with no known
delete function."
- hash-proc)))))
- (table-constructor (or (kw-arg-ref options #:table-constructor)
- (lambda (len) (make-vector len '())))))
- (make-hash-table-mapping (table-constructor size)
- hash-proc
- assoc-proc
- delete-proc)))
-
+ (hashx-remove! hash-proc
assoc-proc table key)))))))))))
+
+(define (make-hash-table-mapping table hash-proc assoc-proc)
+ (make-mapping (hash-table-mapping-hooks hash-proc assoc-proc) table))
+
+(define* (hash-table-mapping #:optional (size 71) #:key
+ (hash-proc hash)
+ (assoc-proc
+ (or (assq-ref `((,hashq . ,assq)
+ (,hashv . ,assv)
+ (,hash . ,assoc))
+ hash-proc)
+ (error 'hash-table-mapping
+ "Hash-procedure specified with no
known assoc function."
+ hash-proc)))
+ (table-constructor
+ (lambda (len) (make-vector len '()))))
+ (make-hash-table-mapping (table-constructor size)
+ hash-proc
+ assoc-proc))
hooks/post-receive
--
GNU Guile
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.7-120-g72ad03f,
Andy Wingo <=