From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Thompson Newsgroups: gmane.lisp.guile.devel Subject: Re: [PATCH] Add procedures to convert alists into hash tables Date: Sun, 17 Nov 2013 21:42:03 -0500 Message-ID: <52897E7B.6000602@worcester.edu> References: <5263E55A.6040307@worcester.edu> <87txg0p805.fsf@gnu.org> <87iow6pqox.fsf@netris.org> <87mwlhlmgr.fsf@gnu.org> <5289726B.6030302@worcester.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------070509000303050809020600" X-Trace: ger.gmane.org 1384742553 17157 80.91.229.3 (18 Nov 2013 02:42:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 18 Nov 2013 02:42:33 +0000 (UTC) Cc: Mark H Weaver , guile-devel To: =?UTF-8?B?THVkb3ZpYyBDb3VydMOocw==?= Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Mon Nov 18 03:42:37 2013 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ViEnK-0003vz-R3 for guile-devel@m.gmane.org; Mon, 18 Nov 2013 03:42:35 +0100 Original-Received: from localhost ([::1]:40995 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ViEnK-0004sx-76 for guile-devel@m.gmane.org; Sun, 17 Nov 2013 21:42:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ViEmr-0004LC-KW for guile-devel@gnu.org; Sun, 17 Nov 2013 21:42:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ViEmj-000358-OZ for guile-devel@gnu.org; Sun, 17 Nov 2013 21:42:05 -0500 Original-Received: from na3sys009aog138.obsmtp.com ([74.125.149.19]:57438) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ViEmj-000350-DN for guile-devel@gnu.org; Sun, 17 Nov 2013 21:41:57 -0500 Original-Received: from mail-qa0-f53.google.com ([209.85.216.53]) (using TLSv1) by na3sys009aob138.postini.com ([74.125.148.12]) with SMTP ID DSNKUol+dE8sss9VAq1Q59zs9VwOwZ5nf7AU@postini.com; Sun, 17 Nov 2013 18:41:57 PST Original-Received: by mail-qa0-f53.google.com with SMTP id k4so1907196qaq.5 for ; Sun, 17 Nov 2013 18:41:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type; bh=aG/oPIOGo8bre8XjYcLkEfUkads/4iVvvFtZxJA4RM4=; b=L/6OM4oxh9h5HWSBVk4X8cNEG80wRY+9VLyLQL8NB5yNtdpiFjQQ0jEYxUwKPhQrF5 ZNXtl4Wsg5pTaMn0G1yfisrbmSFgqaDxI2rNWBzLDyu9l+j3+gdbuxa6R3+jmRAYNZDZ V77d1Gync2AFgw9Xj0Cncte1T9tBOlUUOdjgWOhqQqaMgnDVI4vkRcgAGbfMxhbTN7Hw Ocwwtrz2IyNhXvVfkoCbgmX+9l3o+1leiLsOWYCAkwsJAlg0OkIMOMww09j4yflqEs1e yIlgFYOxw/N/8/FRKuggTvKe1g/8H9X7NrFuWzwVMUh0g2o5yLhk0en5ZzvoF9QlpCBO D59g== X-Gm-Message-State: ALoCoQnrWZFtsrHBKMaHKsxxWoDKhFlV2b9YJ0eZZ+pIGVGgQUz+rpjYW+Jlu1dnCiakpg/JVPuedfwacOw8HjH8ulS3Zn/bp7ItWupNVoVU4Fnpp1URmtA4U+GMFnsDXETs9KwM3N5Ad4+eZJrYQhW+9vvyp1DxDg== X-Received: by 10.49.72.66 with SMTP id b2mr8179469qev.11.1384742515562; Sun, 17 Nov 2013 18:41:55 -0800 (PST) X-Received: by 10.49.72.66 with SMTP id b2mr8179457qev.11.1384742515392; Sun, 17 Nov 2013 18:41:55 -0800 (PST) Original-Received: from [192.168.1.157] (209-6-40-86.c3-0.smr-ubr1.sbo-smr.ma.cable.rcn.com. [209.6.40.86]) by mx.google.com with ESMTPSA id 5sm35290638qao.3.2013.11.17.18.41.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Nov 2013 18:41:54 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20131005 Icedove/17.0.9 In-Reply-To: <5289726B.6030302@worcester.edu> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 74.125.149.19 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:16746 Archived-At: This is a multi-part message in MIME format. --------------070509000303050809020600 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 11/17/2013 08:50 PM, David Thompson wrote: > Finally got around to updating this patch. I opted for adding a > standalone module named (ice-9 hash-table) rather than including it from > boot-9. > > How did I do? > > - Dave > Forgot to add the new module file to Makefile.am. Updated patch attached. - Dave --------------070509000303050809020600 Content-Type: text/x-patch; name="0001-Add-procedures-to-convert-alists-into-hash-tables.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-Add-procedures-to-convert-alists-into-hash-tables.patch" >From 03f604cc3dfffb816cfe66a355e36ede337749f1 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sat, 19 Oct 2013 22:43:37 -0400 Subject: [PATCH] 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. --- doc/ref/api-compound.texi | 21 +++++++++++++++++++++ module/Makefile.am | 1 + module/ice-9/hash-table.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ test-suite/tests/hash.test | 38 +++++++++++++++++++++++++++++++++++++- 4 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 module/ice-9/hash-table.scm diff --git a/doc/ref/api-compound.texi b/doc/ref/api-compound.texi index 94e0145..9e5e649 100644 --- a/doc/ref/api-compound.texi +++ b/doc/ref/api-compound.texi @@ -3829,6 +3829,27 @@ then it can use @var{size} to avoid rehashing when initial entries are added. @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->hash-table hash assoc '((foo . 1) (bar . 2))) +@end example + +@end deffn + @deffn {Scheme Procedure} hash-table? obj @deffnx {C Function} scm_hash_table_p (obj) Return @code{#t} if @var{obj} is a abstract hash table object. diff --git a/module/Makefile.am b/module/Makefile.am index e8dcd4a..8a7befd 100644 --- a/module/Makefile.am +++ b/module/Makefile.am @@ -207,6 +207,7 @@ ICE_9_SOURCES = \ ice-9/format.scm \ ice-9/futures.scm \ ice-9/getopt-long.scm \ + ice-9/hash-table.scm \ ice-9/hcons.scm \ ice-9/i18n.scm \ ice-9/iconv.scm \ diff --git a/module/ice-9/hash-table.scm b/module/ice-9/hash-table.scm new file mode 100644 index 0000000..6b0fa04 --- /dev/null +++ b/module/ice-9/hash-table.scm @@ -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 @var{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 @var{alist} into a hash table with custom @var{hash} and +@var{assoc} procedures." + (let ((table (make-hash-table))) + (for-each (lambda (pair) + (hashx-set! hash assoc table (car pair) (cdr pair))) + (reverse alist)) + table)) diff --git a/test-suite/tests/hash.test b/test-suite/tests/hash.test index 3bd4004..ad247f5 100644 --- a/test-suite/tests/hash.test +++ b/test-suite/tests/hash.test @@ -18,7 +18,8 @@ (define-module (test-suite test-numbers) #:use-module (test-suite lib) - #:use-module (ice-9 documentation)) + #:use-module (ice-9 documentation) + #:use-module (ice-9 hash-table)) ;;; ;;; hash @@ -81,6 +82,41 @@ (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 ;;; -- 1.8.4.2 --------------070509000303050809020600--