Mercurial > hg > xemacs-beta
changeset 4823:fda62293e74a
Merge with revision 50102dde8ab2
| author | Didier Verna <didier@lrde.epita.fr> |
|---|---|
| date | Sun, 10 Jan 2010 10:30:31 +0100 |
| parents | 0482cdb4e35d (current diff) 50102dde8ab2 (diff) |
| children | d08fc2e159c9 |
| files | lisp/ChangeLog |
| diffstat | 8 files changed, 96 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Jan 10 10:25:57 2010 +0100 +++ b/lisp/ChangeLog Sun Jan 10 10:30:31 2010 +0100 @@ -163,6 +163,13 @@ * font.el (x-font-create-object): Check for Xft before using it. This fixes the symptom in openSUSE bug #558764. +2010-01-09 Aidan Kehoe <kehoea@parhasard.net> + + * descr-text.el (describe-char-unihan-field-descriptions): + * cl-macs.el: + Use keywords, not ordinary symbols, in the hash table read syntax, + for compatibility with Common Lisp and recent GNU Emacs. + 2009-11-10 Jerry James <james@xemacs.org> * device.el (device-type): Remove (mostly imaginary) support for
--- a/lisp/cl-macs.el Sun Jan 10 10:25:57 2010 +0100 +++ b/lisp/cl-macs.el Sun Jan 10 10:30:31 2010 +0100 @@ -2598,7 +2598,7 @@ ;; I've just done) in the body of this function, and the following gives the ;; wrong behaviour for gethash: ;; -;; (setq my-hash-table #s(hash-table test equal data ()) +;; (setq my-hash-table #s(hash-table :test equal :data ()) ;; print-gensym t) ;; => t ;; (gethash "my-key" my-hash-table (gensym))
--- a/lisp/descr-text.el Sun Jan 10 10:25:57 2010 +0100 +++ b/lisp/descr-text.el Sun Jan 10 10:30:31 2010 +0100 @@ -291,7 +291,7 @@ "The DB format to use for the `describe-char' cache, or nil if no cache.") (defvar describe-char-unihan-field-descriptions - #s(hash-table test equal data + #s(hash-table :test equal :data ("kAccountingNumeric" "Value as an an accounting numeral" "kBigFive"
--- a/man/ChangeLog Sun Jan 10 10:25:57 2010 +0100 +++ b/man/ChangeLog Sun Jan 10 10:30:31 2010 +0100 @@ -22,6 +22,14 @@ Remove references to xmu.c and xmu.h. (Modules for Interfacing with X Windows): Ditto. +2010-01-09 Aidan Kehoe <kehoea@parhasard.net> + + * lispref/objects.texi (Hash Table Type): + * lispref/hash-tables.texi (Introduction to Hash Tables): + Use keywords, not ordinary symbols, in the hash table read syntax; + document that we do accept the ordinary symbols for the sake of + backward-compatiblity. + 2009-11-10 Jerry James <james@xemacs.org> * internals/internals.texi (XEmacs from the Perspective of Building):
--- a/man/lispref/hash-tables.texi Sun Jan 10 10:25:57 2010 +0100 +++ b/man/lispref/hash-tables.texi Sun Jan 10 10:30:31 2010 +0100 @@ -65,12 +65,15 @@ Hash tables can also be created by the lisp reader using structure syntax, for example: @example -#s(hash-table size 20 data (foo 1 bar 2)) +#s(hash-table :size 20 :data (foo 1 bar 2)) @end example -The structure syntax accepts the same keywords as @code{make-hash-table} -(without the @code{:} character), as well as the additional keyword -@code{data}, which specifies the initial hash table contents. +The structure syntax accepts the same keywords as +@code{make-hash-table}, as well as the additional keyword @code{data}, +which specifies the initial hash table contents. Older versions of +XEmacs required that the keywords not have the initial ``:'' in the +structure syntax, and this version of XEmacs still supports that syntax, +but you cannot mix the two styles within one structure. @defun make-hash-table &key @code{test} @code{size} @code{rehash-size} @code{rehash-threshold} @code{weakness} This function returns a new empty hash table object.
--- a/man/lispref/objects.texi Sun Jan 10 10:25:57 2010 +0100 +++ b/man/lispref/objects.texi Sun Jan 10 10:30:31 2010 +0100 @@ -1320,7 +1320,7 @@ @example @group (make-hash-table :size 50) - @result{} #<hash-table 0/107 0x313a> + @result{} #<hash-table :size 0/107 0x3babb0e4> @end group @end example
--- a/src/ChangeLog Sun Jan 10 10:25:57 2010 +0100 +++ b/src/ChangeLog Sun Jan 10 10:30:31 2010 +0100 @@ -201,6 +201,17 @@ * faces.c (complex_vars_of_faces): Explain why "*" isn't rewritten as a full XLFD. +2010-01-09 Aidan Kehoe <kehoea@parhasard.net> + + * elhash.c: + (print_hash_table, print_hash_table_data) + (hash_table_instantiate) + (structure_type_create_hash_table_structure_name): + (syms_of_elhash): + Use keywords, not ordinary symbols, in the hash table read syntax, + for compatibility with Common Lisp and recent GNU Emacs. Accept + the non-keyword syntax, but don't allow mixing of the two styles. + 2009-11-19 Vin Shelton <acs@xemacs.org> * sysdep.c (sys_subshell): Restore sys_subshell(); it's necessary
--- a/src/elhash.c Sun Jan 10 10:25:57 2010 +0100 +++ b/src/elhash.c Sun Jan 10 10:30:31 2010 +0100 @@ -92,7 +92,7 @@ /* obsolete as of 19990901 in xemacs-21.2 */ static Lisp_Object Qweak, Qkey_weak, Qvalue_weak, Qkey_or_value_weak; -static Lisp_Object Qnon_weak, Q_type; +static Lisp_Object Qnon_weak, Q_type, Q_data; struct Lisp_Hash_Table { @@ -304,15 +304,15 @@ syntax for hash tables. This means that a typical hash table will be readably printed in the form of: - #s(hash-table size 2 data (key1 value1 key2 value2)) + #s(hash-table :size 2 :data (key1 value1 key2 value2)) The supported hash table structure keywords and their values are: - `test' (eql (or nil), eq or equal) - `size' (a natnum or nil) - `rehash-size' (a float) - `rehash-threshold' (a float) - `weakness' (nil, key, value, key-and-value, or key-or-value) - `data' (a list) + `:test' (eql (or nil), eq or equal) + `:size' (a natnum or nil) + `:rehash-size' (a float) + `:rehash-threshold' (a float) + `:weakness' (nil, key, value, key-and-value, or key-or-value) + `:data' (a list) If `print-readably' is nil, then a simpler syntax is used, for example @@ -330,7 +330,7 @@ int count = 0; htentry *e, *sentinel; - write_c_string (printcharfun, " data ("); + write_c_string (printcharfun, " :data ("); for (e = ht->hentries, sentinel = e + ht->size; e < sentinel; e++) if (!HTENTRY_CLEAR_P (e)) @@ -364,9 +364,9 @@ Due to nature of hashing, you cannot use arbitrary test functions anyway. */ if (!ht->test_function) - write_c_string (printcharfun, " test eq"); + write_c_string (printcharfun, " :test eq"); else if (ht->test_function == lisp_object_equal_equal) - write_c_string (printcharfun, " test equal"); + write_c_string (printcharfun, " :test equal"); else if (ht->test_function == lisp_object_eql_equal) DO_NOTHING; else @@ -375,16 +375,16 @@ if (ht->count || !print_readably) { if (print_readably) - write_fmt_string (printcharfun, " size %ld", (long) ht->count); + write_fmt_string (printcharfun, " :size %ld", (long) ht->count); else - write_fmt_string (printcharfun, " size %ld/%ld", (long) ht->count, + write_fmt_string (printcharfun, " :size %ld/%ld", (long) ht->count, (long) ht->size); } if (ht->weakness != HASH_TABLE_NON_WEAK) { write_fmt_string - (printcharfun, " weakness %s", + (printcharfun, " :weakness %s", (ht->weakness == HASH_TABLE_WEAK ? "key-and-value" : ht->weakness == HASH_TABLE_KEY_WEAK ? "key" : ht->weakness == HASH_TABLE_VALUE_WEAK ? "value" : @@ -395,7 +395,7 @@ if (ht->rehash_size != HASH_TABLE_DEFAULT_REHASH_SIZE) { float_to_string (pigbuf, ht->rehash_size); - write_fmt_string (printcharfun, " rehash-size %s", pigbuf); + write_fmt_string (printcharfun, " :rehash-size %s", pigbuf); } if (ht->rehash_threshold @@ -403,7 +403,7 @@ ht->test_function)) { float_to_string (pigbuf, ht->rehash_threshold); - write_fmt_string (printcharfun, " rehash-threshold %s", pigbuf); + write_fmt_string (printcharfun, " :rehash-threshold %s", pigbuf); } if (ht->count) @@ -845,17 +845,40 @@ Lisp_Object weakness = Qnil; Lisp_Object data = Qnil; - PROPERTY_LIST_LOOP_3 (key, value, plist) + if (KEYWORDP (Fcar (plist))) { - if (EQ (key, Qtest)) test = value; - else if (EQ (key, Qsize)) size = value; - else if (EQ (key, Qrehash_size)) rehash_size = value; - else if (EQ (key, Qrehash_threshold)) rehash_threshold = value; - else if (EQ (key, Qweakness)) weakness = value; - else if (EQ (key, Qdata)) data = value; - else if (EQ (key, Qtype))/*obsolete*/ weakness = value; - else - ABORT (); + PROPERTY_LIST_LOOP_3 (key, value, plist) + { + if (EQ (key, Q_test)) test = value; + else if (EQ (key, Q_size)) size = value; + else if (EQ (key, Q_rehash_size)) rehash_size = value; + else if (EQ (key, Q_rehash_threshold)) rehash_threshold = value; + else if (EQ (key, Q_weakness)) weakness = value; + else if (EQ (key, Q_data)) data = value; + else if (!KEYWORDP (key)) + signal_error (Qinvalid_read_syntax, + "can't mix keyword and non-keyword hash table syntax", + key); + else ABORT(); + } + } + else + { + PROPERTY_LIST_LOOP_3 (key, value, plist) + { + if (EQ (key, Qtest)) test = value; + else if (EQ (key, Qsize)) size = value; + else if (EQ (key, Qrehash_size)) rehash_size = value; + else if (EQ (key, Qrehash_threshold)) rehash_threshold = value; + else if (EQ (key, Qweakness)) weakness = value; + else if (EQ (key, Qdata)) data = value; + else if (EQ (key, Qtype))/*obsolete*/ weakness = value; + else if (KEYWORDP (key)) + signal_error (Qinvalid_read_syntax, + "can't mix keyword and non-keyword hash table syntax", + key); + else ABORT(); + } } /* Create the hash table. */ @@ -891,6 +914,16 @@ struct structure_type *st; st = define_structure_type (structure_name, 0, hash_table_instantiate); + + /* First the keyword syntax: */ + define_structure_type_keyword (st, Q_test, hash_table_test_validate); + define_structure_type_keyword (st, Q_size, hash_table_size_validate); + define_structure_type_keyword (st, Q_rehash_size, hash_table_rehash_size_validate); + define_structure_type_keyword (st, Q_rehash_threshold, hash_table_rehash_threshold_validate); + define_structure_type_keyword (st, Q_weakness, hash_table_weakness_validate); + define_structure_type_keyword (st, Q_data, hash_table_data_validate); + + /* Next the mutually exclusive, older, non-keyword syntax: */ define_structure_type_keyword (st, Qtest, hash_table_test_validate); define_structure_type_keyword (st, Qsize, hash_table_size_validate); define_structure_type_keyword (st, Qrehash_size, hash_table_rehash_size_validate); @@ -1851,6 +1884,7 @@ DEFSYMBOL (Qvalue_weak); /* obsolete */ DEFSYMBOL (Qnon_weak); /* obsolete */ + DEFKEYWORD (Q_data); DEFKEYWORD (Q_test); DEFKEYWORD (Q_size); DEFKEYWORD (Q_rehash_size);