Mercurial > hg > xemacs-beta
annotate 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 |
rev | line source |
---|---|
428 | 1 /* Lisp interface to hash tables -- include file. |
2 Copyright (C) 1995, 1996 Ben Wing. | |
3 | |
4 This file is part of XEmacs. | |
5 | |
6 XEmacs is free software; you can redistribute it and/or modify it | |
7 under the terms of the GNU General Public License as published by the | |
8 Free Software Foundation; either version 2, or (at your option) any | |
9 later version. | |
10 | |
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
14 for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with XEmacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
19 Boston, MA 02111-1307, USA. */ | |
20 | |
21 /* Synched up with: Not in FSF. */ | |
22 | |
440 | 23 #ifndef INCLUDED_elhash_h_ |
24 #define INCLUDED_elhash_h_ | |
428 | 25 |
440 | 26 typedef struct Lisp_Hash_Table Lisp_Hash_Table; |
428 | 27 |
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4072
diff
changeset
|
28 DECLARE_LISP_OBJECT (hash_table, Lisp_Hash_Table); |
440 | 29 |
30 #define XHASH_TABLE(x) XRECORD (x, hash_table, Lisp_Hash_Table) | |
617 | 31 #define wrap_hash_table(p) wrap_record (p, hash_table) |
428 | 32 #define HASH_TABLEP(x) RECORDP (x, hash_table) |
33 #define CHECK_HASH_TABLE(x) CHECK_RECORD (x, hash_table) | |
34 #define CONCHECK_HASH_TABLE(x) CONCHECK_RECORD (x, hash_table) | |
35 | |
4072 | 36 typedef struct htentry |
37 { | |
3092 | 38 #ifdef NEW_GC |
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
39 NORMAL_LISP_OBJECT_HEADER lheader; |
4072 | 40 #endif /* NEW_GC */ |
41 Lisp_Object key; | |
42 Lisp_Object value; | |
43 } htentry; | |
44 | |
45 #define HTENTRY_CLEAR_P(htentry) ((*(EMACS_UINT*)(&((htentry)->key))) == 0) | |
46 | |
47 #ifdef NEW_GC | |
48 | |
3092 | 49 typedef struct htentry Lisp_Hash_Table_Entry; |
50 | |
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4072
diff
changeset
|
51 DECLARE_LISP_OBJECT (hash_table_entry, Lisp_Hash_Table_Entry); |
3092 | 52 |
53 #define XHASH_TABLE_ENTRY(x) \ | |
54 XRECORD (x, hash_table_entry, Lisp_Hash_Table_Entry) | |
55 #define wrap_hash_table_entry(p) wrap_record (p, hash_table_entry) | |
56 #define HASH_TABLE_ENTRYP(x) RECORDP (x, hash_table_entry) | |
57 #define CHECK_HASH_TABLE_ENTRY(x) CHECK_RECORD (x, hash_table_entry) | |
58 #define CONCHECK_HASH_TABLE_ENTRY(x) CONCHECK_RECORD (x, hash_table_entry) | |
59 #endif /* NEW_GC */ | |
60 | |
428 | 61 enum hash_table_weakness |
62 { | |
63 HASH_TABLE_NON_WEAK, | |
64 HASH_TABLE_KEY_WEAK, | |
65 HASH_TABLE_VALUE_WEAK, | |
442 | 66 HASH_TABLE_KEY_VALUE_WEAK, |
428 | 67 HASH_TABLE_KEY_CAR_WEAK, |
68 HASH_TABLE_VALUE_CAR_WEAK, | |
450 | 69 HASH_TABLE_KEY_CAR_VALUE_WEAK, |
428 | 70 HASH_TABLE_WEAK |
71 }; | |
72 | |
73 enum hash_table_test | |
74 { | |
75 HASH_TABLE_EQ, | |
76 HASH_TABLE_EQL, | |
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
77 HASH_TABLE_EQUAL, |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
78 HASH_TABLE_EQUALP |
428 | 79 }; |
80 | |
1204 | 81 extern const struct memory_description hash_table_description[]; |
428 | 82 |
83 EXFUN (Fcopy_hash_table, 1); | |
84 EXFUN (Fhash_table_count, 1); | |
85 EXFUN (Fgethash, 3); | |
86 EXFUN (Fputhash, 3); | |
87 EXFUN (Fremhash, 2); | |
88 EXFUN (Fclrhash, 1); | |
89 | |
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
90 typedef struct Hash_Table_Test Hash_Table_Test; |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
91 |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
92 DECLARE_LISP_OBJECT (hash_table_test, struct Hash_Table_Test); |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
93 #define XHASH_TABLE_TEST(x) XRECORD (x, hash_table_test, struct Hash_Table_Test) |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
94 #define wrap_hash_table_test(p) wrap_record (p, hash_table_test) |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
95 #define HASH_TABLE_TESTP(x) RECORDP (x, hash_table_test) |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
96 #define CHECK_HASH_TABLE_TEST(x) CHECK_RECORD (x, hash_table_test) |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
97 #define CONCHECK_HASH_TABLE_TEST(x) CONCHECK_RECORD (x, hash_table_test) |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
98 |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
99 typedef int (*hash_table_equal_function_t) (const Hash_Table_Test *http, |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
100 Lisp_Object obj1, Lisp_Object obj2); |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
101 typedef Hashcode (*hash_table_hash_function_t) (const Hash_Table_Test *http, |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
102 Lisp_Object obj); |
428 | 103 typedef int (*maphash_function_t) (Lisp_Object key, Lisp_Object value, |
104 void* extra_arg); | |
105 | |
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
106 /* test here is a Lisp_Object of type hash-table-test. You probably don't |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
107 want to call this, unless you have registered your own test. */ |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
108 Lisp_Object make_general_lisp_hash_table (Lisp_Object test, |
665 | 109 Elemcount size, |
428 | 110 double rehash_size, |
111 double rehash_threshold, | |
112 enum hash_table_weakness weakness); | |
113 | |
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
114 /* test here is a symbol, e.g. Qeq, Qequal. */ |
665 | 115 Lisp_Object make_lisp_hash_table (Elemcount size, |
428 | 116 enum hash_table_weakness weakness, |
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
117 Lisp_Object test); |
428 | 118 |
119 void elisp_maphash (maphash_function_t function, | |
120 Lisp_Object hash_table, void *extra_arg); | |
121 | |
489 | 122 void elisp_maphash_unsafe (maphash_function_t function, |
123 Lisp_Object hash_table, void *extra_arg); | |
124 | |
428 | 125 void elisp_map_remhash (maphash_function_t predicate, |
126 Lisp_Object hash_table, void *extra_arg); | |
127 | |
128 int finish_marking_weak_hash_tables (void); | |
129 void prune_weak_hash_tables (void); | |
130 | |
440 | 131 void pdump_reorganize_hash_table (Lisp_Object); |
428 | 132 |
2421 | 133 void inchash_eq (Lisp_Object key, Lisp_Object table, EMACS_INT offset); |
134 | |
4072 | 135 htentry *find_htentry (Lisp_Object key, const Lisp_Hash_Table *ht); |
136 | |
5191
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
137 Lisp_Object define_hash_table_test (Lisp_Object name, |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
138 hash_table_equal_function_t equal_function, |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
139 hash_table_hash_function_t hash_function, |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
140 Lisp_Object lisp_equal_function, |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
141 Lisp_Object lisp_hash_function); |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
142 |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
143 void mark_hash_table_tests (void); |
71ee43b8a74d
Add #'equalp as a hash test by default; add #'define-hash-table-test, GNU API
Aidan Kehoe <kehoea@parhasard.net>
parents:
5127
diff
changeset
|
144 |
440 | 145 #endif /* INCLUDED_elhash_h_ */ |