From: Ted Zlatanov <tzz@lifelogs.com>
To: emacs-devel@gnu.org
Subject: Re: hash-table-{to, from}-alist
Date: Tue, 02 Dec 2008 14:56:00 -0600 [thread overview]
Message-ID: <86r64q70v3.fsf@lifelogs.com> (raw)
In-Reply-To: 868wqzd06x.fsf@lifelogs.com
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
The attached patch does print and read of hashtables. It respects
print-length only, exactly like vector print and consistent with the
rest of GNU Emacs. Please review and comment. Some notes:
I ended up with this code to put a list into Fmake_hash_table format
('params' is a Lisp_Object that holds a bunch of conses).
int param_count = 0;
Lisp_Object *pa = (Lisp_Object*) xmalloc(XFASTINT(Flength(params)) * sizeof(Lisp_Object));
while (!NILP(params))
{
pa[param_count++] = CAR_SAFE(params);
params = CDR_SAFE(params);
}
Lisp_Object ht = Fmake_hash_table(param_count, pa);
I would prefer it if I could avoid all that work, but it seems (from
reading lisp.h and hunting for similar code) that it must be done as
above. I don't see a macro to convert a Lisp_Object that holds a list
into the Lisp_Object* that a lot of functions need.
Also I don't know if what xmalloc() gives needs to be freed eventually.
To generate the Lisp symbol ":size" from the symbol "size" for example,
I used:
Lisp_Object colon = make_string (":", 1);
intern(SDATA(concat2(colon, SYMBOL_NAME(head))))
I don't know if there's a better way, but this works.
Thanks!
Ted
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: hashprint.patch --]
[-- Type: text/x-diff, Size: 6975 bytes --]
? 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 2 Dec 2008 20:46:34 -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,94 @@
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;
+ Lisp_Object params = Qnil;
+ Lisp_Object colon = make_string (":", 1);
+
+ 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);
+ }
+
+ if (
+ 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);
+ params = Fcons(val, params);
+ params = Fcons(intern(SDATA(concat2(colon,
+ SYMBOL_NAME(head)))),
+ params);
+ debug_print(params);
+ /*
+ debug_print(head);
+ debug_print(val);
+ */
+ }
+ }
+
+ if (NILP(data))
+ error ("No data marker was found in the hash table");
+
+ int param_count = 0;
+ Lisp_Object *pa = (Lisp_Object*) xmalloc(XFASTINT(Flength(params)) * sizeof(Lisp_Object));
+
+ while (!NILP(params))
+ {
+ pa[param_count++] = CAR_SAFE(params);
+ params = CDR_SAFE(params);
+ }
+
+ Lisp_Object ht = Fmake_hash_table(param_count, pa);
+
+ 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 +4527,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 2 Dec 2008 20:46:34 -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 ("#<hash-table", -1, -1, printcharfun, 0);
if (SYMBOLP (h->test))
{
@@ -2052,6 +2055,68 @@
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))
{
next prev parent reply other threads:[~2008-12-02 20:56 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <34f9604c-a23b-4ad9-9c84-f45884a6df23@x16g2000prn.googlegroups.com>
[not found] ` <mailman.17732.1219901096.18990.help-gnu-emacs@gnu.org>
[not found] ` <bbbc0efc-affc-42dd-bfc0-ebe217ad7073@z6g2000pre.googlegroups.com>
[not found] ` <86od3dfd86.fsf@lifelogs.com>
[not found] ` <mailman.17796.1219947087.18990.help-gnu-emacs@gnu.org>
[not found] ` <868wuflxv9.fsf@lifelogs.com>
[not found] ` <mailman.17897.1220021571.18990.help-gnu-emacs@gnu.org>
2008-08-29 18:10 ` print hash table to disk and reread in hash table Ted Zlatanov
2008-08-30 5:18 ` tomas
2008-08-30 9:17 ` Ted Zlatanov
2008-08-30 12:03 ` tomas
2008-11-17 17:15 ` Ted Zlatanov
2008-11-19 21:37 ` hash-table-{to, from}-alist (was: print hash table to disk and reread in hash table) Ted Zlatanov
2008-11-19 21:57 ` hash-table-{to, from}-alist Glenn Morris
2008-11-20 19:07 ` Ted Zlatanov
2008-11-21 22:02 ` Stefan Monnier
2008-11-21 22:22 ` Ted Zlatanov
2008-11-22 3:18 ` Stefan Monnier
2008-11-22 5:45 ` tomas
2008-11-22 12:27 ` Stephen J. Turnbull
2008-11-22 15:21 ` tomas
2008-11-22 17:38 ` Stephen J. Turnbull
2008-11-24 15:44 ` Richard M Stallman
2008-11-24 16:58 ` Stefan Monnier
2008-11-24 17:21 ` Ted Zlatanov
2008-11-25 1:50 ` Stephen J. Turnbull
2008-11-25 17:33 ` Ted Zlatanov
2008-11-25 23:50 ` Ted Zlatanov
2008-11-26 1:46 ` Stefan Monnier
2008-11-26 2:16 ` David De La Harpe Golden
2008-11-26 3:48 ` Stefan Monnier
2008-11-26 5:46 ` David De La Harpe Golden
2008-11-26 2:29 ` Stephen J. Turnbull
2008-11-26 3:34 ` David De La Harpe Golden
2008-11-26 16:06 ` Ted Zlatanov
2008-11-26 18:10 ` Stefan Monnier
2008-11-26 20:37 ` Ted Zlatanov
2008-11-26 21:16 ` Ted Zlatanov
2008-12-01 22:01 ` Ted Zlatanov
2008-12-02 0:13 ` Andreas Schwab
2008-12-02 14:27 ` Ted Zlatanov
2008-12-02 21:59 ` Stefan Monnier
2008-12-02 22:20 ` Andreas Schwab
2008-12-02 20:56 ` Ted Zlatanov [this message]
2008-12-02 21:27 ` Andreas Schwab
2008-12-02 21:58 ` Stefan Monnier
2008-12-03 19:25 ` Ted Zlatanov
2008-12-04 2:05 ` Stefan Monnier
2008-12-04 6:23 ` Stephen J. Turnbull
2008-12-04 6:34 ` Miles Bader
2008-12-04 9:08 ` Andreas Schwab
2008-12-04 13:18 ` Stefan Monnier
2008-12-04 15:02 ` Ted Zlatanov
2008-12-04 19:34 ` Stefan Monnier
2008-12-04 19:57 ` Ted Zlatanov
2009-07-30 18:24 ` Ted Zlatanov
2009-07-30 19:08 ` Chong Yidong
2009-07-30 19:22 ` Ted Zlatanov
2009-07-30 19:40 ` Chong Yidong
2009-07-30 21:04 ` Stefan Monnier
2009-07-31 1:30 ` Stefan Monnier
2009-07-31 17:49 ` Ted Zlatanov
2009-07-31 19:03 ` Stefan Monnier
2009-07-31 20:25 ` Ted Zlatanov
2009-08-01 2:22 ` Stephen J. Turnbull
2009-08-01 11:35 ` Chong Yidong
2009-08-03 14:53 ` Ted Zlatanov
2009-08-05 9:20 ` Ted Zlatanov
2009-08-05 13:48 ` Chong Yidong
2009-08-05 16:48 ` Ted Zlatanov
2009-08-06 16:30 ` Stefan Monnier
2009-08-06 16:47 ` Ted Zlatanov
2009-08-08 18:36 ` Chong Yidong
2009-08-06 10:13 ` Dan Nicolaescu
2009-08-06 16:58 ` Florian Beck
2009-08-03 21:23 ` Stefan Monnier
2009-07-31 18:10 ` Ted Zlatanov
2008-11-27 0:24 ` Stephen J. Turnbull
2008-12-01 21:53 ` Ted Zlatanov
2008-12-02 9:05 ` Stephen J. Turnbull
2008-12-02 14:21 ` Ted Zlatanov
2008-12-02 15:54 ` Stephen J. Turnbull
2008-12-02 16:10 ` Ted Zlatanov
2008-12-02 16:54 ` Stephen J. Turnbull
2008-12-02 22:19 ` Stefan Monnier
2008-12-02 23:27 ` Ted Zlatanov
2008-11-26 19:44 ` Davis Herring
2008-11-26 20:41 ` Ted Zlatanov
2008-11-25 2:57 ` Stefan Monnier
2008-11-25 7:02 ` Stephen J. Turnbull
2008-11-22 6:07 ` Miles Bader
2008-11-22 15:27 ` tomas
2008-11-22 18:57 ` Ted Zlatanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86r64q70v3.fsf@lifelogs.com \
--to=tzz@lifelogs.com \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).