From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: hash-table-{to, from}-alist Date: Thu, 04 Dec 2008 09:02:56 -0600 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <86prk8q8yn.fsf@lifelogs.com> References: <863aknitfg.fsf@lifelogs.com> <86ej14vhvg.fsf@lifelogs.com> <20081122054510.GA28298@tomas> <873ahkkkt5.fsf@xemacs.org> <20081122152126.GA4142@tomas> <87vdufk6do.fsf@xemacs.org> <867i6tt4yz.fsf@lifelogs.com> <87bpw4k1z6.fsf@xemacs.org> <86bpw3d829.fsf@lifelogs.com> <87k5ari5jh.fsf@xemacs.org> <86prkiiia2.fsf@lifelogs.com> <86ej0ygr5j.fsf@lifelogs.com> <861vwygpc6.fsf@lifelogs.com> <868wqzd06x.fsf@lifelogs.com> <867i6hrrh9.fsf@lifelogs.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1228403046 23971 80.91.229.12 (4 Dec 2008 15:04:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 4 Dec 2008 15:04:06 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 04 16:05:06 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1L8FlG-0007Jj-CK for ged-emacs-devel@m.gmane.org; Thu, 04 Dec 2008 16:05:03 +0100 Original-Received: from localhost ([127.0.0.1]:54747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L8Fk5-0001R4-DB for ged-emacs-devel@m.gmane.org; Thu, 04 Dec 2008 10:03:49 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L8Fk2-0001Qz-55 for emacs-devel@gnu.org; Thu, 04 Dec 2008 10:03:46 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L8Fk1-0001Qn-Jg for emacs-devel@gnu.org; Thu, 04 Dec 2008 10:03:45 -0500 Original-Received: from [199.232.76.173] (port=33384 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L8Fk1-0001Qk-Fg for emacs-devel@gnu.org; Thu, 04 Dec 2008 10:03:45 -0500 Original-Received: from main.gmane.org ([80.91.229.2]:52349 helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L8Fk0-0005d1-KZ for emacs-devel@gnu.org; Thu, 04 Dec 2008 10:03:45 -0500 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1L8Fjy-000070-5g for emacs-devel@gnu.org; Thu, 04 Dec 2008 15:03:42 +0000 Original-Received: from 38.98.147.130 ([38.98.147.130]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 04 Dec 2008 15:03:42 +0000 Original-Received: from tzz by 38.98.147.130 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 04 Dec 2008 15:03:42 +0000 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 263 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 38.98.147.130 X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.0.60 (gnu/linux) Cancel-Lock: sha1:7Zn8S02PN1rACNNYkscXQPznQZM= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:106563 Archived-At: --=-=-= On Wed, 03 Dec 2008 21:05:54 -0500 Stefan Monnier wrote: >> I took your other suggestions, except I don't pass Qnil parameters to >> make-hash-table to keep things clean. I hope this version of the patch >> is acceptable. SM> Some nitpicks, see below. SM> BTW, have you tried to delegate to some Elisp code? Why at this point? The C code is written, is there a problem with it? SM> We like to avoid putting comment markers on their own line. We like SM> to terminate our comments like sentences: with a [d]ot followed by 2 SM> spaces. We like to put the body of the `if' on a separate line. SM> Comments should be capitalized. All these are fixed, thanks for pointing them out. >> + Lisp_Object ht = Fmake_hash_table (param_count, params); >> + Lisp_Object key = Qnil; SM> We recently decided it was OK to use ANSI C syntax for function headers, SM> but I don't think ANSI C allows such variable declarations in the middle SM> of a block. So we should probably move the delcaration of those 2 vars SM> higher up, or open up a new block. Fixed. Revised patch attached. Thanks Ted --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=hashprint.patch ? hashprint.patch Index: lread.c =================================================================== RCS file: /sources/emacs/emacs/src/lread.c,v retrieving revision 1.401 diff -u -r1.401 lread.c --- lread.c 7 Sep 2008 20:41:10 -0000 1.401 +++ lread.c 4 Dec 2008 15:02:39 -0000 @@ -80,6 +80,14 @@ extern int errno; #endif +/* hash table read constants */ +Lisp_Object Qhash_table, Qdata; +Lisp_Object Qtest, Qsize; +Lisp_Object Qweakness; +Lisp_Object Qrehash_size; +Lisp_Object Qrehash_threshold; +extern Lisp_Object QCtest, QCsize, QCrehash_size, QCrehash_threshold, QCweakness; + Lisp_Object Qread_char, Qget_file_char, Qstandard_input, Qcurrent_load_list; Lisp_Object Qvariable_documentation, Vvalues, Vstandard_input, Vafter_load_alist; Lisp_Object Qascii_character, Qload, Qload_file_name; @@ -2341,6 +2349,78 @@ case '#': c = READCHAR; + if (c == 's') + { + c = READCHAR; + if (c == '(') + { + /* Accept extended format for hashtables (extensible to + other types), e.g. + #s(hash-table size 2 test equal data (k1 v1 k2 v2)) */ + Lisp_Object tmp = read_list (0, readcharfun); + Lisp_Object head = CAR_SAFE (tmp); + Lisp_Object data = Qnil; + Lisp_Object val = Qnil; + /* The size is 2 * number of allowed keywords to + make-hash-table. */ + Lisp_Object params[10]; + Lisp_Object ht; + Lisp_Object key = Qnil; + int param_count = 0; + int i; + + if (!EQ (head, Qhash_table)) + error ("Invalid extended read marker at head of #s list " + "(only hash-table allowed)"); + + tmp = CDR_SAFE (tmp); + + /* This is repetitive but fast and simple. */ + params[param_count] = QCsize; + params[param_count+1] = Fplist_get (tmp, Qsize); + if (!NILP (params[param_count+1])) + param_count+=2; + + params[param_count] = QCtest; + params[param_count+1] = Fplist_get (tmp, Qtest); + if (!NILP (params[param_count+1])) + param_count+=2; + + params[param_count] = QCweakness; + params[param_count+1] = Fplist_get (tmp, Qweakness); + if (!NILP (params[param_count+1])) + param_count+=2; + + params[param_count] = QCrehash_size; + params[param_count+1] = Fplist_get (tmp, Qrehash_size); + if (!NILP (params[param_count+1])) + param_count+=2; + + params[param_count] = QCrehash_threshold; + params[param_count+1] = Fplist_get (tmp, Qrehash_threshold); + if (!NILP (params[param_count+1])) + param_count+=2; + + /* This is the hashtable data. */ + data = Fplist_get (tmp, Qdata); + + /* Now use params to make a new hashtable and fill it. */ + ht = Fmake_hash_table (param_count, params); + + while (CONSP (data)) + { + key = XCAR (data); + data = XCDR (data); + if (!CONSP (data)) + error ("Odd number of elements in hashtable data"); + val = XCAR (data); + data = XCDR (data); + Fputhash (key, val, ht); + } + + return ht; + } + } if (c == '^') { c = READCHAR; @@ -4432,6 +4512,21 @@ Vloads_in_progress = Qnil; staticpro (&Vloads_in_progress); + + Qhash_table = intern ("hash-table"); + staticpro (&Qhash_table); + Qdata = intern ("data"); + staticpro (&Qdata); + Qtest = intern ("test"); + staticpro (&Qtest); + Qsize = intern ("size"); + staticpro (&Qsize); + Qweakness = intern ("weakness"); + staticpro (&Qweakness); + Qrehash_size = intern ("rehash-size"); + staticpro (&Qrehash_size); + Qrehash_threshold = intern ("rehash-threshold"); + staticpro (&Qrehash_threshold); } /* arch-tag: a0d02733-0f96-4844-a659-9fd53c4f414d Index: print.c =================================================================== RCS file: /sources/emacs/emacs/src/print.c,v retrieving revision 1.253 diff -u -r1.253 print.c --- print.c 31 Jul 2008 05:33:53 -0000 1.253 +++ print.c 4 Dec 2008 15:02:39 -0000 @@ -1341,6 +1341,7 @@ loop: if (STRINGP (obj) || CONSP (obj) || VECTORP (obj) || COMPILEDP (obj) || CHAR_TABLE_P (obj) || SUB_CHAR_TABLE_P (obj) + || HASH_TABLE_P (obj) || (! NILP (Vprint_gensym) && SYMBOLP (obj) && !SYMBOL_INTERNED_P (obj))) @@ -1536,6 +1537,7 @@ /* Detect circularities and truncate them. */ if (STRINGP (obj) || CONSP (obj) || VECTORP (obj) || COMPILEDP (obj) || CHAR_TABLE_P (obj) || SUB_CHAR_TABLE_P (obj) + || HASH_TABLE_P (obj) || (! NILP (Vprint_gensym) && SYMBOLP (obj) && !SYMBOL_INTERNED_P (obj))) @@ -2036,6 +2038,7 @@ else if (HASH_TABLE_P (obj)) { struct Lisp_Hash_Table *h = XHASH_TABLE (obj); +#if 0 strout ("#test)) { @@ -2052,6 +2055,67 @@ sprintf (buf, " 0x%lx", (unsigned long) h); strout (buf, -1, -1, printcharfun, 0); PRINTCHAR ('>'); +#endif + /* Implement a readable output, e.g.: + #s(hash-table size 2 test equal data (k1 v1 k2 v2)) */ + /* Always print the size. */ + sprintf (buf, "#s(hash-table size %ld", + (long) XVECTOR (h->next)->size); + strout (buf, -1, -1, printcharfun, 0); + + if (!NILP (h->test)) + { + strout (" test ", -1, -1, printcharfun, 0); + print_object (h->test, printcharfun, 0); + } + + if (!NILP (h->weak)) + { + strout (" weakness ", -1, -1, printcharfun, 0); + print_object (h->weak, printcharfun, 0); + } + + if (!NILP (h->rehash_size)) + { + strout (" rehash-size ", -1, -1, printcharfun, 0); + print_object (h->rehash_size, printcharfun, 0); + } + + if (!NILP (h->rehash_threshold)) + { + strout (" rehash-threshold ", -1, -1, printcharfun, 0); + print_object (h->rehash_threshold, printcharfun, 0); + } + + strout (" data ", -1, -1, printcharfun, 0); + + /* Print the data here as a plist. */ + int i; + + int real_size = HASH_TABLE_SIZE (h); + int size = real_size; + + /* Don't print more elements than the specified maximum. */ + if (NATNUMP (Vprint_length) + && XFASTINT (Vprint_length) < size) + size = XFASTINT (Vprint_length); + + PRINTCHAR ('('); + for (i = 0; i < size; i++) + if (!NILP (HASH_HASH (h, i))) + { + if (i) PRINTCHAR (' '); + print_object (HASH_KEY (h, i), printcharfun, 0); + PRINTCHAR (' '); + print_object (HASH_VALUE (h, i), printcharfun, 0); + } + + if (size < real_size) + strout (" ...", 4, 4, printcharfun, 0); + + PRINTCHAR (')'); + PRINTCHAR (')'); + } else if (BUFFERP (obj)) { --=-=-=--