1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00

Add procedures to convert alists into hash tables.

* module/ice-9/hash-table.scm: New module.

* test-suite/tests/hash.test ("alist conversion"): Add tests.

* doc/ref/api-compound.texi (Hash Table Reference): Add docs.
This commit is contained in:
David Thompson 2013-10-19 22:43:37 -04:00 committed by Mark H Weaver
parent 02500d4477
commit 5063f0a93b
4 changed files with 104 additions and 1 deletions

View file

@ -3829,6 +3829,27 @@ then it can use @var{size} to avoid rehashing when initial entries are
added. added.
@end deffn @end deffn
@deffn {Scheme Procedure} alist->hash-table alist
@deffnx {Scheme Procedure} alist->hashq-table alist
@deffnx {Scheme Procedure} alist->hashv-table alist
@deffnx {Scheme Procedure} alist->hashx-table hash assoc alist
Convert @var{alist} into a hash table. When keys are repeated in
@var{alist}, the leftmost association takes precedence.
@example
(use-modules (ice-9 hash-table))
(alist->hash-table '((foo . 1) (bar . 2)))
@end example
When converting to an extended hash table, custom @var{hash} and
@var{assoc} procedures must be provided.
@example
(alist->hashx-table hash assoc '((foo . 1) (bar . 2)))
@end example
@end deffn
@deffn {Scheme Procedure} hash-table? obj @deffn {Scheme Procedure} hash-table? obj
@deffnx {C Function} scm_hash_table_p (obj) @deffnx {C Function} scm_hash_table_p (obj)
Return @code{#t} if @var{obj} is a abstract hash table object. Return @code{#t} if @var{obj} is a abstract hash table object.

View file

@ -207,6 +207,7 @@ ICE_9_SOURCES = \
ice-9/format.scm \ ice-9/format.scm \
ice-9/futures.scm \ ice-9/futures.scm \
ice-9/getopt-long.scm \ ice-9/getopt-long.scm \
ice-9/hash-table.scm \
ice-9/hcons.scm \ ice-9/hcons.scm \
ice-9/i18n.scm \ ice-9/i18n.scm \
ice-9/iconv.scm \ ice-9/iconv.scm \

View file

@ -0,0 +1,45 @@
;;;; hash-table.scm --- Additional hash table procedures
;;;; Copyright (C) 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
;;;; License as published by the Free Software Foundation; either
;;;; version 3 of the License, or (at your option) any later version.
;;;;
;;;; This library is distributed in the hope that it will be useful,
;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
;;;; Lesser General Public License for more details.
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; if not, write to the Free Software
;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;;;;
(define-module (ice-9 hash-table)
#:export (alist->hash-table
alist->hashq-table
alist->hashv-table
alist->hashx-table))
(define-syntax-rule (define-alist-converter name hash-set-proc)
(define (name alist)
"Convert ALIST into a hash table."
(let ((table (make-hash-table)))
(for-each (lambda (pair)
(hash-set-proc table (car pair) (cdr pair)))
(reverse alist))
table)))
(define-alist-converter alist->hash-table hash-set!)
(define-alist-converter alist->hashq-table hashq-set!)
(define-alist-converter alist->hashv-table hashv-set!)
(define (alist->hashx-table hash assoc alist)
"Convert ALIST into a hash table with custom HASH and ASSOC
procedures."
(let ((table (make-hash-table)))
(for-each (lambda (pair)
(hashx-set! hash assoc table (car pair) (cdr pair)))
(reverse alist))
table))

View file

@ -18,7 +18,8 @@
(define-module (test-suite test-numbers) (define-module (test-suite test-numbers)
#:use-module (test-suite lib) #:use-module (test-suite lib)
#:use-module (ice-9 documentation)) #:use-module (ice-9 documentation)
#:use-module (ice-9 hash-table))
;;; ;;;
;;; hash ;;; hash
@ -80,6 +81,41 @@
(lambda () (lambda ()
(write (make-hash-table 100))))))) (write (make-hash-table 100)))))))
;;;
;;; alist->hash-table
;;;
(with-test-prefix
"alist conversion"
(pass-if "alist->hash-table"
(let ((table (alist->hash-table '(("foo" . 1)
("bar" . 2)
("foo" . 3)))))
(and (= (hash-ref table "foo") 1)
(= (hash-ref table "bar") 2))))
(pass-if "alist->hashq-table"
(let ((table (alist->hashq-table '((foo . 1)
(bar . 2)
(foo . 3)))))
(and (= (hashq-ref table 'foo) 1)
(= (hashq-ref table 'bar) 2))))
(pass-if "alist->hashv-table"
(let ((table (alist->hashv-table '((1 . 1)
(2 . 2)
(1 . 3)))))
(and (= (hashv-ref table 1) 1)
(= (hashv-ref table 2) 2))))
(pass-if "alist->hashx-table"
(let ((table (alist->hashx-table hash assoc '((foo . 1)
(bar . 2)
(foo . 3)))))
(and (= (hashx-ref hash assoc table 'foo) 1)
(= (hashx-ref hash assoc table 'bar) 2)))))
;;; ;;;
;;; usual set and reference ;;; usual set and reference
;;; ;;;