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: Mon, 01 Dec 2008 16:01:42 -0600 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <868wqzd06x.fsf@lifelogs.com> References: <863aknitfg.fsf@lifelogs.com> <20080830051807.GB9625@tomas> <86bpwe9su5.fsf@lifelogs.com> <867i6z1jo5.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> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1228168985 26583 80.91.229.12 (1 Dec 2008 22:03:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 1 Dec 2008 22:03:05 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 01 23:04:09 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 1L7Gs0-0004Ku-Vy for ged-emacs-devel@m.gmane.org; Mon, 01 Dec 2008 23:03:57 +0100 Original-Received: from localhost ([127.0.0.1]:37496 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L7Gqq-0000EQ-Sh for ged-emacs-devel@m.gmane.org; Mon, 01 Dec 2008 17:02:44 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L7Gqk-0000Cc-Hw for emacs-devel@gnu.org; Mon, 01 Dec 2008 17:02:38 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L7Gqi-0000CQ-WF for emacs-devel@gnu.org; Mon, 01 Dec 2008 17:02:37 -0500 Original-Received: from [199.232.76.173] (port=36572 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L7Gqi-0000CN-Qx for emacs-devel@gnu.org; Mon, 01 Dec 2008 17:02:36 -0500 Original-Received: from main.gmane.org ([80.91.229.2]:52362 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 1L7Gqh-0004jF-QU for emacs-devel@gnu.org; Mon, 01 Dec 2008 17:02:36 -0500 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1L7Gqf-0008Ub-IA for emacs-devel@gnu.org; Mon, 01 Dec 2008 22:02:33 +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 ; Mon, 01 Dec 2008 22:02:33 +0000 Original-Received: from tzz by 38.98.147.130 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 01 Dec 2008 22:02:33 +0000 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 278 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:2N+G6FRTYcKVk8ozwmXqUv+0HDM= 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:106409 Archived-At: --=-=-= On Wed, 26 Nov 2008 15:16:41 -0600 Ted Zlatanov wrote: TZ> The patch below does all the previously discussed formatting plus TZ> detection of circular references and Davis Herring's suggestion of TZ> skipping the first preliminary space. The old-style hashtable printout TZ> is disabled with an #ifdef, so only the new style is available. The attached patch does reading and writing of hashtables. I believe it works correctly and handles the common error cases. Please review. Here are the issues: - I don't know how to manage a dynamic array of Lisp_Object objects, as make-hash-table wants. What I have right now is hacky and breaks for more than 5 parameters (e.g. reading #s(hash-table size 4 size 5 size 4 size 5 size 4 weakness x) will ignore the weakness parameter. Ideally I'd put the arguments in a list and pass that off to make-hash-table, but I couldn't find an example of that in the source (casting a list of an array of Lisp_Object elements). Additionally I use xmalloc without freeing the memory; I don't know if that will cause issues but I saw it used in other places without freeing the memory. - it seems to me that EQ(head, Qhash_table_size_marker) || EQ(head, Qhash_table_test_marker) || EQ(head, Qhash_table_weakness_marker) || EQ(head, Qhash_table_rehash_size_marker) || EQ(head, Qhash_table_rehash_threshold_marker)) can be written better, but I don't know enough to do it right. In addition, I don't know how to convert all those parameters to their : plist version, e.g. size => :size. I'm sure it's trivial but couldn't find it in the source. I really wish I could write all this in ELisp :) - my code is very deliberate, using CAR_SAFE and CDR_SAFE a lot. If that causes performance issues, please suggest improvements. Ditto for anything else--remember this is my first trip to the C side of Emacs and treat everything with suspicion. 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 1 Dec 2008 21:48:58 -0000 @@ -80,6 +80,13 @@ extern int errno; #endif +/* hash table read constants */ +Lisp_Object Qhash_table_read_marker, Qhash_table_data_marker; +Lisp_Object Qhash_table_test_marker, Qhash_table_size_marker; +Lisp_Object Qhash_table_weakness_marker; +Lisp_Object Qhash_table_rehash_size_marker; +Lisp_Object Qhash_table_rehash_threshold_marker; + 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 +2348,89 @@ 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; + /* will this be freed automatically? */ + Lisp_Object* params = (Lisp_Object*) xmalloc (10 * sizeof(Lisp_Object)); + int param_count = 0; + if (!EQ (head, Qhash_table_read_marker)) + error ("Invalid extended read marker at head of #s list" + "(only hash-table allowed)"); + + while (!NILP(tmp)) + { + tmp = CDR_SAFE(tmp); + head = CAR_SAFE(tmp); + /* allowed parameters: size test weakness + rehash-size rehash-threshold */ + if (EQ(head, Qhash_table_data_marker)) + { + tmp = CDR_SAFE(tmp); + data = CAR_SAFE(tmp); + /* debug_print(data); */ + } + + if ( + param_count < 9 && + EQ(head, Qhash_table_size_marker) || + EQ(head, Qhash_table_test_marker) || + EQ(head, Qhash_table_weakness_marker) || + EQ(head, Qhash_table_rehash_size_marker) || + EQ(head, Qhash_table_rehash_threshold_marker)) + { + tmp = CDR_SAFE(tmp); + val = CAR_SAFE(tmp); + /* + debug_print(head); + debug_print(val); + */ + /* how do I turn head into a symbol with the same contents but beginning with ':'? */ + params[param_count] = head; + params[param_count+1] = val; + param_count+=2; + } + } + + if (NILP(data)) + error ("No data marker was found in the hash table"); + + /* doesn't work because of 'size' vs. ':size' issue, see above + Lisp_Object ht = Fmake_hash_table(param_count, params); + */ + Lisp_Object ht = Fmake_hash_table(0, NULL); + + Lisp_Object key = Qnil; + + while (!NILP(data)) + { + key = CAR_SAFE(data); + data = CDR_SAFE(data); + val = CAR_SAFE(data); + data = CDR_SAFE(data); + if (NILP(val)) + error ("Odd number of elements in hashtable data"); + /* + debug_print(key); + debug_print(val); + */ + Fputhash(key, val, ht); + } + + return ht; + } + } if (c == '^') { c = READCHAR; @@ -4432,6 +4522,21 @@ Vloads_in_progress = Qnil; staticpro (&Vloads_in_progress); + + Qhash_table_read_marker = intern ("hash-table"); + staticpro (&Qhash_table_read_marker); + Qhash_table_data_marker = intern ("data"); + staticpro (&Qhash_table_data_marker); + Qhash_table_test_marker = intern ("test"); + staticpro (&Qhash_table_size_marker); + Qhash_table_test_marker = intern ("size"); + staticpro (&Qhash_table_size_marker); + Qhash_table_weakness_marker = intern ("weakness"); + staticpro (&Qhash_table_weakness_marker); + Qhash_table_rehash_size_marker = intern ("rehash-size"); + staticpro (&Qhash_table_rehash_size_marker); + Qhash_table_rehash_threshold_marker = intern ("rehash-threshold"); + staticpro (&Qhash_table_rehash_threshold_marker); } /* 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 1 Dec 2008 21:48:58 -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,61 @@ 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 printed=0; + + PRINTCHAR ('('); + for (i = 0; i < HASH_TABLE_SIZE (h); ++i) + if (!NILP (HASH_HASH (h, i))) + { + if (printed) + { + PRINTCHAR (' '); + } + print_object (HASH_KEY (h, i), printcharfun, 0); + PRINTCHAR (' '); + print_object (HASH_VALUE (h, i), printcharfun, 0); + printed = 1; + } + PRINTCHAR (')'); + PRINTCHAR (')'); + } else if (BUFFERP (obj)) { --=-=-=--