Mercurial > hg > xemacs-beta
view src/elhash.h @ 5307:c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
src/ChangeLog addition:
2010-11-20 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.c (Fexpand_abbrev):
* alloc.c:
* alloc.c (Fmake_list):
* alloc.c (Fmake_vector):
* alloc.c (Fmake_bit_vector):
* alloc.c (Fmake_byte_code):
* alloc.c (Fmake_string):
* alloc.c (vars_of_alloc):
* bytecode.c (UNUSED):
* bytecode.c (Fbyte_code):
* chartab.c (decode_char_table_range):
* cmds.c (Fself_insert_command):
* data.c (check_integer_range):
* data.c (Fnatnump):
* data.c (Fnonnegativep):
* data.c (Fstring_to_number):
* elhash.c (hash_table_size_validate):
* elhash.c (decode_hash_table_size):
* eval.c (Fbacktrace_frame):
* event-stream.c (lisp_number_to_milliseconds):
* event-stream.c (Faccept_process_output):
* event-stream.c (Frecent_keys):
* event-stream.c (Fdispatch_event):
* events.c (Fmake_event):
* events.c (Fevent_timestamp):
* events.c (Fevent_timestamp_lessp):
* events.h:
* events.h (struct command_builder):
* file-coding.c (gzip_putprop):
* fns.c:
* fns.c (check_sequence_range):
* fns.c (Frandom):
* fns.c (Fnthcdr):
* fns.c (Flast):
* fns.c (Fnbutlast):
* fns.c (Fbutlast):
* fns.c (Fmember):
* fns.c (Ffill):
* fns.c (Freduce):
* fns.c (replace_string_range_1):
* fns.c (Freplace):
* font-mgr.c (Ffc_pattern_get):
* frame-msw.c (msprinter_set_frame_properties):
* glyphs.c (check_valid_xbm_inline):
* indent.c (Fmove_to_column):
* intl-win32.c (mswindows_multibyte_to_unicode_putprop):
* lisp.h:
* lisp.h (ARRAY_DIMENSION_LIMIT):
* lread.c (decode_mode_1):
* mule-ccl.c (ccl_get_compiled_code):
* number.h:
* process-unix.c (unix_open_multicast_group):
* process.c (Fset_process_window_size):
* profile.c (Fstart_profiling):
* unicode.c (Funicode_to_char):
Change NATNUMP to return 1 for positive bignums; changes uses of
it and of CHECK_NATNUM appropriately, usually by checking for an
integer in an appropriate range.
Add array-dimension-limit and use it in #'make-vector,
#'make-string. Add array-total-size-limit, array-rank-limit while
we're at it, for the sake of any Common Lisp-oriented code that
uses these limits.
Rename check_int_range to check_integer_range, have it take
Lisp_Objects (and thus bignums) instead.
Remove bignum_butlast(), just set int_n to an appropriately large
integer if N is a bignum.
Accept bignums in check_sequence_range(), change the functions
that use check_sequence_range() appropriately.
Move the definition of NATNUMP() to number.h; document why it's a
reasonable name, contradicting an old comment.
tests/ChangeLog addition:
2010-11-20 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
* automated/lisp-tests.el (featurep):
* automated/lisp-tests.el (wrong-type-argument):
* automated/mule-tests.el (featurep):
Check for args-out-of-range errors instead of wrong-type-argument
errors in various places when code is handed a large bignum
instead of a fixnum.
Also check for the wrong-type-argument errors when giving the same
code a non-integer value.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 20 Nov 2010 16:49:11 +0000 |
parents | 71ee43b8a74d |
children | 308d34e9f07d |
line wrap: on
line source
/* Lisp interface to hash tables -- include file. Copyright (C) 1995, 1996 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs 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 General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ #ifndef INCLUDED_elhash_h_ #define INCLUDED_elhash_h_ typedef struct Lisp_Hash_Table Lisp_Hash_Table; DECLARE_LISP_OBJECT (hash_table, Lisp_Hash_Table); #define XHASH_TABLE(x) XRECORD (x, hash_table, Lisp_Hash_Table) #define wrap_hash_table(p) wrap_record (p, hash_table) #define HASH_TABLEP(x) RECORDP (x, hash_table) #define CHECK_HASH_TABLE(x) CHECK_RECORD (x, hash_table) #define CONCHECK_HASH_TABLE(x) CONCHECK_RECORD (x, hash_table) typedef struct htentry { #ifdef NEW_GC NORMAL_LISP_OBJECT_HEADER lheader; #endif /* NEW_GC */ Lisp_Object key; Lisp_Object value; } htentry; #define HTENTRY_CLEAR_P(htentry) ((*(EMACS_UINT*)(&((htentry)->key))) == 0) #ifdef NEW_GC typedef struct htentry Lisp_Hash_Table_Entry; DECLARE_LISP_OBJECT (hash_table_entry, Lisp_Hash_Table_Entry); #define XHASH_TABLE_ENTRY(x) \ XRECORD (x, hash_table_entry, Lisp_Hash_Table_Entry) #define wrap_hash_table_entry(p) wrap_record (p, hash_table_entry) #define HASH_TABLE_ENTRYP(x) RECORDP (x, hash_table_entry) #define CHECK_HASH_TABLE_ENTRY(x) CHECK_RECORD (x, hash_table_entry) #define CONCHECK_HASH_TABLE_ENTRY(x) CONCHECK_RECORD (x, hash_table_entry) #endif /* NEW_GC */ enum hash_table_weakness { HASH_TABLE_NON_WEAK, HASH_TABLE_KEY_WEAK, HASH_TABLE_VALUE_WEAK, HASH_TABLE_KEY_VALUE_WEAK, HASH_TABLE_KEY_CAR_WEAK, HASH_TABLE_VALUE_CAR_WEAK, HASH_TABLE_KEY_CAR_VALUE_WEAK, HASH_TABLE_WEAK }; enum hash_table_test { HASH_TABLE_EQ, HASH_TABLE_EQL, HASH_TABLE_EQUAL, HASH_TABLE_EQUALP }; extern const struct memory_description hash_table_description[]; EXFUN (Fcopy_hash_table, 1); EXFUN (Fhash_table_count, 1); EXFUN (Fgethash, 3); EXFUN (Fputhash, 3); EXFUN (Fremhash, 2); EXFUN (Fclrhash, 1); typedef struct Hash_Table_Test Hash_Table_Test; DECLARE_LISP_OBJECT (hash_table_test, struct Hash_Table_Test); #define XHASH_TABLE_TEST(x) XRECORD (x, hash_table_test, struct Hash_Table_Test) #define wrap_hash_table_test(p) wrap_record (p, hash_table_test) #define HASH_TABLE_TESTP(x) RECORDP (x, hash_table_test) #define CHECK_HASH_TABLE_TEST(x) CHECK_RECORD (x, hash_table_test) #define CONCHECK_HASH_TABLE_TEST(x) CONCHECK_RECORD (x, hash_table_test) typedef int (*hash_table_equal_function_t) (const Hash_Table_Test *http, Lisp_Object obj1, Lisp_Object obj2); typedef Hashcode (*hash_table_hash_function_t) (const Hash_Table_Test *http, Lisp_Object obj); typedef int (*maphash_function_t) (Lisp_Object key, Lisp_Object value, void* extra_arg); /* test here is a Lisp_Object of type hash-table-test. You probably don't want to call this, unless you have registered your own test. */ Lisp_Object make_general_lisp_hash_table (Lisp_Object test, Elemcount size, double rehash_size, double rehash_threshold, enum hash_table_weakness weakness); /* test here is a symbol, e.g. Qeq, Qequal. */ Lisp_Object make_lisp_hash_table (Elemcount size, enum hash_table_weakness weakness, Lisp_Object test); void elisp_maphash (maphash_function_t function, Lisp_Object hash_table, void *extra_arg); void elisp_maphash_unsafe (maphash_function_t function, Lisp_Object hash_table, void *extra_arg); void elisp_map_remhash (maphash_function_t predicate, Lisp_Object hash_table, void *extra_arg); int finish_marking_weak_hash_tables (void); void prune_weak_hash_tables (void); void pdump_reorganize_hash_table (Lisp_Object); void inchash_eq (Lisp_Object key, Lisp_Object table, EMACS_INT offset); htentry *find_htentry (Lisp_Object key, const Lisp_Hash_Table *ht); Lisp_Object define_hash_table_test (Lisp_Object name, hash_table_equal_function_t equal_function, hash_table_hash_function_t hash_function, Lisp_Object lisp_equal_function, Lisp_Object lisp_hash_function); void mark_hash_table_tests (void); #endif /* INCLUDED_elhash_h_ */